@paraspell/sdk-core 11.8.0 → 11.8.2

package/dist/index.cjs

@@ -831,48 +831,49 @@ var isConfig = function isConfig(value) {
   Object.keys(value).length < 3 || 'apiOverrides' in value || 'development' in value || 'abstractDecimals' in value || 'xcmFormatCheck' in value);
 };
 
-var computeOverridenAmount = function computeOverridenAmount(options) {
+var computeOverridenAmount = function computeOverridenAmount(options, increaseAmount) {
   var from = options.from,
     to = options.to,
     currency = options.currency,
     api = options.api;
+  var amount = options.currency.amount;
   var config = api.getConfig();
   if (isConfig(config) && config.abstractDecimals) {
-    return BYPASS_CURRENCY_AMOUNT;
+    return BigInt(increaseAmount) + BigInt(amount);
   } else {
     assertToIsString(to);
     var asset = assets.findAssetInfoOrThrow(from, currency, to);
-    return viem.parseUnits(BYPASS_CURRENCY_AMOUNT, asset.decimals);
+    return viem.parseUnits(increaseAmount, asset.decimals) + BigInt(amount);
   }
 };
-var overrideTxAmount = function overrideTxAmount(options, builder) {
+var overrideTxAmount = function overrideTxAmount(options, builder, amount) {
   var modifiedBuilder = builder.currency(_objectSpread2(_objectSpread2({}, options.currency), {}, {
-    amount: computeOverridenAmount(options)
+    amount: computeOverridenAmount(options, amount)
   }));
   return modifiedBuilder['buildInternal']();
 };
-var createTxs = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, builder) {
-    var tx, txBypass;
+var createTx = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, builder, amount) {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          if (!(amount === undefined)) {
+            _context.n = 2;
+            break;
+          }
           _context.n = 1;
           return builder['buildInternal']();
         case 1:
-          tx = _context.v;
-          _context.n = 2;
-          return overrideTxAmount(options, builder);
+          return _context.a(2, _context.v);
         case 2:
-          txBypass = _context.v;
-          return _context.a(2, {
-            tx: tx,
-            txBypass: txBypass
-          });
+          _context.n = 3;
+          return overrideTxAmount(options, builder, amount);
+        case 3:
+          return _context.a(2, _context.v);
       }
     }, _callee);
   }));
-  return function createTxs(_x, _x2) {
+  return function createTx(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -2719,7 +2720,7 @@ var getLocationTokenId = function getLocationTokenId(location, chain) {
   return null;
 };
 
-var computeFeeFromDryRun = function computeFeeFromDryRun(dryRun, chain, _executionFee) {
+var computeFeeFromDryRun = function computeFeeFromDryRun(dryRun, chain, executionFee) {
   var isFeeAsset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   // Extract delivery fees from emitted events
   var deliveryFees = [];
@@ -2771,7 +2772,7 @@ var computeFeeFromDryRun = function computeFeeFromDryRun(dryRun, chain, _executi
     }).reduce(function (acc, df) {
       return acc + df.plancks;
     }, 0n);
-    return totalDeliveryFees;
+    return totalDeliveryFees + executionFee;
   }
 };
 
@@ -3375,7 +3376,7 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
       dest: createDestination(version, reserveChain !== null && reserveChain !== void 0 ? reserveChain : chain, destChain, paraIdTo),
       xcm: [{
         BuyExecution: {
-          fees: updateAsset(assetLocalizedToDest, amount - (feeAsset ? reserveFee : originFee + reserveFee)),
+          fees: updateAsset(assetLocalizedToDest, reserveFee === 1000n ? amount / 2n : amount - (feeAsset ? reserveFee : originFee + reserveFee)),
           weight_limit: 'Unlimited'
         }
       }].concat(_toConsumableArray(suffixXcm))
@@ -4371,95 +4372,125 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
   };
 };
 var getDestXcmFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
     var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, tx, disableFallback, swapConfig, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
           api = options.api, origin = options.origin, hopChain = options.prevChain, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, tx = options.tx, disableFallback = options.disableFallback, swapConfig = options.swapConfig;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           calcPaymentInfoFee = /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-              var originAsset, amount, _t;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.p = _context.n) {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+              var attempt, _t2;
+              return _regenerator().w(function (_context2) {
+                while (1) switch (_context2.p = _context2.n) {
                   case 0:
                     if (!(destination === 'Ethereum')) {
-                      _context.n = 1;
+                      _context2.n = 1;
                       break;
                     }
-                    return _context.a(2, 0n);
+                    return _context2.a(2, 0n);
                   case 1:
-                    originAsset = swapConfig !== null && swapConfig !== void 0 && swapConfig.currencyTo ? assets.findAssetInfoOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, destination) : assets.findAssetInfoOrThrow(origin, currency, destination);
-                    amount = swapConfig !== null && swapConfig !== void 0 && swapConfig.currencyTo ? swapConfig.amountOut : currency.amount;
-                    if (!originAsset.location) {
-                      _context.n = 7;
-                      break;
-                    }
-                    _context.p = 2;
-                    _context.n = 3;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      location: originAsset.location,
-                      amount: amount
-                    });
+                    attempt = /*#__PURE__*/function () {
+                      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, curr, amt) {
+                        var assetInfo, _t;
+                        return _regenerator().w(function (_context) {
+                          while (1) switch (_context.p = _context.n) {
+                            case 0:
+                              assetInfo = assets.findAssetInfoOrThrow(chain, curr, destination);
+                              if (!assetInfo.location) {
+                                _context.n = 6;
+                                break;
+                              }
+                              _context.p = 1;
+                              _context.n = 2;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                location: assetInfo.location,
+                                amount: amt
+                              });
+                            case 2:
+                              return _context.a(2, _context.v);
+                            case 3:
+                              _context.p = 3;
+                              _t = _context.v;
+                              if (!(_t instanceof assets.InvalidCurrencyError)) {
+                                _context.n = 5;
+                                break;
+                              }
+                              _context.n = 4;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                symbol: assetInfo.symbol,
+                                amount: amt
+                              });
+                            case 4:
+                              return _context.a(2, _context.v);
+                            case 5:
+                              throw _t;
+                            case 6:
+                              _context.n = 7;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                symbol: assetInfo.symbol,
+                                amount: amt
+                              });
+                            case 7:
+                              return _context.a(2, _context.v);
+                          }
+                        }, _callee, null, [[1, 3]]);
+                      }));
+                      return function attempt(_x2, _x3, _x4) {
+                        return _ref3.apply(this, arguments);
+                      };
+                    }();
+                    _context2.p = 2;
+                    _context2.n = 3;
+                    return attempt(origin, currency, currency.amount);
                   case 3:
