Merge pull request #1488 from multiversx/SERVICES-2608-update-sdk-cor…

…e-package [SERVICES-2608] Update sdk-core package
multiversx · Sep 24, 2024 · 4899b8c · 4899b8c
2 parents 1762734 + d13f8b4
commit 4899b8c
Show file tree

Hide file tree

Showing 20 changed files with 384 additions and 304 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,10 +31,10 @@
         "@datastructures-js/priority-queue": "^6.1.0",
         "@elastic/elasticsearch": "7.12.0",
         "@golevelup/nestjs-rabbitmq": "^4.0.0",
-        "@multiversx/sdk-core": "^12.8.0",
+        "@multiversx/sdk-core": "^13.6.3",
         "@multiversx/sdk-data-api-client": "^0.5.8",
         "@multiversx/sdk-exchange": "^0.2.20",
-        "@multiversx/sdk-native-auth-server": "1.0.15",
+        "@multiversx/sdk-native-auth-server": "1.0.19",
         "@multiversx/sdk-nestjs-cache": "^3.7.0",
         "@multiversx/sdk-nestjs-common": "^3.7.0",
         "@multiversx/sdk-nestjs-elastic": "^3.7.0",

diff --git a/src/modules/auto-router/specs/auto-router.service.spec.ts b/src/modules/auto-router/specs/auto-router.service.spec.ts
@@ -20,8 +20,6 @@ import { RemoteConfigGetterServiceMock } from 'src/modules/remote-config/mocks/r
 import { PairInfoModel } from 'src/modules/pair/models/pair-info.model';
 import { TokenServiceProvider } from 'src/modules/tokens/mocks/token.service.mock';
 import { Tokens } from 'src/modules/pair/mocks/pair.constants';
-import { encodeTransactionData } from 'src/helpers/helpers';
-import { gasConfig } from 'src/config';
 import { WrapAbiServiceProvider } from 'src/modules/wrapping/mocks/wrap.abi.service.mock';
 import { WrapService } from 'src/modules/wrapping/services/wrap.service';
 import { PairAbiServiceProvider } from 'src/modules/pair/mocks/pair.abi.service.mock';
@@ -285,7 +283,7 @@ describe('AutoRouterService', () => {
                 gasLimit: 40200000,
                 data: 'Y29tcG9zZVRhc2tzQDAwMDAwMDBiNTU1MzQ0NDMyZDMxMzIzMzM0MzUzNjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwNzExNzJhY2UwMjZiMGM0QEBAMDJAMDAwMDAwMTQ3Mzc3NjE3MDU0NmY2YjY1NmU3MzQ2Njk3ODY1NjQ0OTZlNzA3NTc0MDAwMDAwMGI1NTUzNDQ0MzJkMzEzMjMzMzQzNTM2MDAwMDAwMDcxMTcyYWNlMDI2YjBjNA==',
                 chainID: 'T',
-                version: 1,
+                version: 2,
                 options: undefined,
                 signature: undefined,
                 guardian: undefined,
@@ -340,7 +338,7 @@ describe('AutoRouterService', () => {
                 gasLimit: 75200000,
                 data: 'RVNEVFRyYW5zZmVyQDU1NTM0NDQzMmQzMTMyMzMzNDM1MzZAMDcwY2VmOWY1ZWRmY2YyOEA2MzZmNmQ3MDZmNzM2NTU0NjE3MzZiNzNAMDAwMDAwMDQ0NTQ3NGM0NDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwODA2ZjA1YjU5ZDNiMjAwMDBAMDNAMDAwMDAwMjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDEzMDAwMDAwMTU3Mzc3NjE3MDU0NmY2YjY1NmU3MzQ2Njk3ODY1NjQ0Zjc1NzQ3MDc1NzQwMDAwMDAwYzU3NDU0NzRjNDQyZDMxMzIzMzM0MzUzNjAwMDAwMDA1OTJhZmQ4YjAyZjAwMDAwMDIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAxMjAwMDAwMDE1NzM3NzYxNzA1NDZmNmI2NTZlNzM0NjY5Nzg2NTY0NGY3NTc0NzA3NTc0MDAwMDAwMGE0ZDQ1NTgyZDMxMzIzMzM0MzUzNjAwMDAwMDA4MDZmMDViNTlkM2IyMDAwMEAwMUA=',
                 chainID: 'T',
-                version: 1,
+                version: 2,
                 options: undefined,
                 signature: undefined,
                 guardian: undefined,

diff --git a/src/modules/composable-tasks/specs/composable.tasks.transaction.spec.ts b/src/modules/composable-tasks/specs/composable.tasks.transaction.spec.ts
@@ -82,7 +82,7 @@ describe('Composable Tasks Transaction', () => {
             senderUsername: undefined,
             signature: undefined,
             value: '1000000000000000000',
-            version: 1,
+            version: 2,
         });
     });
 
@@ -114,7 +114,7 @@ describe('Composable Tasks Transaction', () => {
             senderUsername: undefined,
             signature: undefined,
             value: '1000000000000000000',
-            version: 1,
+            version: 2,
         });
     });
 
