@paraspell/sdk-core 11.2.0 → 11.2.1

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isChainEvm, getAssetsObject, InvalidCurrencyError, isForeignAsset, extractAssetLocation, getNativeAssetSymbol, getOtherAssets, isAssetEqual, findAssetInfoOrThrow, getExistentialDeposit, findAssetInfo, isTAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, isOverrideLocationSpecifier, findAssetInfoByLoc, findAssetOnDestOrThrow, Native, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, normalizeLocation, hasXcmPaymentApiSupport, normalizeSymbol, getNativeAssets } from '@paraspell/assets';
+import { isChainEvm, getAssetsObject, InvalidCurrencyError, isForeignAsset, extractAssetLocation, getNativeAssetSymbol, getOtherAssets, isAssetEqual, findAssetInfo, isTAsset, findAssetInfoOrThrow, getExistentialDeposit, isOverrideLocationSpecifier, findAssetInfoByLoc, findAssetOnDestOrThrow, Native, isSymbolMatch, hasDryRunSupport, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, normalizeLocation, hasXcmPaymentApiSupport, getExistentialDepositOrThrow, normalizeSymbol, getNativeAssets } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, parseUnits, createPublicClient, http, getContract, pad, toHex, getAddress, concat, keccak256 } from 'viem';
@@ -3474,6 +3474,86 @@ var createDirectExecuteXcm = function createDirectExecuteXcm(options) {
   return addXcmVersionHeader(fullXcm, version);
 };
 
+var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
+  var asset = findAssetInfo(origin, feeAsset, !isTLocation(destination) ? destination : null);
+  var usesRawOverriddenMultiAssets = Array.isArray(currency) && currency.every(isTAsset);
+  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 = isRelayChain(origin);
+  var relayDest = 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 (isChainEvm(chain)) {
+    return isAddress(address) ? address : senderAddress;
+  }
+  return 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 AssetsPallet = /*#__PURE__*/function () {
   function AssetsPallet() {
     _classCallCheck(this, AssetsPallet);
@@ -4010,331 +4090,88 @@ var getOriginFeeDetails = /*#__PURE__*/function () {
   };
 }();
 
-var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
-  var asset = findAssetInfo(origin, feeAsset, !isTLocation(destination) ? destination : null);
-  var usesRawOverriddenMultiAssets = Array.isArray(currency) && currency.every(isTAsset);
-  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 = isRelayChain(origin);
-  var relayDest = 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 (isChainEvm(chain)) {
-    return isAddress(address) ? address : senderAddress;
-  }
-  return 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;
+var dryRun = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var api, senderAddress, origin;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _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);
+          api = options.api, senderAddress = options.senderAddress, origin = options.origin;
+          validateAddress(senderAddress, origin, false);
           _context.n = 1;
-          return Builder(api).from(destination).to(origin).address(toAddress).senderAddress(fromAddress).currency(_objectSpread2(_objectSpread2({}, currencyInput), {}, {
-            amount: currency.amount
-          })).build();
+          return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
-          tx = _context.v;
+          _context.p = 1;
           _context.n = 2;
-          return api.calculateTransactionFee(tx, fromAddress);
+          return dryRunInternal(options);
         case 2:
-          rawFee = _context.v;
-          return _context.a(2, padFee(rawFee, origin, destination, 'destination'));
+          return _context.a(2, _context.v);
+        case 3:
+          _context.p = 3;
+          _context.n = 4;
+          return api.disconnect();
+        case 4:
+          return _context.f(3);
+        case 5:
+          return _context.a(2);
       }
-    }, _callee);
+    }, _callee, null, [[1,, 3, 5]]);
   }));
-  return function getReverseTxFee(_x, _x2) {
-    return _ref2.apply(this, arguments);
+  return function dryRun(_x) {
+    return _ref.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;
+var dryRunOrigin = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var api, chain, address, result;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          if (!feeAsset) {
-            _context.n = 1;
-            break;
-          }
-          return _context.a(2, undefined);
+          api = options.api, chain = options.chain, address = options.address;
+          validateAddress(address, chain, false);
+          _context.n = 1;
+          return api.init(chain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
-          edNative = getExistentialDepositOrThrow(origin);
+          _context.p = 1;
           _context.n = 2;
-          return getBalanceNativeInternal({
-            api: api,
-            chain: origin,
-            address: senderAddress
-          });
+          return api.getDryRunCall(options);
         case 2:
-          balanceNative = _context.v;
-          isNativeAssetToOrigin = isSymbolMatch(asset.symbol, getNativeAssetSymbol(origin));
-          isNativeAssetToDest = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
-          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
+          result = _context.v;
+          if (!result.success) {
             _context.n = 3;
             break;
           }
-          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+          return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
+            currency: getNativeAssetSymbol(chain)
+          }));
         case 3:
-          if (isNativeAssetToOrigin) {
-            _context.n = 5;
-            break;
-          }
-          isSufficientNative = balanceNative - edNative - feeNative > 0n;
-          _context.n = 4;
-          return getAssetBalance({
-            api: api,
-            chain: origin,
-            address: senderAddress,
-            currency: currency
-          });
+          return _context.a(2, result);
         case 4:
-          balanceAsset = _context.v;
-          edAsset = getExistentialDepositOrThrow(origin, currency);
-          isSufficientAsset = balanceAsset - edAsset > 0n;
-          return _context.a(2, isSufficientNative && isSufficientAsset);
+          _context.p = 4;
+          _context.n = 5;
+          return api.disconnect();
         case 5:
-          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+          return _context.f(4);
         case 6:
           return _context.a(2);
       }
-    }, _callee);
+    }, _callee, null, [[1,, 4, 6]]);
   }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
+  return function dryRunOrigin(_x) {
     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) {
+
+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;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          isNativeAsset = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
-          if (isNativeAsset) {
-            _context2.n = 1;
-            break;
-          }
-          return _context2.a(2, undefined);
-        case 1:
-          existentialDeposit = getExistentialDepositOrThrow(destination);
-          _context2.n = 2;
-          return getBalanceNativeInternal({
-            api: api,
-            chain: 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 (isRelayChain(origin)) return DOT_LOCATION;
-  return {
-    parents: isRelayChain(destination) ? Parents.ZERO : Parents.ONE,
-    interior: {
-      X1: [{
-        Parachain: getParaId(origin)
-      }]
-    }
-  };
-};
-var getDestXcmFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.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, 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.p = _context.n) {
-                  case 0:
-                    if (!(destination === 'Ethereum')) {
-                      _context.n = 1;
-                      break;
-                    }
-                    return _context.a(2, 0n);
-                  case 1:
-                    originAsset = findAssetInfoOrThrow(origin, currency, destination);
-                    if (!originAsset.location) {
-                      _context.n = 7;
-                      break;
-                    }
-                    _context.p = 2;
-                    _context.n = 3;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      location: originAsset.location
-                    });
-                  case 3:
-                    return _context.a(2, _context.v);
-                  case 4:
-                    _context.p = 4;
-                    _t = _context.v;
-                    if (!(_t instanceof 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 (!(!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: !hasDryRunSupport(destination) ? sufficient : false
-          });
-        case 3:
-          _context2.n = 4;
-          return api.getDryRunXcm({
-            originLocation: addXcmVersionHeader(createOriginLocation(hopChain, destination), Version.V4),
-            xcm: forwardedXcms[1][0],
-            chain: 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 = 7;
-            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;
-          return _context2.a(2, {
-            fee: _fee2,
-            feeType: 'paymentInfo',
-            dryRunError: dryRunResult.failureReason,
-            sufficient: false
-          });
-        case 7:
-          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;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          DEFAULT_FEE = 2750872500000n;
-          _context.n = 1;
-          return ahApi.getFromRpc('state', 'getStorage', '0x5fbc5c7ba58845ad1f1a9a7c5bc12fad');
+          DEFAULT_FEE = 2750872500000n;
+          _context.n = 1;
+          return ahApi.getFromRpc('state', 'getStorage', '0x5fbc5c7ba58845ad1f1a9a7c5bc12fad');
         case 1:
           feeStorageItem = _context.v;
           leFeeHex = feeStorageItem.replace('0x', '');
@@ -5056,340 +4893,63 @@ var addEthereumBridgeFees = /*#__PURE__*/function () {
   };
 }();
 
-var getFailureInfo$1 = function getFailureInfo(results, hops) {
-  // Check standard chains first for backwards compatibility
-  for (var _i = 0, _arr = ['destination', 'assetHub', 'bridgeHub']; _i < _arr.length; _i++) {
-    var chain = _arr[_i];
-    var res = results[chain];
-    if (res && !res.success && res.failureReason) {
-      return {
-        failureReason: res.failureReason,
-        failureChain: chain
-      };
+var AssetManagerPallet = /*#__PURE__*/function () {
+  function AssetManagerPallet() {
+    _classCallCheck(this, AssetManagerPallet);
+  }
+  return _createClass(AssetManagerPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, asset) {
+      assertHasId(asset);
+      var assetId = asset.assetId,
+        amount = asset.amount;
+      return Promise.resolve({
+        balanceTx: {
+          module: 'AssetManager',
+          method: 'updateBalance',
+          parameters: {
+            who: {
+              Id: address
+            },
+            currency_id: {
+              ForeignAsset: assetId
+            },
+            amount: amount
+          }
+        }
+      });
     }
+  }]);
+}();
+
+var BalancesPallet = /*#__PURE__*/function () {
+  function BalancesPallet() {
+    _classCallCheck(this, BalancesPallet);
   }
-  var _iterator = _createForOfIteratorHelper(hops),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var hop = _step.value;
-      if (!hop.result.success && hop.result.failureReason) {
-        return {
-          failureReason: hop.result.failureReason,
-          failureChain: hop.chain
-        };
-      }
+  return _createClass(BalancesPallet, [{
+    key: "setBalance",
+    value: function setBalance(address, assetInfo, chain) {
+      var amount = assetInfo.amount;
+      var notUseId = chain.startsWith('Hydration') || chain === 'Basilisk' || isChainEvm(chain);
+      return Promise.resolve({
+        balanceTx: {
+          module: 'Balances',
+          method: 'force_set_balance',
+          parameters: {
+            who: notUseId ? address : {
+              Id: address
+            },
+            new_free: amount
+          }
+        }
+      });
     }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return {};
-};
-var dryRunInternal = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var _traversalResult$brid, _traversalResult$asse, _traversalResult$dest;
-    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, resolvedFeeAsset, asset, amount, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, originWithCurrency, assetHubWithCurrency, bridgeHubWithCurrency, destinationWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig;
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          asset = findAssetInfoOrThrow(origin, currency, destination);
-          amount = abstractDecimals(currency.amount, asset.decimals, api);
-          _context2.n = 1;
-          return api.getDryRunCall({
-            tx: tx,
-            chain: origin,
-            address: senderAddress,
-            asset: _objectSpread2(_objectSpread2({}, asset), {}, {
-              amount: amount
-            }),
-            feeAsset: resolvedFeeAsset
-          });
-        case 1:
-          originDryRun = _context2.v;
-          if (originDryRun.success) {
-            _context2.n = 2;
-            break;
-          }
-          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 (hasDryRunSupport(currentChain)) {
-                      _context.n = 1;
-                      break;
-                    }
-                    return _context.a(2, {
-                      success: false,
-                      failureReason: "DryRunApi is not available on chain ".concat(currentChain)
-                    });
-                  case 1:
-                    _context.n = 2;
-                    return hopApi.getDryRunXcm({
-                      originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, currentChain), Version.V4),
-                      xcm: forwardedXcms[1][0],
-                      chain: currentChain,
-                      origin: currentOrigin,
-                      asset: currentAsset,
-                      feeAsset: resolvedFeeAsset,
-                      originFee: originDryRun.fee,
-                      amount: amount
-                    });
-                  case 2:
-                    hopDryRun = _context.v;
-                    if (!hopDryRun.success) {
-                      _context.n = 3;
-                      break;
-                    }
-                    if (destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub'))) {
-                      hopCurrency = getNativeAssetSymbol(currentChain);
-                    } else if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
-                      hopCurrency = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo).symbol;
-                    } else if (isDestination) {
-                      hopCurrency = 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);
-            };
-          }();
-          _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 3:
-          traversalResult = _context2.v;
-          // Process Ethereum bridge fees
-          assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
-          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
-          if (!((_traversalResult$brid = traversalResult.bridgeHub) !== null && _traversalResult$brid !== void 0 && _traversalResult$brid.success)) {
-            _context2.n = 5;
-            break;
-          }
-          _context2.n = 4;
-          return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
-        case 4:
-          _t = _context2.v;
-          _context2.n = 6;
-          break;
-        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 === bridgeHubChain;
-            });
-            if (bridgeHubHopIndex !== -1 && traversalResult.hops[bridgeHubHopIndex].result.success) {
-              traversalResult.hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, traversalResult.hops[bridgeHubHopIndex].result), {}, {
-                fee: processedBridgeHub.fee
-              });
-            }
-          }
-          originWithCurrency = originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
-            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin)
-          }) : originDryRun;
-          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
-            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(assetHubChain)
-          }) : traversalResult.assetHub;
-          bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
-            currency: getNativeAssetSymbol(bridgeHubChain)
-          }) : 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: destinationWithCurrency,
-            assetHub: assetHubWithCurrency,
-            bridgeHub: bridgeHubWithCurrency
-          }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
-          return _context2.a(2, {
-            failureReason: failureReason,
-            failureChain: failureChain,
-            origin: originWithCurrency,
-            assetHub: assetHubWithCurrency,
-            bridgeHub: bridgeHubWithCurrency,
-            destination: destinationWithCurrency,
-            hops: traversalResult.hops
-          });
-      }
-    }, _callee2);
-  }));
-  return function dryRunInternal(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var dryRun = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, senderAddress, origin;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          api = options.api, senderAddress = options.senderAddress, origin = options.origin;
-          validateAddress(senderAddress, origin, false);
-          _context.n = 1;
-          return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 1:
-          _context.p = 1;
-          _context.n = 2;
-          return dryRunInternal(options);
-        case 2:
-          return _context.a(2, _context.v);
-        case 3:
-          _context.p = 3;
-          _context.n = 4;
-          return api.disconnect();
-        case 4:
-          return _context.f(3);
-        case 5:
-          return _context.a(2);
-      }
-    }, _callee, null, [[1,, 3, 5]]);
-  }));
-  return function dryRun(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var dryRunOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, chain, address, result;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          api = options.api, chain = options.chain, address = options.address;
-          validateAddress(address, chain, false);
-          _context.n = 1;
-          return api.init(chain, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 1:
-          _context.p = 1;
-          _context.n = 2;
-          return api.getDryRunCall(options);
-        case 2:
-          result = _context.v;
-          if (!result.success) {
-            _context.n = 3;
-            break;
-          }
-          return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
-            currency: getNativeAssetSymbol(chain)
-          }));
-        case 3:
-          return _context.a(2, result);
-        case 4:
-          _context.p = 4;
-          _context.n = 5;
-          return api.disconnect();
-        case 5:
-          return _context.f(4);
-        case 6:
-          return _context.a(2);
-      }
-    }, _callee, null, [[1,, 4, 6]]);
-  }));
-  return function dryRunOrigin(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var AssetManagerPallet = /*#__PURE__*/function () {
-  function AssetManagerPallet() {
-    _classCallCheck(this, AssetManagerPallet);
-  }
-  return _createClass(AssetManagerPallet, [{
-    key: "setBalance",
-    value: function setBalance(address, asset) {
-      assertHasId(asset);
-      var assetId = asset.assetId,
-        amount = asset.amount;
-      return Promise.resolve({
-        balanceTx: {
-          module: 'AssetManager',
-          method: 'updateBalance',
-          parameters: {
-            who: {
-              Id: address
-            },
-            currency_id: {
-              ForeignAsset: assetId
-            },
-            amount: amount
-          }
-        }
-      });
-    }
-  }]);
-}();
-
-var BalancesPallet = /*#__PURE__*/function () {
-  function BalancesPallet() {
-    _classCallCheck(this, BalancesPallet);
-  }
-  return _createClass(BalancesPallet, [{
-    key: "setBalance",
-    value: function setBalance(address, assetInfo, chain) {
-      var amount = assetInfo.amount;
-      var notUseId = chain.startsWith('Hydration') || chain === 'Basilisk' || isChainEvm(chain);
-      return Promise.resolve({
-        balanceTx: {
-          module: 'Balances',
-          method: 'force_set_balance',
-          parameters: {
-            who: notUseId ? address : {
-              Id: address
-            },
-            new_free: amount
-          }
-        }
-      });
-    }
-  }]);
-}();
-
-var CurrenciesPallet = /*#__PURE__*/function () {
-  function CurrenciesPallet() {
-    _classCallCheck(this, CurrenciesPallet);
+  }]);
+}();
+
+var CurrenciesPallet = /*#__PURE__*/function () {
+  function CurrenciesPallet() {
+    _classCallCheck(this, CurrenciesPallet);
   }
   return _createClass(CurrenciesPallet, [{
     key: "setBalance",
@@ -5977,7 +5537,7 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   };
 }();
 
-var getFailureInfo = function getFailureInfo(chains, hops) {
+var getFailureInfo$1 = function getFailureInfo(chains, hops) {
   var _chains$origin, _chains$assetHub, _chains$bridgeHub, _chains$destination;
   // Check standard chains first for backwards compatibility
   if ((_chains$origin = chains.origin) !== null && _chains$origin !== void 0 && _chains$origin.dryRunError) return {
@@ -6104,7 +5664,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             }),
             hops: []
           };
-          _getFailureInfo = getFailureInfo({
+          _getFailureInfo = getFailureInfo$1({
             origin: _result.origin,
             destination: _result.destination
           }, []), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
@@ -6316,7 +5876,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               };
             })
           });
