@paraspell/sdk-core 10.10.4 → 10.10.6

package/dist/index.cjs

@@ -3302,7 +3302,7 @@ var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, origin,
     version: version
   });
   assertHasLocation(asset);
-  var transformedMultiLocation = localizeLocation('AssetHubPolkadot', asset.multiLocation);
+  var transformedMultiLocation = localizeLocation(origin, asset.multiLocation);
   var call = {
     module: 'PolkadotXcm',
     method: 'execute',
@@ -3958,6 +3958,324 @@ var getOriginFeeDetails = /*#__PURE__*/function () {
   };
 }();
 
+var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
+  var asset = assets.findAsset(origin, feeAsset, !sdkCommon.isTMultiLocation(destination) ? destination : null);
+  var usesRawOverriddenMultiAssets = 'multiasset' in currency && currency.multiasset.every(assets.isTMultiAsset);
+  if (!asset && !usesRawOverriddenMultiAssets) {
+    throwUnsupportedCurrency(feeAsset, origin);
+  }
+  return asset !== null && asset !== void 0 ? asset : undefined;
+};
+
+var isAssetHub = function isAssetHub(chain) {
+  return chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama';
+};
+var isBridgeHub = function isBridgeHub(chain) {
+  return chain === 'BridgeHubPolkadot' || chain === 'BridgeHubKusama';
+};
+var isPeople = function isPeople(chain) {
+  return chain === 'PeoplePolkadot' || chain === 'PeopleKusama';
+};
+var isSystemPara = function isSystemPara(chain) {
+  return isAssetHub(chain) || isBridgeHub(chain) || isPeople(chain);
+};
+var mul = function mul(v, num) {
+  var den = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1n;
+  return v * num / den;
+};
+var padFee = function padFee(raw, origin, dest, side) {
+  var relayOrigin = sdkCommon.isRelayChain(origin);
+  var relayDest = sdkCommon.isRelayChain(dest);
+  var sysParaOrigin = isSystemPara(origin);
+  var sysParaDest = isSystemPara(dest);
+  var relayToPara = relayOrigin && !relayDest;
+  var sysParaToPara = sysParaOrigin && !sysParaDest;
+  var paraToPara = !relayOrigin && !sysParaOrigin;
+  if (sysParaToPara) return raw * 40n;
+  if (relayToPara) return side === 'origin' ? mul(raw, 320n, 100n) : mul(raw, 3000n, 100n);
+  if (paraToPara && side == 'origin' && origin === 'Mythos' && dest !== 'Ethereum') {
+    return 150000000000000000n;
+  }
+  if (paraToPara) return mul(raw, 130n, 100n);
+  // apply default 30% padding
+  return mul(raw, 130n, 100n);
+};
+var padFeeBy = function padFeeBy(amount, percent) {
+  return mul(amount, BigInt(100 + percent), 100n);
+};
+
+var determineAddress = function determineAddress(chain, address, senderAddress) {
+  if (assets.isNodeEvm(chain)) {
+    return viem.isAddress(address) ? address : senderAddress;
+  }
+  return viem.isAddress(address) ? senderAddress : address;
+};
+var getReverseTxFee = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, currencyInput) {
+    var api, origin, destination, senderAddress, address, currency, toAddress, fromAddress, tx, rawFee;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = _ref.api, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency;
+          toAddress = determineAddress(origin, address, senderAddress);
+          fromAddress = determineAddress(destination, address, senderAddress);
+          _context.n = 1;
+          return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
+            amount: currency.amount
+          })).build();
+        case 1:
+          tx = _context.v;
+          _context.n = 2;
+          return api.calculateTransactionFee(tx, fromAddress);
+        case 2:
+          rawFee = _context.v;
+          return _context.a(2, padFee(rawFee, origin, destination, 'destination'));
+      }
+    }, _callee);
+  }));
+  return function getReverseTxFee(_x, _x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var isSufficientOrigin = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, senderAddress, feeNative, currency, asset, feeAsset) {
+    var edNative, balanceNative, isNativeAssetToOrigin, isNativeAssetToDest, isSufficientNative, balanceAsset, edAsset, isSufficientAsset;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          if (!feeAsset) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 1:
+          edNative = assets.getExistentialDepositOrThrow(origin);
+          _context.n = 2;
+          return getBalanceNativeInternal({
+            api: api,
+            node: origin,
+            address: senderAddress
+          });
+        case 2:
+          balanceNative = _context.v;
+          isNativeAssetToOrigin = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(origin));
+          isNativeAssetToDest = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(destination));
+          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
+            _context.n = 3;
+            break;
+          }
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+        case 3:
+          if (isNativeAssetToOrigin) {
+            _context.n = 5;
+            break;
+          }
+          isSufficientNative = balanceNative - edNative - feeNative > 0n;
+          _context.n = 4;
+          return getAssetBalance({
+            api: api,
+            node: origin,
+            address: senderAddress,
+            currency: currency
+          });
+        case 4:
+          balanceAsset = _context.v;
+          edAsset = assets.getExistentialDepositOrThrow(origin, currency);
+          isSufficientAsset = balanceAsset - edAsset > 0n;
+          return _context.a(2, isSufficientNative && isSufficientAsset);
+        case 5:
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+      }
+    }, _callee);
+  }));
+  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var isSufficientDestination = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset, feeNative) {
+    var isNativeAsset, existentialDeposit, nativeBalance;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          isNativeAsset = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(destination));
+          if (isNativeAsset) {
+            _context2.n = 1;
+            break;
+          }
+          return _context2.a(2, undefined);
+        case 1:
+          existentialDeposit = assets.getExistentialDepositOrThrow(destination);
+          _context2.n = 2;
+          return getBalanceNativeInternal({
+            api: api,
+            node: destination,
+            address: address
+          });
+        case 2:
+          nativeBalance = _context2.v;
+          return _context2.a(2, nativeBalance + amount - existentialDeposit - feeNative > 0n);
+      }
+    }, _callee2);
+  }));
+  return function isSufficientDestination(_x9, _x0, _x1, _x10, _x11, _x12) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var createOriginLocation = function createOriginLocation(origin, destination) {
+  if (sdkCommon.isRelayChain(origin)) return DOT_MULTILOCATION;
+  return {
+    parents: sdkCommon.isRelayChain(destination) ? sdkCommon.Parents.ZERO : sdkCommon.Parents.ONE,
+    interior: {
+      X1: [{
+        Parachain: getParaId(origin)
+      }]
+    }
+  };
+};
+var getDestXcmFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var api, origin, hopNode, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, _sufficient, fee, newForwardedXcms, destParaId;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          api = options.api, origin = options.origin, hopNode = options.prevNode, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          calcPaymentInfoFee = /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+              var originAsset, _t;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    if (!(destination === 'Ethereum')) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, 0n);
+                  case 1:
+                    originAsset = assets.findAssetForNodeOrThrow(origin, currency, destination);
+                    if (!originAsset.multiLocation) {
+                      _context.n = 7;
+                      break;
+                    }
+                    _context.p = 2;
+                    _context.n = 3;
+                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                      destination: destination
+                    }), {
+                      multilocation: originAsset.multiLocation
+                    });
+                  case 3:
+                    return _context.a(2, _context.v);
+                  case 4:
+                    _context.p = 4;
+                    _t = _context.v;
+                    if (!(_t instanceof assets.InvalidCurrencyError)) {
+                      _context.n = 6;
+                      break;
+                    }
+                    _context.n = 5;
+                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                      destination: destination
+                    }), {
+                      symbol: originAsset.symbol
+                    });
+                  case 5:
+                    return _context.a(2, _context.v);
+                  case 6:
+                    throw _t;
+                  case 7:
+                    _context.n = 8;
+                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                      destination: destination
+                    }), {
+                      symbol: originAsset.symbol
+                    });
+                  case 8:
+                    return _context.a(2, _context.v);
+                }
+              }, _callee, null, [[2, 4]]);
+            }));
+            return function calcPaymentInfoFee() {
+              return _ref2.apply(this, arguments);
+            };
+          }();
+          if (!(!assets.hasDryRunSupport(destination) || !forwardedXcms || destination === 'Ethereum')) {
+            _context2.n = 3;
+            break;
+          }
+          _context2.n = 1;
+          return calcPaymentInfoFee();
+        case 1:
+          _fee = _context2.v;
+          _context2.n = 2;
+          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
+        case 2:
+          sufficient = _context2.v;
+          return _context2.a(2, {
+            fee: _fee,
+            feeType: 'paymentInfo',
+            sufficient: sufficient
+          });
+        case 3:
+          _context2.n = 4;
+          return api.getDryRunXcm({
+            originLocation: addXcmVersionHeader(createOriginLocation(hopNode, destination), sdkCommon.Version.V4),
+            xcm: forwardedXcms[1][0],
+            node: destination,
+            origin: origin,
+            asset: asset,
+            originFee: originFee,
+            feeAsset: resolvedFeeAsset,
+            amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
+          });
+        case 4:
+          dryRunResult = _context2.v;
+          if (dryRunResult.success) {
+            _context2.n = 8;
+            break;
+          }
+          if (!disableFallback) {
+            _context2.n = 5;
+            break;
+          }
+          return _context2.a(2, {
+            dryRunError: dryRunResult.failureReason
+          });
+        case 5:
+          _context2.n = 6;
+          return calcPaymentInfoFee();
+        case 6:
+          _fee2 = _context2.v;
+          _context2.n = 7;
+          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee2);
+        case 7:
+          _sufficient = _context2.v;
+          return _context2.a(2, {
+            fee: _fee2,
+            feeType: 'paymentInfo',
+            dryRunError: dryRunResult.failureReason,
+            sufficient: _sufficient
+          });
+        case 8:
+          fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
+          return _context2.a(2, {
+            fee: fee,
+            feeType: 'dryRun',
+            sufficient: true,
+            forwardedXcms: newForwardedXcms,
+            destParaId: destParaId
+          });
+      }
+    }, _callee2);
+  }));
+  return function getDestXcmFee(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var getParaEthTransferFees = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(ahApi) {
     var DEFAULT_FEE, feeStorageItem, leFeeHex, bytes, reversedHex, validReversedHex, leFee, transferBridgeFee, finalBridgeFee, finalAssethubExecutionFee;
@@ -4525,339 +4843,162 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           return createTx('transferAssetsUsingTypeAndThenAddress', [
           // This represents (1,X1(Parachain(1000)))
           [1, ['0x00' + numberToHex32(getParaId('AssetHubPolkadot')).slice(2)]],
-          // Assets including fee and the ERC20 asset, with fee be the first
-          [[XCDOT, transferFee], [ethAsset.assetId, currency.amount.toString()]],
-          // The TransferType corresponding to asset being sent, 2 represents `DestinationReserve`
-          2,
-          // index for the fee
-          0,
-          // The TransferType corresponding to fee asset
-          2, customXcmOnDest]);
-        case 14:
-          tx = _context.v;
-          return _context.a(2, tx);
-      }
-    }, _callee);
-  }));
-  return function transferMoonbeamToEth(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
-  var asset = assets.findAsset(origin, feeAsset, !sdkCommon.isTMultiLocation(destination) ? destination : null);
-  var usesRawOverriddenMultiAssets = 'multiasset' in currency && currency.multiasset.every(assets.isTMultiAsset);
-  if (!asset && !usesRawOverriddenMultiAssets) {
-    throwUnsupportedCurrency(feeAsset, origin);
-  }
-  return asset !== null && asset !== void 0 ? asset : undefined;
-};
-
-var isAssetHub = function isAssetHub(chain) {
-  return chain === 'AssetHubPolkadot' || chain === 'AssetHubKusama';
-};
-var isBridgeHub = function isBridgeHub(chain) {
-  return chain === 'BridgeHubPolkadot' || chain === 'BridgeHubKusama';
-};
-var isPeople = function isPeople(chain) {
-  return chain === 'PeoplePolkadot' || chain === 'PeopleKusama';
-};
-var isSystemPara = function isSystemPara(chain) {
-  return isAssetHub(chain) || isBridgeHub(chain) || isPeople(chain);
-};
-var mul = function mul(v, num) {
-  var den = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1n;
-  return v * num / den;
-};
-var padFee = function padFee(raw, origin, dest, side) {
-  var relayOrigin = sdkCommon.isRelayChain(origin);
-  var relayDest = sdkCommon.isRelayChain(dest);
-  var sysParaOrigin = isSystemPara(origin);
-  var sysParaDest = isSystemPara(dest);
-  var relayToPara = relayOrigin && !relayDest;
-  var sysParaToPara = sysParaOrigin && !sysParaDest;
-  var paraToPara = !relayOrigin && !sysParaOrigin;
-  if (sysParaToPara) return raw * 40n;
-  if (relayToPara) return side === 'origin' ? mul(raw, 320n, 100n) : mul(raw, 3000n, 100n);
-  if (paraToPara && side == 'origin' && origin === 'Mythos' && dest !== 'Ethereum') {
-    return 150000000000000000n;
-  }
-  if (paraToPara) return mul(raw, 130n, 100n);
-  // apply default 30% padding
-  return mul(raw, 130n, 100n);
-};
-var padFeeBy = function padFeeBy(amount, percent) {
-  return mul(amount, BigInt(100 + percent), 100n);
-};
-
-var determineAddress = function determineAddress(chain, address, senderAddress) {
-  if (assets.isNodeEvm(chain)) {
-    return viem.isAddress(address) ? address : senderAddress;
-  }
-  return viem.isAddress(address) ? senderAddress : address;
-};
-var getReverseTxFee = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, currencyInput) {
-    var api, origin, destination, senderAddress, address, currency, toAddress, fromAddress, tx, rawFee;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          api = _ref.api, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency;
-          toAddress = determineAddress(origin, address, senderAddress);
-          fromAddress = determineAddress(destination, address, senderAddress);
-          _context.n = 1;
-          return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
-            amount: currency.amount
-          })).build();
-        case 1:
-          tx = _context.v;
-          _context.n = 2;
-          return api.calculateTransactionFee(tx, fromAddress);
-        case 2:
-          rawFee = _context.v;
-          return _context.a(2, padFee(rawFee, origin, destination, 'destination'));
-      }
-    }, _callee);
-  }));
-  return function getReverseTxFee(_x, _x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, senderAddress, feeNative, currency, asset, feeAsset) {
-    var edNative, balanceNative, isNativeAssetToOrigin, isNativeAssetToDest, isSufficientNative, balanceAsset, edAsset, isSufficientAsset;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          if (!feeAsset) {
-            _context.n = 1;
-            break;
-          }
-          return _context.a(2, undefined);
-        case 1:
-          edNative = assets.getExistentialDepositOrThrow(origin);
-          _context.n = 2;
-          return getBalanceNativeInternal({
-            api: api,
-            node: origin,
-            address: senderAddress
-          });
-        case 2:
-          balanceNative = _context.v;
-          isNativeAssetToOrigin = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(origin));
-          isNativeAssetToDest = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(destination));
-          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
-            _context.n = 3;
-            break;
-          }
-          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
-        case 3:
-          if (isNativeAssetToOrigin) {
-            _context.n = 5;
-            break;
-          }
-          isSufficientNative = balanceNative - edNative - feeNative > 0n;
-          _context.n = 4;
-          return getAssetBalance({
-            api: api,
-            node: origin,
-            address: senderAddress,
-            currency: currency
-          });
-        case 4:
-          balanceAsset = _context.v;
-          edAsset = assets.getExistentialDepositOrThrow(origin, currency);
-          isSufficientAsset = balanceAsset - edAsset > 0n;
-          return _context.a(2, isSufficientNative && isSufficientAsset);
-        case 5:
-          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
-      }
-    }, _callee);
-  }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var isSufficientDestination = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset, feeNative) {
-    var isNativeAsset, existentialDeposit, nativeBalance;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          isNativeAsset = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(destination));
-          if (isNativeAsset) {
-            _context2.n = 1;
-            break;
-          }
-          return _context2.a(2, undefined);
-        case 1:
-          existentialDeposit = assets.getExistentialDepositOrThrow(destination);
-          _context2.n = 2;
-          return getBalanceNativeInternal({
-            api: api,
-            node: destination,
-            address: address
-          });
-        case 2:
-          nativeBalance = _context2.v;
-          return _context2.a(2, nativeBalance + amount - existentialDeposit - feeNative > 0n);
+          // Assets including fee and the ERC20 asset, with fee be the first
+          [[XCDOT, transferFee], [ethAsset.assetId, currency.amount.toString()]],
+          // The TransferType corresponding to asset being sent, 2 represents `DestinationReserve`
+          2,
+          // index for the fee
+          0,
+          // The TransferType corresponding to fee asset
+          2, customXcmOnDest]);
+        case 14:
+          tx = _context.v;
+          return _context.a(2, tx);
       }