-                    return _context.a(2, _context.v);
+                    return _context2.a(2, _context2.v);
                   case 4:
-                    _context.p = 4;
-                    _t = _context.v;
-                    if (!(_t instanceof assets.InvalidCurrencyError)) {
-                      _context.n = 6;
+                    _context2.p = 4;
+                    _t2 = _context2.v;
+                    if (!(!(_t2 instanceof assets.InvalidCurrencyError) || !swapConfig)) {
+                      _context2.n = 5;
                       break;
                     }
-                    _context.n = 5;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol,
-                      amount: amount
-                    });
+                    throw _t2;
                   case 5:
-                    return _context.a(2, _context.v);
+                    _context2.n = 6;
+                    return attempt(swapConfig.exchangeChain, swapConfig.currencyTo, swapConfig.amountOut);
                   case 6:
-                    throw _t;
-                  case 7:
-                    _context.n = 8;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol,
-                      amount: amount
-                    });
-                  case 8:
-                    return _context.a(2, _context.v);
+                    return _context2.a(2, _context2.v);
                 }
-              }, _callee, null, [[2, 4]]);
+              }, _callee2, null, [[2, 4]]);
             }));
             return function calcPaymentInfoFee() {
               return _ref2.apply(this, arguments);
             };
           }();
           if (!(!assets.hasDryRunSupport(destination) || !forwardedXcms || destination === 'Ethereum')) {
-            _context2.n = 3;
+            _context3.n = 3;
             break;
           }
-          _context2.n = 1;
+          _context3.n = 1;
           return calcPaymentInfoFee();
         case 1:
-          _fee = _context2.v;
-          _context2.n = 2;
+          _fee = _context3.v;
+          _context3.n = 2;
           return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
         case 2:
