Merge pull request #670 from multiversx/fixes-and-bump-version-15-2-1

Small fixes and bump version

Author: popenta

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-core",
-  "version": "15.2.0",
+  "version": "15.2.1",
   "description": "MultiversX SDK for JavaScript and TypeScript",
   "author": "MultiversX",
   "homepage": "https://multiversx.com",

package.json

@@ -12,31 +12,11 @@ export type BaseControllerInput = {
 };
 
 export class BaseController {
-    private gasLimitEstimator?: IGasLimitEstimator;
+    readonly gasLimitEstimator?: IGasLimitEstimator;
     constructor(options?: { gasLimitEstimator?: IGasLimitEstimator }) {
         this.gasLimitEstimator = options?.gasLimitEstimator;
     }
 
-    protected async setTransactionGasOptions(
-        transaction: Transaction,
-        options: { gasLimit?: bigint; gasPrice?: bigint },
-    ) {
-        if (options.gasPrice) {
-            transaction.gasPrice = options.gasPrice;
-        }
-
-        if (options.gasLimit) {
-            transaction.gasLimit = options.gasLimit;
-            return;
-        } else {
-            this.addExtraGasLimitIfRequired(transaction);
-        }
-
-        if (this.gasLimitEstimator) {
-            transaction.gasLimit = await this.gasLimitEstimator.estimateGasLimit({ transaction });
-        }
-    }
-
     protected addExtraGasLimitIfRequired(transaction: Transaction): void {
         if (transaction.guardian && !transaction.guardian.isEmpty()) {
             transaction.gasLimit += BigInt(EXTRA_GAS_LIMIT_FOR_GUARDED_TRANSACTIONS);
@@ -47,13 +27,6 @@ export class BaseController {
         }
     }
 
-    protected setVersionAndOptionsForGuardian(transaction: Transaction): void {
-        if (transaction.guardian && !transaction.guardian.isEmpty()) {
-            const txComputer = new TransactionComputer();
-            txComputer.applyGuardian(transaction, transaction.guardian);
-        }
-    }
-
     protected async setupAndSignTransaction(
         transaction: Transaction,
         options: BaseControllerInput,
@@ -67,4 +40,31 @@ export class BaseController {
         await this.setTransactionGasOptions(transaction, options);
         transaction.signature = await sender.signTransaction(transaction);
     }
+
+    protected setVersionAndOptionsForGuardian(transaction: Transaction): void {
+        if (transaction.guardian && !transaction.guardian.isEmpty()) {
+            const txComputer = new TransactionComputer();
+            txComputer.applyGuardian(transaction, transaction.guardian);
+        }
+    }
+
+    protected async setTransactionGasOptions(
+        transaction: Transaction,
+        options: { gasLimit?: bigint; gasPrice?: bigint },
+    ) {
+        if (options.gasPrice) {
+            transaction.gasPrice = options.gasPrice;
+        }
+
+        if (options.gasLimit) {
+            transaction.gasLimit = options.gasLimit;
+            return;
+        }
+
+        this.addExtraGasLimitIfRequired(transaction);
+
+        if (this.gasLimitEstimator) {
+            transaction.gasLimit = await this.gasLimitEstimator.estimateGasLimit({ transaction });
+        }
+    }
 }

src/core/baseController.ts

@@ -19,7 +19,7 @@ describe("test transfers controller", function () {
         grace = await Account.newFromPem(path.join(walletsPath, "grace.pem"));
     });
 
-    it("should send relayed with ho native balance", async function () {
+    it("should send relayed with no native balance", async function () {
         sender.nonce = await entrypoint.recallAccountNonce(sender.address);
         const token = new Token({ identifier: "USDC-350c4e" });
         const transfer = new TokenTransfer({ token: token, amount: 7n });