-          _getFailureInfo2 = getFailureInfo({
+          _getFailureInfo2 = getFailureInfo$1({
             origin: result.origin,
             assetHub: result.assetHub,
             bridgeHub: result.bridgeHub,
@@ -6513,1162 +6073,1526 @@ var transferRelayToPara = /*#__PURE__*/function () {
   };
 }();
 
-var send = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, amount, finalAmount, originVersion, destVersion, resolvedVersion, isLocalTransfer, overriddenAsset, resolvedAsset, finalAsset, finalVersion, normalizedAsset;
+var send = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var api, origin, currency, feeAsset, address, destination, paraIdTo, version, senderAddress, ahAddress, pallet, method, isBridge, assetCheckEnabled, asset, resolvedFeeAsset, amount, finalAmount, originVersion, destVersion, resolvedVersion, isLocalTransfer, overriddenAsset, resolvedAsset, finalAsset, finalVersion, normalizedAsset;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
+          validateCurrency(currency, feeAsset);
+          validateDestination(origin, destination);
+          validateDestinationAddress(address, destination);
+          if (senderAddress) validateAddress(senderAddress, origin, false);
+          isBridge = !isTLocation(destination) && isDotKsmBridge(origin, destination);
+          assetCheckEnabled = shouldPerformAssetCheck(origin, currency);
+          validateAssetSpecifiers(assetCheckEnabled, currency);
+          asset = resolveAsset(currency, origin, destination, assetCheckEnabled);
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
+          amount = Array.isArray(currency) ? 0n : abstractDecimals(currency.amount, asset === null || asset === void 0 ? void 0 : asset.decimals, api); // Ensure amount is at least 2 to avoid Rust panic (only for non-array currencies)
+          finalAmount = !Array.isArray(currency) && amount < 2n ? 2n : amount;
+          originVersion = getChainVersion(origin);
+          destVersion = !isTLocation(destination) ? getChainVersion(destination) : undefined;
+          resolvedVersion = selectXcmVersion(version, originVersion, destVersion);
+          if (!isRelayChain(origin)) {
+            _context.n = 6;
+            break;
+          }
+          if (!(destination === 'Ethereum')) {
+            _context.n = 1;
+            break;
+          }
+          throw new InvalidParameterError('Transfers from relay chain to Ethereum are not supported.');
+        case 1:
+          if (asset) {
+            _context.n = 2;
+            break;
+          }
+          throw new InvalidParameterError('Asset is required for relay chain to relay chain transfers.');
+        case 2:
+          isLocalTransfer = origin === destination;
+          if (!isLocalTransfer) {
+            _context.n = 5;
+            break;
+          }
+          if (!isTLocation(address)) {
+            _context.n = 3;
+            break;
+          }
+          throw new InvalidAddressError('Location address is not supported for local transfers.');
+        case 3:
+          _context.n = 4;
+          return api.init(origin, TX_CLIENT_TIMEOUT_MS);
+        case 4:
+          return _context.a(2, api.callTxMethod({
+            module: 'Balances',
+            method: 'transfer_keep_alive',
+            parameters: {
+              dest: {
+                Id: address
+              },
+              value: finalAmount
+            }
+          }));
+        case 5:
+          return _context.a(2, transferRelayToPara({
+            api: api,
+            origin: origin,
+            destination: destination,
+            address: address,
+            assetInfo: _objectSpread2(_objectSpread2({}, asset), {}, {
+              amount: finalAmount
+            }),
+            paraIdTo: paraIdTo,
+            version: resolvedVersion,
+            pallet: pallet,
+            method: method
+          }));
+        case 6:
+          overriddenAsset = resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset);
+          _context.n = 7;
+          return api.init(origin, TX_CLIENT_TIMEOUT_MS);
+        case 7:
+          // In case asset check is disabled, we create asset object from currency symbol
+          resolvedAsset = asset !== null && asset !== void 0 ? asset : {
+            symbol: 'symbol' in currency ? currency.symbol : undefined
+          };
+          finalAsset = Array.isArray(currency) ? _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
+            amount: 0n,
+            assetId: '1'
+          }) : _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
+            amount: finalAmount
+          });
+          finalVersion = selectXcmVersion(version, originVersion, destVersion);
+          normalizedAsset = finalAsset.location ? _objectSpread2(_objectSpread2({}, finalAsset), {}, {
+            location: normalizeLocation(finalAsset.location, finalVersion)
+          }) : finalAsset;
+          return _context.a(2, getChain(origin).transfer({
+            api: api,
+            assetInfo: normalizedAsset,
+            currency: currency,
+            feeAsset: resolvedFeeAsset,
+            feeCurrency: feeAsset,
+            address: address,
+            to: destination,
+            paraIdTo: paraIdTo,
+            overriddenAsset: overriddenAsset,
+            version: finalVersion,
+            senderAddress: senderAddress,
+            ahAddress: ahAddress,
+            pallet: pallet,
+            method: method
+          }));
+      }
+    }, _callee);
+  }));
+  return function send(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var buildTypeAndThenCall = function buildTypeAndThenCall(_ref, isDotAsset, customXcm, assets) {
+  var origin = _ref.origin,
+    reserve = _ref.reserve,
+    dest = _ref.dest,
+    assetInfo = _ref.assetInfo,
+    version = _ref.options.version;
+  var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
+  var finalDest = origin.chain === reserve.chain ? dest.chain : reserve.chain;
+  var destLocation = createDestination(version, origin.chain, finalDest, getParaId(finalDest));
+  var reserveType = origin.chain === reserve.chain ? 'LocalReserve' : 'DestinationReserve';
+  var feeMultiAsset = createAsset(version, assetInfo.amount, feeAssetLocation);
+  return {
+    module: 'PolkadotXcm',
+    method: 'transfer_assets_using_type_and_then',
+    parameters: {
+      dest: addXcmVersionHeader(destLocation, version),
+      assets: addXcmVersionHeader(assets, version),
+      assets_transfer_type: reserveType,
+      remote_fees_id: addXcmVersionHeader(feeMultiAsset.id, version),
+      fees_transfer_type: reserveType,
+      custom_xcm_on_dest: addXcmVersionHeader(customXcm, version),
+      weight_limit: 'Unlimited'
+    }
+  };
+};
+
+var FEE_PADDING_PERCENTAGE$2 = 20;
+var FEE_PADDING_HYDRATION = 150;
+var computeInstructionFee = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, version, xcm) {
+    var chain, api, _t, _t2, _t3;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          chain = _ref.chain, api = _ref.api;
+          _t = padFeeBy;
+          _context.n = 1;
+          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), {
+            location: DOT_LOCATION
+          }, true);
+        case 1:
+          _t2 = _context.v;
+          _t3 = chain === 'Hydration' ? FEE_PADDING_HYDRATION : FEE_PADDING_PERCENTAGE$2;
+          return _context.a(2, _t(_t2, _t3));
+      }
+    }, _callee);
+  }));
+  return function computeInstructionFee(_x, _x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var computeAllFees = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref3, customXcm, isDotAsset, refundInstruction) {
+    var reserve, dest, version, _t4, _t5, _t6, _t7, _t8, _t9, _t0, _t1, _t10;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          reserve = _ref3.reserve, dest = _ref3.dest, version = _ref3.options.version;
+          if (!('DepositReserveAsset' in customXcm)) {
+            _context2.n = 6;
+            break;
+          }
+          _context2.n = 1;
+          return computeInstructionFee(reserve, version, [customXcm]);
+        case 1:
+          _t5 = _context2.v;
+          if (!refundInstruction) {
+            _context2.n = 3;
+            break;
+          }
+          _context2.n = 2;
+          return computeInstructionFee(reserve, version, [refundInstruction]);
+        case 2:
+          _t6 = _context2.v;
+          _context2.n = 4;
+          break;
+        case 3:
+          _t6 = 0n;
+        case 4:
+          _t7 = _t6;
+          _context2.n = 5;
+          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, customXcm.DepositReserveAsset.xcm);
+        case 5:
+          _t8 = _context2.v;
+          _t4 = {
+            reserveFee: _t5,
+            refundFee: _t7,
+            destFee: _t8
+          };
+          _context2.n = 13;
+          break;
+        case 6:
+          if (isDotAsset) {
+            _context2.n = 8;
+            break;
+          }
+          _context2.n = 7;
+          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, [customXcm]);
+        case 7:
+          _t9 = _context2.v;
+          _context2.n = 9;
+          break;
+        case 8:
+          _t9 = 0n;
+        case 9:
+          _t0 = _t9;
+          if (isDotAsset) {
+            _context2.n = 11;
+            break;
+          }
+          _context2.n = 10;
+          return computeInstructionFee(hasXcmPaymentApiSupport(reserve.chain) ? reserve : dest, version, [refundInstruction]);
+        case 10:
+          _t1 = _context2.v;
+          _context2.n = 12;
+          break;
+        case 11:
+          _t1 = 0n;
+        case 12:
+          _t10 = _t1;
+          _t4 = {
+            reserveFee: 0n,
+            destFee: _t0,
+            refundFee: _t10
+          };
+        case 13:
+          return _context2.a(2, _t4);
+      }
+    }, _callee2);
+  }));
+  return function computeAllFees(_x4, _x5, _x6, _x7) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var createTypeAndThenCallContext = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
+    var api, paraIdTo, assetInfo, destChain, reserveChain, destApi, reserveApi;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, origin = options.from, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
-          validateCurrency(currency, feeAsset);
-          validateDestination(origin, destination);
-          validateDestinationAddress(address, destination);
-          if (senderAddress) validateAddress(senderAddress, origin, false);
-          isBridge = !isTLocation(destination) && isDotKsmBridge(origin, destination);
-          assetCheckEnabled = shouldPerformAssetCheck(origin, currency);
-          validateAssetSpecifiers(assetCheckEnabled, currency);
-          asset = resolveAsset(currency, origin, destination, assetCheckEnabled);
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          validateAssetSupport(options, assetCheckEnabled, isBridge, asset);
-          amount = Array.isArray(currency) ? 0n : abstractDecimals(currency.amount, asset === null || asset === void 0 ? void 0 : asset.decimals, api); // Ensure amount is at least 2 to avoid Rust panic (only for non-array currencies)
-          finalAmount = !Array.isArray(currency) && amount < 2n ? 2n : amount;
-          originVersion = getChainVersion(origin);
-          destVersion = !isTLocation(destination) ? getChainVersion(destination) : undefined;
-          resolvedVersion = selectXcmVersion(version, originVersion, destVersion);
-          if (!isRelayChain(origin)) {
-            _context.n = 6;
-            break;
-          }
-          if (!(destination === 'Ethereum')) {
-            _context.n = 1;
-            break;
-          }
-          throw new InvalidParameterError('Transfers from relay chain to Ethereum are not supported.');
+          api = options.api, paraIdTo = options.paraIdTo, assetInfo = options.assetInfo;
+          assertHasLocation(assetInfo);
+          destChain = getTChain(paraIdTo, getRelayChainOf(chain));
+          reserveChain = isRelayChain(destChain) ? destChain : getAssetReserveChain(chain, chain, assetInfo.location);
+          destApi = api.clone();
+          _context.n = 1;
+          return destApi.init(destChain);
         case 1:
-          if (asset) {
-            _context.n = 2;
-            break;
-          }
-          throw new InvalidParameterError('Asset is required for relay chain to relay chain transfers.');
+          reserveApi = reserveChain !== chain ? api.clone() : destApi;
+          _context.n = 2;
+          return reserveApi.init(reserveChain);
         case 2:
-          isLocalTransfer = origin === destination;
-          if (!isLocalTransfer) {
-            _context.n = 5;
-            break;
-          }
-          if (!isTLocation(address)) {
-            _context.n = 3;
-            break;
-          }
-          throw new InvalidAddressError('Location address is not supported for local transfers.');
-        case 3:
-          _context.n = 4;
-          return api.init(origin, TX_CLIENT_TIMEOUT_MS);
-        case 4:
-          return _context.a(2, api.callTxMethod({
-            module: 'Balances',
-            method: 'transfer_keep_alive',
-            parameters: {
-              dest: {
-                Id: address
-              },
-              value: finalAmount
-            }
-          }));
-        case 5:
-          return _context.a(2, transferRelayToPara({
-            api: api,
-            origin: origin,
-            destination: destination,
-            address: address,
-            assetInfo: _objectSpread2(_objectSpread2({}, asset), {}, {
-              amount: finalAmount
-            }),
-            paraIdTo: paraIdTo,
-            version: resolvedVersion,
-            pallet: pallet,
-            method: method
-          }));
-        case 6:
-          overriddenAsset = resolveOverriddenAsset(options, isBridge, assetCheckEnabled, resolvedFeeAsset);
-          _context.n = 7;
-          return api.init(origin, TX_CLIENT_TIMEOUT_MS);
-        case 7:
-          // In case asset check is disabled, we create asset object from currency symbol
-          resolvedAsset = asset !== null && asset !== void 0 ? asset : {
-            symbol: 'symbol' in currency ? currency.symbol : undefined
-          };
-          finalAsset = Array.isArray(currency) ? _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
-            amount: 0n,
-            assetId: '1'
-          }) : _objectSpread2(_objectSpread2({}, resolvedAsset), {}, {
-            amount: finalAmount
+          return _context.a(2, {
+            origin: {
+              api: api,
+              chain: chain
+            },
+            dest: {
+              api: destApi,
+              chain: destChain
+            },
+            reserve: {
+              api: reserveApi,
+              chain: reserveChain
+            },
+            assetInfo: assetInfo,
+            options: options
           });
-          finalVersion = selectXcmVersion(version, originVersion, destVersion);
-          normalizedAsset = finalAsset.location ? _objectSpread2(_objectSpread2({}, finalAsset), {}, {
-            location: normalizeLocation(finalAsset.location, finalVersion)
-          }) : finalAsset;
-          return _context.a(2, getChain(origin).transfer({
-            api: api,
-            assetInfo: normalizedAsset,
-            currency: currency,
-            feeAsset: resolvedFeeAsset,
-            feeCurrency: feeAsset,
-            address: address,
-            to: destination,
-            paraIdTo: paraIdTo,
-            overriddenAsset: overriddenAsset,
-            version: finalVersion,
-            senderAddress: senderAddress,
-            ahAddress: ahAddress,
-            pallet: pallet,
-            method: method
-          }));
       }
     }, _callee);
   }));
-  return function send(_x) {
+  return function createTypeAndThenCallContext(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
 
-var buildTypeAndThenCall = function buildTypeAndThenCall(_ref, isDotAsset, customXcm, assets) {
+var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
   var origin = _ref.origin,
-    reserve = _ref.reserve,
     dest = _ref.dest,
+    reserve = _ref.reserve,
     assetInfo = _ref.assetInfo,
-    version = _ref.options.version;
+    options = _ref.options;
+  var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+    reserveFee: MIN_FEE,
+    refundFee: 0n,
+    destFee: MIN_FEE
+  };
+  var destination = options.destination,
+    version = options.version,
+    address = options.address,
+    paraIdTo = options.paraIdTo;
+  var reserveFee = fees.reserveFee,
+    refundFee = fees.refundFee,
+    destFee = fees.destFee;
   var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
-  var finalDest = origin.chain === reserve.chain ? dest.chain : reserve.chain;
-  var destLocation = createDestination(version, origin.chain, finalDest, getParaId(finalDest));
-  var reserveType = origin.chain === reserve.chain ? 'LocalReserve' : 'DestinationReserve';
-  var feeMultiAsset = createAsset(version, assetInfo.amount, feeAssetLocation);
-  return {
-    module: 'PolkadotXcm',
-    method: 'transfer_assets_using_type_and_then',
-    parameters: {
-      dest: addXcmVersionHeader(destLocation, version),
-      assets: addXcmVersionHeader(assets, version),
-      assets_transfer_type: reserveType,
-      remote_fees_id: addXcmVersionHeader(feeMultiAsset.id, version),
-      fees_transfer_type: reserveType,
-      custom_xcm_on_dest: addXcmVersionHeader(customXcm, version),
-      weight_limit: 'Unlimited'
+  var asset = createAsset(version, assetInfo.amount, localizeLocation(dest.chain, assetInfo.location));
+  var depositInstruction = {
+    DepositAsset: {
+      assets: {
+        Wild: {
+          AllOf: {
+            id: asset.id,
+            fun: 'Fungible'
+          }
+        }
+      },
+      beneficiary: createBeneficiaryLocation({
+        api: origin.api,
+        address: address,
+        version: version
+      })
+    }
+  };
+  var assetsFilter = [];
+  if (!isDotAsset) assetsFilter.push(createAsset(version, reserveFee + destFee, localizeLocation(reserve.chain, RELAY_LOCATION)));
+  assetsFilter.push(createAsset(version, assetInfo.amount, localizeLocation(reserve.chain, assetInfo.location)));
+  return origin.chain !== reserve.chain && dest.chain !== reserve.chain ? {
+    DepositReserveAsset: {
+      assets: fees.destFee === MIN_FEE ? {
+        Wild: 'All'
+      } : {
+        Definite: assetsFilter
+      },
+      dest: createDestination(version, origin.chain, destination, paraIdTo),
+      xcm: [{
+        BuyExecution: {
+          fees: createAsset(version, !isDotAsset ? destFee : assetInfo.amount - reserveFee - refundFee, feeAssetLocation),
+          weight_limit: 'Unlimited'
+        }
+      }, depositInstruction]
     }
+  } : depositInstruction;
+};
+
+var createRefundInstruction = function createRefundInstruction(api, senderAddress, version) {
+  return {
+    SetAppendix: [{
+      DepositAsset: {
+        assets: {
+          Wild: 'All'
+        },
+        beneficiary: createBeneficiaryLocation({
+          api: api,
+          address: senderAddress,
+          version: version
+        })
+      }
+    }]
+  };
+};
+
+var buildAssets = function buildAssets(asset, feeAmount, isDotAsset, version) {
+  var assets = [];
+  if (!isDotAsset) {
+    assets.push(createAsset(version, feeAmount, RELAY_LOCATION));
+  }
+  assets.push(createAsset(version, asset.amount, asset.location));
+  return assets;
+};
+/**
+ * Creates a type and then call for transferring assets using XCM. Works only for DOT and snowbridge assets so far.
+ */
+var createTypeAndThenCall = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
+    var api, senderAddress, version, context, assetInfo, isDotAsset, customXcm, refundInstruction, fees, finalCustomXcm, totalFee, assets;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = options.api, senderAddress = options.senderAddress, version = options.version;
+          _context.n = 1;
+          return createTypeAndThenCallContext(chain, options);
+        case 1:
+          context = _context.v;
+          assetInfo = context.assetInfo;
+          isDotAsset = deepEqual(assetInfo.location, RELAY_LOCATION) || deepEqual(assetInfo.location, {
+            parents: 2,
+            interior: {
+              X1: [{
+                GlobalConsensus: {
+                  Kusama: null
+                }
+              }]
+            }
+          });
+          customXcm = createCustomXcm(context, isDotAsset);
+          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version) : null;
+          _context.n = 2;
+          return computeAllFees(context, customXcm, isDotAsset, refundInstruction);
+        case 2:
+          fees = _context.v;
+          finalCustomXcm = [];
+          if (refundInstruction) finalCustomXcm.push(refundInstruction);
+          finalCustomXcm.push(createCustomXcm(context, isDotAsset, fees));
+          totalFee = fees.reserveFee + fees.destFee + fees.refundFee;
+          assets = buildAssets(assetInfo, totalFee, isDotAsset, version);
+          return _context.a(2, buildTypeAndThenCall(context, isDotAsset, finalCustomXcm, assets));
+      }
+    }, _callee);
+  }));
+  return function createTypeAndThenCall(_x, _x2) {
+    return _ref.apply(this, arguments);
   };
-};
+}();
 
-var FEE_PADDING_PERCENTAGE$2 = 20;
-var FEE_PADDING_HYDRATION = 150;
-var computeInstructionFee = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref, version, xcm) {
-    var chain, api, _t, _t2, _t3;
+var getTransferableAmountInternal = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    var api, senderAddress, chain, destination, currency, tx, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$getOriginXcmFe, fee, transferable;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          chain = _ref.chain, api = _ref.api;
-          _t = padFeeBy;
+          api = _ref.api, senderAddress = _ref.senderAddress, chain = _ref.origin, destination = _ref.destination, currency = _ref.currency, tx = _ref.tx, feeAsset = _ref.feeAsset;
+          validateAddress(senderAddress, chain, false);
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
+          asset = findAssetInfoOrThrow(chain, currency, null);
+          amount = abstractDecimals(currency.amount, asset.decimals, api);
           _context.n = 1;
-          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), {
-            location: DOT_LOCATION
-          }, true);
+          return getAssetBalanceInternal({
+            api: api,
+            address: senderAddress,
+            chain: chain,
+            currency: currency
+          });
         case 1:
-          _t2 = _context.v;
-          _t3 = chain === 'Hydration' ? FEE_PADDING_HYDRATION : FEE_PADDING_PERCENTAGE$2;
-          return _context.a(2, _t(_t2, _t3));
+          balance = _context.v;
+          ed = getExistentialDepositOrThrow(chain, currency);
+          isNativeAsset = getNativeAssetSymbol(chain) === asset.symbol;
+          shouldSubstractFee = isNativeAsset || chain === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, asset);
+          feeToSubtract = 0n;
+          if (!shouldSubstractFee) {
+            _context.n = 4;
+            break;
+          }
+          _context.n = 2;
+          return getOriginXcmFee({
+            api: api,
+            tx: tx,
+            origin: chain,
+            destination: chain,
+            senderAddress: senderAddress,
+            feeAsset: feeAsset,
+            currency: _objectSpread2(_objectSpread2({}, currency), {}, {
+              amount: amount
+            }),
+            disableFallback: false
+          });
+        case 2:
+          _yield$getOriginXcmFe = _context.v;
+          fee = _yield$getOriginXcmFe.fee;
+          if (!(fee === undefined)) {
+            _context.n = 3;
+            break;
+          }
+          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on chain ").concat(chain, "."));
+        case 3:
+          feeToSubtract = fee;
+        case 4:
+          transferable = balance - ed - feeToSubtract;
+          return _context.a(2, transferable > 0n ? transferable : 0n);
       }
     }, _callee);
   }));