-          sufficient = _context2.v;
-          return _context2.a(2, {
+          sufficient = _context3.v;
+          return _context3.a(2, {
             fee: _fee,
             feeType: 'paymentInfo',
             sufficient: !assets.hasDryRunSupport(destination) ? sufficient : false
           });
         case 3:
-          _context2.n = 4;
+          _context3.n = 4;
           return api.getDryRunXcm({
             originLocation: addXcmVersionHeader(createOriginLocation(hopChain, destination), sdkCommon.Version.V4),
             tx: tx,
@@ -4472,24 +4503,24 @@ var getDestXcmFee = /*#__PURE__*/function () {
             amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
           });
         case 4:
-          dryRunResult = _context2.v;
+          dryRunResult = _context3.v;
           if (dryRunResult.success) {
-            _context2.n = 7;
+            _context3.n = 7;
             break;
           }
           if (!disableFallback) {
-            _context2.n = 5;
+            _context3.n = 5;
             break;
           }
-          return _context2.a(2, {
+          return _context3.a(2, {
             dryRunError: dryRunResult.failureReason
           });
         case 5:
-          _context2.n = 6;
+          _context3.n = 6;
           return calcPaymentInfoFee();
         case 6:
-          _fee2 = _context2.v;
-          return _context2.a(2, {
+          _fee2 = _context3.v;
+          return _context3.a(2, {
             fee: _fee2,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
@@ -4497,7 +4528,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
           });
         case 7:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
-          return _context2.a(2, {
+          return _context3.a(2, {
             fee: fee,
             feeType: 'dryRun',
             sufficient: true,
@@ -4505,7 +4536,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
             destParaId: destParaId
           });
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return function getDestXcmFee(_x) {
     return _ref.apply(this, arguments);
@@ -5133,7 +5164,7 @@ function _traverseXcmHops() {
         case 4:
           // true if this hop should be treated as the destination
           // - normally when nextChain === destination
-          // - but if swap is required, only after (or on) the exchange hop      const isDestination =
+          // - but if swap is required, only after (or on) the exchange hop
           isDestination = nextChain === destination && (!swapConfig || hasPassedExchange || nextChain === swapConfig.exchangeChain);
           isAssetHub = nextChain === assetHubChain;
           isBridgeHub = nextChain === bridgeHubChain;
@@ -5271,8 +5302,8 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
 };
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var _traversalResult$brid, _traversalResult$asse;
-    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, bypassOptions, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, assetHubWithCurrency, bridgeHubWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
+    var _traversalResult$brid;
+    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, bypassOptions, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, bridgeHubWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -5408,24 +5439,20 @@ var dryRunInternal = /*#__PURE__*/function () {
               });
             }
           }
-          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
-            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(assetHubChain),
-            asset: resolvedFeeAsset !== null && resolvedFeeAsset !== void 0 ? resolvedFeeAsset : assets.findNativeAssetInfoOrThrow(assetHubChain)
-          }) : traversalResult.assetHub;
           bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
             currency: assets.getNativeAssetSymbol(bridgeHubChain),
             asset: assets.findNativeAssetInfoOrThrow(bridgeHubChain)
           }) : processedBridgeHub;
           _getFailureInfo = getFailureInfo$1({
             destination: traversalResult.destination,
-            assetHub: assetHubWithCurrency,
+            assetHub: traversalResult.assetHub,
             bridgeHub: bridgeHubWithCurrency
           }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
           return _context2.a(2, {
             failureReason: failureReason,
             failureChain: failureChain,
             origin: originDryRun,
-            assetHub: assetHubWithCurrency,
+            assetHub: traversalResult.assetHub,
             bridgeHub: bridgeHubWithCurrency,
             destination: traversalResult.destination,
             hops: traversalResult.hops
@@ -5446,7 +5473,7 @@ var isMultiHopSwap = function isMultiHopSwap(exchangeChain, assetFrom, assetTo)
 
 var createExchangeInstructions = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, assetFrom, assetTo) {
-    var chain, exchangeChain, assetInfoFrom, assetInfoTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, nativeSymbol, needsMultiHop, nativeAsset, shouldUseMaximal, nativeAmountOut, assetNative;
+    var chain, exchangeChain, assetInfoFrom, assetInfoTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, nativeSymbol, needsMultiHop, nativeAsset, nativeAmountOut, assetNative;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5457,7 +5484,6 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             symbol: assets.Native(nativeSymbol)
           }, null);
           assertHasLocation(nativeAsset);
-          shouldUseMaximal = !chain || exchangeChain === 'Hydration' && exchangeFee === 0n;
           if (needsMultiHop) {
             _context.n = 1;
             break;
@@ -5466,7 +5492,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             ExchangeAsset: {
               give: createAssetsFilter(assetFrom),
               want: [assetTo],
-              maximal: shouldUseMaximal
+              maximal: false
             }
           }]);
         case 1:
@@ -5479,7 +5505,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             ExchangeAsset: {
               give: createAssetsFilter(assetFrom),
               want: [assetNative],
-              maximal: shouldUseMaximal
+              maximal: false
             }
           }, {
             ExchangeAsset: {
@@ -5497,17 +5523,15 @@ var createExchangeInstructions = /*#__PURE__*/function () {
 }();
 var createSwapExecuteXcm = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, chain, exchangeChain, destChain, assetInfoFrom, assetInfoTo, _options$fees2, originReserveFee, exchangeFee, destReserveFee, recipientAddress, version, paraIdTo, assetFrom, MIN_FEE, amountOut, assetTo, assetToLocalizedToDest, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, finalXcm, fullXcm;
+    var api, chain, exchangeChain, destChain, assetInfoFrom, assetInfoTo, _options$fees2, originReserveFee, destReserveFee, recipientAddress, version, paraIdTo, assetFrom, amountOut, assetTo, assetToLocalizedToDest, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, finalXcm, fullXcm;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetInfoFrom = options.assetInfoFrom, assetInfoTo = options.assetInfoTo, _options$fees2 = options.fees, originReserveFee = _options$fees2.originReserveFee, exchangeFee = _options$fees2.exchangeFee, destReserveFee = _options$fees2.destReserveFee, recipientAddress = options.recipientAddress, version = options.version, paraIdTo = options.paraIdTo;
+          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetInfoFrom = options.assetInfoFrom, assetInfoTo = options.assetInfoTo, _options$fees2 = options.fees, originReserveFee = _options$fees2.originReserveFee, destReserveFee = _options$fees2.destReserveFee, recipientAddress = options.recipientAddress, version = options.version, paraIdTo = options.paraIdTo;
           assertHasLocation(assetInfoFrom);
           assertHasLocation(assetInfoTo);
           assetFrom = createAsset(version, assetInfoFrom.amount, localizeLocation(exchangeChain, assetInfoFrom.location));
-          MIN_FEE = 1000n; // Exchange fee 0n means we are creating a dummy tx
-          // Set want to 1000n to prevent NoDeal
-          amountOut = chain && exchangeFee === 0n ? MIN_FEE : assetInfoTo.amount;
+          amountOut = assetInfoTo.amount;
           assetTo = createAsset(version, amountOut, localizeLocation(exchangeChain, assetInfoTo.location));
           assetToLocalizedToDest = createAsset(version, amountOut, localizeLocation(destChain !== null && destChain !== void 0 ? destChain : exchangeChain, assetInfoTo.location));
           _prepareCommonExecute = prepareCommonExecuteXcm({
@@ -5527,12 +5551,6 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
           return createExchangeInstructions(options, assetFrom, assetTo);
         case 1:
           exchangeInstructions = _context2.v;
-          if (!(assetInfoTo.amount < MIN_FEE)) {
-            _context2.n = 2;
-            break;
-          }
-          throw new AmountTooLowError('Amount to receive after swap is too low, Increase Currency From amount.');
-        case 2:
           exchangeToDestXcm = destChain ? createBaseExecuteXcm({
             chain: exchangeChain,
             destChain: destChain,
@@ -9674,7 +9692,6 @@ var MAX_WEIGHT = {
   refTime: MAX_U64
 };
 var BYPASS_MINT_AMOUNT = '1000';
-var BYPASS_CURRENCY_AMOUNT = '800';
 
 var buildClaimAssetsParams = function buildClaimAssetsParams(options) {
   var assets = options.assets,
@@ -10273,6 +10290,136 @@ var wrapTxBypass = /*#__PURE__*/function () {
   };
 }();
 
+var getBypassResultWithRetries = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, internalFn, initialTx) {
+    var maxRetries,
+      bumpStep,
+      hasError,
+      first,
+      result,
+      i,
+      amount,
+      bumpedTx,
+      _args = arguments,
+      _t,
+      _t2,
+      _t3;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
+        case 0:
+          maxRetries = _args.length > 3 && _args[3] !== undefined ? _args[3] : 5;
+          bumpStep = _args.length > 4 && _args[4] !== undefined ? _args[4] : 100;
+          hasError = function hasError(res) {
+            return 'failureReason' in res ? !!res.failureReason : 'dryRunError' in res ? !!res.dryRunError : false;
+          };
+          if (!initialTx) {
+            _context.n = 5;
+            break;
+          }
+          _context.p = 1;
+          _context.n = 2;
+          return internalFn(_objectSpread2(_objectSpread2({}, options), {}, {
+            tx: initialTx,
+            useRootOrigin: true
+          }));
+        case 2:
+          first = _context.v;
+          if (hasError(first)) {
+            _context.n = 3;
+            break;
+          }
+          return _context.a(2, first);
+        case 3:
+          _context.n = 5;
+          break;
+        case 4:
+          _context.p = 4;
+          _t = _context.v;
+          if (_t instanceof AmountTooLowError) {
+            _context.n = 5;
+            break;
+          }
+          throw _t;
+        case 5:
+          result = null;
+          i = 1;
+        case 6:
+          if (!(i <= maxRetries)) {
+            _context.n = 19;
+            break;
+          }
+          amount = (bumpStep * i).toString();
+          bumpedTx = void 0;
+          _context.p = 7;
+          _context.n = 8;
+          return options.buildTx(amount);
+        case 8:
+          bumpedTx = _context.v;
+          _context.n = 12;
+          break;
+        case 9:
+          _context.p = 9;
+          _t2 = _context.v;
+          if (!(_t2 instanceof AmountTooLowError)) {
+            _context.n = 11;
+            break;
+          }
+          if (!(i === maxRetries)) {
+            _context.n = 10;
+            break;
+          }
+          throw _t2;
+        case 10:
+          return _context.a(3, 18);
+        case 11:
+          throw _t2;
+        case 12:
+          _context.p = 12;
+          _context.n = 13;
+          return internalFn(_objectSpread2(_objectSpread2({}, options), {}, {
+            tx: bumpedTx,
+            useRootOrigin: true
+          }));
+        case 13:
+          result = _context.v;
+          if (hasError(result)) {
+            _context.n = 14;
+            break;
+          }
+          return _context.a(2, result);
+        case 14:
+          _context.n = 18;
+          break;
+        case 15:
+          _context.p = 15;
+          _t3 = _context.v;
+          if (!(_t3 instanceof AmountTooLowError)) {
+            _context.n = 17;
+            break;
+          }
+          if (!(i === maxRetries)) {
+            _context.n = 16;
+            break;
+          }
+          throw _t3;
+        case 16:
+          return _context.a(3, 18);
+        case 17:
+          throw _t3;
+        case 18:
+          i++;
+          _context.n = 6;
+          break;
+        case 19:
+          return _context.a(2, result);
+      }
+    }, _callee, null, [[12, 15], [7, 9], [1, 4]]);
+  }));
+  return function getBypassResultWithRetries(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var getOriginXcmFeeInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
     var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, _ref$useRootOrigin, useRootOrigin, asset, amount, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, fee, forwardedXcms, destParaId, weight;
@@ -10373,30 +10520,48 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var _options$txs, tx, txBypass, forced, real;
+    var buildTx, tx, real, forced, _forced, _t;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          _options$txs = options.txs, tx = _options$txs.tx, txBypass = _options$txs.txBypass;
-          _context.n = 1;
-          return getOriginXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
-            tx: txBypass,
-            useRootOrigin: true
-          }));
-        case 1:
-          forced = _context.v;
+          buildTx = options.buildTx;
+          _context.p = 1;
           _context.n = 2;