@@ -148,7 +148,7 @@ describe('Composable Tasks Transaction', () => {
             senderUsername: undefined,
             signature: undefined,
             value: '0',
-            version: 1,
+            version: 2,
         });
     });
 });
diff --git a/src/modules/distribution/specs/distribution.transactions.service.spec.ts b/src/modules/distribution/specs/distribution.transactions.service.spec.ts
@@ -59,7 +59,7 @@ describe('DistributionTransactionsService', () => {
                 senderUsername: undefined,
                 signature: undefined,
                 value: '0',
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),

diff --git a/src/modules/escrow/specs/escrow.transaction.service.spec.ts b/src/modules/escrow/specs/escrow.transaction.service.spec.ts
@@ -90,7 +90,7 @@ describe('EscrowTransactionService', () => {
                 chainID: mxConfig.chainID,
                 nonce: 0,
                 data: encodeTransactionData(
-                    `MultiESDTNFTTransfer@${scAddress.escrow}@01@XMEX-123456@01@1000000000000000000@lockFunds@${receiverAddress}`,
+                    `ESDTNFTTransfer@XMEX-123456@01@1000000000000000000@${scAddress.escrow}@lockFunds@${receiverAddress}`,
                 ),
                 gasPrice: 1000000000,
                 gasLimit: gasConfig.escrow.lockFunds,
@@ -99,7 +99,7 @@ describe('EscrowTransactionService', () => {
                 sender: senderAddress,
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
             }),
         );
     });
