Skip to content

Commit

Permalink
Merge pull request #1058 from multiversx/SERVICES-1944-add-proxy-depl…
Browse files Browse the repository at this point in the history
…oyer-implementation

Services 1944 add proxy deployer implementation
  • Loading branch information
danielailie authored Dec 14, 2023
2 parents 0b6a8d9 + da2eee5 commit e9f57b0
Show file tree
Hide file tree
Showing 17 changed files with 694 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .jest/setEnvVars.js
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
process.env.DEPLOYER_ADDRESS = 'erd1qqqqqqqqqqqqqpgqut6lamz9dn480ytj8cmcwvydcu3lj55epltq9t9kam';
process.env.TEMPLATE_BULK_ADDRESS = 'erd1qqqqqqqqqqqqqpgqzs3y0vr4t4sqyet32t6jp9m85l3hlr93u00sdj9rxa';
process.env.TEMPLATE_MINTER_ADDRESS = 'erd1qqqqqqqqqqqqqpgqzs3y0vr4t4sqyet32t6jp9m85l3hlr93u00sdj9rxa';
process.env.TEMPLATE_MARKETPLACE_ADDRESS = 'erd1qqqqqqqqqqqqqpgq9ac9zvc4ugzrgqaqjqgjdhvxxtx7wu2eu00sxezym3';
51 changes: 47 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@aws-sdk/lib-storage": "^3.438.0",
"@elastic/elasticsearch": "7.12.0",
"@golevelup/nestjs-rabbitmq": "4.0.0",
"@multiversx/sdk-core": "12.6.1",
"@multiversx/sdk-core": "12.14.0",
"@multiversx/sdk-native-auth-server": "1.0.7",
"@multiversx/sdk-nestjs-cache": "2.0.0-beta.2",
"@multiversx/sdk-nestjs-common": "2.0.0-beta.2",
Expand Down
18 changes: 15 additions & 3 deletions schema.gql
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ input AssetsFilter {
"""This will work only with an owner address"""
collections: [String!]
creatorAddress: String
customFilters: CustomFiltersEnum
identifier: String
identifiers: [String!]
likedByAddress: String
Expand Down Expand Up @@ -686,8 +685,18 @@ input CurrentPaymentTokensFilters {
marketplaceKey: String
}

enum CustomFiltersEnum {
Tickets
input DeployBulkArgs {
ownerAddress: String!
}

input DeployMarketplaceArgs {
marketplaceFee: String!
ownerAddress: String!

"""
The accepted payment tokens for auction on the marketplace. By default, if left empty, accepts all payment tokens
"""
paymentTokens: [String!]
}

input DeployMinterArgs {
Expand Down Expand Up @@ -974,7 +983,10 @@ type Mutation {
createAuction(input: CreateAuctionArgs!): TransactionNode!
createNft(file: Upload!, input: CreateNftArgs!): TransactionNode!
createNftWithMultipleFiles(files: [Upload!]!, input: CreateNftArgs!): TransactionNode!
deployBulkSmartContract(input: DeployBulkArgs!): TransactionNode!
deployMarketplaceContract(input: DeployMarketplaceArgs!): TransactionNode!
deployMinter(input: DeployMinterArgs!): TransactionNode!
deployMinterSmartContract(input: DeployMinterArgs!): TransactionNode!
disableMarketplace(input: UpdateMarketplaceStateArgs!): Boolean!
enableMarketplace(input: UpdateMarketplaceStateArgs!): Boolean!
endAuction(auctionId: Int!): TransactionNode!
Expand Down
Loading

0 comments on commit e9f57b0

Please sign in to comment.