@paraspell/sdk-core 11.9.0 → 11.9.2

package/dist/index.cjs

@@ -2711,7 +2711,7 @@ var createChainClient = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           wsUrl = getChainProviders(chain);
-          return _context.a(2, api.createApiInstance(wsUrl));
+          return _context.a(2, api.createApiInstance(wsUrl, chain));
       }
     }, _callee);
   }));
@@ -12888,6 +12888,7 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
     refundFee = fees.refundFee,
     destFee = fees.destFee;
   var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
+  var feeLocLocalized = localizeLocation(dest.chain, feeAssetLocation);
   var asset = createAsset(version, assetInfo.amount, localizeLocation(dest.chain, assetInfo.location));
   var depositInstruction = {
     DepositAsset: {
@@ -12919,7 +12920,7 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
     };
     var buyExecution = {
       BuyExecution: {
-        fees: createAsset(version, buyExecutionAmount, feeAssetLocation),
+        fees: createAsset(version, buyExecutionAmount, feeLocLocalized),
         weight_limit: 'Unlimited'
       }
     };
@@ -13776,6 +13777,34 @@ var GeneralBuilder = /*#__PURE__*/function () {
     value: function buildInternal() {
       return this.buildCommon(true);
     }
+  }, {
+    key: "prepareNormalizedOptions",
+    value: function () {
+      var _prepareNormalizedOptions = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+        var builder, buildTx, normalizedOptions;
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
+            case 0:
+              builder = this.currency(_objectSpread2(_objectSpread2({}, options.currency), {}, {
+                amount: MIN_AMOUNT.toString()
+              }));
+              buildTx = builder.createTxFactory();
+              _context2.n = 1;
+              return normalizeAmountAll(this.api, buildTx, options);
+            case 1:
+              normalizedOptions = _context2.v;
+              return _context2.a(2, {
+                normalizedOptions: normalizedOptions,
+                buildTx: buildTx
+              });
+          }
+        }, _callee2, this);
+      }));
+      function prepareNormalizedOptions(_x2) {
+        return _prepareNormalizedOptions.apply(this, arguments);
+      }
+      return prepareNormalizedOptions;
+    }()
     /**
      * Builds and returns the transfer extrinsic.
      *
@@ -13784,19 +13813,19 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "build",
     value: (function () {
-      var _build = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+      var _build = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
         var _yield$this$buildComm, tx;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
-              _context2.n = 1;
+              _context3.n = 1;
               return this.buildCommon();
             case 1:
-              _yield$this$buildComm = _context2.v;
+              _yield$this$buildComm = _context3.v;
               tx = _yield$this$buildComm.tx;
-              return _context2.a(2, tx);
+              return _context3.a(2, tx);
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function build() {
         return _build.apply(this, arguments);
@@ -13806,54 +13835,50 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "buildCommon",
     value: function () {
-      var _buildCommon = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+      var _buildCommon = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
         var isCalledInternally,
           _this$_options,
           from,
           to,
-          builder,
-          createTx,
+          _yield$this$prepareNo,
           normalizedOptions,
           tx,
-          _args3 = arguments;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+          _args4 = arguments;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
             case 0:
-              isCalledInternally = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : false;
+              isCalledInternally = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : false;
               if (!(!this.batchManager.isEmpty() && !isCalledInternally)) {
-                _context3.n = 1;
+                _context4.n = 1;
                 break;
               }
               throw new InvalidParameterError('Transaction manager contains batched items. Use buildBatch() to process them.');
             case 1:
               _this$_options = this._options, from = _this$_options.from, to = _this$_options.to;
               if (!(!sdkCommon.isTLocation(to) && sdkCommon.isRelayChain(from) && sdkCommon.isRelayChain(to) && from !== to)) {
-                _context3.n = 2;
+                _context4.n = 2;
                 break;
               }
               throw new InvalidParameterError('Transfers between relay chains are not yet supported.');
             case 2:
-              builder = this.currency(_objectSpread2(_objectSpread2({}, this._options.currency), {}, {
-                amount: MIN_AMOUNT.toString()
-              }));
-              createTx = builder.createTxFactory();
-              _context3.n = 3;
-              return normalizeAmountAll(this.api, createTx, this._options);
+              _context4.n = 3;
+              return this.prepareNormalizedOptions(this._options);
             case 3:
-              normalizedOptions = _context3.v;
-              _context3.n = 4;
+              _yield$this$prepareNo = _context4.v;
+              normalizedOptions = _yield$this$prepareNo.normalizedOptions;
+              _context4.n = 4;
               return send(normalizedOptions);
             case 4:
-              tx = _context3.v;
-              _context3.n = 5;
+              tx = _context4.v;
+              _context4.n = 5;
               return this.maybePerformXcmFormatCheck(tx, normalizedOptions, isCalledInternally);
             case 5:
-              return _context3.a(2, {
+              return _context4.a(2, {
                 tx: tx,
                 options: normalizedOptions
               });
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function buildCommon() {
         return _buildCommon.apply(this, arguments);
@@ -13863,37 +13888,37 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "maybePerformXcmFormatCheck",
     value: function () {
-      var _maybePerformXcmFormatCheck = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(tx, options, isCalledInternally) {
+      var _maybePerformXcmFormatCheck = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(tx, options, isCalledInternally) {
         var senderAddress, config, dryRunResult;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
               senderAddress = options.senderAddress;
               config = this.api.getConfig();
               if (!(isConfig(config) && config.xcmFormatCheck && !isCalledInternally)) {
-                _context4.n = 2;
+                _context5.n = 2;
                 break;
               }
               assertSenderAddress(senderAddress);
-              _context4.n = 1;
+              _context5.n = 1;
               return buildDryRun(this.api, tx, _objectSpread2(_objectSpread2({}, options), {}, {
                 senderAddress: senderAddress
               }), {
                 sentAssetMintMode: 'bypass'
               });
             case 1:
-              dryRunResult = _context4.v;
+              dryRunResult = _context5.v;
               if (!dryRunResult.failureReason) {
-                _context4.n = 2;
+                _context5.n = 2;
                 break;
               }
               throw new DryRunFailedError(dryRunResult.failureReason, dryRunResult.failureChain);
             case 2:
-              return _context4.a(2);
+              return _context5.a(2);
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function maybePerformXcmFormatCheck(_x2, _x3, _x4) {
+      function maybePerformXcmFormatCheck(_x3, _x4, _x5) {
         return _maybePerformXcmFormatCheck.apply(this, arguments);
       }
       return maybePerformXcmFormatCheck;
@@ -13901,20 +13926,20 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "dryRun",
     value: function () {
-      var _dryRun = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
+      var _dryRun = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
         var _yield$this$buildInte, tx, options;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.n) {
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.n) {
             case 0:
-              _context5.n = 1;
+              _context6.n = 1;
               return this.buildInternal();
             case 1:
-              _yield$this$buildInte = _context5.v;
+              _yield$this$buildInte = _context6.v;
               tx = _yield$this$buildInte.tx;
               options = _yield$this$buildInte.options;
-              return _context5.a(2, buildDryRun(this.api, tx, options));
+              return _context6.a(2, buildDryRun(this.api, tx, options));
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
       function dryRun() {
         return _dryRun.apply(this, arguments);
@@ -13924,25 +13949,25 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "dryRunPreview",
     value: function () {
-      var _dryRunPreview = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(dryRunOptions) {
+      var _dryRunPreview = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(dryRunOptions) {
         var _yield$this$buildInte2, tx, options;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
             case 0:
-              _context6.n = 1;
+              _context7.n = 1;
               return this.buildInternal();
             case 1:
-              _yield$this$buildInte2 = _context6.v;
+              _yield$this$buildInte2 = _context7.v;
               tx = _yield$this$buildInte2.tx;
               options = _yield$this$buildInte2.options;
-              return _context6.a(2, buildDryRun(this.api, tx, options, {
+              return _context7.a(2, buildDryRun(this.api, tx, options, {
                 sentAssetMintMode: 'preview',
                 mintFeeAssets: dryRunOptions === null || dryRunOptions === void 0 ? void 0 : dryRunOptions.mintFeeAssets
               }));
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function dryRunPreview(_x5) {
+      function dryRunPreview(_x6) {
         return _dryRunPreview.apply(this, arguments);
       }
       return dryRunPreview;
@@ -13965,21 +13990,27 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getXcmFee",
     value: (function () {
-      var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(options) {
+      var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(options) {
         var _options$disableFallb;
-        var _this$_options2, from, to, address, senderAddress, feeAsset, currency, disableFallback;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.p = _context7.n) {
+        var disableFallback, _yield$this$prepareNo2, normalizedOptions, buildTx, api, from, to, senderAddress, address, currency, feeAsset;
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.p = _context8.n) {
             case 0:
-              _this$_options2 = this._options, from = _this$_options2.from, to = _this$_options2.to, address = _this$_options2.address, senderAddress = _this$_options2.senderAddress, feeAsset = _this$_options2.feeAsset, currency = _this$_options2.currency;
+              disableFallback = (_options$disableFallb = options === null || options === void 0 ? void 0 : options.disableFallback) !== null && _options$disableFallb !== void 0 ? _options$disableFallb : false;
+              _context8.n = 1;
+              return this.prepareNormalizedOptions(this._options);
+            case 1:
+              _yield$this$prepareNo2 = _context8.v;
+              normalizedOptions = _yield$this$prepareNo2.normalizedOptions;
+              buildTx = _yield$this$prepareNo2.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, address = normalizedOptions.address, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
-              disableFallback = (_options$disableFallb = options === null || options === void 0 ? void 0 : options.disableFallback) !== null && _options$disableFallb !== void 0 ? _options$disableFallb : false;
-              _context7.p = 1;
-              _context7.n = 2;
+              _context8.p = 2;
+              _context8.n = 3;
               return getXcmFee({
-                api: this.api,
-                buildTx: this.createTxFactory(),
+                api: api,
+                buildTx: buildTx,
                 origin: from,
                 destination: to,
                 senderAddress: senderAddress,
@@ -13988,20 +14019,20 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 feeAsset: feeAsset,
                 disableFallback: disableFallback
               });
-            case 2:
-              return _context7.a(2, _context7.v);
             case 3:
-              _context7.p = 3;
-              _context7.n = 4;
-              return this.api.disconnect();
+              return _context8.a(2, _context8.v);
             case 4:
-              return _context7.f(3);
+              _context8.p = 4;
+              _context8.n = 5;
+              return this.api.disconnect();
             case 5:
-              return _context7.a(2);
+              return _context8.f(4);
+            case 6:
+              return _context8.a(2);
           }
-        }, _callee7, this, [[1,, 3, 5]]);
+        }, _callee8, this, [[2,, 4, 6]]);
       }));
-      function getXcmFee$1(_x6) {
+      function getXcmFee$1(_x7) {
         return _getXcmFee2.apply(this, arguments);
       }
       return getXcmFee$1;
@@ -14015,31 +14046,38 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getOriginXcmFee",
     value: (function () {
-      var _getOriginXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
+      var _getOriginXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
         var _ref,
           disableFallback,
-          _this$_options3,
+          _yield$this$prepareNo3,
+          normalizedOptions,
+          buildTx,
+          api,
           from,
           to,
           senderAddress,
           currency,
           feeAsset,
-          api,
-          _args8 = arguments;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.p = _context8.n) {
+          _args9 = arguments;
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.p = _context9.n) {
             case 0:
-              _ref = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {
+              _ref = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {
                 disableFallback: false
               }, disableFallback = _ref.disableFallback;
-              _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, senderAddress = _this$_options3.senderAddress, currency = _this$_options3.currency, feeAsset = _this$_options3.feeAsset;
+              _context9.n = 1;
+              return this.prepareNormalizedOptions(this._options);
+            case 1:
+              _yield$this$prepareNo3 = _context9.v;
+              normalizedOptions = _yield$this$prepareNo3.normalizedOptions;
+              buildTx = _yield$this$prepareNo3.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset;
               assertToIsString(to);
-              api = this.api;
-              _context8.p = 1;
-              _context8.n = 2;
+              _context9.p = 2;
+              _context9.n = 3;
               return getOriginXcmFee({
                 api: api,
-                buildTx: this.createTxFactory(),
+                buildTx: buildTx,
                 origin: from,
                 destination: to,
                 senderAddress: senderAddress,
@@ -14047,18 +14085,18 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 feeAsset: feeAsset,
                 disableFallback: disableFallback
               });
-            case 2:
-              return _context8.a(2, _context8.v);
             case 3:
-              _context8.p = 3;
-              _context8.n = 4;
-              return this.api.disconnect();
+              return _context9.a(2, _context9.v);
             case 4:
-              return _context8.f(3);
+              _context9.p = 4;
+              _context9.n = 5;
+              return this.api.disconnect();
             case 5:
-              return _context8.a(2);
+              return _context9.f(4);
+            case 6:
+              return _context9.a(2);
           }
-        }, _callee8, this, [[1,, 3, 5]]);
+        }, _callee9, this, [[2,, 4, 6]]);
       }));
       function getOriginXcmFee$1() {
         return _getOriginXcmFee2.apply(this, arguments);
@@ -14074,23 +14112,28 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getXcmFeeEstimate",
     value: (function () {
-      var _getXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
-        var _this$_options4, from, to, address, senderAddress, currency, _yield$this$buildInte3, tx;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.p = _context9.n) {
+      var _getXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
+        var _yield$this$prepareNo4, normalizedOptions, buildTx, api, from, to, address, senderAddress, currency, tx;
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.p = _context0.n) {
             case 0:
-              _this$_options4 = this._options, from = _this$_options4.from, to = _this$_options4.to, address = _this$_options4.address, senderAddress = _this$_options4.senderAddress, currency = _this$_options4.currency;
+              _context0.n = 1;
+              return this.prepareNormalizedOptions(this._options);
+            case 1:
+              _yield$this$prepareNo4 = _context0.v;
+              normalizedOptions = _yield$this$prepareNo4.normalizedOptions;
+              buildTx = _yield$this$prepareNo4.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, address = normalizedOptions.address, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency;
               assertToIsString(to);
               assertAddressIsString(address);
-              _context9.n = 1;
-              return this.buildInternal();
-            case 1:
-              _yield$this$buildInte3 = _context9.v;
-              tx = _yield$this$buildInte3.tx;
-              _context9.p = 2;
-              _context9.n = 3;
+              _context0.n = 2;
+              return buildTx();
+            case 2:
+              tx = _context0.v;
+              _context0.p = 3;
+              _context0.n = 4;
               return getXcmFeeEstimate({
-                api: this.api,
+                api: api,
                 tx: tx,
                 origin: from,
                 destination: to,
@@ -14098,18 +14141,18 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 senderAddress: senderAddress,
                 currency: currency
               });
-            case 3:
-              return _context9.a(2, _context9.v);
             case 4:
-              _context9.p = 4;
-              _context9.n = 5;
-              return this.api.disconnect();
+              return _context0.a(2, _context0.v);
             case 5:
-              return _context9.f(4);
+              _context0.p = 5;
+              _context0.n = 6;
+              return this.api.disconnect();
             case 6:
-              return _context9.a(2);
+              return _context0.f(5);
+            case 7:
+              return _context0.a(2);
           }
-        }, _callee9, this, [[2,, 4, 6]]);
+        }, _callee0, this, [[3,, 5, 7]]);
       }));
       function getXcmFeeEstimate$1() {
         return _getXcmFeeEstimate2.apply(this, arguments);
@@ -14125,40 +14168,45 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getOriginXcmFeeEstimate",
     value: (function () {
-      var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
-        var _this$_options5, from, to, senderAddress, currency, _yield$this$buildInte4, tx;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.p = _context0.n) {
+      var _getOriginXcmFeeEstimate2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+        var _yield$this$prepareNo5, normalizedOptions, buildTx, api, from, to, senderAddress, currency, tx;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.p = _context1.n) {
             case 0:
-              _this$_options5 = this._options, from = _this$_options5.from, to = _this$_options5.to, senderAddress = _this$_options5.senderAddress, currency = _this$_options5.currency;
-              assertToIsString(to);
-              _context0.n = 1;
-              return this.buildInternal();
+              _context1.n = 1;
+              return this.prepareNormalizedOptions(this._options);
             case 1:
-              _yield$this$buildInte4 = _context0.v;
-              tx = _yield$this$buildInte4.tx;
-              _context0.p = 2;
-              _context0.n = 3;
+              _yield$this$prepareNo5 = _context1.v;
+              normalizedOptions = _yield$this$prepareNo5.normalizedOptions;
+              buildTx = _yield$this$prepareNo5.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency;
+              assertToIsString(to);
+              _context1.n = 2;
+              return buildTx();
+            case 2:
+              tx = _context1.v;
+              _context1.p = 3;
+              _context1.n = 4;
               return getOriginXcmFeeEstimate({
-                api: this.api,
+                api: api,
                 tx: tx,
                 origin: from,
                 destination: to,
                 currency: currency,
                 senderAddress: senderAddress
               });
-            case 3:
-              return _context0.a(2, _context0.v);
             case 4:
-              _context0.p = 4;
-              _context0.n = 5;
-              return this.api.disconnect();
+              return _context1.a(2, _context1.v);
             case 5:
-              return _context0.f(4);
+              _context1.p = 5;
+              _context1.n = 6;
+              return this.api.disconnect();
             case 6:
-              return _context0.a(2);
+              return _context1.f(5);
+            case 7:
+              return _context1.a(2);
           }
-        }, _callee0, this, [[2,, 4, 6]]);
+        }, _callee1, this, [[3,, 5, 7]]);
       }));
       function getOriginXcmFeeEstimate$1() {
         return _getOriginXcmFeeEstimate2.apply(this, arguments);
@@ -14174,17 +14222,22 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getTransferableAmount",
     value: (function () {
-      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
-        var _this$_options6, from, to, senderAddress, currency, feeAsset, api;
-        return _regenerator().w(function (_context1) {
-          while (1) switch (_context1.n) {
+      var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+        var _yield$this$prepareNo6, normalizedOptions, buildTx, api, from, to, senderAddress, currency, feeAsset;
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.n) {
             case 0:
-              _this$_options6 = this._options, from = _this$_options6.from, to = _this$_options6.to, senderAddress = _this$_options6.senderAddress, currency = _this$_options6.currency, feeAsset = _this$_options6.feeAsset;
+              _context10.n = 1;
+              return this.prepareNormalizedOptions(this._options);
+            case 1:
+              _yield$this$prepareNo6 = _context10.v;
+              normalizedOptions = _yield$this$prepareNo6.normalizedOptions;
+              buildTx = _yield$this$prepareNo6.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset;
               assertToIsString(to);
-              api = this.api;
-              return _context1.a(2, getTransferableAmount({
+              return _context10.a(2, getTransferableAmount({
                 api: api,
-                buildTx: this.createTxFactory(),
+                buildTx: buildTx,
                 origin: from,
                 destination: to,
                 senderAddress: senderAddress,
@@ -14192,7 +14245,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 currency: currency
               }));
           }
-        }, _callee1, this);
+        }, _callee10, this);
       }));
       function getTransferableAmount$1() {
         return _getTransferableAmount2.apply(this, arguments);
@@ -14208,18 +14261,23 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getMinTransferableAmount",
     value: (function () {
-      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
-        var _this$_options7, from, to, senderAddress, address, currency, feeAsset, api;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.n) {
+      var _getMinTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
+        var _yield$this$prepareNo7, normalizedOptions, buildTx, api, from, to, senderAddress, address, currency, feeAsset;
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             case 0:
-              _this$_options7 = this._options, from = _this$_options7.from, to = _this$_options7.to, senderAddress = _this$_options7.senderAddress, address = _this$_options7.address, currency = _this$_options7.currency, feeAsset = _this$_options7.feeAsset;
+              _context11.n = 1;
+              return this.prepareNormalizedOptions(this._options);
+            case 1:
+              _yield$this$prepareNo7 = _context11.v;
+              normalizedOptions = _yield$this$prepareNo7.normalizedOptions;
+              buildTx = _yield$this$prepareNo7.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, senderAddress = normalizedOptions.senderAddress, address = normalizedOptions.address, currency = normalizedOptions.currency, feeAsset = normalizedOptions.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
-              api = this.api;
-              return _context10.a(2, getMinTransferableAmount({
+              return _context11.a(2, getMinTransferableAmount({
                 api: api,
-                buildTx: this.createTxFactory(),
+                buildTx: buildTx,
                 origin: from,
                 destination: to,
                 senderAddress: senderAddress,
@@ -14229,7 +14287,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 builder: this
               }));
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function getMinTransferableAmount$1() {
         return _getMinTransferableAmount2.apply(this, arguments);
@@ -14245,17 +14303,23 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "verifyEdOnDestination",
     value: (function () {
-      var _verifyEdOnDestination2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
-        var _this$_options8, from, to, address, currency, senderAddress, feeAsset;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+      var _verifyEdOnDestination2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
+        var _yield$this$prepareNo8, normalizedOptions, buildTx, api, from, to, address, currency, senderAddress, feeAsset;
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _this$_options8 = this._options, from = _this$_options8.from, to = _this$_options8.to, address = _this$_options8.address, currency = _this$_options8.currency, senderAddress = _this$_options8.senderAddress, feeAsset = _this$_options8.feeAsset;
+              _context12.n = 1;
+              return this.prepareNormalizedOptions(this._options);
+            case 1:
+              _yield$this$prepareNo8 = _context12.v;
+              normalizedOptions = _yield$this$prepareNo8.normalizedOptions;
+              buildTx = _yield$this$prepareNo8.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, address = normalizedOptions.address, currency = normalizedOptions.currency, senderAddress = normalizedOptions.senderAddress, feeAsset = normalizedOptions.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
-              return _context11.a(2, verifyEdOnDestination({
-                api: this.api,
-                buildTx: this.createTxFactory(),
+              return _context12.a(2, verifyEdOnDestination({
+                api: api,
+                buildTx: buildTx,
                 origin: from,
                 destination: to,
                 address: address,
@@ -14264,7 +14328,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 currency: currency
               }));
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function verifyEdOnDestination$1() {
         return _verifyEdOnDestination2.apply(this, arguments);
@@ -14280,17 +14344,23 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getTransferInfo",
     value: (function () {
-      var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
-        var _this$_options9, from, to, address, currency, ahAddress, senderAddress, feeAsset;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.n) {
+      var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13() {
+        var _yield$this$prepareNo9, normalizedOptions, buildTx, api, from, to, address, currency, ahAddress, senderAddress, feeAsset;
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
-              _this$_options9 = this._options, from = _this$_options9.from, to = _this$_options9.to, address = _this$_options9.address, currency = _this$_options9.currency, ahAddress = _this$_options9.ahAddress, senderAddress = _this$_options9.senderAddress, feeAsset = _this$_options9.feeAsset;
+              _context13.n = 1;
+              return this.prepareNormalizedOptions(this._options);
+            case 1:
+              _yield$this$prepareNo9 = _context13.v;
+              normalizedOptions = _yield$this$prepareNo9.normalizedOptions;
+              buildTx = _yield$this$prepareNo9.buildTx;
+              api = normalizedOptions.api, from = normalizedOptions.from, to = normalizedOptions.to, address = normalizedOptions.address, currency = normalizedOptions.currency, ahAddress = normalizedOptions.ahAddress, senderAddress = normalizedOptions.senderAddress, feeAsset = normalizedOptions.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
-              return _context12.a(2, getTransferInfo({
-                api: this.api,
-                buildTx: this.createTxFactory(),
+              return _context13.a(2, getTransferInfo({
+                api: api,
+                buildTx: buildTx,
                 origin: from,
                 destination: to,
                 address: address,
@@ -14300,7 +14370,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 feeAsset: feeAsset
               }));
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function getTransferInfo$1() {
         return _getTransferInfo2.apply(this, arguments);