-    }, _callee2);
+    }, _callee);
   }));
-  return function isSufficientDestination(_x9, _x0, _x1, _x10, _x11, _x12) {
+  return function transferMoonbeamToEth(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
 
-var createOriginLocation = function createOriginLocation(origin, destination) {
-  if (sdkCommon.isRelayChain(origin)) return DOT_MULTILOCATION;
-  return {
-    parents: sdkCommon.isRelayChain(destination) ? sdkCommon.Parents.ZERO : sdkCommon.Parents.ONE,
-    interior: {
-      X1: [{
-        Parachain: getParaId(origin)
-      }]
-    }
-  };
-};
-var getDestXcmFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, origin, hopNode, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, _sufficient, fee, newForwardedXcms, destParaId;
+function traverseXcmHops(_x) {
+  return _traverseXcmHops.apply(this, arguments);
+}
+function _traverseXcmHops() {
+  _traverseXcmHops = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(config) {
+    var api, origin, destination, currency, initialForwardedXcms, initialDestParaId, swapConfig, processHop, shouldContinue, extractNextHopData, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, asset, currentAsset, hasPassedExchange, hops, intermediateResults, destinationResult, nextChain, hopApi, isDestination, isAssetHub, isBridgeHub, hopResult, _extractNextHopData, newXcms, destParaId;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          api = options.api, origin = options.origin, hopNode = options.prevNode, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, disableFallback = options.disableFallback;
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          calcPaymentInfoFee = /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-              var originAsset, _t;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.n) {
-                  case 0:
-                    if (!(destination === 'Ethereum')) {
-                      _context.n = 1;
-                      break;
-                    }
-                    return _context.a(2, 0n);
-                  case 1:
-                    originAsset = assets.findAssetForNodeOrThrow(origin, currency, destination);
-                    if (!originAsset.multiLocation) {
-                      _context.n = 7;
-                      break;
-                    }
-                    _context.p = 2;
-                    _context.n = 3;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      multilocation: originAsset.multiLocation
-                    });
-                  case 3:
-                    return _context.a(2, _context.v);
-                  case 4:
-                    _context.p = 4;
-                    _t = _context.v;
-                    if (!(_t instanceof assets.InvalidCurrencyError)) {
-                      _context.n = 6;
-                      break;
-                    }
-                    _context.n = 5;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol
-                    });
-                  case 5:
-                    return _context.a(2, _context.v);
-                  case 6:
-                    throw _t;
-                  case 7:
-                    _context.n = 8;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol
-                    });
-                  case 8:
-                    return _context.a(2, _context.v);
-                }
-              }, _callee, null, [[2, 4]]);
-            }));
-            return function calcPaymentInfoFee() {
-              return _ref2.apply(this, arguments);
-            };
-          }();
-          if (!(!assets.hasDryRunSupport(destination) || !forwardedXcms || destination === 'Ethereum')) {
-            _context2.n = 3;
+          api = config.api, origin = config.origin, destination = config.destination, currency = config.currency, initialForwardedXcms = config.initialForwardedXcms, initialDestParaId = config.initialDestParaId, swapConfig = config.swapConfig, processHop = config.processHop, shouldContinue = config.shouldContinue, extractNextHopData = config.extractNextHopData;
+          assetHubNode = "AssetHub".concat(getRelayChainOf(origin));
+          bridgeHubNode = "BridgeHub".concat(getRelayChainOf(origin));
+          currentOrigin = origin;
+          forwardedXcms = initialForwardedXcms;
+          nextParaId = initialDestParaId;
+          asset = assets.findAssetForNodeOrThrow(origin, currency, destination);
+          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? assets.findAssetForNodeOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
+          hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
+          hops = [];
+          intermediateResults = {};
+        case 1:
+          if (!(Array.isArray(forwardedXcms) && forwardedXcms.length > 0 && forwardedXcms[1].length > 0 && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
+            _context2.n = 10;
             break;
           }
-          _context2.n = 1;
-          return calcPaymentInfoFee();
-        case 1:
-          _fee = _context2.v;
-          _context2.n = 2;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
+          nextChain = getTNode(nextParaId, getRelayChainOf(origin).toLowerCase());
+          if (nextChain) {
+            _context2.n = 2;
+            break;
+          }
+          throw new InvalidParameterError("Unable to find TNode for paraId ".concat(nextParaId));
         case 2:
-          sufficient = _context2.v;
-          return _context2.a(2, {
-            fee: _fee,
-            feeType: 'paymentInfo',
-            sufficient: sufficient
-          });
-        case 3:
+          hopApi = api.clone();
+          _context2.p = 3;
           _context2.n = 4;
-          return api.getDryRunXcm({
-            originLocation: addXcmVersionHeader(createOriginLocation(hopNode, destination), sdkCommon.Version.V4),
-            xcm: forwardedXcms[1][0],
-            node: destination,
-            origin: origin,
-            asset: asset,
-            originFee: originFee,
-            feeAsset: resolvedFeeAsset,
-            amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
-          });
+          return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 4:
-          dryRunResult = _context2.v;
-          if (dryRunResult.success) {
-            _context2.n = 8;
-            break;
+          isDestination = nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination);
+          isAssetHub = nextChain === assetHubNode;
+          isBridgeHub = nextChain === bridgeHubNode;
+          _context2.n = 5;
+          return processHop({
+            api: hopApi,
+            currentChain: nextChain,
+            currentOrigin: currentOrigin,
+            currentAsset: currentAsset,
+            forwardedXcms: forwardedXcms,
+            hasPassedExchange: hasPassedExchange,
+            isDestination: isDestination,
+            isAssetHub: isAssetHub,
+            isBridgeHub: isBridgeHub
+          });
+        case 5:
+          hopResult = _context2.v;
+          if (!isDestination) {
+            hops.push({
+              chain: nextChain,
+              result: hopResult
+            });
           }
-          if (!disableFallback) {
-            _context2.n = 5;
+          if (isDestination) {
+            destinationResult = hopResult;
+          } else if (isAssetHub) {
+            intermediateResults.assetHub = hopResult;
+          } else if (isBridgeHub) {
+            intermediateResults.bridgeHub = hopResult;
+          }
+          if (shouldContinue(hopResult)) {
+            _context2.n = 6;
             break;
           }
-          return _context2.a(2, {
-            dryRunError: dryRunResult.failureReason
-          });
-        case 5:
-          _context2.n = 6;
-          return calcPaymentInfoFee();
+          return _context2.a(3, 10);
         case 6:
-          _fee2 = _context2.v;
-          _context2.n = 7;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee2);
+          // Update state for next iteration
+          if (swapConfig && nextChain === swapConfig.exchangeChain) {
+            hasPassedExchange = true;
+            currentAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
+          }
+          _extractNextHopData = extractNextHopData(hopResult), newXcms = _extractNextHopData.forwardedXcms, destParaId = _extractNextHopData.destParaId;
+          forwardedXcms = newXcms;
+          nextParaId = destParaId;
+          currentOrigin = nextChain;
         case 7:
-          _sufficient = _context2.v;
-          return _context2.a(2, {
-            fee: _fee2,
-            feeType: 'paymentInfo',
-            dryRunError: dryRunResult.failureReason,
-            sufficient: _sufficient
-          });
+          _context2.p = 7;
+          _context2.n = 8;
+          return hopApi.disconnect();
         case 8:
-          fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
-          return _context2.a(2, {
-            fee: fee,
-            feeType: 'dryRun',
-            sufficient: true,
-            forwardedXcms: newForwardedXcms,
-            destParaId: destParaId
-          });
+          return _context2.f(7);
+        case 9:
+          _context2.n = 1;
+          break;
+        case 10:
+          return _context2.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+            hops: hops
+          }, intermediateResults.assetHub && {
+            assetHub: intermediateResults.assetHub
+          }), intermediateResults.bridgeHub && {
+            bridgeHub: intermediateResults.bridgeHub
+          }), destinationResult && {
+            destination: destinationResult
+          }), {}, {
+            lastProcessedChain: currentOrigin
+          }));
       }