-  return function computeInstructionFee(_x, _x2, _x3) {
+  return function getTransferableAmountInternal(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
-var computeAllFees = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref3, customXcm, isDotAsset, refundInstruction) {
-    var reserve, dest, version, _t4, _t5, _t6, _t7, _t8, _t9, _t0, _t1, _t10;
+var getTransferableAmount = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var api;
     return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+      while (1) switch (_context2.p = _context2.n) {
         case 0:
-          reserve = _ref3.reserve, dest = _ref3.dest, version = _ref3.options.version;
-          if (!('DepositReserveAsset' in customXcm)) {
-            _context2.n = 6;
-            break;
-          }
-          _context2.n = 1;
-          return computeInstructionFee(reserve, version, [customXcm]);
-        case 1:
-          _t5 = _context2.v;
-          if (!refundInstruction) {
-            _context2.n = 3;
-            break;
-          }
+          api = options.api;
+          api.setDisconnectAllowed(false);
+          _context2.p = 1;
           _context2.n = 2;
-          return computeInstructionFee(reserve, version, [refundInstruction]);
+          return getTransferableAmountInternal(options);
         case 2:
-          _t6 = _context2.v;
-          _context2.n = 4;
-          break;
+          return _context2.a(2, _context2.v);
         case 3:
-          _t6 = 0n;
+          _context2.p = 3;
+          api.setDisconnectAllowed(true);
+          _context2.n = 4;
+          return api.disconnect();
         case 4:
-          _t7 = _t6;
-          _context2.n = 5;
-          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, customXcm.DepositReserveAsset.xcm);
+          return _context2.f(3);
         case 5:
-          _t8 = _context2.v;
-          _t4 = {
-            reserveFee: _t5,
-            refundFee: _t7,
-            destFee: _t8
-          };
-          _context2.n = 13;
-          break;
-        case 6:
-          if (isDotAsset) {
-            _context2.n = 8;
-            break;
-          }
-          _context2.n = 7;
-          return computeInstructionFee(hasXcmPaymentApiSupport(dest.chain) ? dest : reserve, version, [customXcm]);
-        case 7:
-          _t9 = _context2.v;
-          _context2.n = 9;
-          break;
-        case 8:
-          _t9 = 0n;
-        case 9:
-          _t0 = _t9;
-          if (isDotAsset) {
-            _context2.n = 11;
-            break;
-          }
-          _context2.n = 10;
-          return computeInstructionFee(hasXcmPaymentApiSupport(reserve.chain) ? reserve : dest, version, [refundInstruction]);
-        case 10:
-          _t1 = _context2.v;
-          _context2.n = 12;
-          break;
-        case 11:
-          _t1 = 0n;
-        case 12:
-          _t10 = _t1;
-          _t4 = {
-            reserveFee: 0n,
-            destFee: _t0,
-            refundFee: _t10
-          };
-        case 13:
-          return _context2.a(2, _t4);
+          return _context2.a(2);
       }
-    }, _callee2);
+    }, _callee2, null, [[1,, 3, 5]]);
   }));
-  return function computeAllFees(_x4, _x5, _x6, _x7) {
-    return _ref4.apply(this, arguments);
+  return function getTransferableAmount(_x2) {
+    return _ref3.apply(this, arguments);
   };
 }();
 
-var createTypeAndThenCallContext = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
-    var api, paraIdTo, assetInfo, destChain, reserveChain, destApi, reserveApi;
+var buildDestInfo = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    var api, origin, destination, address, currency, originFee, isFeeAssetAh, destFeeDetail, assetHubFee, bridgeFee, destApi, destAsset, edDest, edDestBn, destCurrency, destBalance, destAmount, effectiveAmountForBalance, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isAssetHubToAssetHubRoute, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, paraIdTo = options.paraIdTo, assetInfo = options.assetInfo;
-          assertHasLocation(assetInfo);
-          destChain = getTChain(paraIdTo, getRelayChainOf(chain));
-          reserveChain = isRelayChain(destChain) ? destChain : getAssetReserveChain(chain, chain, assetInfo.location);
+          api = _ref.api, origin = _ref.origin, destination = _ref.destination, address = _ref.address, currency = _ref.currency, originFee = _ref.originFee, isFeeAssetAh = _ref.isFeeAssetAh, destFeeDetail = _ref.destFeeDetail, assetHubFee = _ref.assetHubFee, bridgeFee = _ref.bridgeFee;
           destApi = api.clone();
+          if (!(destination !== 'Ethereum')) {
+            _context.n = 1;
+            break;
+          }
           _context.n = 1;
-          return destApi.init(destChain);
+          return destApi.init(destination);
         case 1:
-          reserveApi = reserveChain !== chain ? api.clone() : destApi;
-          _context.n = 2;
-          return reserveApi.init(reserveChain);
+          destAsset = findAssetOnDestOrThrow(origin, destination, currency);
+          edDest = destAsset.existentialDeposit;
+          if (edDest) {
+            _context.n = 2;
+            break;
+          }
+          throw new InvalidParameterError("Existential deposit not found for ".concat(destination, " with currency ").concat(JSON.stringify(currency, replaceBigInt)));
         case 2:
+          edDestBn = BigInt(edDest);
+          destCurrency = destAsset.location ? {
+            location: destAsset.location
+          } : {
+            symbol: destAsset.symbol
+          };
+          _context.n = 3;
+          return getAssetBalanceInternal({
+            api: destApi,
+            address: address,
+            chain: destination,
+            currency: destCurrency
+          });
+        case 3:
+          destBalance = _context.v;
+          destAmount = isFeeAssetAh ? BigInt(currency.amount) - originFee : BigInt(currency.amount);
+          effectiveAmountForBalance = destAmount;
+          if (destination === 'Ethereum' && assetHubFee !== undefined) {
+            effectiveAmountForBalance -= assetHubFee;
+          }
+          destBalanceSufficient = effectiveAmountForBalance - destFeeDetail.fee > (destBalance < edDestBn ? edDestBn : 0);
+          destBalanceSufficientResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceSufficient;
+          destBalanceAfter = destBalance - (destFeeDetail.currency === destAsset.symbol ? destFeeDetail.fee : 0n) + effectiveAmountForBalance;
+          destbalanceAfterResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceAfter;
+          isAssetHubToAssetHubRoute = origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot' || origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama';
+          if (isAssetHubToAssetHubRoute) {
+            nativeAssetOfOriginSymbol = getNativeAssetSymbol(origin);
+            isOriginAssetNative = false;
+            if (destAsset.symbol === nativeAssetOfOriginSymbol) {
+              isOriginAssetNative = true;
+            }
+            if (isOriginAssetNative) {
+              if (bridgeFee === undefined) {
+                receivedAmount = new UnableToComputeError("bridgeFee is required for native asset transfer from ".concat(origin, " to ").concat(destination, " but was not provided."));
+              } else {
+                receivedAmount = BigInt(currency.amount) - originFee - bridgeFee;
+              }
+            } else {
+              receivedAmount = new UnableToComputeError("Unable to compute received amount: The transferred asset (".concat(destAsset.symbol, ") is not the native asset (").concat(nativeAssetOfOriginSymbol, ") of origin ").concat(origin, " for the ").concat(origin, "->").concat(destination, " route."));
+            }
+          } else {
+            if (destbalanceAfterResult instanceof UnableToComputeError) {
+              receivedAmount = destbalanceAfterResult;
+            } else {
+              receivedAmount = destbalanceAfterResult - destBalance;
+            }
+          }
+          isDestFeeInNativeCurrency = destFeeDetail.currency === getNativeAssetSymbol(destination);
+          if (!isDestFeeInNativeCurrency) {
+            _context.n = 5;
+            break;
+          }
+          _context.n = 4;
+          return getBalanceNativeInternal({
+            address: address,
+            chain: destination,
+            api: destApi
+          });
+        case 4:
+          destRecipientNativeBalance = _context.v;
+          destXcmFeeBalance = destRecipientNativeBalance;
+          _context.n = 6;
+          break;
+        case 5:
+          destXcmFeeBalance = destBalance;
+        case 6:
+          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? effectiveAmountForBalance : 0n);
           return _context.a(2, {
-            origin: {
-              api: api,
-              chain: chain
-            },
-            dest: {
-              api: destApi,
-              chain: destChain
-            },
-            reserve: {
-              api: reserveApi,
-              chain: reserveChain
+            receivedCurrency: {
+              sufficient: destBalanceSufficientResult,
+              receivedAmount: receivedAmount,
+              balance: destBalance,
+              balanceAfter: destbalanceAfterResult,
+              currencySymbol: destAsset.symbol,
+              existentialDeposit: edDestBn
             },
-            assetInfo: assetInfo,
-            options: options
+            xcmFee: {
+              fee: destFeeDetail.fee,
+              balance: destXcmFeeBalance,
+              balanceAfter: destXcmFeeBalanceAfter,
+              currencySymbol: destFeeDetail.currency
+            }
           });
       }
     }, _callee);
   }));
-  return function createTypeAndThenCallContext(_x, _x2) {
-    return _ref.apply(this, arguments);
+  return function buildDestInfo(_x) {
+    return _ref2.apply(this, arguments);
   };
 }();
 
-var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
-  var origin = _ref.origin,
-    dest = _ref.dest,
-    reserve = _ref.reserve,
-    assetInfo = _ref.assetInfo,
-    options = _ref.options;
-  var fees = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-    reserveFee: MIN_FEE,
-    refundFee: 0n,
-    destFee: MIN_FEE
-  };
-  var destination = options.destination,
-    version = options.version,
-    address = options.address,
-    paraIdTo = options.paraIdTo;
-  var reserveFee = fees.reserveFee,
-    refundFee = fees.refundFee,
-    destFee = fees.destFee;
-  var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
-  var asset = createAsset(version, assetInfo.amount, localizeLocation(dest.chain, assetInfo.location));
-  var depositInstruction = {
-    DepositAsset: {
-      assets: {
-        Wild: {
-          AllOf: {
-            id: asset.id,
-            fun: 'Fungible'
-          }
-        }
-      },
-      beneficiary: createBeneficiaryLocation({
-        api: origin.api,
-        address: address,
-        version: version
-      })
-    }
-  };
-  var assetsFilter = [];
-  if (!isDotAsset) assetsFilter.push(createAsset(version, reserveFee + destFee, localizeLocation(reserve.chain, RELAY_LOCATION)));
-  assetsFilter.push(createAsset(version, assetInfo.amount, localizeLocation(reserve.chain, assetInfo.location)));
-  return origin.chain !== reserve.chain && dest.chain !== reserve.chain ? {
-    DepositReserveAsset: {
-      assets: fees.destFee === MIN_FEE ? {
-        Wild: 'All'
-      } : {
-        Definite: assetsFilter
-      },
-      dest: createDestination(version, origin.chain, destination, paraIdTo),
-      xcm: [{
-        BuyExecution: {
-          fees: createAsset(version, !isDotAsset ? destFee : assetInfo.amount - reserveFee - refundFee, feeAssetLocation),
-          weight_limit: 'Unlimited'
-        }
-      }, depositInstruction]
-    }
-  } : depositInstruction;
-};
-
-var createRefundInstruction = function createRefundInstruction(api, senderAddress, version) {
-  return {
-    SetAppendix: [{
-      DepositAsset: {
-        assets: {
-          Wild: 'All'
-        },
-        beneficiary: createBeneficiaryLocation({
-          api: api,
-          address: senderAddress,
-          version: version
-        })
-      }
-    }]
-  };
-};
-
-var buildAssets = function buildAssets(asset, feeAmount, isDotAsset, version) {
-  var assets = [];
-  if (!isDotAsset) {
-    assets.push(createAsset(version, feeAmount, RELAY_LOCATION));
-  }
-  assets.push(createAsset(version, asset.amount, asset.location));
-  return assets;
-};
-/**
- * Creates a type and then call for transferring assets using XCM. Works only for DOT and snowbridge assets so far.
- */
-var createTypeAndThenCall = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
-    var api, senderAddress, version, context, assetInfo, isDotAsset, customXcm, refundInstruction, fees, finalCustomXcm, totalFee, assets;
+var buildHopInfo = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    var api, chain, feeData, originChain, currency, senderAddress, ahAddress, hopApi, resolvedAddress, nativeBalanceOnHop, nativeAssetSymbolOnHop, xcmFeeDetails, isBridgeHub, hopAsset, hopCurrencyPayload, balance, ed;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          api = options.api, senderAddress = options.senderAddress, version = options.version;
+          api = _ref.api, chain = _ref.chain, feeData = _ref.feeData, originChain = _ref.originChain, currency = _ref.currency, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress;
+          hopApi = api.clone();
           _context.n = 1;
-          return createTypeAndThenCallContext(chain, options);
+          return hopApi.init(chain);
         case 1:
-          context = _context.v;
-          assetInfo = context.assetInfo;
-          isDotAsset = deepEqual(assetInfo.location, RELAY_LOCATION) || deepEqual(assetInfo.location, {
-            parents: 2,
-            interior: {
-              X1: [{
-                GlobalConsensus: {
-                  Kusama: null
-                }
-              }]
-            }
+          hopApi.setDisconnectAllowed(false);
+          _context.p = 2;
+          resolvedAddress = isChainEvm(originChain) && ahAddress ? ahAddress : senderAddress;
+          _context.n = 3;
+          return getBalanceNativeInternal({
+            api: hopApi,
+            address: resolvedAddress,
+            chain: chain
           });
-          customXcm = createCustomXcm(context, isDotAsset);
-          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version) : null;
-          _context.n = 2;
-          return computeAllFees(context, customXcm, isDotAsset, refundInstruction);
-        case 2:
-          fees = _context.v;
-          finalCustomXcm = [];
-          if (refundInstruction) finalCustomXcm.push(refundInstruction);
-          finalCustomXcm.push(createCustomXcm(context, isDotAsset, fees));
-          totalFee = fees.reserveFee + fees.destFee + fees.refundFee;
-          assets = buildAssets(assetInfo, totalFee, isDotAsset, version);
-          return _context.a(2, buildTypeAndThenCall(context, isDotAsset, finalCustomXcm, assets));
+        case 3:
+          nativeBalanceOnHop = _context.v;
+          nativeAssetSymbolOnHop = getNativeAssetSymbol(chain);
+          xcmFeeDetails = {
+            fee: feeData.fee,
+            balance: nativeBalanceOnHop,
+            currencySymbol: nativeAssetSymbolOnHop
+          };
+          isBridgeHub = chain.includes('BridgeHub');
+          if (!isBridgeHub) {
+            _context.n = 4;
+            break;
+          }
+          return _context.a(2, {
+            currencySymbol: getNativeAssetSymbol(chain),
+            xcmFee: xcmFeeDetails
+          });
+        case 4:
+          hopAsset = findAssetOnDestOrThrow(originChain, chain, currency);
+          hopCurrencyPayload = hopAsset.location ? {
+            location: hopAsset.location
+          } : {
+            symbol: hopAsset.symbol
+          };
+          _context.n = 5;
+          return getAssetBalanceInternal({
+            api: hopApi,
+            address: resolvedAddress,
+            chain: chain,
+            currency: hopCurrencyPayload
+          });
+        case 5:
+          balance = _context.v;
+          ed = getExistentialDeposit(chain, hopCurrencyPayload);
+          if (ed) {
+            _context.n = 6;
+            break;
+          }
+          throw new InvalidParameterError("Existential deposit not found for chain ".concat(chain, " with currency ").concat(JSON.stringify(hopCurrencyPayload)));
+        case 6:
+          return _context.a(2, {
+            balance: balance,
+            currencySymbol: hopAsset.symbol,
+            existentialDeposit: BigInt(ed),
+            xcmFee: xcmFeeDetails
+          });
+        case 7:
+          _context.p = 7;
+          hopApi.setDisconnectAllowed(true);
+          _context.n = 8;
+          return hopApi.disconnect();
+        case 8:
+          return _context.f(7);
+        case 9:
+          return _context.a(2);
       }
-    }, _callee);
+    }, _callee, null, [[2,, 7, 9]]);
   }));
-  return function createTypeAndThenCall(_x, _x2) {
-    return _ref.apply(this, arguments);
+  return function buildHopInfo(_x) {
+    return _ref2.apply(this, arguments);
   };
 }();
 
-var attemptDryRunFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var origin, currency, builder, reductionPcts, lastReduction, result, _i, _reductionPcts, percentage, modifiedBuilder, _t, _t2, _t3, _t4, _t5, _t6, _t7;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+var getTransferInfo = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
+    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, destinationInfo, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
         case 0:
-          origin = options.origin, currency = options.currency, builder = options.builder;
-          reductionPcts = [0, 10, 20, 30, 40, 50];
-          lastReduction = reductionPcts[reductionPcts.length - 1];
-          result = null;
-          _i = 0, _reductionPcts = reductionPcts;
-        case 1:
-          if (!(_i < _reductionPcts.length)) {
-            _context.n = 5;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
+          if (!(isChainEvm(origin) && !ahAddress)) {
+            _context2.n = 1;
             break;
           }
-          percentage = _reductionPcts[_i];
-          modifiedBuilder = builder.currency(_objectSpread2(_objectSpread2({}, currency), {}, {
-            amount: padFeeBy(BigInt(currency.amount), -percentage)
-          }));
-          _t = getOriginXcmFeeInternal;
-          _t2 = _objectSpread2;
-          _t3 = _objectSpread2({}, options);
-          _t4 = {};
-          _context.n = 2;
-          return modifiedBuilder.build();
+          throw new InvalidParameterError("ahAddress is required for EVM origin ".concat(origin, "."));
+        case 1:
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          _context2.n = 2;
+          return api.init(origin);
         case 2:
-          _t5 = _context.v;
-          _t6 = {
-            tx: _t5
-          };
-          _t7 = _t2(_t3, _t4, _t6);
-          _context.n = 3;
-          return _t(_t7);
-        case 3:
-          result = _context.v;
-          if (!(result.feeType === 'dryRun' || percentage === lastReduction || !hasDryRunSupport(origin))) {
-            _context.n = 4;
+          api.setDisconnectAllowed(false);
+          _context2.p = 3;
+          originAsset = findAssetInfoOrThrow(origin, currency, destination);
+          amount = abstractDecimals(currency.amount, originAsset.decimals, api);
+          if (!(feeAsset && resolvedFeeAsset)) {
+            _context2.n = 5;
             break;
           }
-          return _context.a(2, result);
+          _context2.n = 4;
+          return getAssetBalanceInternal({
+            api: api,
+            address: senderAddress,
+            chain: origin,
+            currency: feeAsset
+          });
         case 4:
-          _i++;
-          _context.n = 1;
+          _t = _context2.v;
+          _context2.n = 7;
           break;
         case 5:
-          return _context.a(2, result);
-      }
-    }, _callee);
-  }));
-  return function attemptDryRunFee(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var getTransferableAmountInternal = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, senderAddress, chain, destination, currency, builder, feeAsset, resolvedFeeAsset, asset, amount, balance, ed, isNativeAsset, shouldSubstractFee, feeToSubtract, _yield$attemptDryRunF, 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, builder = _ref.builder, feeAsset = _ref.feeAsset;
-          validateAddress(senderAddress, chain, false);
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, chain, destination, currency) : undefined;
-          asset = findAssetInfoOrThrow(chain, currency, null);
-          amount = abstractDecimals(currency.amount, asset.decimals, api);
-          _context.n = 1;
+          _context2.n = 6;
+          return getBalanceNativeInternal({
+            api: api,
+            address: senderAddress,
+            chain: origin
+          });
+        case 6:
+          _t = _context2.v;
+        case 7:
+          originBalanceFee = _t;
+          _context2.n = 8;
           return getAssetBalanceInternal({
             api: api,
             address: senderAddress,
-            chain: chain,
+            chain: origin,
             currency: currency
           });
-        case 1:
-          balance = _context.v;
-          ed = getExistentialDepositOrThrow(chain, currency);
-          isNativeAsset = getNativeAssetSymbol(chain) === asset.symbol;
-          shouldSubstractFee = isNativeAsset || chain === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, asset);
-          feeToSubtract = 0n;
-          if (!shouldSubstractFee) {
-            _context.n = 4;
+        case 8:
+          originBalance = _context2.v;
+          edOrigin = getExistentialDepositOrThrow(origin, currency);
+          _context2.n = 9;
+          return getXcmFee({
+            api: api,
+            tx: tx,
+            origin: origin,
+            destination: destination,
+            senderAddress: senderAddress,
+            address: address,
+            currency: currency,
+            feeAsset: feeAsset,
+            disableFallback: false
+          });
+        case 9:
+          _yield$getXcmFee = _context2.v;
+          _yield$getXcmFee$orig = _yield$getXcmFee.origin;
+          originFee = _yield$getXcmFee$orig.fee;
+          originFeeCurrency = _yield$getXcmFee$orig.currency;
+          assetHubFeeResult = _yield$getXcmFee.assetHub;
+          bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
+          destFeeDetail = _yield$getXcmFee.destination;
+          hops = _yield$getXcmFee.hops;
+          isFeeAssetAh = origin === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, originAsset);
+          originBalanceAfter = originBalance - amount;
+          originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - amount : originBalanceFee - originFee;
+          originBalanceNativeSufficient = originBalanceFee >= originFee;
+          originBalanceSufficient = originBalanceAfter >= edOrigin;
+          if (!assetHubFeeResult) {
+            _context2.n = 11;
             break;
           }