+          return buildTx();
+        case 2:
+          tx = _context.v;
+          _context.n = 3;
           return getOriginXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
             tx: tx,
             useRootOrigin: false
           }));
-        case 2:
+        case 3:
           real = _context.v;
+          _context.n = 4;
+          return getBypassResultWithRetries(options, getOriginXcmFeeInternal, tx);
+        case 4:
+          forced = _context.v;
           return _context.a(2, _objectSpread2(_objectSpread2({}, forced), {}, {
             sufficient: real.sufficient
           }));
+        case 5:
+          _context.p = 5;
+          _t = _context.v;
+          if (_t instanceof AmountTooLowError) {
+            _context.n = 6;
+            break;
+          }
+          throw _t;
+        case 6:
+          _context.n = 7;
+          return getBypassResultWithRetries(options, getOriginXcmFeeInternal);
+        case 7:
+          _forced = _context.v;
+          return _context.a(2, _objectSpread2(_objectSpread2({}, _forced), {}, {
+            sufficient: false
+          }));
       }
-    }, _callee);
+    }, _callee, null, [[1, 5]]);
   }));
   return function getOriginXcmFee(_x) {
     return _ref.apply(this, arguments);
@@ -10753,7 +10918,9 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                       feeAsset: feeAsset,
                       tx: tx,
                       originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
-                      disableFallback: disableFallback
+                      disableFallback: disableFallback,
+                      hasPassedExchange: hasPassedExchange,
+                      swapConfig: swapConfig
                     });
                   case 1:
                     hopResult = _context.v;