-    }, _callee2);
+    }, _callee2, null, [[3,, 7, 9]]);
   }));
-  return function getDestXcmFee(_x) {
+  return _traverseXcmHops.apply(this, arguments);
+}
+var addEthereumBridgeFees = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, bridgeHubResult, destination, assetHubNode) {
+    var ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          if (!(!bridgeHubResult || !('fee' in bridgeHubResult) || destination !== 'Ethereum')) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, bridgeHubResult);
+        case 1:
+          ahApi = api.clone();
+          _context.n = 2;
+          return ahApi.init(assetHubNode, DRY_RUN_CLIENT_TIMEOUT_MS);
+        case 2:
+          _context.n = 3;
+          return getParaEthTransferFees(ahApi);
+        case 3:
+          _yield$getParaEthTran = _context.v;
+          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 1);
+          bridgeFee = _yield$getParaEthTran2[0];
+          return _context.a(2, _objectSpread2(_objectSpread2({}, bridgeHubResult), {}, {
+            fee: bridgeHubResult.fee + bridgeFee
+          }));
+      }
+    }, _callee);
+  }));
+  return function addEthereumBridgeFees(_x2, _x3, _x4, _x5) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -4894,186 +5035,166 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
   return {};
 };
 var dryRunInternal = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var _intermediateFees$bri, _intermediateFees$ass, _processedBridgeHubDa, _destinationDryRun;