-          _context.n = 2;
-          return attemptDryRunFee({
+          _context2.n = 10;
+          return buildHopInfo({
             api: api,
-            builder: builder,
-            origin: chain,
-            destination: chain,
+            chain: "AssetHub".concat(getRelayChainOf(origin)),
+            feeData: assetHubFeeResult,
+            originChain: origin,
+            currency: currency,
             senderAddress: senderAddress,
-            feeAsset: feeAsset,
+            ahAddress: ahAddress
+          });
+        case 10:
+          assetHub = _context2.v;
+        case 11:
+          if (!bridgeHubFeeResult) {
+            _context2.n = 13;
+            break;
+          }
+          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
+          _context2.n = 12;
+          return buildHopInfo({
+            api: api,
+            chain: bridgeHubChain,
+            feeData: bridgeHubFeeResult,
+            originChain: origin,
+            currency: currency,
+            senderAddress: senderAddress,
+            ahAddress: ahAddress
+          });
+        case 12:
+          bridgeHub = _context2.v;
+        case 13:
+          builtHops = [];
+          if (!(hops && hops.length > 0)) {
+            _context2.n = 15;
+            break;
+          }
+          _context2.n = 14;
+          return Promise.all(hops.map(/*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(hop) {
+              var result;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    _context.n = 1;
+                    return buildHopInfo({
+                      api: api,
+                      chain: hop.chain,
+                      feeData: hop.result,
+                      originChain: origin,
+                      currency: currency,
+                      senderAddress: senderAddress,
+                      ahAddress: ahAddress
+                    });
+                  case 1:
+                    result = _context.v;
+                    return _context.a(2, {
+                      chain: hop.chain,
+                      result: result
+                    });
+                }
+              }, _callee);
+            }));
+            return function (_x2) {
+              return _ref3.apply(this, arguments);
+            };
+          }()));
+        case 14:
+          builtHops = _context2.v;
+        case 15:
+          _context2.n = 16;
+          return buildDestInfo({
+            api: api,
+            origin: origin,
+            destination: destination,
+            address: address,
             currency: _objectSpread2(_objectSpread2({}, currency), {}, {
               amount: amount
             }),
-            disableFallback: false
+            originFee: originFee,
+            isFeeAssetAh: !!isFeeAssetAh,
+            destFeeDetail: destFeeDetail,
+            assetHubFee: assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.fee,
+            bridgeFee: bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.fee
           });
-        case 2:
-          _yield$attemptDryRunF = _context.v;
-          fee = _yield$attemptDryRunF.fee;
-          if (!(fee === undefined)) {
-            _context.n = 3;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on chain ").concat(chain, "."));
-        case 3:
-          feeToSubtract = fee;
-        case 4:
-          transferable = balance - ed - feeToSubtract;
-          return _context.a(2, transferable > 0n ? transferable : 0n);
-      }
-    }, _callee);
-  }));
-  return function getTransferableAmountInternal(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-var getTransferableAmount = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.p = _context2.n) {
-        case 0:
-          api = options.api;
-          api.setDisconnectAllowed(false);
-          _context2.p = 1;
-          _context2.n = 2;
-          return getTransferableAmountInternal(options);
-        case 2:
-          return _context2.a(2, _context2.v);
-        case 3:
-          _context2.p = 3;
+        case 16:
+          destinationInfo = _context2.v;
+          return _context2.a(2, {
+            chain: {
+              origin: origin,
+              destination: destination,
+              ecosystem: getRelayChainSymbol(origin)
+            },
+            origin: {
+              selectedCurrency: {
+                sufficient: originBalanceSufficient,
+                balance: originBalance,
+                balanceAfter: originBalanceAfter,
+                currencySymbol: originAsset.symbol,
+                existentialDeposit: edOrigin
+              },
+              xcmFee: {
+                sufficient: originBalanceNativeSufficient,
+                fee: originFee,
+                balance: originBalanceFee,
+                balanceAfter: originBalanceFeeAfter,
+                currencySymbol: originFeeCurrency
+              }
+            },
+            assetHub: assetHub,
+            bridgeHub: bridgeHub,
+            hops: builtHops,
+            destination: destinationInfo
+          });
+        case 17:
+          _context2.p = 17;
           api.setDisconnectAllowed(true);
-          _context2.n = 4;
+          _context2.n = 18;
           return api.disconnect();
-        case 4:
-          return _context2.f(3);
-        case 5:
+        case 18:
+          return _context2.f(17);
+        case 19:
           return _context2.a(2);
       }
-    }, _callee2, null, [[1,, 3, 5]]);
+    }, _callee2, null, [[3,, 17, 19]]);
   }));
-  return function getTransferableAmount(_x2) {
-    return _ref3.apply(this, arguments);
+  return function getTransferInfo(_x) {
+    return _ref2.apply(this, arguments);
   };
 }();
 
-var buildDestInfo = /*#__PURE__*/function () {
+var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
+  var _feeResult$assetHub;
+  var totalFee = 0n;
+  if (((_feeResult$assetHub = feeResult.assetHub) === null || _feeResult$assetHub === void 0 ? void 0 : _feeResult$assetHub.fee) !== undefined) {
+    totalFee += feeResult.assetHub.fee;
+  }
+  if (feeResult.destination.fee !== undefined) {
+    totalFee += feeResult.destination.fee;
+  }
+  return totalFee;
+};
+var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, origin, destination, address, currency, originFee, isFeeAssetAh, destFeeDetail, assetHubFee, bridgeFee, destApi, destAsset, edDest, edDestBn, destCurrency, destBalance, destAmount, effectiveAmountForBalance, destBalanceSufficient, destBalanceSufficientResult, destBalanceAfter, destbalanceAfterResult, receivedAmount, isAssetHubToAssetHubRoute, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
+    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, amount, destCurrency, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, destination = _ref.destination, address = _ref.address, currency = _ref.currency, originFee = _ref.originFee, isFeeAssetAh = _ref.isFeeAssetAh, destFeeDetail = _ref.destFeeDetail, assetHubFee = _ref.assetHubFee, bridgeFee = _ref.bridgeFee;
-          destApi = api.clone();
-          if (!(destination !== 'Ethereum')) {
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, address = _ref.address, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset, currency = _ref.currency;
+          if (!(destination === 'Ethereum')) {
             _context.n = 1;
             break;
           }
-          _context.n = 1;
-          return destApi.init(destination);
+          return _context.a(2, true);
         case 1:
-          destAsset = findAssetOnDestOrThrow(origin, destination, currency);
-          edDest = destAsset.existentialDeposit;
-          if (edDest) {
+          validateAddress(address, destination);
+          if (!(origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama')) {
             _context.n = 2;
             break;
           }
-          throw new InvalidParameterError("Existential deposit not found for ".concat(destination, " with currency ").concat(JSON.stringify(currency, replaceBigInt)));
+          throw new InvalidParameterError('Kusama is outside of Polkadot ecosystem, thus function is unable to verify the existential deposit for it.');
         case 2:
-          edDestBn = BigInt(edDest);
-          destCurrency = destAsset.location ? {
-            location: destAsset.location
+          if (!(origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot')) {
+            _context.n = 3;
+            break;
+          }
+          throw new InvalidParameterError('Polkadot is outside of Kusama ecosystem, thus function is unable to verify the existential deposit for it.');
+        case 3:
+          destApi = api.clone();
+          _context.n = 4;
+          return destApi.init(destination);
+        case 4:
+          asset = findAssetOnDestOrThrow(origin, destination, currency);
+          amount = abstractDecimals(currency.amount, asset.decimals, api);
+          destCurrency = asset.location ? {
+            location: asset.location
           } : {
-            symbol: destAsset.symbol
+            symbol: asset.symbol
           };
-          _context.n = 3;
+          ed = getExistentialDepositOrThrow(destination, destCurrency);
+          _context.n = 5;
           return getAssetBalanceInternal({
-            api: destApi,
             address: address,
             chain: destination,
+            api: destApi,
             currency: destCurrency
           });
-        case 3:
-          destBalance = _context.v;
-          destAmount = isFeeAssetAh ? BigInt(currency.amount) - originFee : BigInt(currency.amount);
-          effectiveAmountForBalance = destAmount;
-          if (destination === 'Ethereum' && assetHubFee !== undefined) {
-            effectiveAmountForBalance -= assetHubFee;
+        case 5:
+          balance = _context.v;
+          _context.n = 6;
+          return getXcmFee({
+            api: api,
+            tx: tx,
+            origin: origin,
+            destination: destination,
+            senderAddress: senderAddress,
+            address: address,
+            currency: _objectSpread2(_objectSpread2({}, currency), {}, {
+              amount: amount
+            }),
+            feeAsset: feeAsset,
+            disableFallback: false
+          });
+        case 6:
+          xcmFeeResult = _context.v;
+          dryRunError = xcmFeeResult.origin.dryRunError, assetHubFeeResult = xcmFeeResult.assetHub, bridgeHubFeeResult = xcmFeeResult.bridgeHub, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
+          if (!(destFee === undefined)) {
+            _context.n = 7;
+            break;
           }
-          destBalanceSufficient = effectiveAmountForBalance - destFeeDetail.fee > (destBalance < edDestBn ? edDestBn : 0);
-          destBalanceSufficientResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceSufficient;
-          destBalanceAfter = destBalance - (destFeeDetail.currency === destAsset.symbol ? destFeeDetail.fee : 0n) + effectiveAmountForBalance;
-          destbalanceAfterResult = destFeeDetail.currency !== destAsset.symbol && destination !== 'Ethereum' ? new UnableToComputeError('Unable to compute if dest balance will be sufficient. Fee currency is not the same') : destBalanceAfter;
-          isAssetHubToAssetHubRoute = origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot' || origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama';
-          if (isAssetHubToAssetHubRoute) {
-            nativeAssetOfOriginSymbol = getNativeAssetSymbol(origin);
-            isOriginAssetNative = false;
-            if (destAsset.symbol === nativeAssetOfOriginSymbol) {
-              isOriginAssetNative = true;
-            }
-            if (isOriginAssetNative) {
-              if (bridgeFee === undefined) {
-                receivedAmount = new UnableToComputeError("bridgeFee is required for native asset transfer from ".concat(origin, " to ").concat(destination, " but was not provided."));
-              } else {
-                receivedAmount = BigInt(currency.amount) - originFee - bridgeFee;
-              }
-            } else {
-              receivedAmount = new UnableToComputeError("Unable to compute received amount: The transferred asset (".concat(destAsset.symbol, ") is not the native asset (").concat(nativeAssetOfOriginSymbol, ") of origin ").concat(origin, " for the ").concat(origin, "->").concat(destination, " route."));
-            }
-          } else {
-            if (destbalanceAfterResult instanceof UnableToComputeError) {
-              receivedAmount = destbalanceAfterResult;
-            } else {
-              receivedAmount = destbalanceAfterResult - destBalance;
-            }
+          throw new InvalidParameterError("Cannot get destination xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on chain ").concat(destination, "."));
+        case 7:
+          if (!dryRunError) {
+            _context.n = 8;
+            break;
           }
-          isDestFeeInNativeCurrency = destFeeDetail.currency === getNativeAssetSymbol(destination);
-          if (!isDestFeeInNativeCurrency) {
-            _context.n = 5;
+          throw new DryRunFailedError(dryRunError, 'origin');
+        case 8:
+          hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
+          if (!hopDryRunError) {
+            _context.n = 9;
             break;
           }
-          _context.n = 4;
-          return getBalanceNativeInternal({
-            address: address,
-            chain: destination,
-            api: destApi
-          });
-        case 4:
-          destRecipientNativeBalance = _context.v;
-          destXcmFeeBalance = destRecipientNativeBalance;
-          _context.n = 6;
-          break;
-        case 5:
-          destXcmFeeBalance = destBalance;
-        case 6:
-          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeDetail.currency === destAsset.symbol ? effectiveAmountForBalance : 0n);
-          return _context.a(2, {
-            receivedCurrency: {
-              sufficient: destBalanceSufficientResult,
-              receivedAmount: receivedAmount,
-              balance: destBalance,
-              balanceAfter: destbalanceAfterResult,
-              currencySymbol: destAsset.symbol,
-              existentialDeposit: edDestBn
-            },
-            xcmFee: {
-              fee: destFeeDetail.fee,
-              balance: destXcmFeeBalance,
-              balanceAfter: destXcmFeeBalanceAfter,
-              currencySymbol: destFeeDetail.currency
-            }
-          });
+          throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
+        case 9:
+          if (!destDryRunError) {
+            _context.n = 10;
+            break;
+          }
+          throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
+        case 10:
+          if (!(normalizeSymbol(asset.symbol) !== normalizeSymbol(destFeeCurrency))) {
+            _context.n = 11;
+            break;
+          }
+          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 11:
+          totalFee = calculateTotalXcmFee(xcmFeeResult);
+          method = api.getMethod(tx);
+          if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
+            feeToSubtract = totalFee;
+          } else {
+            feeToSubtract = destFee;
+          }
+          return _context.a(2, amount - feeToSubtract > (balance < ed ? ed : 0));
       }
     }, _callee);
   }));
-  return function buildDestInfo(_x) {
+  return function verifyEdOnDestinationInternal(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
 
-var buildHopInfo = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, chain, feeData, originChain, currency, senderAddress, ahAddress, hopApi, resolvedAddress, nativeBalanceOnHop, nativeAssetSymbolOnHop, xcmFeeDetails, isBridgeHub, hopAsset, hopCurrencyPayload, balance, ed;
+var verifyEdOnDestination = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
+    var api;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
-          api = _ref.api, chain = _ref.chain, feeData = _ref.feeData, originChain = _ref.originChain, currency = _ref.currency, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress;
-          hopApi = api.clone();
-          _context.n = 1;
-          return hopApi.init(chain);
-        case 1:
-          hopApi.setDisconnectAllowed(false);
-          _context.p = 2;
-          resolvedAddress = isChainEvm(originChain) && ahAddress ? ahAddress : senderAddress;
-          _context.n = 3;
-          return getBalanceNativeInternal({
-            api: hopApi,
-            address: resolvedAddress,
-            chain: chain
-          });
+          api = options.api;
+          _context.p = 1;
+          _context.n = 2;
+          return verifyEdOnDestinationInternal(options);
+        case 2:
+          return _context.a(2, _context.v);
         case 3:
-          nativeBalanceOnHop = _context.v;
-          nativeAssetSymbolOnHop = getNativeAssetSymbol(chain);
-          xcmFeeDetails = {
-            fee: feeData.fee,
-            balance: nativeBalanceOnHop,
-            currencySymbol: nativeAssetSymbolOnHop
-          };
-          isBridgeHub = chain.includes('BridgeHub');
-          if (!isBridgeHub) {
-            _context.n = 4;
-            break;
-          }
-          return _context.a(2, {
-            currencySymbol: getNativeAssetSymbol(chain),
-            xcmFee: xcmFeeDetails
-          });
+          _context.p = 3;
+          _context.n = 4;
+          return api.disconnect();
         case 4:
-          hopAsset = findAssetOnDestOrThrow(originChain, chain, currency);
-          hopCurrencyPayload = hopAsset.location ? {
-            location: hopAsset.location
-          } : {
-            symbol: hopAsset.symbol
-          };
-          _context.n = 5;
-          return getAssetBalanceInternal({
-            api: hopApi,
-            address: resolvedAddress,
-            chain: chain,
-            currency: hopCurrencyPayload
-          });
+          return _context.f(3);
         case 5:
-          balance = _context.v;
-          ed = getExistentialDeposit(chain, hopCurrencyPayload);
-          if (ed) {
-            _context.n = 6;
-            break;
-          }
-          throw new InvalidParameterError("Existential deposit not found for chain ".concat(chain, " with currency ").concat(JSON.stringify(hopCurrencyPayload)));
-        case 6:
-          return _context.a(2, {
-            balance: balance,
-            currencySymbol: hopAsset.symbol,
-            existentialDeposit: BigInt(ed),
-            xcmFee: xcmFeeDetails
-          });
-        case 7:
-          _context.p = 7;
-          hopApi.setDisconnectAllowed(true);
-          _context.n = 8;
-          return hopApi.disconnect();
-        case 8:
-          return _context.f(7);
-        case 9:
           return _context.a(2);
       }
-    }, _callee, null, [[2,, 7, 9]]);
+    }, _callee, null, [[1,, 3, 5]]);
   }));