@@ -10847,7 +11014,8 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             tx: tx,
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             senderAddress: senderAddress,
-            disableFallback: disableFallback
+            disableFallback: disableFallback,
+            swapConfig: swapConfig
           });
         case 11:
           destFallback = _context2.v;
@@ -10955,30 +11123,27 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
 
 var getXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var _real$assetHub, _real$bridgeHub;
-    var _options$txs, tx, txBypass, forced, real, api;
+    var buildTx, api, _real$assetHub, _real$bridgeHub, tx, real, forced, _forced, _t;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          _options$txs = options.txs, tx = _options$txs.tx, txBypass = _options$txs.txBypass;
-          _context.n = 1;
-          return getXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
-            tx: txBypass,
-            useRootOrigin: true
-          }));
-        case 1:
-          forced = _context.v;
+          buildTx = options.buildTx, api = options.api;
+          _context.p = 1;
           _context.n = 2;
+          return buildTx();
+        case 2:
+          tx = _context.v;
+          _context.n = 3;
           return getXcmFeeInternal(_objectSpread2(_objectSpread2({}, options), {}, {
             tx: tx,
             useRootOrigin: false
           }));
-        case 2:
-          real = _context.v;
-          api = options.api;
-          _context.n = 3;
-          return api.disconnect();
         case 3:
+          real = _context.v;
+          _context.n = 4;
+          return getBypassResultWithRetries(options, getXcmFeeInternal, tx);
+        case 4:
+          forced = _context.v;
           return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, forced), {}, {
             origin: _objectSpread2(_objectSpread2({}, forced.origin), {}, {
               sufficient: real.origin.sufficient
@@ -10995,17 +11160,62 @@ var getXcmFee = /*#__PURE__*/function () {
               sufficient: (_real$bridgeHub = real.bridgeHub) === null || _real$bridgeHub === void 0 ? void 0 : _real$bridgeHub.sufficient
             })
           } : {}), {}, {
-            hops: forced.hops.map(function (hop, index) {
-              var _real$hops$index;
+            hops: forced.hops.map(function (hop, i) {
+              var _real$hops$i;
               return _objectSpread2(_objectSpread2({}, hop), {}, {
                 result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
-                  sufficient: (_real$hops$index = real.hops[index]) === null || _real$hops$index === void 0 ? void 0 : _real$hops$index.result.sufficient
+                  sufficient: (_real$hops$i = real.hops[i]) === null || _real$hops$i === void 0 || (_real$hops$i = _real$hops$i.result) === null || _real$hops$i === void 0 ? void 0 : _real$hops$i.sufficient
                 })
               });
             })
           }));
+        case 5:
+          _context.p = 5;
+          _t = _context.v;
+          if (_t instanceof AmountTooLowError) {
+            _context.n = 6;
+            break;
+          }
+          throw _t;
+        case 6:
+          _context.n = 7;
+          return getBypassResultWithRetries(options, getXcmFeeInternal);
+        case 7:
+          _forced = _context.v;
+          return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, _forced), {}, {
+            origin: _objectSpread2(_objectSpread2({}, _forced.origin), {}, {
+              sufficient: false
+            }),
+            destination: _objectSpread2(_objectSpread2({}, _forced.destination), {}, {
+              sufficient: false
+            })
+          }, _forced.assetHub ? {
+            assetHub: _objectSpread2(_objectSpread2({}, _forced.assetHub), {}, {
+              sufficient: false
+            })
+          } : {}), _forced.bridgeHub ? {
+            bridgeHub: _objectSpread2(_objectSpread2({}, _forced.bridgeHub), {}, {
+              sufficient: false
+            })
+          } : {}), {}, {
+            hops: _forced.hops.map(function (hop) {
+              return _objectSpread2(_objectSpread2({}, hop), {}, {
+                result: _objectSpread2(_objectSpread2({}, hop.result), {}, {
+                  sufficient: false
+                })
+              });
+            })
+          }));
+        case 8:
+          _context.p = 8;
+          _context.n = 9;
+          return api.disconnect();
+        case 9:
+          return _context.f(8);
+        case 10:
+          return _context.a(2);
       }