-    var origin, destination, currency, api, tx, senderAddress, feeAsset, swapConfig, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, assetHubNode, bridgeHubNode, currentAsset, hasPassedExchange, currentOrigin, forwardedXcms, nextParaId, intermediateFees, hops, destinationDryRun, nextChain, hopApi, hopDryRun, hopCurrency, newXcms, destParaId, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, _getFailureInfo, failureReason, failureChain;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var _traversalResult$brid, _traversalResult$asse, _traversalResult$dest;
+    var origin, destination, currency, api, tx, senderAddress, feeAsset, swapConfig, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubNode, bridgeHubNode, processedBridgeHub, bridgeHubHopIndex, originWithCurrency, assetHubWithCurrency, bridgeHubWithCurrency, destinationWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           asset = assets.findAssetForNodeOrThrow(origin, currency, destination);
-          _context.n = 1;
+          _context2.n = 1;
           return api.getDryRunCall({
             tx: tx,
             node: origin,
             address: senderAddress,
-            feeAsset: resolvedFeeAsset
-          });
-        case 1:
-          originDryRun = _context.v;
-          if (originDryRun.success) {
-            _context.n = 2;
-            break;
-          }
-          return _context.a(2, {
-            failureReason: originDryRun.failureReason,
-            failureChain: 'origin',
-            origin: originDryRun,
-            hops: []
-          });
-        case 2:
-          initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
-          assetHubNode = "AssetHub".concat(getRelayChainOf(origin));
-          bridgeHubNode = "BridgeHub".concat(getRelayChainOf(origin));
-          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? assets.findAssetForNodeOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
-          hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
-          currentOrigin = origin;
-          forwardedXcms = initialForwardedXcms;
-          nextParaId = initialDestParaId;
-          intermediateFees = {};
-          hops = [];
-        case 3:
-          if (!(Array.isArray(forwardedXcms) && forwardedXcms.length && forwardedXcms[1].length && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context.n = 13;
-            break;
-          }
-          nextChain = getTNode(nextParaId, getRelayChainOf(origin).toLowerCase());
-          if (nextChain) {
-            _context.n = 4;
-            break;
-          }
-          throw new InvalidParameterError("Unable to find TNode for paraId ".concat(nextParaId));
-        case 4:
-          hopApi = api.clone();
-          _context.p = 5;
-          if (assets.hasDryRunSupport(nextChain)) {
-            _context.n = 6;
+            feeAsset: resolvedFeeAsset
+          });
+        case 1:
+          originDryRun = _context2.v;
+          if (originDryRun.success) {
+            _context2.n = 2;
             break;
           }
-          if (nextChain === destination) {
-            destinationDryRun = {
-              success: false,
-              failureReason: "DryRunApi is not available on node ".concat(nextChain)
+          return _context2.a(2, {
+            failureReason: originDryRun.failureReason,
+            failureChain: 'origin',
+            origin: originDryRun,
+            hops: []
+          });
+        case 2:
+          initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
+          processHop = /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, isDestination, hopDryRun, hopCurrency;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange, isDestination = params.isDestination;
+                    if (assets.hasDryRunSupport(currentChain)) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, {
+                      success: false,
+                      failureReason: "DryRunApi is not available on node ".concat(currentChain)
+                    });
+                  case 1:
+                    _context.n = 2;
+                    return hopApi.getDryRunXcm({
+                      originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, currentChain), sdkCommon.Version.V4),
+                      xcm: forwardedXcms[1][0],
+                      node: currentChain,
+                      origin: currentOrigin,
+                      asset: currentAsset,
+                      feeAsset: resolvedFeeAsset,
+                      originFee: originDryRun.fee,
+                      amount: BigInt(currency.amount)
+                    });
+                  case 2:
+                    hopDryRun = _context.v;
+                    if (!hopDryRun.success) {
+                      _context.n = 3;
+                      break;
+                    }
+                    if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
+                      hopCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo).symbol;
+                    } else if (isDestination) {
+                      hopCurrency = assets.findAssetOnDestOrThrow(origin, currentChain, currency).symbol;
+                    } else {
+                      hopCurrency = asset.symbol;
+                    }
+                    return _context.a(2, _objectSpread2(_objectSpread2({}, hopDryRun), {}, {
+                      currency: hopCurrency
+                    }));
+                  case 3:
+                    return _context.a(2, hopDryRun);
+                }
+              }, _callee);
+            }));
+            return function processHop(_x2) {
+              return _ref2.apply(this, arguments);
             };
