Merge pull request #1078 from multiversx/development

Development to main
multiversx · Sep 11, 2024 · 5e1f730 · 5e1f730
2 parents 2005f85 + 56eaf98
commit 5e1f730
Show file tree

Hide file tree

Showing 11 changed files with 8,103 additions and 3,960 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,15 +39,15 @@
     "@aws-sdk/lib-storage": "^3.438.0",
     "@elastic/elasticsearch": "7.12.0",
     "@golevelup/nestjs-rabbitmq": "4.0.0",
-    "@multiversx/sdk-core": "12.14.0",
-    "@multiversx/sdk-native-auth-server": "1.0.7",
-    "@multiversx/sdk-nestjs-cache": "3.4.1",
-    "@multiversx/sdk-nestjs-common": "3.4.1",
-    "@multiversx/sdk-nestjs-elastic": "3.4.1",
-    "@multiversx/sdk-nestjs-http": "3.4.1",
-    "@multiversx/sdk-nestjs-monitoring": "3.4.1",
-    "@multiversx/sdk-nestjs-redis": "3.4.1",
-    "@multiversx/sdk-network-providers": "^1.2.1",
+    "@multiversx/sdk-core": "13.4.2",
+    "@multiversx/sdk-native-auth-server": "1.0.19",
+    "@multiversx/sdk-nestjs-cache": "3.7.2",
+    "@multiversx/sdk-nestjs-common": "3.7.2",
+    "@multiversx/sdk-nestjs-elastic": "3.7.2",
+    "@multiversx/sdk-nestjs-http": "3.7.2",
+    "@multiversx/sdk-nestjs-monitoring": "3.7.2",
+    "@multiversx/sdk-nestjs-redis": "3.7.2",
+    "@multiversx/sdk-network-providers": "2.7.0",
     "@nestjs/apollo": "12.0.7",
     "@nestjs/common": "10.2.4",
     "@nestjs/config": "3.0.1",
@@ -57,17 +57,17 @@
     "@nestjs/microservices": "10.2.4",
     "@nestjs/mongoose": "10.0.1",
     "@nestjs/passport": "10.0.1",
-    "@nestjs/platform-express": "10.2.4",
+    "@nestjs/platform-express": "10.3.5",
     "@nestjs/schedule": "3.0.3",
     "@nestjs/typeorm": "10.0.0",
     "@types/cache-manager": "3.4.0",
     "agentkeepalive": "4.2.1",
     "amqp-connection-manager": "3.7.0",
     "amqplib": "0.8.0",
-    "axios": "0.21.4",
-    "axios-retry": "3.1.8",
+    "axios": "1.7.4",
+    "axios-retry": "4.5.0",
     "bignumber.js": "9.0.1",
-    "clarifai-nodejs-grpc": "8.0.0",
+    "clarifai-nodejs-grpc": "10.7.2",
     "class-transformer": "0.4.0",
     "class-validator": "0.14.0",
     "config": "3.3.6",
@@ -85,7 +85,7 @@
     "jwks-rsa": "2.0.3",
     "moment": "^2.29.4",
     "mongoose": "7.5.0",
-    "mysql2": "2.2.5",
+    "mysql2": "3.9.8",
     "nest-winston": "1.9.4",
     "object-hash": "2.2.0",
     "passport": "0.6.0",

diff --git a/src/common/services/mx-communication/mx-api.service.ts b/src/common/services/mx-communication/mx-api.service.ts
@@ -29,14 +29,14 @@ export class MxApiService {
     };
     const httpAgent = new Agent(keepAliveOptions);
     const httpsAgent = new Agent.HttpsAgent(keepAliveOptions);
-
     this.apiProvider = new ApiNetworkProvider(process.env.ELROND_API, {
       timeout: mxConfig.proxyTimeout,
       httpAgent: mxConfig.keepAlive ? httpAgent : null,
       httpsAgent: mxConfig.keepAlive ? httpsAgent : null,
       headers: {
         origin: 'NftService',
       },
+      clientName: "nft-service",
     });
   }
 
@@ -394,9 +394,9 @@ export class MxApiService {
     const token = await this.doGetGeneric(this.getTokenData.name, `tokens/${tokenId}?fields=identifier,name,ticker,decimals,price`);
     return token
       ? new Token({
-          ...token,
-          symbol: token.ticker,
-        })
+        ...token,
+        symbol: token.ticker,
+      })
       : undefined;
   }
 

diff --git a/src/common/services/mx-communication/mx-private-api.service.ts b/src/common/services/mx-communication/mx-private-api.service.ts
@@ -26,6 +26,7 @@ export class MxPrivateApiService {
       headers: {
         origin: 'NftService',
       },
+      clientName: "nft-service",
     });
   }
 

