@sravankumar02/sdk-core 1.0.0 → 2.0.0

package/out/tokenManagement/tokenManagementTransactionsFactory.js

@@ -3,22 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenManagementTransactionsFactory = void 0;
 const abi_1 = require("../abi");
 const address_1 = require("../core/address");
+const baseFactory_1 = require("../core/baseFactory");
 const constants_1 = require("../core/constants");
 const errors_1 = require("../core/errors");
 const logger_1 = require("../core/logger");
-const transactionBuilder_1 = require("../core/transactionBuilder");
+const transaction_1 = require("../core/transaction");
 /**
  * Use this class to create token management transactions like issuing DCDTs, creating NFTs, setting roles, etc.
  */
-class TokenManagementTransactionsFactory {
+class TokenManagementTransactionsFactory extends baseFactory_1.BaseFactory {
     constructor(options) {
+        super({ config: options.config, gasLimitEstimator: options.gasLimitEstimator });
         this.config = options.config;
         this.argSerializer = new abi_1.ArgSerializer();
         this.trueAsString = "true";
         this.falseAsString = "false";
         this.dcdtContractAddress = address_1.Address.newFromHex(constants_1.DCDT_CONTRACT_ADDRESS_HEX, this.config.addressHrp);
     }
-    createTransactionForIssuingFungible(sender, options) {
+    async createTransactionForIssuingFungible(sender, options) {
         this.notifyAboutUnsettingBurnRoleGlobally();
         const args = [
             new abi_1.StringValue(options.tokenName),
@@ -39,17 +41,18 @@ class TokenManagementTransactionsFactory {
             new abi_1.StringValue(this.boolToString(options.canAddSpecialRoles)),
         ];
         const dataParts = ["issue", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitIssue,
-            addDataMovementGas: true,
-            amount: this.config.issueCost,
-        }).build();
-    }
-    createTransactionForIssuingSemiFungible(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+            value: this.config.issueCost,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitIssue);
+        return transaction;
+    }
+    async createTransactionForIssuingSemiFungible(sender, options) {
         this.notifyAboutUnsettingBurnRoleGlobally();
         const args = [
             new abi_1.StringValue(options.tokenName),
@@ -70,17 +73,18 @@ class TokenManagementTransactionsFactory {
             new abi_1.StringValue(this.boolToString(options.canAddSpecialRoles)),
         ];
         const dataParts = ["issueSemiFungible", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitIssue,
-            addDataMovementGas: true,
-            amount: this.config.issueCost,
-        }).build();
-    }
-    createTransactionForIssuingNonFungible(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+            value: this.config.issueCost,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitIssue);
+        return transaction;
+    }
+    async createTransactionForIssuingNonFungible(sender, options) {
         this.notifyAboutUnsettingBurnRoleGlobally();
         const args = [
             new abi_1.StringValue(options.tokenName),
@@ -101,17 +105,18 @@ class TokenManagementTransactionsFactory {
             new abi_1.StringValue(this.boolToString(options.canAddSpecialRoles)),
         ];
         const dataParts = ["issueNonFungible", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitIssue,
-            addDataMovementGas: true,
-            amount: this.config.issueCost,
-        }).build();
-    }
-    createTransactionForRegisteringMetaDCDT(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+            value: this.config.issueCost,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitIssue);
+        return transaction;
+    }
+    async createTransactionForRegisteringMetaDCDT(sender, options) {
         this.notifyAboutUnsettingBurnRoleGlobally();
         const args = [
             new abi_1.StringValue(options.tokenName),
@@ -133,17 +138,18 @@ class TokenManagementTransactionsFactory {
             new abi_1.StringValue(this.boolToString(options.canAddSpecialRoles)),
         ];
         const dataParts = ["registerMetaDCDT", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitIssue,
-            addDataMovementGas: true,
-            amount: this.config.issueCost,
-        }).build();
-    }
-    createTransactionForRegisteringAndSettingRoles(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+            value: this.config.issueCost,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitIssue);
+        return transaction;
+    }
+    async createTransactionForRegisteringAndSettingRoles(sender, options) {
         this.notifyAboutUnsettingBurnRoleGlobally();
         const dataParts = [
             "registerAndSetAllRoles",
@@ -154,75 +160,80 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BigUIntValue(options.numDecimals),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitIssue,
-            addDataMovementGas: true,
-            amount: this.config.issueCost,
-        }).build();
-    }
-    createTransactionForSettingBurnRoleGlobally(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+            value: this.config.issueCost,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitIssue);
+        return transaction;
+    }
+    async createTransactionForSettingBurnRoleGlobally(sender, options) {
         const dataParts = [
             "setBurnRoleGlobally",
             ...this.argSerializer.valuesToStrings([new abi_1.StringValue(options.tokenIdentifier)]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitToggleBurnRoleGlobally,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUnsettingBurnRoleGlobally(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitToggleBurnRoleGlobally);
+        return transaction;
+    }
+    async createTransactionForUnsettingBurnRoleGlobally(sender, options) {
         const dataParts = [
             "unsetBurnRoleGlobally",
             ...this.argSerializer.valuesToStrings([new abi_1.StringValue(options.tokenIdentifier)]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitToggleBurnRoleGlobally,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForSettingSpecialRoleOnFungibleToken(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitToggleBurnRoleGlobally);
+        return transaction;
+    }
+    async createTransactionForSettingSpecialRoleOnFungibleToken(sender, options) {
         const args = [new abi_1.StringValue(options.tokenIdentifier), new abi_1.AddressValue(options.user)];
         options.addRoleLocalMint ? args.push(new abi_1.StringValue("DCDTRoleLocalMint")) : 0;
         options.addRoleLocalBurn ? args.push(new abi_1.StringValue("DCDTRoleLocalBurn")) : 0;
         options.addRoleDCDTTransferRole ? args.push(new abi_1.StringValue("DCDTTransferRole")) : 0;
         const dataParts = ["setSpecialRole", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitSetSpecialRole,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUnsettingSpecialRoleOnFungibleToken(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitSetSpecialRole);
+        return transaction;
+    }
+    async createTransactionForUnsettingSpecialRoleOnFungibleToken(sender, options) {
         const args = [new abi_1.StringValue(options.tokenIdentifier), new abi_1.AddressValue(options.user)];
         options.removeRoleLocalMint ? args.push(new abi_1.StringValue("DCDTRoleLocalMint")) : 0;
         options.removeRoleDCDTTransferRole ? args.push(new abi_1.StringValue("DCDTRoleLocalBurn")) : 0;
         options.removeRoleDCDTTransferRole ? args.push(new abi_1.StringValue("DCDTTransferRole")) : 0;
         const dataParts = ["unSetSpecialRole", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitSetSpecialRole,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForSettingSpecialRoleOnSemiFungibleToken(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitSetSpecialRole);
+        return transaction;
+    }
+    async createTransactionForSettingSpecialRoleOnSemiFungibleToken(sender, options) {
         const args = [new abi_1.StringValue(options.tokenIdentifier), new abi_1.AddressValue(options.user)];
         options.addRoleNFTCreate ? args.push(new abi_1.StringValue("DCDTRoleNFTCreate")) : 0;
         options.addRoleNFTBurn ? args.push(new abi_1.StringValue("DCDTRoleNFTBurn")) : 0;
@@ -234,16 +245,17 @@ class TokenManagementTransactionsFactory {
         options.addRoleDCDTModifyCreator ? args.push(new abi_1.StringValue("DCDTRoleModifyCreator")) : 0;
         options.addRoleNFTRecreate ? args.push(new abi_1.StringValue("DCDTRoleNFTRecreate")) : 0;
         const dataParts = ["setSpecialRole", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitSetSpecialRole,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUnsettingSpecialRoleOnSemiFungibleToken(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitSetSpecialRole);
+        return transaction;
+    }
+    async createTransactionForUnsettingSpecialRoleOnSemiFungibleToken(sender, options) {
         const args = [new abi_1.StringValue(options.tokenIdentifier), new abi_1.AddressValue(options.user)];
         options.removeRoleNFTBurn ? args.push(new abi_1.StringValue("DCDTRoleNFTBurn")) : 0;
         options.removeRoleNFTAddQuantity ? args.push(new abi_1.StringValue("DCDTRoleNFTAddQuantity")) : 0;
@@ -254,22 +266,23 @@ class TokenManagementTransactionsFactory {
         options.removeRoleDCDTModifyCreator ? args.push(new abi_1.StringValue("DCDTRoleModifyCreator")) : 0;
         options.removeRoleNFTRecreate ? args.push(new abi_1.StringValue("DCDTRoleNFTRecreate")) : 0;
         const dataParts = ["unSetSpecialRole", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitSetSpecialRole,
-            addDataMovementGas: true,
-        }).build();
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitSetSpecialRole);
+        return transaction;
     }
-    createTransactionForSettingSpecialRoleOnMetaDCDT(sender, options) {
-        return this.createTransactionForSettingSpecialRoleOnSemiFungibleToken(sender, options);
+    async createTransactionForSettingSpecialRoleOnMetaDCDT(sender, options) {
+        return await this.createTransactionForSettingSpecialRoleOnSemiFungibleToken(sender, options);
     }
-    createTransactionForUnsettingSpecialRoleOnMetaDCDT(sender, options) {
-        return this.createTransactionForUnsettingSpecialRoleOnSemiFungibleToken(sender, options);
+    async createTransactionForUnsettingSpecialRoleOnMetaDCDT(sender, options) {
+        return await this.createTransactionForUnsettingSpecialRoleOnSemiFungibleToken(sender, options);
     }
-    createTransactionForSettingSpecialRoleOnNonFungibleToken(sender, options) {
+    async createTransactionForSettingSpecialRoleOnNonFungibleToken(sender, options) {
         const args = [new abi_1.StringValue(options.tokenIdentifier), new abi_1.AddressValue(options.user)];
         options.addRoleNFTCreate ? args.push(new abi_1.StringValue("DCDTRoleNFTCreate")) : 0;
         options.addRoleNFTBurn ? args.push(new abi_1.StringValue("DCDTRoleNFTBurn")) : 0;
@@ -281,16 +294,17 @@ class TokenManagementTransactionsFactory {
         options.addRoleDCDTSetNewURI ? args.push(new abi_1.StringValue("DCDTRoleSetNewURI")) : 0;
         options.addRoleDCDTModifyRoyalties ? args.push(new abi_1.StringValue("DCDTRoleModifyRoyalties")) : 0;
         const dataParts = ["setSpecialRole", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitSetSpecialRole,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUnsettingSpecialRoleOnNonFungibleToken(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitSetSpecialRole);
+        return transaction;
+    }
+    async createTransactionForUnsettingSpecialRoleOnNonFungibleToken(sender, options) {
         const args = [new abi_1.StringValue(options.tokenIdentifier), new abi_1.AddressValue(options.user)];
         options.removeRoleNFTBurn ? args.push(new abi_1.StringValue("DCDTRoleNFTBurn")) : 0;
         options.removeRoleNFTUpdateAttributes ? args.push(new abi_1.StringValue("DCDTRoleNFTUpdateAttributes")) : 0;
@@ -301,16 +315,17 @@ class TokenManagementTransactionsFactory {
         options.removeRoleDCDTSetNewURI ? args.push(new abi_1.StringValue("DCDTRoleSetNewURI")) : 0;
         options.removeRoleDCDTModifyRoyalties ? args.push(new abi_1.StringValue("DCDTRoleModifyRoyalties")) : 0;
         const dataParts = ["unSetSpecialRole", ...this.argSerializer.valuesToStrings(args)];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitSetSpecialRole,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForCreatingNFT(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitSetSpecialRole);
+        return transaction;
+    }
+    async createTransactionForCreatingNFT(sender, options) {
         const dataParts = [
             "DCDTNFTCreate",
             ...this.argSerializer.valuesToStrings([
@@ -326,41 +341,44 @@ class TokenManagementTransactionsFactory {
         // Note that the following is an approximation (a reasonable one):
         const nftData = options.name + options.hash + options.attributes + options.uris.join("");
         const storageGasLimit = this.config.gasLimitStorePerByte + BigInt(nftData.length);
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtNftCreate + storageGasLimit,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForPausing(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtNftCreate + storageGasLimit);
+        return transaction;
+    }
+    async createTransactionForPausing(sender, options) {
         const dataParts = ["pause", ...this.argSerializer.valuesToStrings([new abi_1.StringValue(options.tokenIdentifier)])];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitPausing,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUnpausing(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitPausing);
+        return transaction;
+    }
+    async createTransactionForUnpausing(sender, options) {
         const dataParts = [
             "unPause",
             ...this.argSerializer.valuesToStrings([new abi_1.StringValue(options.tokenIdentifier)]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitPausing,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForFreezing(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitPausing);
+        return transaction;
+    }
+    async createTransactionForFreezing(sender, options) {
         const dataParts = [
             "freeze",
             ...this.argSerializer.valuesToStrings([
@@ -368,16 +386,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.AddressValue(options.user),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitFreezing,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUnfreezing(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitFreezing);
+        return transaction;
+    }
+    async createTransactionForUnfreezing(sender, options) {
         const dataParts = [
             "UnFreeze",
             ...this.argSerializer.valuesToStrings([
@@ -385,16 +404,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.AddressValue(options.user),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitFreezing,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForWiping(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitFreezing);
+        return transaction;
+    }
+    async createTransactionForWiping(sender, options) {
         const dataParts = [
             "wipe",
             ...this.argSerializer.valuesToStrings([
@@ -402,16 +422,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.AddressValue(options.user),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitWiping,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForLocalMint(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitWiping);
+        return transaction;
+    }
+    async createTransactionForLocalMint(sender, options) {
         const dataParts = [
             "DCDTLocalMint",
             ...this.argSerializer.valuesToStrings([
@@ -419,16 +440,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BigUIntValue(options.supplyToMint),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtLocalMint,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForLocalBurning(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtLocalMint);
+        return transaction;
+    }
+    async createTransactionForLocalBurning(sender, options) {
         const dataParts = [
             "DCDTLocalBurn",
             ...this.argSerializer.valuesToStrings([
@@ -436,16 +458,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BigUIntValue(options.supplyToBurn),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtLocalBurn,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUpdatingAttributes(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtLocalBurn);
+        return transaction;
+    }
+    async createTransactionForUpdatingAttributes(sender, options) {
         const dataParts = [
             "DCDTNFTUpdateAttributes",
             ...this.argSerializer.valuesToStrings([
@@ -454,16 +477,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BytesValue(Buffer.from(options.attributes)),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtNftUpdateAttributes,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForAddingQuantity(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtNftUpdateAttributes);
+        return transaction;
+    }
+    async createTransactionForAddingQuantity(sender, options) {
         const dataParts = [
             "DCDTNFTAddQuantity",
             ...this.argSerializer.valuesToStrings([
@@ -472,16 +496,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BigUIntValue(options.quantity),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtNftAddQuantity,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForBurningQuantity(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtNftAddQuantity);
+        return transaction;
+    }
+    async createTransactionForBurningQuantity(sender, options) {
         const dataParts = [
             "DCDTNFTBurn",
             ...this.argSerializer.valuesToStrings([
@@ -490,16 +515,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BigUIntValue(options.quantity),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtNftBurn,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForModifyingRoyalties(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtNftBurn);
+        return transaction;
+    }
+    async createTransactionForModifyingRoyalties(sender, options) {
         const dataParts = [
             "DCDTModifyRoyalties",
             ...this.argSerializer.valuesToStrings([
@@ -508,16 +534,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BigUIntValue(options.newRoyalties),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtModifyRoyalties,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForSettingNewUris(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtModifyRoyalties);
+        return transaction;
+    }
+    async createTransactionForSettingNewUris(sender, options) {
         if (!options.newUris.length) {
             throw new errors_1.ErrBadUsage("No URIs provided");
         }
@@ -529,16 +556,17 @@ class TokenManagementTransactionsFactory {
                 ...options.newUris.map((uri) => new abi_1.StringValue(uri)),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitSetNewUris,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForModifyingCreator(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitSetNewUris);
+        return transaction;
+    }
+    async createTransactionForModifyingCreator(sender, options) {
         const dataParts = [
             "DCDTModifyCreator",
             ...this.argSerializer.valuesToStrings([
@@ -546,16 +574,17 @@ class TokenManagementTransactionsFactory {
                 new abi_1.BigUIntValue(options.tokenNonce),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtModifyCreator,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUpdatingMetadata(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtModifyCreator);
+        return transaction;
+    }
+    async createTransactionForUpdatingMetadata(sender, options) {
         const dataParts = [
             "DCDTMetaDataUpdate",
             ...this.argSerializer.valuesToStrings([
@@ -568,16 +597,17 @@ class TokenManagementTransactionsFactory {
                 ...(options.newUris ? options.newUris.map((uri) => new abi_1.StringValue(uri)) : []),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitDcdtMetadataUpdate,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForMetadataRecreate(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitDcdtMetadataUpdate);
+        return transaction;
+    }
+    async createTransactionForMetadataRecreate(sender, options) {
         const dataParts = [
             "DCDTMetaDataRecreate",
             ...this.argSerializer.valuesToStrings([
@@ -590,44 +620,47 @@ class TokenManagementTransactionsFactory {
                 ...(options.newUris ? options.newUris.map((uri) => new abi_1.StringValue(uri)) : []),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: sender,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitNftMetadataRecreate,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForChangingTokenToDynamic(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitNftMetadataRecreate);
+        return transaction;
+    }
+    async createTransactionForChangingTokenToDynamic(sender, options) {
         const dataParts = [
             "changeToDynamic",
             ...this.argSerializer.valuesToStrings([new abi_1.StringValue(options.tokenIdentifier)]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitNftChangeToDynamic,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForUpdatingTokenId(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitNftChangeToDynamic);
+        return transaction;
+    }
+    async createTransactionForUpdatingTokenId(sender, options) {
         const dataParts = [
             "updateTokenID",
             ...this.argSerializer.valuesToStrings([new abi_1.StringValue(options.tokenIdentifier)]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitUpdateTokenId,
-            addDataMovementGas: true,
-        }).build();
-    }
-    createTransactionForRegisteringDynamicToken(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitUpdateTokenId);
+        return transaction;
+    }
+    async createTransactionForRegisteringDynamicToken(sender, options) {
         const dataParts = [
             "registerDynamic",
             ...this.argSerializer.valuesToStrings([
@@ -636,17 +669,18 @@ class TokenManagementTransactionsFactory {
                 new abi_1.StringValue(options.tokenType),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitRegisterDynamic,
-            addDataMovementGas: true,
-            amount: this.config.issueCost,
-        }).build();
-    }
-    createTransactionForRegisteringDynamicAndSettingRoles(sender, options) {
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+            value: this.config.issueCost,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitRegisterDynamic);
+        return transaction;
+    }
+    async createTransactionForRegisteringDynamicAndSettingRoles(sender, options) {
         const dataParts = [
             "registerAndSetAllRolesDynamic",
             ...this.argSerializer.valuesToStrings([
@@ -655,15 +689,16 @@ class TokenManagementTransactionsFactory {
                 new abi_1.StringValue(options.tokenType),
             ]),
         ];
-        return new transactionBuilder_1.TransactionBuilder({
-            config: this.config,
+        const transaction = new transaction_1.Transaction({
             sender: sender,
             receiver: this.dcdtContractAddress,
-            dataParts: dataParts,
-            gasLimit: this.config.gasLimitRegisterDynamic,
-            addDataMovementGas: true,
-            amount: this.config.issueCost,
-        }).build();
+            chainID: this.config.chainID,
+            gasLimit: 0n,
+            value: this.config.issueCost,
+        });
+        this.setTransactionPayload(transaction, dataParts);
+        await this.setGasLimit(transaction, undefined, this.config.gasLimitRegisterDynamic);
+        return transaction;
     }
     notifyAboutUnsettingBurnRoleGlobally() {
         logger_1.Logger.info(`