@@ -132,7 +132,7 @@ describe('EscrowTransactionService', () => {
                 senderUsername: undefined,
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),
@@ -168,7 +168,7 @@ describe('EscrowTransactionService', () => {
                 senderUsername: undefined,
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),

diff --git a/src/modules/farm/base-module/services/farm.transaction.service.ts b/src/modules/farm/base-module/services/farm.transaction.service.ts
@@ -273,7 +273,7 @@ export abstract class TransactionsFarmService {
             .withMultiESDTNFTTransfer(mappedPayments)
             .withSender(Address.fromString(sender))
             .withGasLimit(
-                gasConfig.farms.admin.mergeFarmTokensMultiplier *
+                gasConfig.farms['v1.3'].mergeFarmTokensMultiplier *
                     payments.length,
             )
             .withChainID(mxConfig.chainID)

diff --git a/src/modules/farm/specs/farm.transactions.service.spec.ts b/src/modules/farm/specs/farm.transactions.service.spec.ts
@@ -89,15 +89,15 @@ describe('FarmService', () => {
             nonce: 0,
             value: '0',
             receiver:
-                'erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu',
+                'erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqssfuwnk5',
             sender: 'erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu',
             gasPrice: 1000000000,
             gasLimit: gasConfig.farms['v1.2'].enterFarm.default,
             data: encodeTransactionData(
-                'MultiESDTNFTTransfer@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqssfuwnk5@01@EGLDMEXLP-abcdef@@1000000000000@enterFarmAndLockRewards',
+                'ESDTTransfer@EGLDMEXLP-abcdef@1000000000000@enterFarmAndLockRewards',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
         });
@@ -134,7 +134,7 @@ describe('FarmService', () => {
                 'ESDTNFTTransfer@EGLDMEXFL-abcdef@01@1000000000000@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqssfuwnk5@07311709943153914477',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
         });
@@ -170,7 +170,7 @@ describe('FarmService', () => {
                 'ESDTNFTTransfer@EGLDTOK4FL-abcdef@01@1000000000000@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqes9lzxht@claimRewards',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
         });
@@ -226,7 +226,7 @@ describe('FarmService', () => {
                 'ESDTNFTTransfer@EGLDMEXFL-abcdef@01@1000000000000@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqssfuwnk5@migrateToNewFarm@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
         });
@@ -258,7 +258,7 @@ describe('FarmService', () => {
                 'setFarmMigrationConfig@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqssfuwnk5@EGLDMEXFL-abcdef@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -286,7 +286,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms['v1.2'].stopRewards,
             data: encodeTransactionData('stopRewardsAndMigrateRps'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -324,7 +324,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.end_produce_rewards,
             data: encodeTransactionData('end_produce_rewards'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -362,7 +362,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.start_produce_rewards,
             data: encodeTransactionData('start_produce_rewards'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -404,7 +404,7 @@ describe('FarmService', () => {
                 'setPerBlockRewardAmount@1000000000000',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -444,7 +444,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.set_penalty_percent,
             data: encodeTransactionData('set_penalty_percent@05'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -484,7 +484,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.set_minimum_farming_epochs,
             data: encodeTransactionData('set_minimum_farming_epochs@10'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -526,7 +526,7 @@ describe('FarmService', () => {
                 'set_transfer_exec_gas_limit@0100000000',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -566,7 +566,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.set_burn_gas_limit,
             data: encodeTransactionData('set_burn_gas_limit@0100000000'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -604,7 +604,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.pause,
             data: encodeTransactionData('pause'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -642,7 +642,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.resume,
             data: encodeTransactionData('resume'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -688,7 +688,7 @@ describe('FarmService', () => {
                 'registerFarmToken@FarmingToken12@T1T2-1234@18',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -726,7 +726,7 @@ describe('FarmService', () => {
             gasLimit: gasConfig.farms.admin.setLocalRolesFarmToken,
             data: encodeTransactionData('setLocalRolesFarmToken'),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
             guardian: undefined,
@@ -785,12 +785,12 @@ describe('FarmService', () => {
                 'erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu',
             sender: 'erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu',
             gasPrice: 1000000000,
-            gasLimit: gasConfig.farms.admin.mergeFarmTokensMultiplier * 2,
+            gasLimit: gasConfig.farms['v1.3'].mergeFarmTokensMultiplier * 2,
             data: encodeTransactionData(
                 'MultiESDTNFTTransfer@erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqssfuwnk5@02@EGLDMEXFL-abcdef@@01000000000000@EGLDMEXFL-abcdef@@01000000000000@mergeFarmTokens',
             ),
             chainID: mxConfig.chainID,
-            version: 1,
+            version: 2,
             options: undefined,
             signature: undefined,
         });

diff --git a/src/modules/fees-collector/specs/fees-collector.transaction.service.spec.ts b/src/modules/fees-collector/specs/fees-collector.transaction.service.spec.ts
@@ -64,7 +64,7 @@ describe('FeesCollectorTransactionService', () => {
                 data: encodeTransactionData('claimRewards'),
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),
@@ -94,7 +94,7 @@ describe('FeesCollectorTransactionService', () => {
                     data: encodeTransactionData('claimRewards'),
                     options: undefined,
                     signature: undefined,
-                    version: 1,
+                    version: 2,
                     guardian: undefined,
                     guardianSignature: undefined,
                 },
@@ -135,7 +135,7 @@ describe('FeesCollectorTransactionService', () => {
                     data: encodeTransactionData('claimRewards'),
                     options: undefined,
                     signature: undefined,
-                    version: 1,
+                    version: 2,
                     guardian: undefined,
                     guardianSignature: undefined,
                 },
@@ -180,7 +180,7 @@ describe('FeesCollectorTransactionService', () => {
                 ),
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),
@@ -212,7 +212,7 @@ describe('FeesCollectorTransactionService', () => {
                 ),
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),

diff --git a/src/modules/locked-token-wrapper/specs/locked.token.wrapper.transaction.service.spec.ts b/src/modules/locked-token-wrapper/specs/locked.token.wrapper.transaction.service.spec.ts
@@ -110,7 +110,7 @@ describe('LockedTokenWrapperTransactionService', () => {
                 ),
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
             }),
         );
     });
@@ -141,7 +141,7 @@ describe('LockedTokenWrapperTransactionService', () => {
                 ),
                 options: undefined,
                 signature: undefined,
-                version: 1,
+                version: 2,
             }),
         );
     });

diff --git a/src/modules/metabonding/specs/metabonding.transactions.service.spec.ts b/src/modules/metabonding/specs/metabonding.transactions.service.spec.ts
@@ -76,7 +76,7 @@ describe('MetabondingTransactionsService', () => {
                 sender,
                 signature: undefined,
                 value: '0',
-                version: 1,
+                version: 2,
             }),
         );
     });
@@ -101,7 +101,7 @@ describe('MetabondingTransactionsService', () => {
                 senderUsername: undefined,
                 signature: undefined,
                 value: '0',
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),
@@ -128,7 +128,7 @@ describe('MetabondingTransactionsService', () => {
                 senderUsername: undefined,
                 signature: undefined,
                 value: '0',
-                version: 1,
+                version: 2,
                 guardian: undefined,
                 guardianSignature: undefined,
             }),