-          }
-          return _context.a(3, 13);
-        case 6:
-          _context.n = 7;
-          return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 7:
-          _context.n = 8;
-          return hopApi.getDryRunXcm({
-            originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, nextChain), sdkCommon.Version.V4),
-            xcm: forwardedXcms[1][0],
-            node: nextChain,
-            origin: currentOrigin,
-            asset: currentAsset,
-            feeAsset: resolvedFeeAsset,
-            originFee: originDryRun.fee,
-            amount: BigInt(currency.amount)
+          }();
+          _context2.n = 3;
+          return traverseXcmHops({
+            api: api,
+            origin: origin,
+            destination: destination,
+            currency: currency,
+            initialForwardedXcms: initialForwardedXcms,
+            initialDestParaId: initialDestParaId,
+            swapConfig: swapConfig,
+            processHop: processHop,
+            shouldContinue: function shouldContinue(hopResult) {
+              return hopResult.success;
+            },
+            extractNextHopData: function extractNextHopData(hopResult) {
+              return {
+                forwardedXcms: hopResult.success ? hopResult.forwardedXcms : undefined,
+                destParaId: hopResult.success ? hopResult.destParaId : undefined
+              };
+            }
           });
-        case 8:
-          hopDryRun = _context.v;
-          hopCurrency = void 0;
-          if (hasPassedExchange && swapConfig && nextChain !== swapConfig.exchangeChain) {
-            hopCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo).symbol;
-          } else {
-            hopCurrency = asset.symbol;
-          }
-          // Add to hops array (only if not the destination)
-          if (nextChain !== destination) {
-            hops.push({
-              chain: nextChain,
-              result: hopDryRun.success && hopCurrency ? _objectSpread2(_objectSpread2({}, hopDryRun), {}, {
-                currency: hopCurrency
-              }) : hopDryRun
-            });
-          }
-          // Keep existing logic for backwards compatibility
-          if (nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination)) {
-            destinationDryRun = hopDryRun;
-          } else if (nextChain === assetHubNode) {
-            intermediateFees.assetHub = hopDryRun;
-          } else if (nextChain === bridgeHubNode) {
-            intermediateFees.bridgeHub = hopDryRun;
-          }
-          if (hopDryRun.success) {
-            _context.n = 9;
+        case 3:
+          traversalResult = _context2.v;
+          // Process Ethereum bridge fees
+          assetHubNode = "AssetHub".concat(getRelayChainOf(origin));
+          bridgeHubNode = "BridgeHub".concat(getRelayChainOf(origin));
+          if (!((_traversalResult$brid = traversalResult.bridgeHub) !== null && _traversalResult$brid !== void 0 && _traversalResult$brid.success)) {
+            _context2.n = 5;
             break;
           }
-          return _context.a(3, 13);
-        case 9:
-          if (swapConfig && nextChain === swapConfig.exchangeChain) {
-            hasPassedExchange = true;
-            currentAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
-          }
-          newXcms = hopDryRun.forwardedXcms, destParaId = hopDryRun.destParaId;
-          forwardedXcms = newXcms;
-          nextParaId = destParaId;
-          currentOrigin = nextChain;
-        case 10:
-          _context.p = 10;
-          _context.n = 11;
-          return hopApi.disconnect();
-        case 11:
-          return _context.f(10);
-        case 12:
-          _context.n = 3;
+          _context2.n = 4;
+          return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubNode);
+        case 4:
+          _t = _context2.v;
+          _context2.n = 6;
           break;
-        case 13:
-          processedBridgeHubData = intermediateFees.bridgeHub;
-          if (!((_intermediateFees$bri = intermediateFees.bridgeHub) !== null && _intermediateFees$bri !== void 0 && _intermediateFees$bri.success && destination === 'Ethereum')) {
-            _context.n = 16;
-            break;
-          }
-          ahApi = api.clone();
-          _context.n = 14;
-          return ahApi.init(assetHubNode, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 14:
-          _context.n = 15;
-          return getParaEthTransferFees(ahApi);
-        case 15:
-          _yield$getParaEthTran = _context.v;
-          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 1);
-          bridgeFee = _yield$getParaEthTran2[0];
-          processedBridgeHubData = _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
-            fee: intermediateFees.bridgeHub.fee + bridgeFee
-          });
-          // Update the hop data if BridgeHub is in the hops array
-          bridgeHubHopIndex = hops.findIndex(function (hop) {
-            return hop.chain === bridgeHubNode;
-          });
-          if (bridgeHubHopIndex !== -1 && hops[bridgeHubHopIndex].result.success) {
-            hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, hops[bridgeHubHopIndex].result), {}, {
-              fee: intermediateFees.bridgeHub.fee + bridgeFee
+        case 5:
+          _t = traversalResult.bridgeHub;
+        case 6:
+          processedBridgeHub = _t;
+          // Update bridge hub in hops if needed
+          if (processedBridgeHub && processedBridgeHub.success && traversalResult.bridgeHub && traversalResult.bridgeHub.success && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
+            bridgeHubHopIndex = traversalResult.hops.findIndex(function (hop) {
+              return hop.chain === bridgeHubNode;
             });
+            if (bridgeHubHopIndex !== -1 && traversalResult.hops[bridgeHubHopIndex].result.success) {
+              traversalResult.hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, traversalResult.hops[bridgeHubHopIndex].result), {}, {
+                fee: processedBridgeHub.fee
+              });
+            }
           }
-        case 16:
+          originWithCurrency = originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
+            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(origin)
+          }) : originDryRun;
+          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
+            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(assetHubNode)
+          }) : traversalResult.assetHub;
+          bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
+            currency: assets.getNativeAssetSymbol(bridgeHubNode)
+          }) : processedBridgeHub;
+          destinationWithCurrency = (_traversalResult$dest = traversalResult.destination) !== null && _traversalResult$dest !== void 0 && _traversalResult$dest.success ? _objectSpread2(_objectSpread2({}, traversalResult.destination), {}, {
+            currency: asset === null || asset === void 0 ? void 0 : asset.symbol
+          }) : traversalResult.destination;
           _getFailureInfo = getFailureInfo$1({
-            destination: destinationDryRun,
-            assetHub: intermediateFees.assetHub,
-            bridgeHub: intermediateFees.bridgeHub
-          }, hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
-          return _context.a(2, {
+            destination: destinationWithCurrency,
+            assetHub: assetHubWithCurrency,
+            bridgeHub: bridgeHubWithCurrency
+          }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
+          return _context2.a(2, {
             failureReason: failureReason,
             failureChain: failureChain,
-            origin: originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
-              currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(origin)
-            }) : originDryRun,
-            assetHub: (_intermediateFees$ass = intermediateFees.assetHub) !== null && _intermediateFees$ass !== void 0 && _intermediateFees$ass.success ? _objectSpread2(_objectSpread2({}, intermediateFees.assetHub), {}, {
-              currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(assetHubNode)
-            }) : intermediateFees.assetHub,
-            bridgeHub: (_processedBridgeHubDa = processedBridgeHubData) !== null && _processedBridgeHubDa !== void 0 && _processedBridgeHubDa.success ? _objectSpread2(_objectSpread2({}, processedBridgeHubData), {}, {
-              currency: assets.getNativeAssetSymbol(bridgeHubNode)
-            }) : processedBridgeHubData,
-            destination: (_destinationDryRun = destinationDryRun) !== null && _destinationDryRun !== void 0 && _destinationDryRun.success ? _objectSpread2(_objectSpread2({}, destinationDryRun), {}, {
-              currency: asset === null || asset === void 0 ? void 0 : asset.symbol
-            }) : destinationDryRun,
-            hops: hops
+            origin: originWithCurrency,
+            assetHub: assetHubWithCurrency,
+            bridgeHub: bridgeHubWithCurrency,
+            destination: destinationWithCurrency,
+            hops: traversalResult.hops
           });
       }