diff --git a/src/common/services/mx-communication/mx-proxy.service.ts b/src/common/services/mx-communication/mx-proxy.service.ts
@@ -20,6 +20,7 @@ export class MxProxyService {
       timeout: parseInt(process.env.KEEPALIVE_TIMEOUT_DOWNSTREAM),
       httpAgent: mxConfig.keepAlive ? httpAgent : null,
       httpsAgent: mxConfig.keepAlive ? httpsAgent : null,
+      clientName: "nft-service"
     });
   }
 

diff --git a/src/modules/assets/tests/assets-transaction.service.spec.ts b/src/modules/assets/tests/assets-transaction.service.spec.ts
@@ -61,7 +61,7 @@ describe('Assets Transaction Service', () => {
       sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
       signature: undefined,
       value: '0',
-      version: 1,
+      version: 2,
     };
 
     it('returns built transaction with right arguments', async () => {
@@ -107,7 +107,7 @@ describe('Assets Transaction Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.burnQuantity(ownerAddress, burnRequest);
@@ -149,7 +149,7 @@ describe('Assets Transaction Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.burnQuantity(ownerAddress, burnRequest);
@@ -170,7 +170,7 @@ describe('Assets Transaction Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.transferNft(
@@ -195,7 +195,7 @@ describe('Assets Transaction Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.transferNft(
@@ -231,7 +231,7 @@ describe('Assets Transaction Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.createNft(

diff --git a/src/modules/auctions/tests/nft-marketplace.abi.service.spec.ts b/src/modules/auctions/tests/nft-marketplace.abi.service.spec.ts
@@ -106,7 +106,7 @@ describe('Nft Marketplace Abi Service', () => {
       sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
       signature: undefined,
       value: '0',
-      version: 1,
+      version: 2,
     };
 
     it('returns built transaction with right arguments', async () => {
@@ -147,7 +147,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
       const result = await service.createAuction(ownerAddress, {
         ...createAuctionRequestWithEgld,
@@ -201,7 +201,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '111111111111111',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.bid(ownerAddress, inputWithEgld);
@@ -226,7 +226,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.bid(ownerAddress, inputWithEsdt);
@@ -264,7 +264,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.withdraw('erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha', 1);
@@ -318,7 +318,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '111111111111111',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.createOffer(ownerAddress, createOfferRequest);
@@ -343,7 +343,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.createOffer(
@@ -392,7 +392,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.withdrawOffer('erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha', 1);
@@ -478,7 +478,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.acceptOffer(ownerAddress, acceptOfferWithoutAuction);
@@ -560,7 +560,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.acceptOffer(ownerAddress, acceptOfferWithAuctionId);
@@ -588,7 +588,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.endAuction('erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha', 1);
@@ -635,7 +635,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '1111111',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.buySft(ownerAddress, buySftRequestWithEgld);
@@ -661,7 +661,7 @@ describe('Nft Marketplace Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.buySft(ownerAddress, {

diff --git a/src/modules/campaigns/tests/nft-minter.abi.service.spec.ts b/src/modules/campaigns/tests/nft-minter.abi.service.spec.ts
@@ -59,7 +59,7 @@ describe('Nft Minter Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '50000000000000000',
-        version: 1,
+        version: 2,
       };
       expect(result).toMatchObject(expectedResult);
     });
@@ -78,7 +78,7 @@ describe('Nft Minter Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '10000000',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.buyRandomNft(
@@ -117,7 +117,7 @@ describe('Nft Minter Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       expect(result).toMatchObject(expectedResult);

diff --git a/src/modules/minters/tests/minters-deployer.abi.service.spec.ts b/src/modules/minters/tests/minters-deployer.abi.service.spec.ts
@@ -47,7 +47,7 @@ describe('Minters Deployer Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
       expect(result).toMatchObject(expectedResult);
     });
@@ -66,7 +66,7 @@ describe('Minters Deployer Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.pauseNftMinter(
@@ -95,7 +95,7 @@ describe('Minters Deployer Abi Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       expect(result).toMatchObject(expectedResult);

diff --git a/src/modules/nftCollections/tests/collections-transactions.service.spec.ts b/src/modules/nftCollections/tests/collections-transactions.service.spec.ts
@@ -32,7 +32,7 @@ describe('Collections Transactions Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '50000000000000000',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.issueToken(
@@ -61,7 +61,7 @@ describe('Collections Transactions Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '50000000000000000',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.issueToken(
@@ -92,7 +92,7 @@ describe('Collections Transactions Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.stopNFTCreate(
@@ -119,7 +119,7 @@ describe('Collections Transactions Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.transferNFTCreateRole(
@@ -147,7 +147,7 @@ describe('Collections Transactions Service', () => {
         sender: 'erd1dc3yzxxeq69wvf583gw0h67td226gu2ahpk3k50qdgzzym8npltq7ndgha',
         signature: undefined,
         value: '0',
-        version: 1,
+        version: 2,
       };
 
       const result = await service.setNftRoles(
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ export class MxPrivateApiService { @@
           headers: {
             origin: 'NftService',
           },
+          clientName: "nft-service",
         });
       }
@@ Expand Down @@