-  return function buildHopInfo(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var getTransferInfo = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, amount, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubChain, builtHops, destinationInfo, _t;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.p = _context2.n) {
+  return function verifyEdOnDestination(_x) {
+    return _ref.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:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
-          if (!(isChainEvm(origin) && !ahAddress)) {
-            _context2.n = 1;
+          if (!feeAsset) {
+            _context.n = 1;
             break;
           }
-          throw new InvalidParameterError("ahAddress is required for EVM origin ".concat(origin, "."));
+          return _context.a(2, undefined);
         case 1:
-          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          _context2.n = 2;
-          return api.init(origin);
-        case 2:
-          api.setDisconnectAllowed(false);
-          _context2.p = 3;
-          originAsset = findAssetInfoOrThrow(origin, currency, destination);
-          amount = abstractDecimals(currency.amount, originAsset.decimals, api);
-          if (!(feeAsset && resolvedFeeAsset)) {
-            _context2.n = 5;
-            break;
-          }
-          _context2.n = 4;
-          return getAssetBalanceInternal({
-            api: api,
-            address: senderAddress,
-            chain: origin,
-            currency: feeAsset
-          });
-        case 4:
-          _t = _context2.v;
-          _context2.n = 7;
-          break;
-        case 5:
-          _context2.n = 6;
+          edNative = getExistentialDepositOrThrow(origin);
+          _context.n = 2;
           return getBalanceNativeInternal({
             api: api,
-            address: senderAddress,
-            chain: origin
-          });
-        case 6:
-          _t = _context2.v;
-        case 7:
-          originBalanceFee = _t;
-          _context2.n = 8;
-          return getAssetBalanceInternal({
-            api: api,
-            address: senderAddress,
             chain: origin,
-            currency: currency
-          });
-        case 8:
-          originBalance = _context2.v;
-          edOrigin = getExistentialDepositOrThrow(origin, currency);
-          _context2.n = 9;
-          return getXcmFee({
-            api: api,
-            tx: tx,
-            origin: origin,
-            destination: destination,
-            senderAddress: senderAddress,
-            address: address,
-            currency: currency,
-            feeAsset: feeAsset,
-            disableFallback: false
+            address: senderAddress
           });
-        case 9:
-          _yield$getXcmFee = _context2.v;
-          _yield$getXcmFee$orig = _yield$getXcmFee.origin;
-          originFee = _yield$getXcmFee$orig.fee;
-          originFeeCurrency = _yield$getXcmFee$orig.currency;
-          assetHubFeeResult = _yield$getXcmFee.assetHub;
-          bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
-          destFeeDetail = _yield$getXcmFee.destination;
-          hops = _yield$getXcmFee.hops;
-          if (!(originFee === undefined)) {
-            _context2.n = 10;
+        case 2:
+          balanceNative = _context.v;
+          isNativeAssetToOrigin = isSymbolMatch(asset.symbol, getNativeAssetSymbol(origin));
+          isNativeAssetToDest = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
+          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
+            _context.n = 3;
             break;
           }
-          throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on chain ").concat(origin, "."));
-        case 10:
-          isFeeAssetAh = origin === 'AssetHubPolkadot' && resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, originAsset);
-          originBalanceAfter = originBalance - amount;
-          originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - amount : originBalanceFee - originFee;
-          originBalanceNativeSufficient = originBalanceFee >= originFee;
-          originBalanceSufficient = originBalanceAfter >= edOrigin;
-          if (!assetHubFeeResult) {
-            _context2.n = 12;
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+        case 3:
+          if (isNativeAssetToOrigin) {
+            _context.n = 5;
             break;
           }
-          _context2.n = 11;
-          return buildHopInfo({
+          isSufficientNative = balanceNative - edNative - feeNative > 0n;
+          _context.n = 4;
+          return getAssetBalance({
             api: api,
-            chain: "AssetHub".concat(getRelayChainOf(origin)),
-            feeData: assetHubFeeResult,
-            originChain: origin,
-            currency: currency,
-            senderAddress: senderAddress,
-            ahAddress: ahAddress
+            chain: origin,
+            address: senderAddress,
+            currency: currency
           });
-        case 11:
-          assetHub = _context2.v;
-        case 12:
-          if (!bridgeHubFeeResult) {
-            _context2.n = 14;
+        case 4:
+          balanceAsset = _context.v;
+          edAsset = 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);
+        case 6:
+          return _context.a(2);
+      }
+    }, _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 = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
+          if (isNativeAsset) {
+            _context2.n = 1;
             break;
           }
-          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
-          _context2.n = 13;
-          return buildHopInfo({
+          return _context2.a(2, undefined);
+        case 1:
+          existentialDeposit = getExistentialDepositOrThrow(destination);
+          _context2.n = 2;
+          return getBalanceNativeInternal({
             api: api,
-            chain: bridgeHubChain,
-            feeData: bridgeHubFeeResult,
-            originChain: origin,
-            currency: currency,
-            senderAddress: senderAddress,
-            ahAddress: ahAddress
+            chain: destination,
+            address: address
           });
-        case 13:
-          bridgeHub = _context2.v;
-        case 14:
-          builtHops = [];
-          if (!(hops && hops.length > 0)) {
-            _context2.n = 16;
-            break;
-          }
-          _context2.n = 15;
-          return Promise.all(hops.map(/*#__PURE__*/function () {
-            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(hop) {
-              var result;
+        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 (isRelayChain(origin)) return DOT_LOCATION;
+  return {
+    parents: isRelayChain(destination) ? Parents.ZERO : Parents.ONE,
+    interior: {
+      X1: [{
+        Parachain: getParaId(origin)
+      }]
+    }
+  };
+};
+var getDestXcmFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.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, 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) {
+                while (1) switch (_context.p = _context.n) {
                   case 0:
-                    _context.n = 1;
-                    return buildHopInfo({
-                      api: api,
-                      chain: hop.chain,
-                      feeData: hop.result,
-                      originChain: origin,
-                      currency: currency,
-                      senderAddress: senderAddress,
-                      ahAddress: ahAddress
-                    });
+                    if (!(destination === 'Ethereum')) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, 0n);
                   case 1:
-                    result = _context.v;
-                    return _context.a(2, {
-                      chain: hop.chain,
-                      result: result
+                    originAsset = findAssetInfoOrThrow(origin, currency, destination);
+                    if (!originAsset.location) {
+                      _context.n = 7;
+                      break;
+                    }
+                    _context.p = 2;
+                    _context.n = 3;
+                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                      destination: destination
+                    }), {
+                      location: originAsset.location
+                    });
+                  case 3:
+                    return _context.a(2, _context.v);
+                  case 4:
+                    _context.p = 4;
+                    _t = _context.v;
+                    if (!(_t instanceof 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);
+              }, _callee, null, [[2, 4]]);
             }));
-            return function (_x2) {
-              return _ref3.apply(this, arguments);
+            return function calcPaymentInfoFee() {
+              return _ref2.apply(this, arguments);
             };
-          }()));
-        case 15:
-          builtHops = _context2.v;
-        case 16:
-          _context2.n = 17;
-          return buildDestInfo({
-            api: api,
+          }();
+          if (!(!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: !hasDryRunSupport(destination) ? sufficient : false
+          });
+        case 3:
+          _context2.n = 4;
+          return api.getDryRunXcm({
+            originLocation: addXcmVersionHeader(createOriginLocation(hopChain, destination), Version.V4),
+            xcm: forwardedXcms[1][0],
+            chain: destination,
             origin: origin,
-            destination: destination,
-            address: address,
-            currency: _objectSpread2(_objectSpread2({}, currency), {}, {
-              amount: amount
-            }),
+            asset: asset,
             originFee: originFee,
-            isFeeAssetAh: !!isFeeAssetAh,
-            destFeeDetail: destFeeDetail,
-            assetHubFee: assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.fee,
-            bridgeFee: bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.fee
+            feeAsset: resolvedFeeAsset,
+            amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
           });
-        case 17:
-          destinationInfo = _context2.v;
+        case 4:
+          dryRunResult = _context2.v;
+          if (dryRunResult.success) {
+            _context2.n = 7;
+            break;
+          }
+          if (!disableFallback) {
+            _context2.n = 5;
+            break;
+          }
           return _context2.a(2, {
-            chain: {
-              origin: origin,
-              destination: destination,
-              ecosystem: getRelayChainSymbol(origin)
-            },
-            origin: {
-              selectedCurrency: {
-                sufficient: originBalanceSufficient,
-                balance: originBalance,
-                balanceAfter: originBalanceAfter,
-                currencySymbol: originAsset.symbol,
-                existentialDeposit: edOrigin
-              },
-              xcmFee: {
-                sufficient: originBalanceNativeSufficient,
-                fee: originFee,
-                balance: originBalanceFee,
-                balanceAfter: originBalanceFeeAfter,
-                currencySymbol: originFeeCurrency
-              }
-            },
-            assetHub: assetHub,
-            bridgeHub: bridgeHub,
-            hops: builtHops,
-            destination: destinationInfo
+            dryRunError: dryRunResult.failureReason
+          });
+        case 5:
+          _context2.n = 6;
+          return calcPaymentInfoFee();
+        case 6:
+          _fee2 = _context2.v;
+          return _context2.a(2, {
+            fee: _fee2,
+            feeType: 'paymentInfo',
+            dryRunError: dryRunResult.failureReason,
+            sufficient: false
+          });
+        case 7:
+          fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
+          return _context2.a(2, {
+            fee: fee,
+            feeType: 'dryRun',
+            sufficient: true,
+            forwardedXcms: newForwardedXcms,
+            destParaId: destParaId
           });
-        case 18:
-          _context2.p = 18;
-          api.setDisconnectAllowed(true);
-          _context2.n = 19;
-          return api.disconnect();
-        case 19:
-          return _context2.f(18);
-        case 20:
-          return _context2.a(2);
       }
-    }, _callee2, null, [[3,, 18, 20]]);
+    }, _callee2);
   }));
-  return function getTransferInfo(_x) {
-    return _ref2.apply(this, arguments);
+  return function getDestXcmFee(_x) {
+    return _ref.apply(this, arguments);
   };
 }();
 
-var calculateTotalXcmFee = function calculateTotalXcmFee(feeResult) {
-  var _feeResult$assetHub;
-  var totalFee = 0n;
-  if (((_feeResult$assetHub = feeResult.assetHub) === null || _feeResult$assetHub === void 0 ? void 0 : _feeResult$assetHub.fee) !== undefined) {
-    totalFee += feeResult.assetHub.fee;
+var getFailureInfo = function getFailureInfo(results, hops) {
+  // Check standard chains first for backwards compatibility
+  for (var _i = 0, _arr = ['destination', 'assetHub', 'bridgeHub']; _i < _arr.length; _i++) {
+    var chain = _arr[_i];
+    var res = results[chain];
+    if (res && !res.success && res.failureReason) {
+      return {
+        failureReason: res.failureReason,
+        failureChain: chain
+      };
+    }
   }
-  if (feeResult.destination.fee !== undefined) {
-    totalFee += feeResult.destination.fee;
+  var _iterator = _createForOfIteratorHelper(hops),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var hop = _step.value;
+      if (!hop.result.success && hop.result.failureReason) {
+        return {
+          failureReason: hop.result.failureReason,
+          failureChain: hop.chain
+        };
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
-  return totalFee;
+  return {};
 };
-var verifyEdOnDestinationInternal = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, address, senderAddress, feeAsset, currency, destApi, asset, amount, destCurrency, ed, balance, xcmFeeResult, dryRunError, assetHubFeeResult, bridgeHubFeeResult, _xcmFeeResult$destina, destFee, destFeeCurrency, destDryRunError, hopDryRunError, totalFee, method, feeToSubtract;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+var dryRunInternal = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var _traversalResult$brid, _traversalResult$asse, _traversalResult$dest;
+    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, originWithCurrency, assetHubWithCurrency, bridgeHubWithCurrency, destinationWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, address = _ref.address, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset, currency = _ref.currency;
-          if (!(destination === 'Ethereum')) {
-            _context.n = 1;
-            break;
-          }
-          return _context.a(2, true);
+          api = options.api, origin = options.origin, destination = options.destination, currency = options.currency, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          asset = findAssetInfoOrThrow(origin, currency, destination);
+          amount = abstractDecimals(currency.amount, asset.decimals, api);
+          _context2.n = 1;
+          return api.getDryRunCall({
+            tx: tx,
+            chain: origin,
+            address: senderAddress,
+            asset: _objectSpread2(_objectSpread2({}, asset), {}, {
+              amount: amount
+            }),
+            feeAsset: resolvedFeeAsset,
+            useRootOrigin: useRootOrigin
+          });
         case 1:
-          validateAddress(address, destination);
-          if (!(origin === 'AssetHubPolkadot' && destination === 'AssetHubKusama')) {
-            _context.n = 2;
-            break;
-          }
-          throw new InvalidParameterError('Kusama is outside of Polkadot ecosystem, thus function is unable to verify the existential deposit for it.');
-        case 2:
-          if (!(origin === 'AssetHubKusama' && destination === 'AssetHubPolkadot')) {
-            _context.n = 3;
+          originDryRun = _context2.v;
+          if (originDryRun.success) {
+            _context2.n = 2;
             break;
           }
-          throw new InvalidParameterError('Polkadot is outside of Kusama ecosystem, thus function is unable to verify the existential deposit for it.');
-        case 3:
-          destApi = api.clone();
-          _context.n = 4;
-          return destApi.init(destination);
-        case 4:
-          asset = findAssetOnDestOrThrow(origin, destination, currency);
-          amount = abstractDecimals(currency.amount, asset.decimals, api);
-          destCurrency = asset.location ? {
-            location: asset.location
-          } : {
-            symbol: asset.symbol
-          };
-          ed = getExistentialDepositOrThrow(destination, destCurrency);
-          _context.n = 5;
-          return getAssetBalanceInternal({
-            address: address,
-            chain: destination,
-            api: destApi,
-            currency: destCurrency
+          return _context2.a(2, {
+            failureReason: originDryRun.failureReason,
+            failureChain: 'origin',
+            origin: originDryRun,
+            hops: []
           });
-        case 5:
-          balance = _context.v;
-          _context.n = 6;
-          return getXcmFee({
+        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 (hasDryRunSupport(currentChain)) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, {
+                      success: false,
+                      failureReason: "DryRunApi is not available on chain ".concat(currentChain)
+                    });
+                  case 1:
+                    _context.n = 2;
+                    return hopApi.getDryRunXcm({
+                      originLocation: addXcmVersionHeader(createOriginLocation(currentOrigin, currentChain), Version.V4),
+                      xcm: forwardedXcms[1][0],
+                      chain: currentChain,
+                      origin: currentOrigin,
+                      asset: currentAsset,
+                      feeAsset: resolvedFeeAsset,
+                      originFee: originDryRun.fee,
+                      amount: amount
+                    });
+                  case 2:
+                    hopDryRun = _context.v;
+                    if (!hopDryRun.success) {
+                      _context.n = 3;
+                      break;
+                    }
+                    if (destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub'))) {
+                      hopCurrency = getNativeAssetSymbol(currentChain);
+                    } else if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
+                      hopCurrency = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo).symbol;
+                    } else if (isDestination) {
+                      hopCurrency = 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);
+            };
+          }();
+          _context2.n = 3;
+          return traverseXcmHops({
             api: api,
-            tx: tx,
             origin: origin,
             destination: destination,
-            senderAddress: senderAddress,
-            address: address,
-            currency: _objectSpread2(_objectSpread2({}, currency), {}, {
-              amount: amount
-            }),
-            feeAsset: feeAsset,
-            disableFallback: false
+            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 6:
-          xcmFeeResult = _context.v;
-          dryRunError = xcmFeeResult.origin.dryRunError, assetHubFeeResult = xcmFeeResult.assetHub, bridgeHubFeeResult = xcmFeeResult.bridgeHub, _xcmFeeResult$destina = xcmFeeResult.destination, destFee = _xcmFeeResult$destina.fee, destFeeCurrency = _xcmFeeResult$destina.currency, destDryRunError = _xcmFeeResult$destina.dryRunError;
-          if (!(destFee === undefined)) {
-            _context.n = 7;
-            break;
-          }
-          throw new InvalidParameterError("Cannot get destination xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on chain ").concat(destination, "."));
-        case 7:
-          if (!dryRunError) {
-            _context.n = 8;
-            break;
-          }
-          throw new DryRunFailedError(dryRunError, 'origin');
-        case 8:
-          hopDryRunError = (assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.dryRunError) || (bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.dryRunError);
-          if (!hopDryRunError) {
-            _context.n = 9;
-            break;
-          }
-          throw new DryRunFailedError(hopDryRunError, assetHubFeeResult !== null && assetHubFeeResult !== void 0 && assetHubFeeResult.dryRunError ? 'assetHub' : 'bridgeHub');
-        case 9:
-          if (!destDryRunError) {
-            _context.n = 10;
-            break;
-          }
-          throw new UnableToComputeError("Unable to compute fee for the destination asset. Destination dry run error: ".concat(destDryRunError));
-        case 10:
-          if (!(normalizeSymbol(asset.symbol) !== normalizeSymbol(destFeeCurrency))) {
-            _context.n = 11;
+        case 3:
+          traversalResult = _context2.v;
+          // Process Ethereum bridge fees
+          assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
+          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
+          if (!((_traversalResult$brid = traversalResult.bridgeHub) !== null && _traversalResult$brid !== void 0 && _traversalResult$brid.success)) {
+            _context2.n = 5;
             break;
           }
-          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 11:
-          totalFee = calculateTotalXcmFee(xcmFeeResult);
-          method = api.getMethod(tx);
-          if (method === 'transfer_assets_using_type_and_then' || method === 'transferAssetsUsingTypeAndThen') {
-            feeToSubtract = totalFee;
-          } else {
-            feeToSubtract = destFee;
-          }
-          return _context.a(2, amount - feeToSubtract > (balance < ed ? ed : 0));
-      }
-    }, _callee);
-  }));
-  return function verifyEdOnDestinationInternal(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var verifyEdOnDestination = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          api = options.api;
-          _context.p = 1;
-          _context.n = 2;
-          return verifyEdOnDestinationInternal(options);
-        case 2:
-          return _context.a(2, _context.v);
-        case 3:
-          _context.p = 3;
-          _context.n = 4;
-          return api.disconnect();
+          _context2.n = 4;
+          return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
         case 4:
-          return _context.f(3);
+          _t = _context2.v;
+          _context2.n = 6;
+          break;
         case 5:
-          return _context.a(2);
+          _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 === bridgeHubChain;
+            });
+            if (bridgeHubHopIndex !== -1 && traversalResult.hops[bridgeHubHopIndex].result.success) {
+              traversalResult.hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, traversalResult.hops[bridgeHubHopIndex].result), {}, {
+                fee: processedBridgeHub.fee
+              });
+            }
+          }
+          originWithCurrency = originDryRun.success ? _objectSpread2(_objectSpread2({}, originDryRun), {}, {
+            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(origin)
+          }) : originDryRun;
+          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
+            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(assetHubChain)
+          }) : traversalResult.assetHub;
+          bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
+            currency: getNativeAssetSymbol(bridgeHubChain)
+          }) : 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({
+            destination: destinationWithCurrency,
+            assetHub: assetHubWithCurrency,
+            bridgeHub: bridgeHubWithCurrency
+          }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
+          return _context2.a(2, {
+            failureReason: failureReason,
+            failureChain: failureChain,
+            origin: originWithCurrency,
+            assetHub: assetHubWithCurrency,
+            bridgeHub: bridgeHubWithCurrency,
+            destination: destinationWithCurrency,
+            hops: traversalResult.hops
+          });
       }