-    }, _callee, null, [[5,, 10, 12]]);
+    }, _callee2);
   }));
   return function dryRunInternal(_x) {
     return _ref.apply(this, arguments);
@@ -5485,14 +5606,14 @@ var getFailureInfo = function getFailureInfo(nodes, hops) {
   return {};
 };
 var getXcmFee = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, hops, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, currentAsset, hasPassedExchange, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, destinationSufficient, nextChain, hopApi, hopResult, hopCurrency, hopDetail, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, destCurrency, result, _getFailureInfo2, failureChain, failureReason;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, assetHubNode, processedBridgeHub, bridgeHubNode, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig;
-          asset = assets.findAssetForNodeOrThrow(origin, currency, destination); // Origin fee = execution fee + delivery fees
-          _context.n = 1;
+          asset = assets.findAssetForNodeOrThrow(origin, currency, destination);
+          _context2.n = 1;
           return getOriginXcmFee({
             api: api,
             tx: tx,
@@ -5504,7 +5625,7 @@ var getXcmFee = /*#__PURE__*/function () {
             disableFallback: disableFallback
           });
         case 1:
-          _yield$getOriginXcmFe = _context.v;
+          _yield$getOriginXcmFe = _context2.v;
           originFee = _yield$getOriginXcmFe.fee;
           originCurrency = _yield$getOriginXcmFe.currency;
           originFeeType = _yield$getOriginXcmFe.feeType;
@@ -5514,22 +5635,20 @@ var getXcmFee = /*#__PURE__*/function () {
           originWeight = _yield$getOriginXcmFe.weight;
           sufficientOriginFee = _yield$getOriginXcmFe.sufficient;
           api.setDisconnectAllowed(true);
-          _context.n = 2;
+          _context2.n = 2;
           return api.disconnect();
         case 2:
-          // Initialize hops array
-          hops = [];
           if (!(originDryRunError || originFeeType === 'paymentInfo')) {
-            _context.n = 8;
+            _context2.n = 8;
             break;
           }
           destApi = api.clone();
-          _context.p = 3;
-          _context.n = 4;
+          _context2.p = 3;
+          _context2.n = 4;
           return destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 4:
           destApi.setDisconnectAllowed(false);
-          _context.n = 5;
+          _context2.n = 5;
           return getDestXcmFee({
             api: destApi,
             forwardedXcms: undefined,
@@ -5545,7 +5664,7 @@ var getXcmFee = /*#__PURE__*/function () {
             disableFallback: disableFallback
           });
         case 5:
-          destFeeRes = _context.v;
+          destFeeRes = _context2.v;
           _result = {
             origin: _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
               fee: originFee
@@ -5569,134 +5688,127 @@ var getXcmFee = /*#__PURE__*/function () {
             }), {}, {
               currency: assets.getNativeAssetSymbol(destination)
             }),
-            hops: hops // Include empty hops array
+            hops: []
           };
           _getFailureInfo = getFailureInfo({
             origin: _result.origin,
             destination: _result.destination
-          }, hops), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
-          return _context.a(2, _objectSpread2(_objectSpread2({}, _result), {}, {
+          }, []), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
+          return _context2.a(2, _objectSpread2(_objectSpread2({}, _result), {}, {
             failureChain: _failureChain,
             failureReason: _failureReason
           }));
         case 6:
-          _context.p = 6;
+          _context2.p = 6;
           destApi.setDisconnectAllowed(true);
-          _context.n = 7;
+          _context2.n = 7;
           return destApi.disconnect();
         case 7:
-          return _context.f(6);
+          return _context2.f(6);
         case 8:
-          assetHubNode = "AssetHub".concat(getRelayChainOf(origin));
-          bridgeHubNode = "BridgeHub".concat(getRelayChainOf(origin));
-          currentOrigin = origin;
-          forwardedXcms = initialForwardedXcm;
-          nextParaId = initialDestParaId;
-          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? assets.findAssetForNodeOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
-          hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
-          intermediateFees = {};
-          destinationFee = 0n;
-          destinationFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
-          destinationSufficient = undefined;
-        case 9:
-          if (!(Array.isArray(forwardedXcms) && forwardedXcms.length > 0 && forwardedXcms[1].length > 0 && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context.n = 21;
-            break;
-          }
-          nextChain = getTNode(nextParaId, getRelayChainOf(origin).toLowerCase());
-          if (!(nextChain === null)) {
-            _context.n = 10;
-            break;
-          }
-          throw new InvalidParameterError("Unable to find TNode for paraId ".concat(nextParaId));
-        case 10:
-          hopApi = api.clone();
-          _context.p = 11;
-          _context.n = 12;
-          return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 12:
-          _context.n = 13;
-          return getDestXcmFee({
-            api: hopApi,
-            forwardedXcms: forwardedXcms,
+          processHop = /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopResult, hopCurrency;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange;
+                    _context.n = 1;
+                    return getDestXcmFee({
+                      api: hopApi,
+                      forwardedXcms: forwardedXcms,
+                      origin: origin,
+                      prevNode: currentOrigin,
+                      destination: currentChain,
+                      currency: currency,
+                      address: address,
+                      senderAddress: senderAddress,
+                      asset: currentAsset,
+                      feeAsset: feeAsset,
+                      originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
+                      disableFallback: disableFallback
+                    });
+                  case 1:
+                    hopResult = _context.v;
+                    if (hopResult.feeType === 'dryRun') {
+                      if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
+                        hopCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo).symbol;
+                      } else if (destination === currentChain) {
+                        hopCurrency = assets.findAssetOnDestOrThrow(origin, currentChain, currency).symbol;
+                      } else {
+                        hopCurrency = asset.symbol;
+                      }
+                    } else {
+                      hopCurrency = assets.getNativeAssetSymbol(currentChain);
+                    }
+                    return _context.a(2, _objectSpread2(_objectSpread2({}, hopResult), {}, {
+                      currency: hopCurrency
+                    }));
+                }
+              }, _callee);
+            }));
+            return function processHop(_x2) {
+              return _ref3.apply(this, arguments);
+            };
+          }();
+          _context2.n = 9;
+          return traverseXcmHops({
+            api: api,
             origin: origin,
-            prevNode: currentOrigin,
-            destination: nextChain,
+            destination: destination,
             currency: currency,
-            address: address,
-            senderAddress: senderAddress,
-            asset: currentAsset,
-            feeAsset: feeAsset,
-            originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
-            disableFallback: disableFallback
-          });
-        case 13:
-          hopResult = _context.v;
-          hopCurrency = void 0;
-          if (hopResult.feeType === 'dryRun') {
-            if (hasPassedExchange && swapConfig && nextChain !== swapConfig.exchangeChain) {
-              hopCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo).symbol;
-            } else if (destination === nextChain) {
-              hopCurrency = assets.findAssetOnDestOrThrow(origin, nextChain, currency).symbol;
-            } else {
-              hopCurrency = asset.symbol;
+            initialForwardedXcms: initialForwardedXcm,
+            initialDestParaId: initialDestParaId,
+            swapConfig: swapConfig,
+            processHop: processHop,
+            shouldContinue: function shouldContinue(hopResult) {
+              return !hopResult.dryRunError;
+            },
+            extractNextHopData: function extractNextHopData(hopResult) {
+              return {
+                forwardedXcms: hopResult.forwardedXcms,
+                destParaId: hopResult.destParaId
+              };
             }
-          } else {
-            hopCurrency = assets.getNativeAssetSymbol(nextChain);
-          }
-          hopDetail = hopResult.dryRunError ? {
-            fee: hopResult.fee,
-            feeType: hopResult.feeType,
-            currency: hopCurrency,
-            sufficient: hopResult.sufficient,
-            dryRunError: hopResult.dryRunError
-          } : {
-            fee: hopResult.fee,
-            feeType: hopResult.feeType,
-            currency: hopCurrency,
-            sufficient: hopResult.sufficient
-          };
-          if (nextChain !== destination) {
-            hops.push({
-              chain: nextChain,
-              result: hopDetail
-            });
-          }
-          if (!hopResult.dryRunError) {
-            _context.n = 17;
+          });
+        case 9:
+          traversalResult = _context2.v;
+          // Handle case where we failed before reaching destination
+          destFee = 0n;
+          destFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
+          destSufficient = undefined;
+          if (!traversalResult.destination) {
+            _context2.n = 10;
             break;
           }
