Skip to content

Commit

Permalink
Merge pull request #1054 from multiversx/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
danielailie authored Nov 8, 2023
2 parents 178ede3 + ca70765 commit bfab245
Show file tree
Hide file tree
Showing 51 changed files with 1,892 additions and 2,084 deletions.
1,942 changes: 1,413 additions & 529 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@
},
"dependencies": {
"@apollo/server": "^4.9.3",
"@aws-sdk/client-s3": "^3.438.0",
"@aws-sdk/lib-storage": "^3.438.0",
"@elastic/elasticsearch": "7.12.0",
"@golevelup/nestjs-rabbitmq": "3.4.0",
"@golevelup/nestjs-rabbitmq": "4.0.0",
"@multiversx/sdk-core": "12.6.1",
"@multiversx/sdk-native-auth-server": "1.0.7",
"@multiversx/sdk-nestjs-cache": "2.0.0-beta.2",
Expand All @@ -62,7 +64,6 @@
"agentkeepalive": "4.2.1",
"amqp-connection-manager": "3.7.0",
"amqplib": "0.8.0",
"aws-sdk": "2.1366.0",
"axios": "0.21.4",
"axios-retry": "3.1.8",
"bignumber.js": "9.0.1",
Expand Down
63 changes: 6 additions & 57 deletions schema.gql
Original file line number Diff line number Diff line change
Expand Up @@ -352,12 +352,6 @@ input BuySftActionArgs {
quantity: String
}

input BuyTicketsArgs {
collectionIdentifier: String!
price: String!
ticketsNumber: Int!
}

type Campaign {
availableNfts: Int!
campaignId: ID!
Expand Down Expand Up @@ -426,10 +420,6 @@ input ChildFilter {
values: [String!]!
}

input ClaimTicketsArgs {
collectionIdentifier: String!
}

input ClearReportCollectionInput {
collectionIdentifier: String!
}
Expand Down Expand Up @@ -971,8 +961,6 @@ type Mutation {
burnQuantity(input: HandleQuantityArgs!): TransactionNode!
buyRandomNft(input: BuyRandomNftActionArgs!): TransactionNode!
buySft(input: BuySftActionArgs!): TransactionNode!
buyTickets(input: BuyTicketsArgs!): TransactionNode!
claimTicket(input: ClaimTicketsArgs!): TransactionNode!
clearCollectionScamInfo(collection: String!): Boolean!
clearNftScamInfo(identifier: String!): Boolean!
clearReportCollection(input: ClearReportCollectionInput!): Boolean!
Expand All @@ -995,6 +983,7 @@ type Mutation {
removeBlacklistedCollection(collection: String!): Boolean!
removeFeaturedCollection(input: FeaturedCollectionsArgs!): Boolean!
removeLike(input: RemoveLikeArgs!): Boolean!
removeWhitelistCollection(input: RemoveWhitelistCollectionArgs!): Boolean!
reportCollection(
"""This endpoint can be used to report a Collection"""
input: ReportCollectionInput!
Expand Down Expand Up @@ -1239,36 +1228,6 @@ type PriceRange {
minBid: Price!
}

type PrimarySale {
collectionIdentifier: ID
frozen: Boolean
maxUnitsPerWallet: Int!
paymentToken: String!
price: String
saleTime: PrimarySaleTime!
status: PrimarySaleStatusEnum!
}

input PrimarySaleFilter {
collectionName: String!
}

enum PrimarySaleStatusEnum {
BetweenPeriod
ClaimPeriod
EndedPeriod
NonePeriod
NotStarted
SalePeriod
}

type PrimarySaleTime {
endClaim: Int
endSale: Int!
startClaim: Int
startSale: Int!
}

enum Privacy {
private
public
Expand Down Expand Up @@ -1307,17 +1266,13 @@ type Query {
featuredCollections(filters: FeaturedCollectionsFilter, pagination: ConnectionArgs): CollectionResponse!
featuredNfts(pagination: ConnectionArgs): AssetsResponse!
generalAnalytics(input: AnalyticsInput): GeneralAnalyticsModel!
hasClaimedTickets(collectionIdentifier: String!): Boolean!
isWhitelisted: WhitelistedInfo!
marketplaces(filters: MarketplaceFilters, pagination: ConnectionArgs): MarketplacesResponse!
myClaimableAuctions(filters: MyClaimableAuctionsFilters, pagination: ConnectionArgs): AuctionResponse!
myTickets(collectionIdentifier: String!): [TicketInfo!]!
notifications(filters: NotificationsFilters, pagination: ConnectionArgs): NotificationsResponse!
offers(filters: OffersFilters, pagination: ConnectionArgs): OffersResponse!
orders(filters: FiltersExpression, pagination: ConnectionArgs, sorting: [Sorting!]): OrdersResponse!
owners(filters: OwnersFilters!, pagination: ConnectionArgs): OwnerResponse!
priceRange(filters: TokenFilter): PriceRange!
primarySale(filters: PrimarySaleFilter!): PrimarySale!
search(filters: SearchFilter!): SearchResponse!
tags(filters: TagsFilter!, pagination: ConnectionArgs): TagsResponse!
trendingAssets: [Asset!]!
Expand All @@ -1341,6 +1296,11 @@ input RemoveLikeArgs {
identifier: String!
}

input RemoveWhitelistCollectionArgs {
collection: String!
marketplaceKey: String!
}

input ReportCollectionInput {
collectionIdentifier: String!
}
Expand Down Expand Up @@ -1442,12 +1402,6 @@ type TagsResponse {
pageInfo: TagPageInfo
}

type TicketInfo {
buyer: String!
ticketNumber: Int!
winningNonce: String!
}

type Tier {
availableNfts: Int!
campaignId: ID!
Expand Down Expand Up @@ -1586,9 +1540,4 @@ input WhitelistMarketplaceArgs {
input WhitelistMinterArgs {
address: String!
adminAddress: String!
}

type WhitelistedInfo {
isWhitelisted: Boolean!
message: String
}
Loading

0 comments on commit bfab245

Please sign in to comment.