Merge pull request #47 from multiversx/tm/feature/upgrade-sdk-core-v14 (#48)

Upgrade sdk-core v.14

Author: arhtudormorar

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[3.0.0](https://github.com/multiversx/mx-sdk-dapp-swap/pull/48)] - 2025-03-27
+
+- [Upgrade sdk-core to v.14](https://github.com/multiversx/mx-sdk-dapp-swap/pull/47)
+
+
 ## [[2.1.5](https://github.com/multiversx/mx-sdk-dapp-swap/pull/45)] - 2025-01-17
 
 - [FIX: Swap route is defined when both inputs don't have amounts](https://github.com/multiversx/mx-sdk-dapp-swap/pull/44)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp-swap",
-  "version": "2.1.5",
+  "version": "3.0.0",
   "description": "A library to hold the main logic for swapping between tokens on the MultiversX blockchain",
   "author": "MultiversX",
   "license": "GPL-3.0-or-later",
@@ -27,8 +27,8 @@
   "devDependencies": {
     "@apollo/client": ">=3.8.6",
     "graphql": ">=16.9.0",
-    "@multiversx/sdk-core": ">=13.12.0",
-    "@multiversx/sdk-dapp": ">=3.0.0",
+    "@multiversx/sdk-core": "^14.x",
+    "@multiversx/sdk-dapp": "^4.x",
     "@size-limit/preset-small-lib": "7.0.8",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "13.3.0",
@@ -88,8 +88,8 @@
     "transaction"
   ],
   "peerDependencies": {
-    "@multiversx/sdk-core": ">=13.12.0",
-    "@multiversx/sdk-dapp": ">=3.0.0",
+    "@multiversx/sdk-core": "^14.x",
+    "@multiversx/sdk-dapp": "^4.x",
     "@apollo/client": ">=3.8.6",
     "react": ">=18",
     "react-dom": ">=18",

src/utils/createTransactionFromRaw.ts

@@ -2,7 +2,6 @@ import {
   Address,
   Transaction,
   TransactionOptions,
-  TransactionPayload,
   TransactionVersion,
   IPlainTransactionObject
 } from '@multiversx/sdk-core';
@@ -28,19 +27,26 @@ export const createTransactionFromRaw = (
 
   const { address } = accountSelector(store.getState());
 
-  const dataPayload = isStringBase64(data ?? '')
-    ? TransactionPayload.fromEncoded(data)
-    : new TransactionPayload(data);
+  const dataPayload = data
+    ? isStringBase64(data)
+      ? Buffer.from(data, 'base64')
+      : Buffer.from(data.trim())
+    : undefined;
 
-  return new Transaction({
-    value: value.valueOf(),
+  const transaction = new Transaction({
+    value: BigInt(value),
     data: dataPayload,
     receiver: new Address(receiver),
     sender: new Address(sender && sender !== '' ? sender : address),
-    gasLimit: gasLimit.valueOf() ?? GAS_LIMIT,
-    gasPrice: gasPrice.valueOf() ?? GAS_PRICE,
+    gasLimit: BigInt(gasLimit.valueOf() ?? GAS_LIMIT),
+    gasPrice: BigInt(gasPrice.valueOf() ?? GAS_PRICE),
     chainID: chainID.valueOf(),
-    version: new TransactionVersion(version ?? VERSION),
-    ...(options ? { options: new TransactionOptions(options) } : {})
+    version: new TransactionVersion(version ?? VERSION).valueOf()
   });
+
+  if (options) {
+    transaction.options = new TransactionOptions(options).valueOf();
+  }
+
+  return transaction;
 };

src/utils/getTransactionFee.ts

@@ -1,4 +1,8 @@
-import { IPlainTransactionObject, NetworkConfig } from '@multiversx/sdk-core';
+import {
+  IPlainTransactionObject,
+  NetworkConfig,
+  TransactionComputer
+} from '@multiversx/sdk-core';
 import {
   GAS_LIMIT,
   GAS_PER_DATA_BYTE,
@@ -10,12 +14,17 @@ export const getTransactionFee = (rawTransaction: IPlainTransactionObject) => {
   const transaction = createTransactionFromRaw(rawTransaction);
 
   const networkConfig = new NetworkConfig();
-  networkConfig.MinGasLimit = GAS_LIMIT;
-  networkConfig.GasPerDataByte = GAS_PER_DATA_BYTE;
-  networkConfig.GasPriceModifier = GAS_PRICE_MODIFIER;
+  networkConfig.minGasLimit = BigInt(GAS_LIMIT);
+  networkConfig.gasPerDataByte = BigInt(GAS_PER_DATA_BYTE);
+  networkConfig.gasPriceModifier = GAS_PRICE_MODIFIER;
 
   try {
-    return transaction.computeFee(networkConfig).toString(10);
+    const transactionComputer = new TransactionComputer();
+    const fee = transactionComputer.computeTransactionFee(
+      transaction,
+      networkConfig
+    );
+    return fee.toString(10);
   } catch (err) {
     return 0;
   }