-          failingRecord = hopDetail;
-          hopIsDestination = nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination);
-          if (hopIsDestination) {
-            destinationFee = hopResult.fee;
-            destinationFeeType = hopResult.feeType; // paymentInfo
-            destinationDryRunError = hopResult.dryRunError;
-            destinationSufficient = hopResult.sufficient;
-          } else if (nextChain === assetHubNode) {
-            intermediateFees.assetHub = failingRecord;
-          } else if (nextChain === bridgeHubNode) {
-            intermediateFees.bridgeHub = failingRecord;
-          }
-          // We failed before the true destination, use fallback via paymentInfo.
-          if (hopIsDestination) {
-            _context.n = 16;
+          destResult = traversalResult.destination;
+          destFee = destResult.fee;
+          destFeeType = destResult.feeType;
+          destDryRunError = destResult.dryRunError;
+          destSufficient = destResult.sufficient;
+          destCurrency = destResult.currency;
+          _context2.n = 14;
+          break;
+        case 10:
+          if (!(traversalResult.hops.length > 0 && traversalResult.hops[traversalResult.hops.length - 1].result.dryRunError)) {
+            _context2.n = 13;
             break;
           }
+          // We failed before reaching destination, use fallback
           _destApi = api.clone();
           if (!(destination !== 'Ethereum')) {
-            _context.n = 14;
+            _context2.n = 11;
             break;
           }
-          _context.n = 14;
+          _context2.n = 11;
           return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 14:
-          _context.n = 15;
+        case 11:
+          _context2.n = 12;
           return getDestXcmFee({
             api: _destApi,
             forwardedXcms: undefined,
             origin: origin,
-            prevNode: currentOrigin,
+            prevNode: traversalResult.lastProcessedChain || origin,
             destination: destination,
             currency: currency,
             address: address,
@@ -5705,78 +5817,52 @@ var getXcmFee = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             disableFallback: disableFallback
           });
-        case 15:
-          destFallback = _context.v;
-          destinationFee = destFallback.fee;
-          destinationFeeType = destFallback.feeType;
-          destinationSufficient = destFallback.sufficient;
-        case 16:
-          return _context.a(3, 21);
-        case 17:
-          if (nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination)) {
-            destinationFee = hopResult.fee;
-            destinationFeeType = hopResult.feeType;
-            destinationSufficient = hopResult.sufficient;
-          } else if (nextChain === assetHubNode) {
-            intermediateFees.assetHub = hopDetail;
-          } else if (nextChain === bridgeHubNode) {
-            intermediateFees.bridgeHub = hopDetail;
-          } else ;
-          if (swapConfig && nextChain === swapConfig.exchangeChain) {
-            hasPassedExchange = true;
-            currentAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
-          }
-          forwardedXcms = hopResult.forwardedXcms;
-          nextParaId = hopResult.destParaId;
-          currentOrigin = nextChain;
-        case 18:
-          _context.p = 18;
-          _context.n = 19;
-          return hopApi.disconnect();
-        case 19:
-          return _context.f(18);
-        case 20:
-          _context.n = 9;
+        case 12:
+          destFallback = _context2.v;
+          destFee = destFallback.fee;
+          destFeeType = destFallback.feeType;
+          destSufficient = destFallback.sufficient;
+          destCurrency = assets.getNativeAssetSymbol(destination);
+          _context2.n = 14;
           break;
-        case 21:
-          processedBridgeHubData = intermediateFees.bridgeHub;
-          if (!(intermediateFees.bridgeHub && !intermediateFees.bridgeHub.dryRunError && destination === 'Ethereum')) {
-            _context.n = 24;
-            break;
-          }
-          ahApi = api.clone();
-          _context.n = 22;
-          return ahApi.init(assetHubNode, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 22:
-          _context.n = 23;
-          return getParaEthTransferFees(ahApi);
-        case 23:
-          _yield$getParaEthTran = _context.v;
-          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 1);
-          bridgeFee = _yield$getParaEthTran2[0];
-          processedBridgeHubData = _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
-            fee: intermediateFees.bridgeHub.fee + bridgeFee
-          });
-          bridgeHubHopIndex = hops.findIndex(function (hop) {
-            return hop.chain === bridgeHubNode;
-          });
-          if (bridgeHubHopIndex !== -1) {
-            hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, hops[bridgeHubHopIndex].result), {}, {
-              fee: intermediateFees.bridgeHub.fee + bridgeFee
+        case 13:
+          destFee = 0n;
+          destFeeType = 'noFeeRequired';
+          destSufficient = true;
+          destCurrency = assets.getNativeAssetSymbol(destination);
+        case 14:
+          // Process Ethereum bridge fees
+          assetHubNode = "AssetHub".concat(getRelayChainOf(origin));
+          _context2.n = 15;
+          return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubNode);
+        case 15:
+          processedBridgeHub = _context2.v;
+          // Update bridge hub fee in hops if needed
+          if (processedBridgeHub && traversalResult.bridgeHub && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
+            bridgeHubNode = "BridgeHub".concat(getRelayChainOf(origin));
+            bridgeHubHopIndex = traversalResult.hops.findIndex(function (hop) {
+              return hop.chain === bridgeHubNode;
             });
-          }
-        case 24:
-          intermediateFees.bridgeHub = processedBridgeHubData;
-          if (destinationFeeType === 'dryRun') {
-            if (hasPassedExchange && swapConfig && destination !== swapConfig.exchangeChain) {
-              destCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, destination, swapConfig.currencyTo).symbol;
-            } else {
-              destCurrency = assets.findAssetOnDestOrThrow(origin, destination, currency).symbol;
+            if (bridgeHubHopIndex !== -1) {
+              traversalResult.hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, traversalResult.hops[bridgeHubHopIndex].result), {}, {
+                fee: processedBridgeHub.fee
+              });
             }
-          } else {
-            destCurrency = assets.getNativeAssetSymbol(destination);
           }