-    }, _callee);
+    }, _callee, null, [[1, 5, 8, 10]]);
   }));
   return function getXcmFee(_x) {
     return _ref.apply(this, arguments);
@@ -11451,11 +11661,11 @@ var buildHopInfo = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, txs, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, originFeeAsset, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, totalHopFee, destinationInfo, _t;
+    var api, buildTx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, originFeeAsset, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, totalHopFee, destinationInfo, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
-          api = _ref.api, txs = _ref.txs, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
+          api = _ref.api, buildTx = _ref.buildTx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
           if (!(assets.isChainEvm(origin) && !ahAddress)) {
             _context2.n = 1;
             break;
@@ -11509,7 +11719,7 @@ var getTransferInfo = /*#__PURE__*/function () {
           _context2.n = 9;
           return getXcmFee({
             api: api,
-            txs: txs,
+            buildTx: buildTx,
             origin: origin,
             destination: destination,
             senderAddress: senderAddress,
@@ -11677,11 +11887,11 @@ var getTransferInfo = /*#__PURE__*/function () {
 
 var getMinTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, origin, senderAddress, address, chain, destination, currency, feeAsset, txs, builder, resolvedFeeAsset, asset, destAsset, destCurrency, destApi, destBalance, destEd, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, amount, result, originFee, hopFeeTotal, destinationFee, edComponent, minAmount, modifiedBuilder, dryRunResult, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
+    var api, origin, senderAddress, address, chain, destination, currency, feeAsset, buildTx, builder, resolvedFeeAsset, asset, destAsset, destCurrency, destApi, destBalance, destEd, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, amount, result, originFee, hopFeeTotal, destinationFee, edComponent, minAmount, modifiedBuilder, dryRunResult, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, senderAddress = _ref.senderAddress, address = _ref.address, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, feeAsset = _ref.feeAsset, txs = _ref.txs, builder = _ref.builder;
+          api = _ref.api, origin = _ref.origin, senderAddress = _ref.senderAddress, address = _ref.address, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, feeAsset = _ref.feeAsset, buildTx = _ref.buildTx, builder = _ref.builder;
           validateAddress(senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = assets.findAssetInfoOrThrow(chain, currency, null);
@@ -11714,7 +11924,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
             api: api,
             origin: origin,
             destination: destination,
-            txs: txs,
+            buildTx: buildTx,
             senderAddress: senderAddress,
             address: address,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
@@ -11809,11 +12019,11 @@ var getMinTransferableAmount = /*#__PURE__*/function () {
 
 var getTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, senderAddress, chain, destination, currency, txs, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
+    var api, senderAddress, chain, destination, currency, buildTx, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, nativeAssetInfo, isNativeAsset, paysOriginInSendingAsset, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, txs = _ref.txs, feeAsset = _ref.feeAsset;
+          api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, buildTx = _ref.buildTx, feeAsset = _ref.feeAsset;
           validateAddress(senderAddress, chain, false);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
           asset = assets.findAssetInfoOrThrow(chain, currency, null);
@@ -11839,7 +12049,7 @@ var getTransferableAmountInternal = /*#__PURE__*/function () {
           _context.n = 2;
           return getOriginXcmFee({
             api: api,
-            txs: txs,
+            buildTx: buildTx,
             origin: chain,
             destination: chain,
             senderAddress: senderAddress,
@@ -11936,7 +12146,7 @@ var computeInstructionFee = /*#__PURE__*/function () {
           chain = _ref.chain, api = _ref.api;
           _t = padFeeBy;
           _context.n = 1;
-          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), {
+          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), [], {
             location: DOT_LOCATION
           }, true);
         case 1:
@@ -12225,11 +12435,11 @@ var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
 };
 var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, txs, origin, destination, currency, address, senderAddress, feeAsset, destApi, asset, amount, destCurrency, ed, balance, tx, txBypass, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
+    var api, buildTx, origin, destination, currency, address, senderAddress, feeAsset, destApi, asset, amount, destCurrency, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, tx, totalFee, method, feeToSubtract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, txs = options.txs, origin = options.origin, destination = options.destination, currency = options.currency, address = options.address, senderAddress = options.senderAddress, feeAsset = options.feeAsset;
+          api = options.api, buildTx = options.buildTx, origin = options.origin, destination = options.destination, currency = options.currency, address = options.address, senderAddress = options.senderAddress, feeAsset = options.feeAsset;
           if (!(destination === 'Ethereum')) {
             _context.n = 1;
             break;
@@ -12270,11 +12480,10 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           });
         case 5:
           balance = _context.v;
-          tx = txs.tx, txBypass = txs.txBypass;
           _context.n = 6;
-          return getXcmFeeInternal({
+          return getXcmFee({
             api: api,
-            tx: txBypass,
+            buildTx: buildTx,
             origin: origin,
             destination: destination,
             senderAddress: senderAddress,
@@ -12283,8 +12492,7 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
               amount: amount
             }),
             feeAsset: feeAsset,
-            disableFallback: false,
-            useRootOrigin: true
+            disableFallback: false
           });
         case 6:
           xcmFeeResult = _context.v;
@@ -12314,6 +12522,10 @@ var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
           }
           throw new UnableToComputeError("The XCM fee could not be calculated because the origin or destination chain does not support DryRun.\n       As a result, fee estimation is only available through PaymentInfo, which provides the cost in the native asset.\n       This limitation restricts support to transfers involving the native asset of the Destination chain only.");
         case 10:
+          _context.n = 11;
+          return buildTx();
+        case 11:
+          tx = _context.v;
           totalFee = calculateTotalXcmFee(xcmFeeResult);
           method = api.getMethod(tx);
           if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
@@ -12877,11 +13089,14 @@ var GeneralBuilder = /*#__PURE__*/function () {
       return dryRunPreview;
     }()
   }, {
-    key: "createTxs",
-    value: function createTxs$1() {
-      return createTxs(_objectSpread2(_objectSpread2({}, this._options), {}, {
-        api: this.api
-      }), this);
+    key: "createTxFactory",
+    value: function createTxFactory() {
+      var _this = this;
+      return function (amount) {
+        return createTx(_objectSpread2(_objectSpread2({}, _this._options), {}, {
+          api: _this.api
+        }), _this, amount);
+      };
     }
     /**
      * Returns the XCM fee for the transfer using dryRun or paymentInfo function.
@@ -12893,7 +13108,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
     value: (function () {
       var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(options) {
         var _options$disableFallb;
-        var _this$_options2, from, to, address, senderAddress, feeAsset, currency, disableFallback, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9, _t0;
+        var _this$_options2, from, to, address, senderAddress, feeAsset, currency, disableFallback;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.p = _context7.n) {
             case 0:
@@ -12902,43 +13117,30 @@ var GeneralBuilder = /*#__PURE__*/function () {
               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;
-              _t = getXcmFee;
-              _t2 = this.api;
               _context7.n = 2;
-              return this.createTxs();
-            case 2:
-              _t3 = _context7.v;
-              _t4 = from;
-              _t5 = to;
-              _t6 = senderAddress;
-              _t7 = address;
-              _t8 = currency;
-              _t9 = feeAsset;
-              _t0 = disableFallback;
-              _context7.n = 3;
-              return _t({
-                api: _t2,
-                txs: _t3,
-                origin: _t4,
-                destination: _t5,
-                senderAddress: _t6,
-                address: _t7,
-                currency: _t8,
-                feeAsset: _t9,
-                disableFallback: _t0
+              return getXcmFee({
+                api: this.api,
+                buildTx: this.createTxFactory(),
+                origin: from,
+                destination: to,
+                senderAddress: senderAddress,
+                address: address,
+                currency: currency,
+                feeAsset: feeAsset,
+                disableFallback: disableFallback
               });
-            case 3:
+            case 2:
               return _context7.a(2, _context7.v);
-            case 4:
-              _context7.p = 4;
-              _context7.n = 5;
+            case 3:
+              _context7.p = 3;
+              _context7.n = 4;
               return this.api.disconnect();
+            case 4:
+              return _context7.f(3);
             case 5:
-              return _context7.f(4);
-            case 6:
               return _context7.a(2);
           }
-        }, _callee7, this, [[1,, 4, 6]]);
+        }, _callee7, this, [[1,, 3, 5]]);
       }));
       function getXcmFee$1(_x6) {
         return _getXcmFee2.apply(this, arguments);
@@ -12964,16 +13166,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
           currency,
           feeAsset,
           api,
-          _args8 = arguments,
-          _t1,
-          _t10,
-          _t11,
-          _t12,
-          _t13,
-          _t14,
-          _t15,
-          _t16,
-          _t17;
+          _args8 = arguments;
         return _regenerator().w(function (_context8) {
           while (1) switch (_context8.p = _context8.n) {
             case 0:
@@ -12984,41 +13177,29 @@ var GeneralBuilder = /*#__PURE__*/function () {
               assertToIsString(to);
               api = this.api;
               _context8.p = 1;
-              _t1 = getOriginXcmFee;
-              _t10 = api;
               _context8.n = 2;
-              return this.createTxs();
-            case 2:
-              _t11 = _context8.v;
-              _t12 = from;
-              _t13 = to;
-              _t14 = senderAddress;
-              _t15 = currency;
-              _t16 = feeAsset;
-              _t17 = disableFallback;
-              _context8.n = 3;
-              return _t1({
-                api: _t10,
-                txs: _t11,
-                origin: _t12,
-                destination: _t13,
-                senderAddress: _t14,
-                currency: _t15,
-                feeAsset: _t16,
-                disableFallback: _t17
+              return getOriginXcmFee({
+                api: api,
+                buildTx: this.createTxFactory(),
+                origin: from,
+                destination: to,
+                senderAddress: senderAddress,
+                currency: currency,
+                feeAsset: feeAsset,
+                disableFallback: disableFallback
               });
-            case 3:
+            case 2:
               return _context8.a(2, _context8.v);
-            case 4:
-              _context8.p = 4;
-              _context8.n = 5;
+            case 3:
+              _context8.p = 3;
+              _context8.n = 4;
               return this.api.disconnect();
+            case 4:
+              return _context8.f(3);
             case 5:
-              return _context8.f(4);
-            case 6:
               return _context8.a(2);
           }
-        }, _callee8, this, [[1,, 4, 6]]);
+        }, _callee8, this, [[1,, 3, 5]]);
       }));
       function getOriginXcmFee$1() {
         return _getOriginXcmFee2.apply(this, arguments);
@@ -13133,32 +13314,21 @@ 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, _t18, _t19, _t20, _t21, _t22, _t23, _t24, _t25;
+        var _this$_options6, from, to, senderAddress, currency, feeAsset, api;
         return _regenerator().w(function (_context1) {
           while (1) switch (_context1.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;
               assertToIsString(to);
               api = this.api;
-              _t18 = getTransferableAmount;
-              _t19 = api;
-              _context1.n = 1;
-              return this.createTxs();
-            case 1:
-              _t20 = _context1.v;
-              _t21 = from;
-              _t22 = to;
-              _t23 = senderAddress;
-              _t24 = feeAsset;
-              _t25 = currency;
-              return _context1.a(2, _t18({
-                api: _t19,
-                txs: _t20,
-                origin: _t21,
-                destination: _t22,
-                senderAddress: _t23,
-                feeAsset: _t24,
-                currency: _t25
+              return _context1.a(2, getTransferableAmount({
+                api: api,
+                buildTx: this.createTxFactory(),
+                origin: from,
+                destination: to,
+                senderAddress: senderAddress,
+                feeAsset: feeAsset,
+                currency: currency
               }));
           }
         }, _callee1, this);
@@ -13178,7 +13348,7 @@ 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, _t26, _t27, _t28, _t29, _t30, _t31, _t32, _t33, _t34, _t35;
+        var _this$_options7, from, to, senderAddress, address, currency, feeAsset, api;
         return _regenerator().w(function (_context10) {
           while (1) switch (_context10.n) {
             case 0:
@@ -13186,29 +13356,16 @@ var GeneralBuilder = /*#__PURE__*/function () {
               assertToIsString(to);
               assertAddressIsString(address);
               api = this.api;
-              _t26 = getMinTransferableAmount;
-              _t27 = api;
-              _context10.n = 1;
-              return this.createTxs();
-            case 1:
-              _t28 = _context10.v;
-              _t29 = from;
-              _t30 = to;
-              _t31 = senderAddress;
-              _t32 = address;
-              _t33 = feeAsset;
-              _t34 = currency;
-              _t35 = this;
-              return _context10.a(2, _t26({
-                api: _t27,
-                txs: _t28,
-                origin: _t29,
-                destination: _t30,
-                senderAddress: _t31,
-                address: _t32,
-                feeAsset: _t33,
-                currency: _t34,
-                builder: _t35
+              return _context10.a(2, getMinTransferableAmount({
+                api: api,
+                buildTx: this.createTxFactory(),
+                origin: from,
+                destination: to,
+                senderAddress: senderAddress,
+                address: address,
+                feeAsset: feeAsset,
+                currency: currency,
+                builder: this
               }));
           }
         }, _callee10, this);
@@ -13228,34 +13385,22 @@ 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, _t36, _t37, _t38, _t39, _t40, _t41, _t42, _t43, _t44;
+        var _this$_options8, from, to, address, currency, senderAddress, feeAsset;
         return _regenerator().w(function (_context11) {
           while (1) switch (_context11.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;
               assertToIsString(to);
               assertAddressIsString(address);
-              _t36 = verifyEdOnDestination;
-              _t37 = this.api;
-              _context11.n = 1;
-              return this.createTxs();
-            case 1:
-              _t38 = _context11.v;
-              _t39 = from;
-              _t40 = to;
-              _t41 = address;
-              _t42 = senderAddress;
-              _t43 = feeAsset;
-              _t44 = currency;
-              return _context11.a(2, _t36({
-                api: _t37,
-                txs: _t38,
-                origin: _t39,
-                destination: _t40,
-                address: _t41,
-                senderAddress: _t42,
-                feeAsset: _t43,
-                currency: _t44
+              return _context11.a(2, verifyEdOnDestination({
+                api: this.api,
+                buildTx: this.createTxFactory(),
+                origin: from,
+                destination: to,
+                address: address,
+                senderAddress: senderAddress,
+                feeAsset: feeAsset,
+                currency: currency
               }));
           }
         }, _callee11, this);
@@ -13275,36 +13420,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, _t45, _t46, _t47, _t48, _t49, _t50, _t51, _t52, _t53, _t54;
+        var _this$_options9, from, to, address, currency, ahAddress, senderAddress, feeAsset;
         return _regenerator().w(function (_context12) {
           while (1) switch (_context12.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;
               assertToIsString(to);
               assertAddressIsString(address);
-              _t45 = getTransferInfo;
-              _t46 = this.api;
-              _context12.n = 1;
-              return this.createTxs();
-            case 1:
-              _t47 = _context12.v;
-              _t48 = from;
-              _t49 = to;
-              _t50 = address;
-              _t51 = senderAddress;
-              _t52 = ahAddress;
-              _t53 = currency;
-              _t54 = feeAsset;
-              return _context12.a(2, _t45({
-                api: _t46,
-                txs: _t47,
-                origin: _t48,
-                destination: _t49,
-                address: _t50,
-                senderAddress: _t51,
-                ahAddress: _t52,
-                currency: _t53,
-                feeAsset: _t54
+              return _context12.a(2, getTransferInfo({
+                api: this.api,
+                buildTx: this.createTxFactory(),
+                origin: from,
+                destination: to,
+                address: address,
+                senderAddress: senderAddress,
+                ahAddress: ahAddress,
+                currency: currency,
+                feeAsset: feeAsset
               }));
           }
         }, _callee12, this);
@@ -13394,7 +13526,7 @@ exports.createChainClient = createChainClient;
 exports.createDirectExecuteXcm = createDirectExecuteXcm;
 exports.createExecuteCall = createExecuteCall;
 exports.createExecuteExchangeXcm = createExecuteExchangeXcm;
-exports.createTxs = createTxs;
+exports.createTx = createTx;
 exports.createTypeAndThenCall = createTypeAndThenCall;
 exports.createVersionedAssets = createVersionedAssets;
 exports.createX1Payload = createX1Payload;