-    }, _callee, null, [[1,, 3, 5]]);
+    }, _callee2);
   }));
-  return function verifyEdOnDestination(_x) {
+  return function dryRunInternal(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 
-var validateHops = function validateHops(hops) {
-  var _iterator = _createForOfIteratorHelper(hops),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var hop = _step.value;
-      if (!hop.result.success) {
-        throw new DryRunFailedError("Dry run failed on an intermediate hop (".concat(hop.chain, "). Reason: ").concat(hop.result.failureReason || 'Unknown'));
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-};
 var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
   if (!hops || hops.length === 0 || !hops[0].result.success) {
     return MIN_FEE;
@@ -7678,7 +7602,7 @@ var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
 var FEE_PADDING_PERCENTAGE$1 = 40;
 var handleExecuteTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
-    var api, senderAddress, paraIdTo, assetInfo, currency, feeCurrency, address, feeAssetInfo, version, feeAssetBalance, checkAmount, destChain, internalOptions, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight, _t;
+    var api, senderAddress, paraIdTo, assetInfo, currency, feeCurrency, address, feeAssetInfo, version, checkAmount, destChain, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -7690,25 +7614,6 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           throw new InvalidParameterError('Please provide senderAddress');
         case 1:
           assertAddressIsString(address);
-          if (!(feeCurrency && feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo))) {
-            _context.n = 3;
-            break;
-          }
-          _context.n = 2;
-          return getAssetBalanceInternal({
-            api: api,
-            address: senderAddress,
-            chain: chain,
-            currency: feeCurrency
-          });
-        case 2:
-          _t = _context.v;
-          _context.n = 4;
-          break;
-        case 3:
-          _t = undefined;
-        case 4:
-          feeAssetBalance = _t;
           checkAmount = function checkAmount(fee) {
             if (assetInfo.amount <= fee) {
               throw new InvalidParameterError("Asset amount is too low, please increase the amount or use a different fee asset.");
@@ -7729,14 +7634,16 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             version: version,
             paraIdTo: paraIdTo
-          };
+          }; // We mint 1000 units of feeAsset and use 100
+          FEE_ASSET_AMOUNT = 100;
+          feeAssetAmount = feeAssetInfo ? parseUnits(FEE_ASSET_AMOUNT.toString(), feeAssetInfo.decimals) : MIN_FEE;
           call = createExecuteCall(chain, createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
-              originFee: feeAssetBalance && feeAssetBalance > 1n ? feeAssetBalance : MIN_FEE,
+              originFee: feeAssetAmount,
               reserveFee: MIN_FEE
             }
           })), MAX_WEIGHT);
-          _context.n = 5;
+          _context.n = 2;
           return dryRunInternal({
             api: api,
             tx: api.callTxMethod(call),
@@ -7745,17 +7652,17 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             senderAddress: senderAddress,
             address: address,
             currency: currency,
-            feeAsset: feeCurrency
+            feeAsset: feeCurrency,
+            useRootOrigin: true
           });
-        case 5:
+        case 2:
           dryRunResult = _context.v;
           if (dryRunResult.origin.success) {
-            _context.n = 6;
+            _context.n = 3;
             break;
           }
           throw new DryRunFailedError(dryRunResult.failureReason);
-        case 6:
-          validateHops(dryRunResult.hops);
+        case 3:
           originFeeEstimate = dryRunResult.origin.fee;
           originFee = padFeeBy(originFeeEstimate, FEE_PADDING_PERCENTAGE$1);
           reserveFeeEstimate = getReserveFeeFromHops(dryRunResult.hops);
@@ -7767,9 +7674,9 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
               reserveFee: reserveFee
             }
           }));
-          _context.n = 7;
+          _context.n = 4;
           return api.getXcmWeight(xcm);
-        case 7:
+        case 4:
           weight = _context.v;
           return _context.a(2, createExecuteCall(chain, xcm, weight));
       }
@@ -8060,7 +7967,7 @@ var createXcmAndCall = /*#__PURE__*/function () {
 }();
 var handleSwapExecuteTransfer = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, hasOriginReserveHop, requireExchangeSuccess, extractedFees, exchangeHop, totalFeesInFromAsset, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, secondCall, secondDryRunResult, finalFees, hasHopsInSecondRun, isOnExchangeChain, finalExchangeHopIndex, finalTotalFeesInFromAsset, finalAmountAvailableForSwap, finalMinAmountOut, finalAssetTo, _yield$createXcmAndCa3, finalCall;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, extractedFees, totalFeesInFromAsset, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, finalCall;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
@@ -8087,7 +7994,8 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             swapConfig: {
               currencyTo: currencyTo,
               exchangeChain: exchangeChain
-            }
+            },
+            useRootOrigin: true
           }; // First dry run with dummy fees to extract actual fees
           _context3.n = 2;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
@@ -8106,38 +8014,8 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           }));
         case 3:
           firstDryRunResult = _context3.v;
-          exchangeHopIndex = findExchangeHopIndex(chain, firstDryRunResult.hops, exchangeChain, destChain); // Check if there's a hop before exchange (origin reserve hop)
-          hasOriginReserveHop = destChain ? exchangeHopIndex > 0 : firstDryRunResult.hops.length > 0; // If there's no origin reserve hop, we need the exchange hop/destination to succeed to get fees
-          requireExchangeSuccess = !hasOriginReserveHop;
-          extractedFees = extractFeesFromDryRun(chain, firstDryRunResult, exchangeHopIndex, destChain, false); // If we need exchange to succeed but it failed, throw error
-          if (!(requireExchangeSuccess && extractedFees.exchangeFee === 0n)) {
-            _context3.n = 6;
-            break;
-          }
-          if (!destChain) {
-            _context3.n = 5;
-            break;
-          }
-          if (!chain) {
-            _context3.n = 4;
-            break;
-          }
-          exchangeHop = firstDryRunResult.hops[exchangeHopIndex];
-          if (exchangeHop.result.success) {
-            _context3.n = 4;
-            break;
-          }
-          throw new DryRunFailedError("Exchange hop failed when no origin reserve exists: ".concat(exchangeHop.result.failureReason || 'Unknown reason'));
-        case 4:
-          _context3.n = 6;
-          break;
-        case 5:
-          if (!(firstDryRunResult.destination && !firstDryRunResult.destination.success)) {
-            _context3.n = 6;
-            break;
-          }
-          throw new DryRunFailedError("Exchange (destination) failed when no origin reserve exists: ".concat(firstDryRunResult.destination.failureReason || 'Unknown reason'));
-        case 6:
+          exchangeHopIndex = findExchangeHopIndex(chain, firstDryRunResult.hops, exchangeChain, destChain);
+          extractedFees = extractFeesFromDryRun(chain, firstDryRunResult, exchangeHopIndex, destChain, false);
           if (extractedFees.exchangeFee === 0n) {
             // We set the exchange fee to non-zero value to prevent creating dummy tx
             extractedFees.exchangeFee = MIN_FEE;
@@ -8147,67 +8025,27 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           validateAmount(BigInt(assetFrom.amount), totalFeesInFromAsset);
           updatedAssetTo = assetTo;
           if (!chain) {
-            _context3.n = 8;
+            _context3.n = 5;
             break;
           }
           amountAvailableForSwap = BigInt(assetFrom.amount) - totalFeesInFromAsset;
-          _context3.n = 7;
+          _context3.n = 4;
           return calculateMinAmountOut(amountAvailableForSwap);
-        case 7:
+        case 4:
           recalculatedMinAmountOut = _context3.v;
           updatedAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
             amount: recalculatedMinAmountOut
           });
-        case 8:
-          _context3.n = 9;
+        case 5:
+          _context3.n = 6;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetInfoTo: updatedAssetTo,
             fees: extractedFees
           }), firstDryRunResult.origin.success ? firstDryRunResult.origin.weight : undefined);
-        case 9:
+        case 6:
           _yield$createXcmAndCa2 = _context3.v;
-          secondCall = _yield$createXcmAndCa2.call;
-          _context3.n = 10;
-          return executeDryRun(_objectSpread2(_objectSpread2({}, dryRunParams), {}, {
-            tx: api.callTxMethod(secondCall)
-          }));
-        case 10:
-          secondDryRunResult = _context3.v;
-          hasHopsInSecondRun = secondDryRunResult.hops && secondDryRunResult.hops.length > 0;
-          isOnExchangeChain = chain === exchangeChain;
-          if (hasHopsInSecondRun && !isOnExchangeChain) {
-            finalExchangeHopIndex = findExchangeHopIndex(chain, secondDryRunResult.hops, exchangeChain, destChain);
-            finalFees = extractFeesFromDryRun(chain, secondDryRunResult, finalExchangeHopIndex, destChain, true);
-          } else {
-            finalFees = extractFeesFromDryRun(chain, secondDryRunResult, 0, destChain, true);
-          }
-          // Validate that we have enough after accounting for final fees
-          finalTotalFeesInFromAsset = chain ? finalFees.originReserveFee + finalFees.exchangeFee : 0n;
-          validateAmount(BigInt(assetFrom.amount), finalTotalFeesInFromAsset);
-          // If the final fees are different, we might need one more iteration
-          if (!(finalFees.exchangeFee !== extractedFees.exchangeFee || finalFees.originReserveFee !== extractedFees.originReserveFee)) {
-            _context3.n = 13;
-            break;
-          }
-          finalAmountAvailableForSwap = BigInt(assetFrom.amount) - finalTotalFeesInFromAsset;
-          _context3.n = 11;
-          return calculateMinAmountOut(finalAmountAvailableForSwap);
-        case 11:
-          finalMinAmountOut = _context3.v;
-          finalAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
-            amount: finalMinAmountOut
-          });
-          _context3.n = 12;
-          return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
-            assetInfoTo: finalAssetTo,
-            fees: finalFees
-          }), secondDryRunResult.origin.success ? secondDryRunResult.origin.weight : undefined);
-        case 12:
-          _yield$createXcmAndCa3 = _context3.v;
-          finalCall = _yield$createXcmAndCa3.call;
+          finalCall = _yield$createXcmAndCa2.call;
           return _context3.a(2, api.callTxMethod(finalCall));
-        case 13:
-          return _context3.a(2, api.callTxMethod(secondCall));
       }
     }, _callee3);
   }));
@@ -12673,15 +12511,19 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getTransferableAmount",
     value: (function () {
       var _getTransferableAmount2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
-        var _this$_options7, from, to, senderAddress, currency, feeAsset;
+        var _this$_options7, from, to, senderAddress, currency, feeAsset, tx;
         return _regenerator().w(function (_context8) {
           while (1) switch (_context8.n) {
             case 0:
               _this$_options7 = this._options, from = _this$_options7.from, to = _this$_options7.to, senderAddress = _this$_options7.senderAddress, currency = _this$_options7.currency, feeAsset = _this$_options7.feeAsset;
               assertToIsString(to);
+              _context8.n = 1;
+              return this.build();
+            case 1:
+              tx = _context8.v;
               return _context8.a(2, getTransferableAmount({
                 api: this.api,
-                builder: this,
+                tx: tx,
                 origin: from,
                 destination: to,
                 senderAddress: senderAddress,