-          result = _objectSpread2(_objectSpread2({
+          convertToFeeDetail = function convertToFeeDetail(result) {
+            return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, result.fee !== undefined && {
+              fee: result.fee
+            }), result.feeType && {
+              feeType: result.feeType
+            }), result.sufficient !== undefined && {
+              sufficient: result.sufficient
+            }), {}, {
+              currency: result.currency
+            }, result.dryRunError && {
+              dryRunError: result.dryRunError
+            });
+          };
+          result = _objectSpread2(_objectSpread2(_objectSpread2({
             origin: _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, originWeight && {
               weight: originWeight
             }), originFee && {
@@ -5790,31 +5876,40 @@ var getXcmFee = /*#__PURE__*/function () {
             }, originDryRunError && {
               dryRunError: originDryRunError
             })
-          }, intermediateFees), {}, {
-            destination: _objectSpread2(_objectSpread2(_objectSpread2({}, destinationFee !== undefined && {
-              fee: destinationFee
-            }), destinationFeeType && {
-              feeType: destinationFeeType
+          }, traversalResult.assetHub && {
+            assetHub: convertToFeeDetail(traversalResult.assetHub)
+          }), processedBridgeHub && {
+            bridgeHub: convertToFeeDetail(processedBridgeHub)
+          }), {}, {
+            destination: _objectSpread2(_objectSpread2(_objectSpread2({}, destFee !== undefined && {
+              fee: destFee
+            }), destFeeType && {
+              feeType: destFeeType
             }), {}, {
-              sufficient: destinationSufficient,
+              sufficient: destSufficient,
               currency: destCurrency
-            }, destinationDryRunError && {
-              dryRunError: destinationDryRunError
+            }, destDryRunError && {
+              dryRunError: destDryRunError
             }),
-            hops: hops
+            hops: traversalResult.hops.map(function (hop) {
+              return {
+                chain: hop.chain,
+                result: convertToFeeDetail(hop.result)
+              };
+            })
           });
           _getFailureInfo2 = getFailureInfo({
             origin: result.origin,
             assetHub: result.assetHub,
             bridgeHub: result.bridgeHub,
             destination: result.destination
-          }, hops), failureChain = _getFailureInfo2.failureChain, failureReason = _getFailureInfo2.failureReason;
-          return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
+          }, result.hops), failureChain = _getFailureInfo2.failureChain, failureReason = _getFailureInfo2.failureReason;
+          return _context2.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
             failureChain: failureChain,
             failureReason: failureReason
           }));
       }
-    }, _callee, null, [[11,, 18, 20], [3,, 6, 8]]);
+    }, _callee2, null, [[3,, 6, 8]]);
   }));
   return function getXcmFee(_x) {
     return _ref2.apply(this, arguments);
@@ -7088,8 +7183,8 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
   return fees;
 };
 var createXcmAndCall = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var xcm, api, chain, exchangeChain, weight, call;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options, dryRunWeight) {
+    var xcm, api, chain, exchangeChain, hasApiSupport, weight, call, _t;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -7098,10 +7193,21 @@ var createXcmAndCall = /*#__PURE__*/function () {
         case 1:
           xcm = _context2.v;
           api = options.api, chain = options.chain, exchangeChain = options.exchangeChain;
+          hasApiSupport = assets.hasXcmPaymentApiSupport(chain !== null && chain !== void 0 ? chain : exchangeChain);
+          if (!hasApiSupport) {
+            _context2.n = 3;
+            break;
+          }
           _context2.n = 2;
           return api.getXcmWeight(xcm);
         case 2:
-          weight = _context2.v;
+          _t = _context2.v;
+          _context2.n = 4;
+          break;
+        case 3:
+          _t = dryRunWeight !== null && dryRunWeight !== void 0 ? dryRunWeight : MAX_WEIGHT;
+        case 4:
+          weight = _t;
           call = createExecuteCall(chain !== null && chain !== void 0 ? chain : exchangeChain, xcm, weight);
           return _context2.a(2, {
             xcm: xcm,
@@ -7111,7 +7217,7 @@ var createXcmAndCall = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function createXcmAndCall(_x2) {
+  return function createXcmAndCall(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -7220,7 +7326,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: updatedAssetTo,
             fees: extractedFees
-          }));
+          }), firstDryRunResult.origin.success ? firstDryRunResult.origin.weight : undefined);
         case 9:
           _yield$createXcmAndCa2 = _context3.v;
           secondCall = _yield$createXcmAndCa2.call;
@@ -7258,7 +7364,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: finalAssetTo,
             fees: finalFees
-          }));
+          }), secondDryRunResult.origin.success ? secondDryRunResult.origin.weight : undefined);
         case 12:
           _yield$createXcmAndCa3 = _context3.v;
           finalCall = _yield$createXcmAndCa3.call;
@@ -7268,7 +7374,7 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function handleSwapExecuteTransfer(_x3) {
+  return function handleSwapExecuteTransfer(_x4) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -11532,24 +11638,12 @@ var GeneralBuilder = /*#__PURE__*/function () {
   }, {
     key: "getXcmFee",
     value: (function () {
-      var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
-        var _ref,
-          disableFallback,
-          _this$_options3,
-          from,
-          to,
-          address,
-          senderAddress,
-          feeAsset,
-          currency,
-          tx,
-          _args4 = arguments;
+      var _getXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(options) {
+        var _options$disableFallb;
+        var _this$_options3, from, to, address, senderAddress, feeAsset, currency, tx, disableFallback;
         return _regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
             case 0:
-              _ref = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {
-                disableFallback: false
-              }, disableFallback = _ref.disableFallback;
               _this$_options3 = this._options, from = _this$_options3.from, to = _this$_options3.to, address = _this$_options3.address, senderAddress = _this$_options3.senderAddress, feeAsset = _this$_options3.feeAsset, currency = _this$_options3.currency;
               assertToIsString(to);
               assertAddressIsString(address);
@@ -11557,6 +11651,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
               return this.build();
             case 1:
               tx = _context4.v;
+              disableFallback = (_options$disableFallb = options === null || options === void 0 ? void 0 : options.disableFallback) !== null && _options$disableFallb !== void 0 ? _options$disableFallb : false;
               _context4.p = 2;
               _context4.n = 3;
               return getXcmFee({
@@ -11583,7 +11678,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
           }
         }, _callee4, this, [[2,, 4, 6]]);
       }));
-      function getXcmFee$1() {
+      function getXcmFee$1(_x2) {
         return _getXcmFee2.apply(this, arguments);
       }
       return getXcmFee$1;
@@ -11598,7 +11693,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getOriginXcmFee",
     value: (function () {
       var _getOriginXcmFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
-        var _ref2,
+        var _ref,
           disableFallback,
           _this$_options4,
           from,
@@ -11611,9 +11706,9 @@ var GeneralBuilder = /*#__PURE__*/function () {
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
             case 0:
-              _ref2 = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {
+              _ref = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {
                 disableFallback: false
-              }, disableFallback = _ref2.disableFallback;
+              }, disableFallback = _ref.disableFallback;
               _this$_options4 = this._options, from = _this$_options4.from, to = _this$_options4.to, senderAddress = _this$_options4.senderAddress, currency = _this$_options4.currency, feeAsset = _this$_options4.feeAsset;
               assertToIsString(to);
               _context5.n = 1;
@@ -11917,6 +12012,7 @@ exports.ScenarioNotSupportedError = ScenarioNotSupportedError;
 exports.TX_CLIENT_TIMEOUT_MS = TX_CLIENT_TIMEOUT_MS;
 exports.TransferToAhNotSupported = TransferToAhNotSupported;
 exports.UnableToComputeError = UnableToComputeError;
+exports.addEthereumBridgeFees = addEthereumBridgeFees;
 exports.addXcmVersionHeader = addXcmVersionHeader;
 exports.assertAddressIsString = assertAddressIsString;
 exports.assertHasLocation = assertHasLocation;
@@ -11981,6 +12077,7 @@ exports.sortMultiAssets = sortMultiAssets;
 exports.transferMoonbeamEvm = transferMoonbeamEvm;
 exports.transferMoonbeamToEth = transferMoonbeamToEth;
 exports.transferRelayToPara = transferRelayToPara;
+exports.traverseXcmHops = traverseXcmHops;
 exports.validateAddress = validateAddress;
 exports.verifyEdOnDestination = verifyEdOnDestination;
 Object.keys(assets).forEach(function (k) {