@paraspell/sdk-core 14.3.3 → 14.3.5

package/dist/index.mjs

@@ -1,13 +1,15 @@
 import { blake2b } from '@noble/hashes/blake2.js';
-import { isChainEvm, getAssetsObject, InvalidCurrencyError, isSymbolMatch, isAssetEqual, isStableCoinAsset, isAdditionalSubstrateBridgeAsset, isBridgedSystemAsset, STABLECOIN_IDS, isSymbolSpecifier, normalizeLocation, getNativeAssetSymbol, getEdFromAssetOrThrow, extractAssetLocation, hasDryRunSupport, normalizeSymbol, Native, getOtherAssets, canonicalizeLocation, getAssetsObjectImpl, getAssetsImpl, getNativeAssetsImpl, getOtherAssetsImpl, findAssetInfoImpl, findAssetInfoOrThrowImpl, findAssetInfoOnDestImpl, findAssetOnDestOrThrowImpl, findNativeAssetInfoImpl, findNativeAssetInfoOrThrowImpl, isChainEvmImpl, getNativeAssetSymbolImpl, getRelayChainSymbolImpl, hasDryRunSupportImpl, hasXcmPaymentApiSupportImpl, getExistentialDepositOrThrowImpl, normalizeCustomAssets } from '@paraspell/assets';
+import { isChainEvm, getAssetsObject, InvalidCurrencyError, isAssetEqual, isSymbolMatch, isStableCoinAsset, isAdditionalSubstrateBridgeAsset, isBridgedSystemAsset, STABLECOIN_IDS, isSymbolSpecifier, normalizeLocation, getNativeAssetSymbol, getEdFromAssetOrThrow, extractAssetLocation, hasDryRunSupport, normalizeSymbol, Native, getOtherAssets, canonicalizeLocation, getAssetsObjectImpl, getAssetsImpl, getNativeAssetsImpl, getOtherAssetsImpl, findAssetInfoImpl, findAssetInfoOrThrowImpl, findAssetInfoOnDestImpl, findAssetOnDestOrThrowImpl, findNativeAssetInfoImpl, findNativeAssetInfoOrThrowImpl, isChainEvmImpl, getNativeAssetSymbolImpl, getRelayChainSymbolImpl, hasDryRunSupportImpl, hasXcmPaymentApiSupportImpl, getExistentialDepositOrThrowImpl, normalizeCustomAssets } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, isHex, createPublicClient, http, formatUnits as formatUnits$1, parseUnits as parseUnits$1 } from 'viem';
-import { ParaSpellError, isTLocation, replaceBigInt, isExternalChain, CHAINS, Version, isRelayChain, isSubstrateBridge, Parents, deepEqual, isTrustedChain, isCustomChain, isSnowbridge, getJunctionValue, hasJunction, ETHEREUM_BRIDGE_ORIGINS, isBridge, flattenJunctions, RELAYCHAINS, DEFAULT_SS58_PREFIX } from '@paraspell/sdk-common';
+import { ParaSpellError, isTLocation, replaceBigInt, isExternalChain, CHAINS, Version, isRelayChain, isSubstrateBridge, Parents, deepEqual, isTrustedChain, isCustomChain, isSnowbridge, getJunctionValue, hasJunction, ETHEREUM_BRIDGE_ORIGINS, isBridge, isSubstrateChain, flattenJunctions, RELAYCHAINS, DEFAULT_SS58_PREFIX } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
-import { getXcmPallet, getOtherAssetsPallets, getNativeAssetsPallet, getSupportedPalletsDetails, ASSETS_PALLETS, NATIVE_ASSETS_PALLET_PRIORITY, OTHER_ASSETS_PALLET_PRIORITY, hasPalletImpl, getXcmPalletImpl } from '@paraspell/pallets';
+import { getOtherAssetsPallets, getNativeAssetsPallet, BRIDGE_PALLETS, getPalletIndex, getXcmPallet, getSupportedPalletsDetails, ASSETS_PALLETS, NATIVE_ASSETS_PALLET_PRIORITY, OTHER_ASSETS_PALLET_PRIORITY, hasPalletImpl, getXcmPalletImpl } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
 import { mainnet, sepolia } from 'viem/chains';
+import { keccak_256 } from '@noble/hashes/sha3.js';
+import { bytesToHex, hexToBytes } from '@noble/hashes/utils.js';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -2038,7 +2040,12 @@ var createBuyExecution = function createBuyExecution(asset, weight) {
   return [{
     BuyExecution: {
       fees: asset,
-      weight_limit: 'Unlimited'
+      weight_limit: weight ? {
+        Limited: {
+          ref_time: weight.refTime,
+          proof_size: weight.proofSize
+        }
+      } : 'Unlimited'
     }
   }];
 };
@@ -2140,65 +2147,6 @@ var createTransactInstructions = /*#__PURE__*/function () {
   };
 }();
 
-var handleTransactUsingSend = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, version, chain, destination, destChain, recipient, paraIdTo, asset, transactOptions, dest, transactInstructions, message;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          api = _ref.api, version = _ref.version, chain = _ref.chain, destination = _ref.destination, destChain = _ref.destChain, recipient = _ref.recipient, paraIdTo = _ref.paraIdTo, asset = _ref.asset, transactOptions = _ref.transactOptions;
-          dest = createDestination(api, version, chain, destination, paraIdTo);
-          if (transactOptions !== null && transactOptions !== void 0 && transactOptions.call) {
-            _context.n = 1;
-            break;
-          }
-          throw new UnsupportedOperationError('Cannot use handleTransactUsingSend without transactOptions.call defined');
-        case 1:
-          if (destChain) {
-            _context.n = 2;
-            break;
-          }
-          throw new UnsupportedOperationError('destChain must be provided when using handleTransactUsingSend');
-        case 2:
-          assertAddressIsString(recipient);
-          _context.n = 3;
-          return createTransactInstructions(api, transactOptions, version, destChain, recipient);
-        case 3:
-          transactInstructions = _context.v;
-          message = [{
-            WithdrawAsset: [asset]
-          }].concat(_toConsumableArray(createBuyExecution(asset)), _toConsumableArray(transactInstructions), [{
-            RefundSurplus: undefined
-          }, {
-            DepositAsset: {
-              assets: {
-                Wild: {
-                  AllCounted: 1
-                }
-              },
-              beneficiary: createBeneficiaryLocation({
-                api: api,
-                address: recipient,
-                version: version
-              })
-            }
-          }]);
-          return _context.a(2, {
-            module: getXcmPallet(chain),
-            method: 'send',
-            params: {
-              dest: addXcmVersionHeader(dest, version),
-              message: addXcmVersionHeader(message, version)
-            }
-          });
-      }
-    }, _callee);
-  }));
-  return function handleTransactUsingSend(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
 var BaseAssetsPallet = /*#__PURE__*/_createClass(function BaseAssetsPallet(palletName) {
   _classCallCheck(this, BaseAssetsPallet);
   this.palletName = palletName;
@@ -2427,9 +2375,30 @@ var CurrenciesPallet = /*#__PURE__*/function (_BaseAssetsPallet) {
     }
   }, {
     key: "getBalance",
-    value: function getBalance() {
-      throw new UnsupportedOperationError('No balance support.');
-    }
+    value: function () {
+      var _getBalance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, address, asset) {
+        var account;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
+            case 0:
+              assertHasId(asset);
+              _context.n = 1;
+              return api.queryRuntimeApi({
+                module: 'CurrenciesApi',
+                method: 'account',
+                params: [Number(asset.assetId), address]
+              });
+            case 1:
+              account = _context.v;
+              return _context.a(2, (account === null || account === void 0 ? void 0 : account.free) !== undefined ? BigInt(account.free) : 0n);
+          }
+        }, _callee);
+      }));
+      function getBalance(_x, _x2, _x3) {
+        return _getBalance.apply(this, arguments);
+      }
+      return getBalance;
+    }()
   }]);
 }(BaseAssetsPallet);
 
@@ -2682,6 +2651,14 @@ var resolveParaId = function resolveParaId(paraId, destination, api) {
   return paraId !== undefined ? paraId : api.getParaId(destination);
 };
 
+var getFeeAssetInfo = function getFeeAssetInfo(assetInfo, feeAssetInfo) {
+  return feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo) ? feeAssetInfo : undefined;
+};
+var hasMatchingFeeAssetReserve = function hasMatchingFeeAssetReserve(api, chain, assetInfo, feeAssetInfo) {
+  var resolvedFeeAssetInfo = getFeeAssetInfo(assetInfo, feeAssetInfo);
+  return !resolvedFeeAssetInfo || api.getAssetReserveChain(chain, resolvedFeeAssetInfo.location) === api.getAssetReserveChain(chain, assetInfo.location);
+};
+
 var resolveScenario = function resolveScenario(origin, destination) {
   if (isRelayChain(origin)) return 'RelayToPara';
   var isRelayDestination = !isTLocation(destination) && isRelayChain(destination);
@@ -2739,7 +2716,7 @@ var SubstrateChain = /*#__PURE__*/function (_Chain) {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(transferOptions) {
-        var api, asset, currency, feeAsset, feeCurrency, recipient, destination, paraIdTo, overriddenAsset, version, sender, ahAddress, pallet, method, keepAlive, transactOptions, scenario, paraId, destChain, isLocalTransfer, isRelayAsset, mythAsset, isMythAsset, assetNeedsTypeThen, shouldUseReserveTransfer, supportsTypeThen, isSubBridge, useTypeAndThen, options, promise, isAHOrigin, isAHDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, call, input, _t;
+        var api, asset, currency, feeAsset, feeCurrency, recipient, destination, paraIdTo, overriddenAsset, version, sender, ahAddress, pallet, method, keepAlive, transactOptions, scenario, paraId, destChain, isLocalTransfer, isRelayAsset, mythAsset, isMythAsset, assetNeedsTypeThen, shouldUseReserveTransfer, supportsTypeThen, isSubBridge, useTypeAndThen, options, promise, isAHOrigin, isAHDest, isExternalAsset, isEthDest, isExternalAssetViaAh, isExternalAssetToAh, tx, call, input, _t;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -2780,9 +2757,9 @@ var SubstrateChain = /*#__PURE__*/function (_Chain) {
               }
               throw new TypeAndThenUnavailableError('Relaychain assets require the type-and-then method which is not supported by this chain.');
             case 4:
-              useTypeAndThen = !shouldUseReserveTransfer && assetNeedsTypeThen && supportsTypeThen && destChain && !isExternalChain(destChain) && !feeAsset && (!isTrustedChain(this.chain) || !isTrustedChain(destChain)) || isSubBridge;
+              useTypeAndThen = !shouldUseReserveTransfer && assetNeedsTypeThen && supportsTypeThen && destChain && !isExternalChain(destChain) && (!isTrustedChain(this.chain) || !isTrustedChain(destChain)) || isSubBridge;
               if (!(supportsPolkadotXCM(this) || useTypeAndThen)) {
-                _context.n = 13;
+                _context.n = 14;
                 break;
               }
               options = {
@@ -2833,44 +2810,52 @@ var SubstrateChain = /*#__PURE__*/function (_Chain) {
               isAHDest = !isTLocation(destination) && destination.includes('AssetHub'); // Handle common cases
               isExternalAsset = asset.location.parents === Parents.TWO;
               isEthDest = _typeof(destination) !== 'object' && isExternalChain(destination); // External asset - Any origin to any dest via AH - DestinationReserve - multiple instructions
-              isExternalAssetViaAh = isExternalAsset && !isAHOrigin && !isAHDest && !isEthDest && !feeAsset; // External asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
-              isExternalAssetToAh = isExternalAsset && isAHDest && !isAHOrigin && !isEthDest && !feeAsset;
+              isExternalAssetViaAh = isExternalAsset && !isAHOrigin && !isAHDest && !isEthDest; // External asset - Any origin to AHP - DestinationReserve - one DepositAsset instruction
+              isExternalAssetToAh = isExternalAsset && isAHDest && !isAHOrigin && !isEthDest;
               if (!(isExternalAssetViaAh || isExternalAssetToAh || useTypeAndThen)) {
-                _context.n = 10;
+                _context.n = 11;
                 break;
               }
               if (!(useTypeAndThen && supportsPolkadotXCM(this) && !isSubBridge)) {
-                _context.n = 8;
+                _context.n = 9;
                 break;
               }
               _context.n = 8;
               return this.transferPolkadotXCM(options);
             case 8:
-              _context.n = 9;
-              return createTypeAndThenCall(options);
+              tx = _context.v;
+              if (!this.shouldUseExecuteTransfer(options)) {
+                _context.n = 9;
+                break;
+              }
+              return _context.a(2, tx);
             case 9:
+              _context.n = 10;
+              return createTypeAndThenCall(options);
+            case 10:
               call = _context.v;
               return _context.a(2, api.deserializeExtrinsics(call));
-            case 10:
+            case 11:
               if (!supportsPolkadotXCM(this)) {
-                _context.n = 12;
+                _context.n = 13;
                 break;
               }
-              if (!(this.shouldUseNativeAssetTeleport(transferOptions) && !this.shouldUseExecuteTransfer(options))) {
-                _context.n = 11;
+              if (!(this.shouldUseNativeAssetTeleport(transferOptions) && !getFeeAssetInfo(asset, feeAsset) && !this.shouldUseExecuteTransfer(options))) {
+                _context.n = 12;
                 break;
               }
               return _context.a(2, transferPolkadotXcm(options, 'limited_teleport_assets', 'Unlimited'));
-            case 11:
-              return _context.a(2, this.transferPolkadotXCM(options));
             case 12:
-              _context.n = 14;
-              break;
+              return _context.a(2, this.transferPolkadotXCM(options));
             case 13:
+              _context.n = 15;
+              break;
+            case 14:
               if (!supportsXTokens(this)) {
-                _context.n = 14;
+                _context.n = 15;
                 break;
               }
+              validateFeeAssetSupport(asset, feeAsset, overriddenAsset, 'XTokens');
               input = {
                 api: api,
                 asset: asset,
@@ -2885,9 +2870,9 @@ var SubstrateChain = /*#__PURE__*/function (_Chain) {
                 method: method
               };
               return _context.a(2, this.transferXTokens(input));
-            case 14:
-              throw new NoXCMSupportImplementedError(this.chain);
             case 15:
+              throw new NoXCMSupportImplementedError(this.chain);
+            case 16:
               return _context.a(2);
           }
         }, _callee, this);
@@ -3287,15 +3272,19 @@ var resolveCurrency = function resolveCurrency(api, currency, resolvedFeeAsset,
 };
 
 var resolveFeeAsset = function resolveFeeAsset(api, feeAsset, origin, destination, currency) {
-  if (!Array.isArray(currency) && !origin.startsWith('Hydration') && origin !== 'AssetHubPolkadot') {
-    throw new ScenarioNotSupportedError("Fee asset is not supported on ".concat(origin));
-  }
   var dest = !isTLocation(destination) ? destination : null;
   var asset = api.findAssetInfo(origin, feeAsset, dest);
   if (!asset) {
     return throwUnsupportedCurrency(feeAsset, origin);
   }
   if (!Array.isArray(currency)) {
+    if (dest && isExternalChain(dest)) {
+      var transferredAsset = api.findAssetInfo(origin, currency, dest);
+      var relayAsset = api.findNativeAssetInfoOrThrow(api.getRelayChainOf(origin));
+      if (!isAssetEqual(asset, relayAsset) && !(transferredAsset && isAssetEqual(asset, transferredAsset))) {
+        throw new ScenarioNotSupportedError('Only the relay chain native asset can be used as fee asset for Snowbridge transfers');
+      }
+    }
     return asset;
   }
   var feeElement = currency.find(function (item) {
@@ -3305,13 +3294,16 @@ var resolveFeeAsset = function resolveFeeAsset(api, feeAsset, origin, destinatio
   if (!feeElement) {
     throw new InvalidCurrencyError('Fee asset must be one of the provided assets');
   }
+  if (currency.length > 2) {
+    throw new UnsupportedOperationError('Sending more than one non-fee asset is not yet supported');
+  }
   return _objectSpread2(_objectSpread2({}, asset), {}, {
     amount: abstractDecimals(feeElement.amount, asset.decimals, api)
   });
 };
 
 var resolveHopAsset = function resolveHopAsset(_ref) {
-  var _api$findAssetInfoOnD;
+  var _api$findAssetInfoOnD2;
   var api = _ref.api,
     tx = _ref.tx,
     originChain = _ref.originChain,
@@ -3321,16 +3313,27 @@ var resolveHopAsset = function resolveHopAsset(_ref) {
     asset = _ref.asset,
     currentAsset = _ref.currentAsset,
     hasPassedExchange = _ref.hasPassedExchange,
-    currency = _ref.currency;
-  var isRelayAssetIncluded = !Array.isArray(currency) && api.getTypeThenAssetCount(tx) === 2;
+    currency = _ref.currency,
+    feeAsset = _ref.feeAsset;
+  var feeAssetInfo = feeAsset && getFeeAssetInfo(asset, feeAsset);
+  var isRelayAssetIncluded = !Array.isArray(currency) && !feeAssetInfo && api.getTypeThenAssetCount(tx) === 2;
   var useRelayAssetAsFee = typeof destination === 'string' && isExternalChain(destination) || isRelayAssetIncluded;
   if (useRelayAssetAsFee) {
-    return api.findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
+    var originRelay = api.getRelayChainOf(originChain);
+    return getRelayChainOf(currentChain) === originRelay ? api.findNativeAssetInfoOrThrow(originRelay) : api.findAssetInfoOrThrow(currentChain, {
+      location: api.localizeLocation(currentChain, RELAY_LOCATION, originChain)
+    });
+  }
+  if (feeAssetInfo) {
+    var _api$findAssetInfoOnD;
+    return (_api$findAssetInfoOnD = api.findAssetInfoOnDest(originChain, currentChain, {
+      location: feeAssetInfo.location
+    }, feeAssetInfo)) !== null && _api$findAssetInfoOnD !== void 0 ? _api$findAssetInfoOnD : feeAssetInfo;
   }
   if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
     return api.findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
   }
-  return (_api$findAssetInfoOnD = api.findAssetInfoOnDest(originChain, currentChain, currency, asset)) !== null && _api$findAssetInfoOnD !== void 0 ? _api$findAssetInfoOnD : currentAsset;
+  return (_api$findAssetInfoOnD2 = api.findAssetInfoOnDest(originChain, currentChain, currency, asset)) !== null && _api$findAssetInfoOnD2 !== void 0 ? _api$findAssetInfoOnD2 : currentAsset;
 };
 
 var getEthereumJunction = function getEthereumJunction(api, chain) {
@@ -3443,6 +3446,13 @@ var resolveOverriddenAsset = function resolveOverriddenAsset(options, isBridge,
   return undefined;
 };
 
+/**
+ * Whether the chain can charge the origin transaction fee in a user-selected fee asset.
+ */
+var supportsFeeAssetPayment = function supportsFeeAssetPayment(chain) {
+  return chain === 'AssetHubPolkadot' || chain.startsWith('Hydration');
+};
+
 var validateCurrency = function validateCurrency(currency, feeAsset) {
   if (Array.isArray(currency)) {
     if (currency.length === 0) {
@@ -3456,6 +3466,11 @@ var validateCurrency = function validateCurrency(currency, feeAsset) {
     }
   }
 };
+var validateFeeAssetSupport = function validateFeeAssetSupport(assetInfo, feeAsset, overriddenAsset, method) {
+  if (getFeeAssetInfo(assetInfo, feeAsset) && !overriddenAsset) {
+    throw new ScenarioNotSupportedError("Fee asset cannot be used with ".concat(method));
+  }
+};
 var validateDestination = function validateDestination(origin, destination, api) {
   if (isRelayChain(origin) && !isTLocation(destination) && isRelayChain(destination) && origin !== destination) {
     throw new ScenarioNotSupportedError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
@@ -3687,354 +3702,34 @@ var getMythosOriginFee = /*#__PURE__*/function () {
   };
 }();
 
-var createX1Payload = function createX1Payload(version, junction) {
-  return version === Version.V3 ? {
-    X1: junction
-  } : {
-    X1: [junction]
-  };
+var evmExtension;
+var registerEvmExtension = function registerEvmExtension(extension) {
+  evmExtension = extension;
 };
-
-var createAccountPayload = function createAccountPayload(api, address) {
-  return isAddress(address) ? {
-    AccountKey20: {
-      key: address
-    }
-  } : {
-    AccountId32: {
-      id: api.accountToHex(address)
-    }
-  };
+var getEvmExtensionOrThrow = function getEvmExtensionOrThrow() {
+  assertExtensionInstalled(evmExtension, 'EVM', '@paraspell/evm', 'using an EVM origin');
+  return evmExtension;
 };
-var createBeneficiaryLocXTokens = function createBeneficiaryLocXTokens(_ref) {
-  var api = _ref.api,
-    recipient = _ref.recipient,
-    origin = _ref.origin,
-    destination = _ref.destination,
-    version = _ref.version,
-    paraId = _ref.paraId;
-  if (isTLocation(recipient)) {
-    return recipient;
-  }
-  var scenario = resolveScenario(origin, destination);
-  var accountPayload = createAccountPayload(api, recipient);
-  if (scenario === 'ParaToRelay') {
-    return {
-      parents: Parents.ONE,
-      interior: createX1Payload(version, {
-        AccountId32: {
-          id: api.accountToHex(recipient)
-        }
-      })
-    };
-  } else if (scenario === 'ParaToPara') {
-    return {
-      parents: Parents.ONE,
-      interior: {
-        X2: [{
-          Parachain: paraId
-        }, accountPayload]
-      }
-    };
-  }
-  return {
-    parents: Parents.ZERO,
-    interior: createX1Payload(version, accountPayload)
-  };
+
+var evmSnowbridgeExtension;
+var registerEvmSnowbridgeExtension = function registerEvmSnowbridgeExtension(extension) {
+  evmSnowbridgeExtension = extension;
 };
-var createBeneficiaryLocation = function createBeneficiaryLocation(_ref2) {
-  var api = _ref2.api,
-    address = _ref2.address,
-    version = _ref2.version;
-  if (isTLocation(address)) return address;
-  var accountPayload = createAccountPayload(api, address);
-  return {
-    parents: Parents.ZERO,
-    interior: createX1Payload(version, accountPayload)
-  };
+var getEvmSnowbridgeExtensionOrThrow = function getEvmSnowbridgeExtensionOrThrow() {
+  assertExtensionInstalled(evmSnowbridgeExtension, 'EVM Snowbridge', '@paraspell/evm-snowbridge', 'using Ethereum as an origin');
+  return evmSnowbridgeExtension;
 };
 
-var createDestination = function createDestination(api, version, origin, destination, chainId, junction, parents) {
-  var isLocDestination = isTLocation(destination);
-  var isSubBridge = !isLocDestination && !isExternalChain(destination) && isSubstrateBridge(origin, destination);
-  if (isSubBridge) {
-    return {
-      parents: Parents.TWO,
-      interior: {
-        X2: [{
-          GlobalConsensus: api.getRelayChainOf(destination)
-        }, {
-          Parachain: chainId
-        }]
-      }
-    };
-  }
-  var isExternalDestination = !isLocDestination && isExternalChain(destination);
-  if (isExternalDestination) {
-    return {
-      parents: Parents.TWO,
-      interior: {
-        X1: [getEthereumJunction(api, origin)]
-      }
-    };
-  }
-  var scenario = resolveScenario(origin, destination);
-  var parentsResolved = parents !== null && parents !== void 0 ? parents : scenario === 'RelayToPara' ? Parents.ZERO : Parents.ONE;
-  var interior = scenario === 'ParaToRelay' ? 'Here' : createX1Payload(version, junction !== null && junction !== void 0 ? junction : {
-    Parachain: chainId
-  });
-  return isLocDestination ? destination : {
-    parents: parentsResolved,
-    interior: interior
-  };
+var swapExtension;
+var registerSwapExtension = function registerSwapExtension(extension) {
+  swapExtension = extension;
 };
-var createVersionedDestination = function createVersionedDestination(api, version, origin, destination, chainId, junction, parents) {
-  var plainDestination = createDestination(api, version, origin, destination, chainId, junction, parents);
-  return addXcmVersionHeader(plainDestination, version);
+var getSwapExtensionOrThrow = function getSwapExtensionOrThrow() {
+  assertExtensionInstalled(swapExtension, 'swap', '@paraspell/swap', 'using swap features');
+  return swapExtension;
 };
 
-var getChainLocation = function getChainLocation(chain, destChain, customCtx) {
-  var fromRelay = isRelayChain(chain);
-  var toRelay = isRelayChain(destChain);
-  var parents = fromRelay ? Parents.ZERO : Parents.ONE;
-  var interior = toRelay ? 'Here' : {
-    X1: [{
-      Parachain: getParaIdImpl(destChain, customCtx)
-    }]
-  };
-  return {
-    parents: parents,
-    interior: interior
-  };
-};
-
-/**
- * This function localizes a location by removing the `Parachain` junction
- * if it exists. The `parents` field is set to `0` either if a `Parachain` was removed
- * or if the resulting interior is `'Here'` and the chain is a relay chain.
- *
- * @param chain - The current chain
- * @param location - The location to localize
- * @returns The localized location
- */
-var localizeLocationInner = function localizeLocationInner(chain, location, origin, resolveRelay, resolveParaId) {
-  var _Object$keys$;
-  var targetRelay = isExternalChain(chain) ? undefined : resolveRelay(chain).toLowerCase();
-  var originRelay = origin && !isExternalChain(origin) ? resolveRelay(origin).toLowerCase() : undefined;
-  var locationConsensus = getJunctionValue(location, 'GlobalConsensus');
-  var locationRelay = locationConsensus ? (_Object$keys$ = Object.keys(locationConsensus)[0]) === null || _Object$keys$ === void 0 ? void 0 : _Object$keys$.toLowerCase() : undefined;
-  var ecosystemDiffers = targetRelay && originRelay && originRelay !== targetRelay;
-  var junctions = location.interior === 'Here' ? [] : flattenJunctions(location.interior);
-  var junctionCount = junctions.length;
-  var isLocationOnTargetRelay = targetRelay !== undefined && locationRelay === targetRelay;
-  // Check if target is an external chain and location's GlobalConsensus matches it
-  var isLocationOnTargetExternal = isExternalChain(chain) && locationRelay === chain.toLowerCase();
-  var isConsensusAnchored = junctions.findIndex(function (junction) {
-    return 'GlobalConsensus' in junction;
-  }) === 0;
-  if (locationRelay && targetRelay && locationRelay !== targetRelay && (!origin || !ecosystemDiffers && isConsensusAnchored)) {
-    return location;
-  }
-  if (origin && ecosystemDiffers && location.parents === Parents.TWO && originRelay !== undefined && targetRelay !== undefined && deepEqual(getJunctionValue(location, 'GlobalConsensus'), _defineProperty({}, targetRelay, null)) && junctionCount === 1) {
-    return RELAY_LOCATION;
-  }
-  var newInterior = location.interior;
-  var parachainRemoved = false;
-  if (location.interior !== 'Here') {
-    var paraId = resolveParaId(chain);
-    var filteredJunctions = junctions.filter(function (junction) {
-      if ('GlobalConsensus' in junction && (isLocationOnTargetRelay || isLocationOnTargetExternal)) {
-        return false;
-      }
-      if ('Parachain' in junction && (!ecosystemDiffers || isLocationOnTargetRelay)) {
-        var paraJunctionId = getJunctionValue(location, 'Parachain');
-        if (paraJunctionId === paraId) {
-          parachainRemoved = true;
-          return false;
-        }
-      }
-      return true;
-    });
-    if (filteredJunctions.length === 0) {
-      newInterior = 'Here';
-    } else {
-      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
-    }
-  }
-  var isOriginRelayHere = deepEqual(location, RELAY_LOCATION);
-  var hasGlobalConsensus = hasJunction(location, 'GlobalConsensus');
-  if (origin && isExternalChain(chain) && originRelay !== undefined && isOriginRelayHere && !hasGlobalConsensus) {
-    return {
-      parents: Parents.ONE,
-      interior: {
-        X1: [{
-          GlobalConsensus: _defineProperty({}, originRelay, null)
-        }]
-      }
-    };
-  }
-  if (isExternalChain(chain) && location.parents === Parents.TWO && RELAYCHAINS.some(function (relay) {
-    return deepEqual(getJunctionValue(location, 'GlobalConsensus'), _defineProperty({}, relay.toLowerCase(), null));
-  })) {
-    return _objectSpread2(_objectSpread2({}, location), {}, {
-      parents: Parents.ONE
-    });
-  }
-  if (origin && ecosystemDiffers && isOriginRelayHere && !hasGlobalConsensus && originRelay !== undefined) {
-    return {
-      parents: Parents.TWO,
-      interior: {
-        X2: [{
-          GlobalConsensus: _defineProperty({}, originRelay, null)
-        }, {
-          Parachain: resolveParaId(origin)
-        }]
-      }
-    };
-  }
-  if (origin && ecosystemDiffers && newInterior !== 'Here' && !hasGlobalConsensus && originRelay !== undefined) {
-    var _junctions = flattenJunctions(newInterior);
-    var updatedJunctions = [{
-      GlobalConsensus: _defineProperty({}, originRelay, null)
-    }].concat(_toConsumableArray(_junctions));
-    return {
-      parents: Parents.TWO,
-      interior: _defineProperty({}, "X".concat(updatedJunctions.length), updatedJunctions)
-    };
-  }
-  var shouldSetParentsToZero = parachainRemoved || newInterior === 'Here' && isRelayChain(chain) || isLocationOnTargetExternal;
-  return {
-    parents: shouldSetParentsToZero ? Parents.ZERO : location.parents,
-    interior: newInterior
-  };
-};
-var localizeLocation = function localizeLocation(chain, location, origin) {
-  return localizeLocationInner(chain, location, origin, function (c) {
-    return getRelayChainOf(c);
-  }, function (c) {
-    return getParaId(c);
-  });
-};
-var localizeLocationImpl = function localizeLocationImpl(api, chain, location, origin) {
-  return localizeLocationInner(chain, location, origin, function (c) {
-    return getRelayChainOfImpl(api, c);
-  }, function (c) {
-    return getParaIdImpl(c, api._customCtx);
-  });
-};
-
-var reverseTransformLocation = function reverseTransformLocation(location) {
-  var parachainJunction = {
-    Parachain: 1000
-  };
-  var alreadyHasP1000 = location.interior !== 'Here' && Object.values(location.interior).flat().some(function (j) {
-    return _typeof(j) === 'object' && j !== null && 'Parachain' in j && j.Parachain === 1000;
-  });
-  if (alreadyHasP1000) {
-    return _objectSpread2(_objectSpread2({}, location), {}, {
-      parents: Parents.ONE
-    });
-  }
-  var existingJunctions = location.interior === 'Here' ? [] // no other junctions
-  : Object.values(location.interior).flat();
-  var allJunctions = [parachainJunction].concat(_toConsumableArray(existingJunctions));
-  return _objectSpread2(_objectSpread2({}, location), {}, {
-    parents: Parents.ONE,
-    interior: _defineProperty({}, "X".concat(allJunctions.length), allJunctions)
-  });
-};
-
-var EMPTY_TOPIC = "0x".concat('00'.repeat(32));
-var getBridgeDestFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, destApi, origin, destination, assetInfo, feeAssetInfo, hasSystemFeeAsset, recipient, version) {
-    var systemAsset, transferredAsset, assets, destIsReserve, feeAssetLocation, buyExecution, depositAsset, feesSplitFromAssets, prologue, xcm;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          systemAsset = createAsset(version, MIN_AMOUNT, RELAY_LOCATION);
-          transferredAsset = createAsset(version, assetInfo.amount, normalizeLocation(api.localizeLocation(origin, assetInfo.location), version));
-          assets = hasSystemFeeAsset ? sortAssets([systemAsset, transferredAsset]) : [transferredAsset];
-          destIsReserve = hasSystemFeeAsset ? destination === 'AssetHubPolkadot' : deepEqual(getJunctionValue(assetInfo.location, 'GlobalConsensus'), _defineProperty({}, getRelayChainOf(destination).toLowerCase(), null));
-          feeAssetLocation = hasSystemFeeAsset ? RELAY_LOCATION : assetInfo.location;
-          buyExecution = {
-            BuyExecution: {
-              fees: createAsset(version, MIN_AMOUNT, api.localizeLocation(destination, feeAssetLocation, origin)),
-              weight_limit: 'Unlimited'
-            }
-          };
-          depositAsset = {
-            DepositAsset: {
-              assets: {
-                Wild: hasSystemFeeAsset ? {
-                  AllOf: {
-                    id: api.localizeLocation(destination, assetInfo.location, origin),
-                    fun: 'Fungible'
-                  }
-                } : {
-                  AllCounted: 1
-                }
-              },
-              beneficiary: createBeneficiaryLocation({
-                api: destApi,
-                address: recipient,
-                version: version
-              })
-            }
-          };
-          feesSplitFromAssets = destIsReserve && hasSystemFeeAsset;
-          prologue = feesSplitFromAssets ? [{
-            ReserveAssetDeposited: [systemAsset]
-          }, buyExecution, {
-            WithdrawAsset: [transferredAsset]
-          }, {
-            ClearOrigin: null
-          }] : [destIsReserve ? {
-            WithdrawAsset: assets
-          } : {
-            ReserveAssetDeposited: assets
-          }, {
-            ClearOrigin: null
-          }, buyExecution];
-          xcm = [].concat(prologue, [buyExecution, depositAsset, {
-            SetTopic: EMPTY_TOPIC
-          }]);
-          return _context.a(2, destApi.getXcmPaymentApiFee(destination, addXcmVersionHeader(xcm, version), [], feeAssetInfo, version, true));
-      }
-    }, _callee);
-  }));
-  return function getBridgeDestFee(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var evmExtension;
-var registerEvmExtension = function registerEvmExtension(extension) {
-  evmExtension = extension;
-};
-var getEvmExtensionOrThrow = function getEvmExtensionOrThrow() {
-  assertExtensionInstalled(evmExtension, 'EVM', '@paraspell/evm', 'using an EVM origin');
-  return evmExtension;
-};
-
-var evmSnowbridgeExtension;
-var registerEvmSnowbridgeExtension = function registerEvmSnowbridgeExtension(extension) {
-  evmSnowbridgeExtension = extension;
-};
-var getEvmSnowbridgeExtensionOrThrow = function getEvmSnowbridgeExtensionOrThrow() {
-  assertExtensionInstalled(evmSnowbridgeExtension, 'EVM Snowbridge', '@paraspell/evm-snowbridge', 'using Ethereum as an origin');
-  return evmSnowbridgeExtension;
-};
-
-var swapExtension;
-var registerSwapExtension = function registerSwapExtension(extension) {
-  swapExtension = extension;
-};
-var getSwapExtensionOrThrow = function getSwapExtensionOrThrow() {
-  assertExtensionInstalled(swapExtension, 'swap', '@paraspell/swap', 'using swap features');
-  return swapExtension;
-};
-
-var API_TYPES = ['PAPI', 'PJS', 'DEDOT'];
+var API_TYPES = ['PAPI', 'PJS', 'DEDOT'];
 
 /**
  * The options for the batch builder.
@@ -6000,9 +5695,34 @@ var getParaEthTransferFees = /*#__PURE__*/function () {
   };
 }();
 
+var resolveBridgedHop = function resolveBridgedHop(api, origin, destination, currentChain,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+forwardedXcms) {
+  if (isExternalChain(destination) || !isSubstrateBridge(origin, destination)) return undefined;
+  var originRelay = api.getRelayChainOf(origin);
+  var destBridgeHub = "BridgeHub".concat(api.getRelayChainOf(destination));
+  var messagesPallet = BRIDGE_PALLETS.find(function (pallet) {
+    return pallet === "Bridge".concat(originRelay, "Messages");
+  });
+  if (!messagesPallet || !isSubstrateChain(destBridgeHub) || currentChain !== "BridgeHub".concat(originRelay)) return undefined;
+  var palletIndex = getPalletIndex(destBridgeHub, messagesPallet);
+  if (palletIndex === undefined) {
+    throw new RoutingResolutionError("Unable to find ".concat(messagesPallet, " pallet index on ").concat(destBridgeHub));
+  }
+  return {
+    forwardedXcms: api.createBridgedForwardedXcms(forwardedXcms[1][0], {
+      palletIndex: palletIndex,
+      relay: originRelay,
+      paraId: api.getParaId(origin),
+      destination: getChainLocation(destBridgeHub, destination, api._customCtx)
+    }),
+    destParaId: api.getParaId(destination),
+    currentOrigin: destBridgeHub
+  };
+};
 var traverseXcmHops = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(config) {
-    var api, origin, destination, asset, initialForwardedXcms, initialDestParaId, swapConfig, processHop, shouldContinue, extractNextHopData, currentOrigin, forwardedXcms, nextParaId, currentAsset, hasPassedExchange, hops, destinationResult, nextChain, hopApi, isDestination, hopResult, _extractNextHopData, newXcms, destParaId;
+    var api, origin, destination, asset, initialForwardedXcms, initialDestParaId, swapConfig, processHop, shouldContinue, extractNextHopData, currentOrigin, forwardedXcms, nextParaId, currentAsset, hasPassedExchange, hops, destinationResult, nextChain, hopApi, _resolveBridgedHop, isDestination, hopResult, next;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
@@ -6018,7 +5738,7 @@ var traverseXcmHops = /*#__PURE__*/function () {
             _context.n = 10;
             break;
           }
-          nextChain = getTSubstrateChain(nextParaId, api.getRelayChainOf(origin));
+          nextChain = getTSubstrateChain(nextParaId, api.getRelayChainOf(currentOrigin));
           if (nextChain) {
             _context.n = 2;
             break;
@@ -6066,10 +5786,12 @@ var traverseXcmHops = /*#__PURE__*/function () {
             hasPassedExchange = true;
             currentAsset = api.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
           }
-          _extractNextHopData = extractNextHopData(hopResult), newXcms = _extractNextHopData.forwardedXcms, destParaId = _extractNextHopData.destParaId;
-          forwardedXcms = newXcms;
-          nextParaId = destParaId;
-          currentOrigin = nextChain;
+          next = (_resolveBridgedHop = resolveBridgedHop(api, origin, destination, nextChain, forwardedXcms)) !== null && _resolveBridgedHop !== void 0 ? _resolveBridgedHop : _objectSpread2(_objectSpread2({}, extractNextHopData(hopResult)), {}, {
+            currentOrigin: nextChain
+          });
+          forwardedXcms = next.forwardedXcms;
+          nextParaId = next.destParaId;
+          currentOrigin = next.currentOrigin;
         case 7:
           _context.p = 7;
           _context.n = 8;
@@ -6128,18 +5850,17 @@ var addEthereumBridgeFees = /*#__PURE__*/function () {
 }();
 
 var dryRunInternal = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var _traversalResult$dest;
-    var api, origin, destination, currency, tx, sender, feeAsset, swapConfig, version, bypassOptions, keepAlive, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, _resolveCurrency, assets, asset, amount, resolvedVersion, originDryRun, isMythosToEthereum, originDryModified, initialForwardedXcms, initialDestParaId, processHop, traversalResult, relayChain, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, resolveBridgeDestination, result, dryRunError, _t4, _t5, _t6, _t7, _t8, _t9, _t0, _t1, _t10, _t11, _t12, _t13, _t14;
-    return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.n) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+    var api, origin, destination, currency, tx, sender, feeAsset, swapConfig, version, bypassOptions, keepAlive, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, _resolveCurrency, assets, asset, amount, resolvedVersion, originDryRun, isMythosToEthereum, originDryModified, initialForwardedXcms, initialDestParaId, processHop, traversalResult, relayChain, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, result, dryRunError, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
+    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, sender = options.sender, feeAsset = options.feeAsset, swapConfig = options.swapConfig, version = options.version, bypassOptions = options.bypassOptions, keepAlive = options.keepAlive, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(api, feeAsset, origin, destination, currency) : undefined;
           _resolveCurrency = resolveCurrency(api, currency, resolvedFeeAsset, origin, destination), assets = _resolveCurrency.assets, asset = _resolveCurrency.asset;
           amount = asset.amount;
           resolvedVersion = pickCompatibleXcmVersion(api, origin, destination, version);
-          _context3.n = 1;
+          _context2.n = 1;
           return api.getDryRunCall({
             tx: tx,
             chain: origin,
@@ -6156,12 +5877,12 @@ var dryRunInternal = /*#__PURE__*/function () {
             useRootOrigin: useRootOrigin || !!bypassOptions
           });
         case 1:
-          originDryRun = _context3.v;
+          originDryRun = _context2.v;
           if (originDryRun.success) {
-            _context3.n = 2;
+            _context2.n = 2;
             break;
           }
-          return _context3.a(2, {
+          return _context2.a(2, {
             success: false,
             dryRunError: _objectSpread2({
               chainKind: 'origin',
@@ -6173,27 +5894,27 @@ var dryRunInternal = /*#__PURE__*/function () {
         case 2:
           isMythosToEthereum = origin === 'Mythos' && destination === 'Ethereum';
           if (!isMythosToEthereum) {
-            _context3.n = 4;
+            _context2.n = 4;
             break;
           }
-          _t5 = _objectSpread2;
-          _t6 = _objectSpread2({}, originDryRun);
-          _t7 = {};
-          _t8 = originDryRun.fee;
-          _context3.n = 3;
+          _t2 = _objectSpread2;
+          _t3 = _objectSpread2({}, originDryRun);
+          _t4 = {};
+          _t5 = originDryRun.fee;
+          _context2.n = 3;
           return getMythosOriginFee(api);
         case 3:
-          _t9 = _context3.v;
-          _t0 = _t8 + _t9;
-          _t4 = _t5(_t6, _t7, {
-            fee: _t0
+          _t6 = _context2.v;
+          _t7 = _t5 + _t6;
+          _t = _t2(_t3, _t4, {
+            fee: _t7
           });
-          _context3.n = 5;
+          _context2.n = 5;
           break;
         case 4:
-          _t4 = originDryRun;
+          _t = originDryRun;
         case 5:
-          originDryModified = _t4;
+          originDryModified = _t;
           initialForwardedXcms = originDryModified.forwardedXcms, initialDestParaId = originDryModified.destParaId;
           processHop = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
@@ -6211,6 +5932,7 @@ var dryRunInternal = /*#__PURE__*/function () {
                       asset: asset,
                       currentAsset: currentAsset,
                       currency: currency,
+                      feeAsset: resolvedFeeAsset,
                       swapConfig: swapConfig,
                       hasPassedExchange: hasPassedExchange
                     });
@@ -6251,7 +5973,7 @@ var dryRunInternal = /*#__PURE__*/function () {
               return _ref2.apply(this, arguments);
             };
           }();
-          _context3.n = 6;
+          _context2.n = 6;
           return traverseXcmHops({
             api: api,
             origin: origin,
@@ -6272,7 +5994,7 @@ var dryRunInternal = /*#__PURE__*/function () {
             }
           });
         case 6:
-          traversalResult = _context3.v;
+          traversalResult = _context2.v;
           // Process Ethereum bridge fees
           relayChain = api.getRelayChainOf(origin);
           bridgeHubChain = relayChain === 'Paseo' ? undefined : "BridgeHub".concat(relayChain);
@@ -6281,29 +6003,29 @@ var dryRunInternal = /*#__PURE__*/function () {
             return hop.chain === bridgeHubChain;
           }); // For Mythos → Ethereum, we skip additional Ethereum bridge fees (aligns with getXcmFeeInternal)
           if (!isMythosToEthereum) {
-            _context3.n = 7;
+            _context2.n = 7;
             break;
           }
-          _t1 = bridgeHubHop === null || bridgeHubHop === void 0 ? void 0 : bridgeHubHop.result;
-          _context3.n = 11;
+          _t8 = bridgeHubHop === null || bridgeHubHop === void 0 ? void 0 : bridgeHubHop.result;
+          _context2.n = 11;
           break;
         case 7:
           if (!(bridgeHubHop !== null && bridgeHubHop !== void 0 && bridgeHubHop.result.success)) {
-            _context3.n = 9;
+            _context2.n = 9;
             break;
           }
-          _context3.n = 8;
+          _context2.n = 8;
           return addEthereumBridgeFees(api, bridgeHubHop === null || bridgeHubHop === void 0 ? void 0 : bridgeHubHop.result, destination, assetHubChain);
         case 8:
-          _t10 = _context3.v;
-          _context3.n = 10;
+          _t9 = _context2.v;
+          _context2.n = 10;
           break;
         case 9:
-          _t10 = bridgeHubHop === null || bridgeHubHop === void 0 ? void 0 : bridgeHubHop.result;
+          _t9 = bridgeHubHop === null || bridgeHubHop === void 0 ? void 0 : bridgeHubHop.result;
         case 10:
-          _t1 = _t10;
+          _t8 = _t9;
         case 11:
-          processedBridgeHub = _t1;
+          processedBridgeHub = _t8;
           // Update bridge hub in hops if needed
           if (processedBridgeHub && processedBridgeHub.success && bridgeHubHop && bridgeHubHop.result.success && processedBridgeHub.fee !== bridgeHubHop.result.fee) {
             bridgeHubHopIndex = traversalResult.hops.findIndex(function (hop) {
@@ -6315,67 +6037,10 @@ var dryRunInternal = /*#__PURE__*/function () {
               });
             }
           }
-          resolveBridgeDestination = /*#__PURE__*/function () {
-            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-              var _api$findAssetInfoOnD;
-              var destApi, systemAsset, hasSystemFeeAsset, destAsset, _t, _t2, _t3;
-              return _regenerator().w(function (_context2) {
-                while (1) switch (_context2.n) {
-                  case 0:
-                    if (!(isExternalChain(destination) || !isSubstrateBridge(origin, destination))) {
-                      _context2.n = 1;
-                      break;
-                    }
-                    return _context2.a(2, undefined);
-                  case 1:
-                    destApi = api.clone();
-                    _context2.n = 2;
-                    return destApi.init(destination);
-                  case 2:
-                    systemAsset = api.findNativeAssetInfoOrThrow(api.getRelayChainOf(origin));
-                    hasSystemFeeAsset = deepEqual(getJunctionValue(asset.location, 'GlobalConsensus'), getEthereumJunction(api, origin, false).GlobalConsensus);
-                    destAsset = hasSystemFeeAsset ? api.findAssetInfoOrThrow(destination, {
-                      symbol: systemAsset.symbol
-                    }) : (_api$findAssetInfoOnD = api.findAssetInfoOnDest(origin, destination, currency, asset)) !== null && _api$findAssetInfoOnD !== void 0 ? _api$findAssetInfoOnD : asset;
-                    _context2.n = 3;
-                    return getBridgeDestFee(api, destApi, origin, destination, asset, destAsset, hasSystemFeeAsset, sender, resolvedVersion);
-                  case 3:
-                    _t = _context2.v;
-                    _t2 = destAsset;
-                    _t3 = [];
-                    return _context2.a(2, {
-                      success: true,
-                      fee: _t,
-                      asset: _t2,
-                      forwardedXcms: _t3
-                    });
-                }
-              }, _callee2);
-            }));
-            return function resolveBridgeDestination() {
-              return _ref3.apply(this, arguments);
-            };
-          }();
-          _t11 = originDryModified;
-          if (!((_traversalResult$dest = traversalResult.destination) !== null && _traversalResult$dest !== void 0)) {
-            _context3.n = 12;
-            break;
-          }
-          _t12 = _traversalResult$dest;
-          _context3.n = 14;
-          break;
-        case 12:
-          _context3.n = 13;
-          return resolveBridgeDestination();
-        case 13:
-          _t12 = _context3.v;
-        case 14:
-          _t13 = _t12;
-          _t14 = traversalResult.hops;
           result = {
-            origin: _t11,
-            destination: _t13,
-            hops: _t14
+            origin: originDryModified,
+            destination: traversalResult.destination,
+            hops: traversalResult.hops
           };
           dryRunError = getDryRunError({
             origin: {
@@ -6388,12 +6053,12 @@ var dryRunInternal = /*#__PURE__*/function () {
             } : undefined,
             hops: result.hops
           });
-          return _context3.a(2, _objectSpread2({
+          return _context2.a(2, _objectSpread2({
             success: !dryRunError,
             dryRunError: dryRunError
           }, result));
       }
-    }, _callee3);
+    }, _callee2);
   }));
   return function dryRunInternal(_x) {
     return _ref.apply(this, arguments);
@@ -6879,12 +6544,13 @@ var getBypassResultWithRetries = /*#__PURE__*/function () {
 
 var getOriginXcmFeeInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, sender, disableFallback, feeAsset, currency, version, _ref$useRootOrigin, useRootOrigin, resolvedFeeAsset, _resolveCurrency, assets, asset, _yield$api$getPayment, rawFee, paddedFee, sufficient, resolvedVersion, dryRunResult, _yield$api$getPayment2, _rawFee, _paddedFee, fee, forwardedXcms, destParaId, weight;
+    var api, tx, origin, destination, sender, disableFallback, feeAsset, currency, version, _ref$useRootOrigin, useRootOrigin, resolvedFeeAsset, originFeeAsset, _resolveCurrency, assets, asset, _yield$api$getPayment, rawFee, paddedFee, sufficient, resolvedVersion, dryRunResult, _yield$api$getPayment2, _rawFee, _paddedFee, fee, forwardedXcms, destParaId, weight;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, sender = _ref.sender, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency, version = _ref.version, _ref$useRootOrigin = _ref.useRootOrigin, useRootOrigin = _ref$useRootOrigin === void 0 ? false : _ref$useRootOrigin;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(api, feeAsset, origin, destination, currency) : undefined;
+          originFeeAsset = supportsFeeAssetPayment(origin) ? resolvedFeeAsset : undefined;
           _resolveCurrency = resolveCurrency(api, currency, resolvedFeeAsset, origin, destination), assets = _resolveCurrency.assets, asset = _resolveCurrency.asset;
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
@@ -6900,12 +6566,12 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
           rawFee = _yield$api$getPayment.partialFee;
           paddedFee = padFee(rawFee, origin, destination, 'origin');
           _context.n = 3;
-          return isSufficientOrigin(api, origin, destination, sender, paddedFee, asset, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, sender, paddedFee, asset, originFeeAsset);
         case 3:
           sufficient = _context.v;
           return _context.a(2, {
             fee: paddedFee,
-            asset: resolvedFeeAsset !== null && resolvedFeeAsset !== void 0 ? resolvedFeeAsset : api.findNativeAssetInfoOrThrow(origin),
+            asset: originFeeAsset !== null && originFeeAsset !== void 0 ? originFeeAsset : api.findNativeAssetInfoOrThrow(origin),
             feeType: 'paymentInfo',
             sufficient: sufficient
           });
@@ -7023,7 +6689,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
 
 var getXcmFeeOnce = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, tx, origin, destination, sender, recipient, currency, feeAsset, version, disableFallback, swapConfig, useRootOrigin, skipReverseFeeCalculation, resolvedFeeAsset, _resolveCurrency, asset, resolvedVersion, _yield$getOriginXcmFe, originFeeRaw, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _dryRunError, processHop, traversalResult, destFee, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, _api$findAssetInfoOnD, _destApi2, systemAsset, hasSystemFeeAsset, relayChain, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, convertToFeeDetail, result, dryRunError, _t, _t2, _t3, _t4;
+    var api, tx, origin, destination, sender, recipient, currency, feeAsset, version, disableFallback, swapConfig, useRootOrigin, skipReverseFeeCalculation, resolvedFeeAsset, _resolveCurrency, asset, resolvedVersion, _yield$getOriginXcmFe, originFeeRaw, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _dryRunError, processHop, traversalResult, destFee, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, relayChain, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, convertToFeeDetail, result, dryRunError, _t, _t2, _t3, _t4;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
@@ -7167,6 +6833,7 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
                       asset: asset,
                       currentAsset: currentAsset,
                       currency: currency,
+                      feeAsset: resolvedFeeAsset,
                       swapConfig: swapConfig,
                       hasPassedExchange: hasPassedExchange
                     });
@@ -7235,7 +6902,7 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
           destDryRunError = destResult.dryRunError;
           destSufficient = destResult.sufficient;
           destAsset = destResult.asset;
-          _context2.n = 19;
+          _context2.n = 16;
           break;
         case 12:
           if (!(traversalResult.hops.length > 0 && traversalResult.hops[traversalResult.hops.length - 1].result.dryRunError)) {
@@ -7274,36 +6941,14 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
           destFeeType = destFallback.feeType;
           destSufficient = destFallback.sufficient;
           destAsset = api.findNativeAssetInfoOrThrow(destination);
-          _context2.n = 19;
-          break;
-        case 15:
-          if (!(!isExternalChain(destination) && isSubstrateBridge(origin, destination))) {
-            _context2.n = 18;
-            break;
-          }
-          _destApi2 = api.clone();
           _context2.n = 16;
-          return _destApi2.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 16:
-          systemAsset = api.findNativeAssetInfoOrThrow(api.getRelayChainOf(origin));
-          hasSystemFeeAsset = deepEqual(getJunctionValue(asset.location, 'GlobalConsensus'), getEthereumJunction(api, origin, false).GlobalConsensus);
-          destAsset = hasSystemFeeAsset ? api.findAssetInfoOrThrow(destination, {
-            symbol: systemAsset.symbol
-          }) : (_api$findAssetInfoOnD = api.findAssetInfoOnDest(origin, destination, currency, asset)) !== null && _api$findAssetInfoOnD !== void 0 ? _api$findAssetInfoOnD : asset;
-          _context2.n = 17;
-          return getBridgeDestFee(api, _destApi2, origin, destination, asset, destAsset, hasSystemFeeAsset, recipient, resolvedVersion);
-        case 17:
-          destFee = _context2.v;
-          destFeeType = 'dryRun';
-          destSufficient = true;
-          _context2.n = 19;
           break;
-        case 18:
+        case 15:
           destFee = 0n;
           destFeeType = 'noFeeRequired';
           destSufficient = true;
           destAsset = api.findNativeAssetInfoOrThrow(destination);
-        case 19:
+        case 16:
           // Process Ethereum bridge fees
           relayChain = api.getRelayChainOf(origin);
           bridgeHubChain = relayChain === 'Paseo' ? undefined : "BridgeHub".concat(relayChain);
@@ -7312,18 +6957,18 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
             return hop.chain === bridgeHubChain;
           });
           if (!isMythosToEthereum) {
-            _context2.n = 20;
+            _context2.n = 17;
             break;
           }
           _t4 = bridgeHubHop === null || bridgeHubHop === void 0 ? void 0 : bridgeHubHop.result;
-          _context2.n = 22;
+          _context2.n = 19;
           break;
-        case 20:
-          _context2.n = 21;
+        case 17:
+          _context2.n = 18;
           return addEthereumBridgeFees(api, bridgeHubHop === null || bridgeHubHop === void 0 ? void 0 : bridgeHubHop.result, destination, assetHubChain);
-        case 21:
+        case 18:
           _t4 = _context2.v;
-        case 22:
+        case 19:
           processedBridgeHub = _t4;
           // Update bridge hub fee in hops if needed
           if (processedBridgeHub && bridgeHubHop && processedBridgeHub.fee !== bridgeHubHop.result.fee) {
@@ -7941,11 +7586,13 @@ var getTransferInfo = /*#__PURE__*/function () {
 var FEE_PADDING = 30;
 var sumHopFees = function sumHopFees(result, _ref) {
   var assetInfo = _ref.assetInfo,
+    feeAssetInfo = _ref.feeAssetInfo,
     isRelayAsset = _ref.isRelayAsset,
     systemAsset = _ref.systemAsset;
+  var feeAsset = isRelayAsset ? assetInfo : feeAssetInfo !== null && feeAssetInfo !== void 0 ? feeAssetInfo : systemAsset;
   return result.hops.reduce(function (acc, hop) {
     // only add if asset is equal
-    return isAssetEqual(hop.result.asset, isRelayAsset ? assetInfo : systemAsset) ? acc + hop.result.fee : acc;
+    return isAssetEqual(hop.result.asset, feeAsset) ? acc + hop.result.fee : acc;
   }, 0n);
 };
 var computeAllFees = /*#__PURE__*/function () {
@@ -8357,57 +8004,259 @@ var getTransferableAmount = /*#__PURE__*/function () {
   };
 }();
 
-var resolveTransferType = function resolveTransferType(_ref) {
-  var origin = _ref.origin,
-    reserve = _ref.reserve,
-    dest = _ref.dest,
-    isSubBridge = _ref.isSubBridge,
-    assetInfo = _ref.assetInfo;
-  // Direct A → C: when origin is reserve OR dest is reserve, check origin <-> dest trust
-  // Hop A → B → C: when reserve differs from both, check origin <-> reserve trust
-  var isDirect = origin.chain === reserve.chain || dest.chain === reserve.chain;
-  var chainToCheck = isDirect ? dest.chain : reserve.chain;
-  var canTeleport = isTrustedChain(origin.chain) && isTrustedChain(chainToCheck) || isNativeAssetTeleport(origin.api, origin.chain, chainToCheck, assetInfo);
-  if (canTeleport && !isSubBridge) return 'Teleport';
-  if (origin.chain === reserve.chain) return 'LocalReserve';
-  return 'DestinationReserve';
+var createX1Payload = function createX1Payload(version, junction) {
+  return version === Version.V3 ? {
+    X1: junction
+  } : {
+    X1: [junction]
+  };
 };
-var buildTypeAndThenCall = function buildTypeAndThenCall(context, isDotAsset, customXcm, assets) {
-  var origin = context.origin,
-    reserve = context.reserve,
-    dest = context.dest,
-    assetInfo = context.assetInfo,
-    bridgeHopChain = context.bridgeHopChain,
-    isSubBridge = context.isSubBridge,
-    _context$options = context.options,
-    version = _context$options.version,
-    pallet = _context$options.pallet,
-    method = _context$options.method,
-    overriddenAsset = _context$options.overriddenAsset;
-  var feeAssetLocation = !isDotAsset ? RELAY_LOCATION : assetInfo.location;
-  var finalDest = bridgeHopChain !== null && bridgeHopChain !== void 0 ? bridgeHopChain : origin.chain === reserve.chain ? dest.chain : reserve.chain;
-  var destLocation = createDestination(origin.api, version, origin.chain, finalDest, origin.api.getParaId(finalDest));
-  var transferType = bridgeHopChain ? 'DestinationReserve' : resolveTransferType(context);
-  var feesTransferType = isSubBridge && !isDotAsset ? 'LocalReserve' : transferType;
-  var feeAsset = Array.isArray(overriddenAsset) ? overriddenAsset.find(function (a) {
-    return a.isFeeAsset;
-  }) : null;
-  var feeMultiAsset = feeAsset !== null && feeAsset !== void 0 ? feeAsset : createAsset(version, assetInfo.amount, normalizeLocation(origin.api.localizeLocation(origin.chain, feeAssetLocation), version));
-  var module = pallet !== null && pallet !== void 0 ? pallet : origin.api.getXcmPallet(origin.chain);
-  var methodName = method !== null && method !== void 0 ? method : 'transfer_assets_using_type_and_then';
+
+var createAccountPayload = function createAccountPayload(api, address) {
+  return isAddress(address) ? {
+    AccountKey20: {
+      key: address
+    }
+  } : {
+    AccountId32: {
+      id: api.accountToHex(address)
+    }
+  };
+};
+var createBeneficiaryLocXTokens = function createBeneficiaryLocXTokens(_ref) {
+  var api = _ref.api,
+    recipient = _ref.recipient,
+    origin = _ref.origin,
+    destination = _ref.destination,
+    version = _ref.version,
+    paraId = _ref.paraId;
+  if (isTLocation(recipient)) {
+    return recipient;
+  }
+  var scenario = resolveScenario(origin, destination);
+  var accountPayload = createAccountPayload(api, recipient);
+  if (scenario === 'ParaToRelay') {
+    return {
+      parents: Parents.ONE,
+      interior: createX1Payload(version, {
+        AccountId32: {
+          id: api.accountToHex(recipient)
+        }
+      })
+    };
+  } else if (scenario === 'ParaToPara') {
+    return {
+      parents: Parents.ONE,
+      interior: {
+        X2: [{
+          Parachain: paraId
+        }, accountPayload]
+      }
+    };
+  }
   return {
-    module: module,
-    method: methodName,
-    params: {
-      dest: addXcmVersionHeader(destLocation, version),
-      assets: addXcmVersionHeader(assets, version),
-      assets_transfer_type: transferType,
-      remote_fees_id: addXcmVersionHeader(feeMultiAsset.id, version),
-      fees_transfer_type: feesTransferType,
-      custom_xcm_on_dest: addXcmVersionHeader(customXcm, version),
-      weight_limit: 'Unlimited'
+    parents: Parents.ZERO,
+    interior: createX1Payload(version, accountPayload)
+  };
+};
+var createBeneficiaryLocation = function createBeneficiaryLocation(_ref2) {
+  var api = _ref2.api,
+    address = _ref2.address,
+    version = _ref2.version;
+  if (isTLocation(address)) return address;
+  var accountPayload = createAccountPayload(api, address);
+  return {
+    parents: Parents.ZERO,
+    interior: createX1Payload(version, accountPayload)
+  };
+};
+
+var createDestination = function createDestination(api, version, origin, destination, chainId, junction, parents) {
+  var isLocDestination = isTLocation(destination);
+  var isSubBridge = !isLocDestination && !isExternalChain(destination) && isSubstrateBridge(origin, destination);
+  if (isSubBridge) {
+    return {
+      parents: Parents.TWO,
+      interior: {
+        X2: [{
+          GlobalConsensus: api.getRelayChainOf(destination)
+        }, {
+          Parachain: chainId
+        }]
+      }
+    };
+  }
+  var isExternalDestination = !isLocDestination && isExternalChain(destination);
+  if (isExternalDestination) {
+    return {
+      parents: Parents.TWO,
+      interior: {
+        X1: [getEthereumJunction(api, origin)]
+      }
+    };
+  }
+  var scenario = resolveScenario(origin, destination);
+  var parentsResolved = parents !== null && parents !== void 0 ? parents : scenario === 'RelayToPara' ? Parents.ZERO : Parents.ONE;
+  var interior = scenario === 'ParaToRelay' ? 'Here' : createX1Payload(version, junction !== null && junction !== void 0 ? junction : {
+    Parachain: chainId
+  });
+  return isLocDestination ? destination : {
+    parents: parentsResolved,
+    interior: interior
+  };
+};
+var createVersionedDestination = function createVersionedDestination(api, version, origin, destination, chainId, junction, parents) {
+  var plainDestination = createDestination(api, version, origin, destination, chainId, junction, parents);
+  return addXcmVersionHeader(plainDestination, version);
+};
+
+var getChainLocation = function getChainLocation(chain, destChain, customCtx) {
+  var fromRelay = isRelayChain(chain);
+  var toRelay = isRelayChain(destChain);
+  var parents = fromRelay ? Parents.ZERO : Parents.ONE;
+  var interior = toRelay ? 'Here' : {
+    X1: [{
+      Parachain: getParaIdImpl(destChain, customCtx)
+    }]
+  };
+  return {
+    parents: parents,
+    interior: interior
+  };
+};
+
+/**
+ * This function localizes a location by removing the `Parachain` junction
+ * if it exists. The `parents` field is set to `0` either if a `Parachain` was removed
+ * or if the resulting interior is `'Here'` and the chain is a relay chain.
+ *
+ * @param chain - The current chain
+ * @param location - The location to localize
+ * @returns The localized location
+ */
+var localizeLocationInner = function localizeLocationInner(chain, location, origin, resolveRelay, resolveParaId) {
+  var _Object$keys$;
+  var targetRelay = isExternalChain(chain) ? undefined : resolveRelay(chain).toLowerCase();
+  var originRelay = origin && !isExternalChain(origin) ? resolveRelay(origin).toLowerCase() : undefined;
+  var locationConsensus = getJunctionValue(location, 'GlobalConsensus');
+  var locationRelay = locationConsensus ? (_Object$keys$ = Object.keys(locationConsensus)[0]) === null || _Object$keys$ === void 0 ? void 0 : _Object$keys$.toLowerCase() : undefined;
+  var ecosystemDiffers = targetRelay && originRelay && originRelay !== targetRelay;
+  var junctions = location.interior === 'Here' ? [] : flattenJunctions(location.interior);
+  var junctionCount = junctions.length;
+  var isLocationOnTargetRelay = targetRelay !== undefined && locationRelay === targetRelay;
+  // Check if target is an external chain and location's GlobalConsensus matches it
+  var isLocationOnTargetExternal = isExternalChain(chain) && locationRelay === chain.toLowerCase();
+  var isConsensusAnchored = junctions.findIndex(function (junction) {
+    return 'GlobalConsensus' in junction;
+  }) === 0;
+  if (locationRelay && targetRelay && locationRelay !== targetRelay && (!origin || !ecosystemDiffers && isConsensusAnchored)) {
+    return location;
+  }
+  if (origin && ecosystemDiffers && location.parents === Parents.TWO && originRelay !== undefined && targetRelay !== undefined && deepEqual(getJunctionValue(location, 'GlobalConsensus'), _defineProperty({}, targetRelay, null)) && junctionCount === 1) {
+    return RELAY_LOCATION;
+  }
+  var newInterior = location.interior;
+  var parachainRemoved = false;
+  if (location.interior !== 'Here') {
+    var paraId = resolveParaId(chain);
+    var filteredJunctions = junctions.filter(function (junction) {
+      if ('GlobalConsensus' in junction && (isLocationOnTargetRelay || isLocationOnTargetExternal)) {
+        return false;
+      }
+      if ('Parachain' in junction && (!ecosystemDiffers || isLocationOnTargetRelay)) {
+        var paraJunctionId = getJunctionValue(location, 'Parachain');
+        if (paraJunctionId === paraId) {
+          parachainRemoved = true;
+          return false;
+        }
+      }
+      return true;
+    });
+    if (filteredJunctions.length === 0) {
+      newInterior = 'Here';
+    } else {
+      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
     }
+  }
+  var isOriginRelayHere = deepEqual(location, RELAY_LOCATION);
+  var hasGlobalConsensus = hasJunction(location, 'GlobalConsensus');
+  if (origin && isExternalChain(chain) && originRelay !== undefined && isOriginRelayHere && !hasGlobalConsensus) {
+    return {
+      parents: Parents.ONE,
+      interior: {
+        X1: [{
+          GlobalConsensus: _defineProperty({}, originRelay, null)
+        }]
+      }
+    };
+  }
+  if (isExternalChain(chain) && location.parents === Parents.TWO && RELAYCHAINS.some(function (relay) {
+    return deepEqual(getJunctionValue(location, 'GlobalConsensus'), _defineProperty({}, relay.toLowerCase(), null));
+  })) {
+    return _objectSpread2(_objectSpread2({}, location), {}, {
+      parents: Parents.ONE
+    });
+  }
+  if (origin && ecosystemDiffers && isOriginRelayHere && !hasGlobalConsensus && originRelay !== undefined) {
+    return {
+      parents: Parents.TWO,
+      interior: {
+        X1: [{
+          GlobalConsensus: _defineProperty({}, originRelay, null)
+        }]
+      }
+    };
+  }
+  if (origin && ecosystemDiffers && newInterior !== 'Here' && !hasGlobalConsensus && originRelay !== undefined) {
+    var _junctions = flattenJunctions(newInterior);
+    var updatedJunctions = [{
+      GlobalConsensus: _defineProperty({}, originRelay, null)
+    }].concat(_toConsumableArray(_junctions));
+    return {
+      parents: Parents.TWO,
+      interior: _defineProperty({}, "X".concat(updatedJunctions.length), updatedJunctions)
+    };
+  }
+  var shouldSetParentsToZero = parachainRemoved || newInterior === 'Here' && isRelayChain(chain) || isLocationOnTargetExternal;
+  return {
+    parents: shouldSetParentsToZero ? Parents.ZERO : location.parents,
+    interior: newInterior
+  };
+};
+var localizeLocation = function localizeLocation(chain, location, origin) {
+  return localizeLocationInner(chain, location, origin, function (c) {
+    return getRelayChainOf(c);
+  }, function (c) {
+    return getParaId(c);
+  });
+};
+var localizeLocationImpl = function localizeLocationImpl(api, chain, location, origin) {
+  return localizeLocationInner(chain, location, origin, function (c) {
+    return getRelayChainOfImpl(api, c);
+  }, function (c) {
+    return getParaIdImpl(c, api._customCtx);
+  });
+};
+
+var reverseTransformLocation = function reverseTransformLocation(location) {
+  var parachainJunction = {
+    Parachain: 1000
   };
+  var alreadyHasP1000 = location.interior !== 'Here' && Object.values(location.interior).flat().some(function (j) {
+    return _typeof(j) === 'object' && j !== null && 'Parachain' in j && j.Parachain === 1000;
+  });
+  if (alreadyHasP1000) {
+    return _objectSpread2(_objectSpread2({}, location), {}, {
+      parents: Parents.ONE
+    });
+  }
+  var existingJunctions = location.interior === 'Here' ? [] // no other junctions
+  : Object.values(location.interior).flat();
+  var allJunctions = [parachainJunction].concat(_toConsumableArray(existingJunctions));
+  return _objectSpread2(_objectSpread2({}, location), {}, {
+    parents: Parents.ONE,
+    interior: _defineProperty({}, "X".concat(allJunctions.length), allJunctions)
+  });
 };
 
 var PINK_LOCATION = {
@@ -8430,6 +8279,13 @@ var requiresSystemAssetByLocation = function requiresSystemAssetByLocation(api,
     return deepEqual(assetLocation, location);
   });
 };
+var getFeeAssetLocation = function getFeeAssetLocation(_ref) {
+  var _feeAssetInfo$locatio;
+  var feeAssetInfo = _ref.feeAssetInfo,
+    isRelayAsset = _ref.isRelayAsset,
+    assetInfo = _ref.assetInfo;
+  return (_feeAssetInfo$locatio = feeAssetInfo === null || feeAssetInfo === void 0 ? void 0 : feeAssetInfo.location) !== null && _feeAssetInfo$locatio !== void 0 ? _feeAssetInfo$locatio : isRelayAsset ? assetInfo.location : RELAY_LOCATION;
+};
 var getBridgeReserve = function getBridgeReserve(api, chain, destination, location) {
   var assetConsensus = getJunctionValue(location, 'GlobalConsensus');
   var ethereumConsensus = getEthereumJunction(api, chain, false).GlobalConsensus;
@@ -8449,17 +8305,23 @@ var resolveReserveChain = function resolveReserveChain(api, chain, destination,
   return api.getAssetReserveChain(chain, assetLocation, isExternalChain(destination));
 };
 var createTypeAndThenCallContext = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, overrides) {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, overrides) {
     var _overrides$noFeeAsset;
-    var api, chain, destination, assetInfo, isSubBridge, isSb, reserveChain, NO_FEE_ASSET_LOCS, systemAsset, assetGlobalConsensus, originRelayChain, isExternalDestination, isSnowbridgeAsset, requiresSystemAsset, isAssetHubToExternal, isForeignRelayToExternal, isRelayAsset, assetHubChain, bridgeHopChain, destApi, reserveApi;
+    var api, chain, destination, assetInfo, overriddenAsset, isSubBridge, isSb, transferredAsset, reserveChain, feeAssetInfo, feeAssetLocation, feeReserveChain, NO_FEE_ASSET_LOCS, systemAsset, assetGlobalConsensus, originRelayChain, isExternalDestination, isSnowbridgeAsset, requiresSystemAsset, isAssetHubToExternal, isForeignRelayToExternal, isRelayAsset, assetHubChain, bridgeHopChain, routedChain, destApi, reserveApi;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = options.api, chain = options.chain, destination = options.destination, assetInfo = options.assetInfo;
+          api = options.api, chain = options.chain, destination = options.destination, assetInfo = options.assetInfo, overriddenAsset = options.overriddenAsset;
           assertToIsString(destination);
           isSubBridge = isSubstrateBridge(chain, destination);
-          isSb = isSnowbridge(chain, destination);
-          reserveChain = resolveReserveChain(api, chain, destination, assetInfo.location, isSubBridge, overrides.reserveChain);
+          isSb = isSnowbridge(chain, destination); // For multi-asset transfers `assetInfo` is the fee asset, so the reserve is taken from the transferred asset
+          transferredAsset = overriddenAsset === null || overriddenAsset === void 0 ? void 0 : overriddenAsset.find(function (asset) {
+            return !asset.isFeeAsset;
+          });
+          reserveChain = resolveReserveChain(api, chain, destination, transferredAsset ? extractAssetLocation(transferredAsset) : assetInfo.location, isSubBridge, overrides.reserveChain);
+          feeAssetInfo = getFeeAssetInfo(assetInfo, options.feeAssetInfo);
+          feeAssetLocation = transferredAsset ? assetInfo.location : feeAssetInfo === null || feeAssetInfo === void 0 ? void 0 : feeAssetInfo.location;
+          feeReserveChain = feeAssetLocation && resolveReserveChain(api, chain, destination, feeAssetLocation, isSubBridge);
           NO_FEE_ASSET_LOCS = [RELAY_LOCATION, {
             parents: 2,
             interior: {
@@ -8496,19 +8358,26 @@ var createTypeAndThenCallContext = /*#__PURE__*/function () {
           isForeignRelayToExternal = isExternalDestination && !chain.startsWith('AssetHub') && assetInfo.location.parents === 2 && RELAYCHAINS.some(function (relay) {
             return relay !== originRelayChain && deepEqual(assetGlobalConsensus, _defineProperty({}, relay.toLowerCase(), null));
           });
-          isRelayAsset = !requiresSystemAsset && !isForeignRelayToExternal && (isAssetHubToExternal || NO_FEE_ASSET_LOCS.some(function (loc) {
+          isRelayAsset = !feeAssetInfo && !requiresSystemAsset && !isForeignRelayToExternal && (isAssetHubToExternal || NO_FEE_ASSET_LOCS.some(function (loc) {
             return deepEqual(assetInfo.location, loc);
           }) || isSubBridge || ((_overrides$noFeeAsset = overrides.noFeeAsset) !== null && _overrides$noFeeAsset !== void 0 ? _overrides$noFeeAsset : false));
           assetHubChain = "AssetHub".concat(originRelayChain);
           bridgeHopChain = !chain.startsWith('AssetHub') && destination !== assetHubChain && assetGlobalConsensus !== undefined ? assetHubChain : undefined;
+          routedChain = bridgeHopChain !== null && bridgeHopChain !== void 0 ? bridgeHopChain : reserveChain === chain ? destination : reserveChain;
+          if (!(feeReserveChain !== undefined && feeReserveChain !== chain && feeReserveChain !== routedChain)) {
+            _context.n = 1;
+            break;
+          }
+          throw new ScenarioNotSupportedError("Fee asset cannot pay fees on ".concat(routedChain, " because its reserve chain (").concat(feeReserveChain, ") is neither the origin nor ").concat(routedChain));
+        case 1:
           destApi = api.clone();
-          _context.n = 1;
+          _context.n = 2;
           return destApi.init(destination);
-        case 1:
+        case 2:
           reserveApi = reserveChain === chain ? api : reserveChain === destination ? destApi : api.clone();
-          _context.n = 2;
+          _context.n = 3;
           return reserveApi.init(reserveChain);
-        case 2:
+        case 3:
           return _context.a(2, {
             origin: {
               api: api,
@@ -8526,6 +8395,8 @@ var createTypeAndThenCallContext = /*#__PURE__*/function () {
             isSnowbridge: isSb,
             isRelayAsset: isRelayAsset,
             assetInfo: assetInfo,
+            feeAssetInfo: feeAssetInfo,
+            feeReserveChain: feeReserveChain,
             options: options,
             systemAsset: systemAsset,
             bridgeHopChain: bridgeHopChain
@@ -8534,9 +8405,69 @@ var createTypeAndThenCallContext = /*#__PURE__*/function () {
     }, _callee);
   }));
   return function createTypeAndThenCallContext(_x, _x2) {
-    return _ref2.apply(this, arguments);
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+var resolveTransferType = function resolveTransferType(_ref, assetInfo, assetReserveChain) {
+  var origin = _ref.origin,
+    reserve = _ref.reserve,
+    dest = _ref.dest,
+    isSubBridge = _ref.isSubBridge;
+  // Direct A → C: when origin is reserve OR dest is reserve, check origin <-> dest trust
+  // Hop A → B → C: when reserve differs from both, check origin <-> reserve trust
+  var isDirect = origin.chain === reserve.chain || dest.chain === reserve.chain;
+  var chainToCheck = isDirect ? dest.chain : reserve.chain;
+  var canTeleport = isTrustedChain(origin.chain) && isTrustedChain(chainToCheck) || isNativeAssetTeleport(origin.api, origin.chain, chainToCheck, assetInfo);
+  if (canTeleport && !isSubBridge) return 'Teleport';
+  if (origin.chain === assetReserveChain) return 'LocalReserve';
+  return 'DestinationReserve';
+};
+var buildTypeAndThenCall = function buildTypeAndThenCall(context, isDotAsset, customXcm, assets) {
+  var origin = context.origin,
+    reserve = context.reserve,
+    dest = context.dest,
+    assetInfo = context.assetInfo,
+    feeAssetInfo = context.feeAssetInfo,
+    feeReserveChain = context.feeReserveChain,
+    bridgeHopChain = context.bridgeHopChain,
+    isSubBridge = context.isSubBridge,
+    _context$options = context.options,
+    version = _context$options.version,
+    pallet = _context$options.pallet,
+    method = _context$options.method,
+    overriddenAsset = _context$options.overriddenAsset;
+  var feeAssetLocation = getFeeAssetLocation(context);
+  var finalDest = bridgeHopChain !== null && bridgeHopChain !== void 0 ? bridgeHopChain : origin.chain === reserve.chain ? dest.chain : reserve.chain;
+  var destLocation = createDestination(origin.api, version, origin.chain, finalDest, origin.api.getParaId(finalDest));
+  var transferType = bridgeHopChain ? 'DestinationReserve' : resolveTransferType(context, assetInfo, reserve.chain);
+  var resolveFeesTransferType = function resolveFeesTransferType() {
+    if (feeReserveChain !== undefined) {
+      return resolveTransferType(context, feeAssetInfo !== null && feeAssetInfo !== void 0 ? feeAssetInfo : assetInfo, feeReserveChain);
+    }
+    return isSubBridge && !isDotAsset ? 'LocalReserve' : transferType;
   };
-}();
+  var feesTransferType = resolveFeesTransferType();
+  var overriddenFeeAsset = overriddenAsset === null || overriddenAsset === void 0 ? void 0 : overriddenAsset.find(function (asset) {
+    return asset.isFeeAsset;
+  });
+  var feeMultiAsset = createAsset(version, assetInfo.amount, normalizeLocation(origin.api.localizeLocation(origin.chain, overriddenFeeAsset ? extractAssetLocation(overriddenFeeAsset) : feeAssetLocation), version));
+  var module = pallet !== null && pallet !== void 0 ? pallet : origin.api.getXcmPallet(origin.chain);
+  var methodName = method !== null && method !== void 0 ? method : 'transfer_assets_using_type_and_then';
+  return {
+    module: module,
+    method: methodName,
+    params: {
+      dest: addXcmVersionHeader(destLocation, version),
+      assets: addXcmVersionHeader(assets, version),
+      assets_transfer_type: transferType,
+      remote_fees_id: addXcmVersionHeader(feeMultiAsset.id, version),
+      fees_transfer_type: feesTransferType,
+      custom_xcm_on_dest: addXcmVersionHeader(customXcm, version),
+      weight_limit: 'Unlimited'
+    }
+  };
+};
 
 var generateMessageId = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, senderAddress, sourceParaId, tokenAddress, recipient, amount) {
@@ -8666,7 +8597,7 @@ var createCustomXcm = /*#__PURE__*/function () {
           setTopic = messageId ? [{
             SetTopic: messageId
           }] : [];
-          feeAssetLocation = !isRelayAsset ? RELAY_LOCATION : assetInfo.location;
+          feeAssetLocation = getFeeAssetLocation(context);
           feeLocLocalized = origin.api.localizeLocation(dest.chain, feeAssetLocation, origin.chain);
           assetLocLocalized = origin.api.localizeLocation(dest.chain, assetInfo.location, origin.chain);
           asset = createAsset(version, assetInfo.amount, assetLocLocalized);
@@ -8699,7 +8630,7 @@ var createCustomXcm = /*#__PURE__*/function () {
               return localizeFilterAsset(asset.fun.Fungible, extractAssetLocation(asset));
             })));
           } else {
-            if (!isRelayAsset && !isExternalChain(dest.chain)) assetsFilter.push(createAsset(version, hopFees + destFee, origin.api.localizeLocation(reserve.chain, RELAY_LOCATION)));
+            if (!isRelayAsset && !isExternalChain(dest.chain)) assetsFilter.push(createAsset(version, normalizeAmount(hopFees + destFee), origin.api.localizeLocation(reserve.chain, feeAssetLocation)));
             assetsFilter.push(localizeFilterAsset(assetInfo.amount, assetInfo.location));
           }
           isAssetEthereumNative = deepEqual(getJunctionValue(assetInfo.location, 'GlobalConsensus'), getEthereumJunction(origin.api, origin.chain, false).GlobalConsensus);
@@ -8719,7 +8650,7 @@ var createCustomXcm = /*#__PURE__*/function () {
               AllCounted: assetCount
             }
           } : {
-            Definite: assetsFilter
+            Definite: sortAssets(assetsFilter)
           };
           buyExecutionAsset = isExternalChain(dest.chain) ? createAsset(version, buyExecutionAmount, assetLocLocalized) : createAsset(version, normalizeAmount(buyExecutionAmount), feeLocLocalized);
           buyExecution = {
@@ -8793,17 +8724,25 @@ var createCustomXcm = /*#__PURE__*/function () {
   };
 }();
 
-var buildAssets = function buildAssets(api, chain, asset, feeAmount, isRelayAsset, _ref) {
-  var version = _ref.version,
-    overriddenAsset = _ref.overriddenAsset;
+var buildAssets = function buildAssets(context, feeAmount) {
+  var _context$origin = context.origin,
+    api = _context$origin.api,
+    chain = _context$origin.chain,
+    assetInfo = context.assetInfo,
+    isRelayAsset = context.isRelayAsset,
+    _context$options = context.options,
+    version = _context$options.version,
+    overriddenAsset = _context$options.overriddenAsset;
+  var localize = function localize(amount, location) {
+    return createAsset(version, amount, normalizeLocation(api.localizeLocation(chain, location), version));
+  };
   if (overriddenAsset) {
-    return overriddenAsset;
-  }
-  var assets = [];
-  if (!isRelayAsset) {
-    assets.push(createAsset(version, feeAmount, RELAY_LOCATION));
+    return sortAssets(overriddenAsset.map(function (asset) {
+      return localize(asset.fun.Fungible, extractAssetLocation(asset));
+    }));
   }
-  assets.push(createAsset(version, asset.amount, normalizeLocation(api.localizeLocation(chain, asset.location), version)));
+  var assets = isRelayAsset ? [] : [localize(feeAmount, getFeeAssetLocation(context))];
+  assets.push(localize(assetInfo.amount, assetInfo.location));
   return sortAssets(assets);
 };
 var resolveAssetCount = function resolveAssetCount(overriddenAsset, isRelayAsset) {
@@ -8814,22 +8753,20 @@ var resolveAssetCount = function resolveAssetCount(overriddenAsset, isRelayAsset
 };
 var DEFAULT_SYSTEM_ASSET_AMOUNT = '1';
 var DEFAULT_SYSTEM_ASSET_AMOUNT_EXTERNAL = '10';
-var resolveSystemAssetAmount = function resolveSystemAssetAmount(_ref2, isForFeeCalc, fees) {
-  var systemAsset = _ref2.systemAsset,
-    dest = _ref2.dest;
+var resolveSystemAssetAmount = function resolveSystemAssetAmount(_ref, isForFeeCalc, fees) {
+  var systemAsset = _ref.systemAsset,
+    feeAssetInfo = _ref.feeAssetInfo,
+    dest = _ref.dest;
   if (isForFeeCalc) {
     var defaultAmount = isExternalChain(dest.chain) ? DEFAULT_SYSTEM_ASSET_AMOUNT_EXTERNAL : DEFAULT_SYSTEM_ASSET_AMOUNT;
-    return parseUnits(defaultAmount, systemAsset.decimals);
+    return parseUnits(defaultAmount, (feeAssetInfo !== null && feeAssetInfo !== void 0 ? feeAssetInfo : systemAsset).decimals);
   }
   return normalizeAmount(fees.destFee + fees.hopFees);
 };
 var constructTypeAndThenCall = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context) {
     var fees,
-      origin,
-      assetInfo,
       isRelayAsset,
-      options,
       overriddenAsset,
       assetCount,
       resolvedFees,
@@ -8842,8 +8779,7 @@ var constructTypeAndThenCall = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           fees = _args.length > 1 && _args[1] !== undefined ? _args[1] : null;
-          origin = context.origin, assetInfo = context.assetInfo, isRelayAsset = context.isRelayAsset, options = context.options;
-          overriddenAsset = options.overriddenAsset;
+          isRelayAsset = context.isRelayAsset, overriddenAsset = context.options.overriddenAsset;
           assetCount = resolveAssetCount(overriddenAsset, isRelayAsset);
           resolvedFees = fees !== null && fees !== void 0 ? fees : {
             hopFees: 0n,
@@ -8855,20 +8791,20 @@ var constructTypeAndThenCall = /*#__PURE__*/function () {
           return createCustomXcm(context, assetCount, isForFeeCalc, systemAssetAmount, resolvedFees);
         case 1:
           customXcm = _context.v;
-          assets = buildAssets(origin.api, origin.chain, assetInfo, systemAssetAmount, isRelayAsset, options);
+          assets = buildAssets(context, systemAssetAmount);
           return _context.a(2, buildTypeAndThenCall(context, isRelayAsset, customXcm, assets));
       }
     }, _callee);
   }));
   return function constructTypeAndThenCall(_x) {
-    return _ref3.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
 }();
 /**
  * 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 _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
     var overrides,
       context,
       origin,
@@ -8905,7 +8841,7 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
         case 3:
           _context3.n = 4;
           return computeAllFees(context, /*#__PURE__*/function () {
-            var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(amount, relative) {
+            var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(amount, relative) {
               var overridenAmount, _t, _t2;
               return _regenerator().w(function (_context2) {
                 while (1) switch (_context2.n) {
@@ -8925,7 +8861,7 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
               }, _callee2);
             }));
             return function (_x3, _x4) {
-              return _ref5.apply(this, arguments);
+              return _ref4.apply(this, arguments);
             };
           }());
         case 4:
@@ -8935,7 +8871,7 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
     }, _callee3);
   }));
   return function createTypeAndThenCall(_x2) {
-    return _ref4.apply(this, arguments);
+    return _ref3.apply(this, arguments);
   };
 }();
 
@@ -9219,6 +9155,66 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
   };
 }();
 
+var handleTransactUsingSend = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    var api, version, chain, destination, destChain, recipient, paraIdTo, asset, assetInfo, feeAssetInfo, overriddenAsset, transactOptions, dest, transactInstructions, message;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = _ref.api, version = _ref.version, chain = _ref.chain, destination = _ref.destination, destChain = _ref.destChain, recipient = _ref.recipient, paraIdTo = _ref.paraIdTo, asset = _ref.asset, assetInfo = _ref.assetInfo, feeAssetInfo = _ref.feeAssetInfo, overriddenAsset = _ref.overriddenAsset, transactOptions = _ref.transactOptions;
+          validateFeeAssetSupport(assetInfo, feeAssetInfo, overriddenAsset, 'send');
+          dest = createDestination(api, version, chain, destination, paraIdTo);
+          if (transactOptions !== null && transactOptions !== void 0 && transactOptions.call) {
+            _context.n = 1;
+            break;
+          }
+          throw new UnsupportedOperationError('Cannot use handleTransactUsingSend without transactOptions.call defined');
+        case 1:
+          if (destChain) {
+            _context.n = 2;
+            break;
+          }
+          throw new UnsupportedOperationError('destChain must be provided when using handleTransactUsingSend');
+        case 2:
+          assertAddressIsString(recipient);
+          _context.n = 3;
+          return createTransactInstructions(api, transactOptions, version, destChain, recipient);
+        case 3:
+          transactInstructions = _context.v;
+          message = [{
+            WithdrawAsset: [asset]
+          }].concat(_toConsumableArray(createBuyExecution(asset)), _toConsumableArray(transactInstructions), [{
+            RefundSurplus: undefined
+          }, {
+            DepositAsset: {
+              assets: {
+                Wild: {
+                  AllCounted: 1
+                }
+              },
+              beneficiary: createBeneficiaryLocation({
+                api: api,
+                address: recipient,
+                version: version
+              })
+            }
+          }]);
+          return _context.a(2, {
+            module: getXcmPallet(chain),
+            method: 'send',
+            params: {
+              dest: addXcmVersionHeader(dest, version),
+              message: addXcmVersionHeader(message, version)
+            }
+          });
+      }
+    }, _callee);
+  }));
+  return function handleTransactUsingSend(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
 var transferPolkadotXcm = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var method,
@@ -9230,6 +9226,7 @@ var transferPolkadotXcm = /*#__PURE__*/function () {
       beneficiaryLocation,
       multiAsset,
       overriddenAsset,
+      feeAssetInfo,
       pallet,
       version,
       methodOverride,
@@ -9246,7 +9243,7 @@ var transferPolkadotXcm = /*#__PURE__*/function () {
         case 0:
           method = _args.length > 1 && _args[1] !== undefined ? _args[1] : 'transfer_assets_using_type_and_then';
           fees = _args.length > 2 && _args[2] !== undefined ? _args[2] : undefined;
-          api = options.api, chain = options.chain, destination = options.destination, asset = options.assetInfo, beneficiaryLocation = options.beneficiaryLocation, multiAsset = options.asset, overriddenAsset = options.overriddenAsset, pallet = options.pallet, version = options.version, methodOverride = options.method, paraIdTo = options.paraIdTo;
+          api = options.api, chain = options.chain, destination = options.destination, asset = options.assetInfo, beneficiaryLocation = options.beneficiaryLocation, multiAsset = options.asset, overriddenAsset = options.overriddenAsset, feeAssetInfo = options.feeAssetInfo, pallet = options.pallet, version = options.version, methodOverride = options.method, paraIdTo = options.paraIdTo;
           if (!(method === 'transfer_assets_using_type_and_then')) {
             _context.n = 2;
             break;
@@ -9260,6 +9257,7 @@ var transferPolkadotXcm = /*#__PURE__*/function () {
         case 1:
           return _context.a(2, _t.deserializeExtrinsics.call(_t, _context.v));
         case 2:
+          validateFeeAssetSupport(asset, feeAssetInfo, overriddenAsset, methodOverride !== null && methodOverride !== void 0 ? methodOverride : method);
           resolvedMultiAssets = maybeOverrideAssets(version, asset.amount, [multiAsset], overriddenAsset);
           destLocation = createDestination(api, version, chain, destination, paraIdTo);
           feeAssetIndex = overriddenAsset === undefined ? DEFAULT_FEE_ASSET : overriddenAsset.findIndex(function (asset) {
@@ -9314,6 +9312,13 @@ var applyDecimalAbstraction = function applyDecimalAbstraction(amount, decimals,
   return parseUnits(amount.toString(), decimals);
 };
 
+var createAllCountedFilter = function createAllCountedFilter(count) {
+  return {
+    Wild: {
+      AllCounted: count
+    }
+  };
+};
 var createAssetsFilter = function createAssetsFilter(asset, version) {
   var location = extractAssetLocation(asset);
   var id = createAssetId(version, location);
@@ -9344,7 +9349,10 @@ var prepareExecuteContext = function prepareExecuteContext(_ref) {
     destChain = _ref.destChain,
     assetInfo = _ref.assetInfo,
     feeAssetInfo = _ref.feeAssetInfo,
-    originFee = _ref.fees.originFee,
+    _ref$fees = _ref.fees,
+    originFee = _ref$fees.originFee,
+    reserveFee = _ref$fees.reserveFee,
+    destFee = _ref$fees.destFee,
     version = _ref.version;
   var amount = assetInfo.amount;
   var reserveChain = api.getAssetReserveChain(chain, assetInfo.location);
@@ -9352,10 +9360,13 @@ var prepareExecuteContext = function prepareExecuteContext(_ref) {
   var assetLocalized = createAsset(version, amount, api.localizeLocation(chain, assetInfo.location));
   var assetLocalizedToDest = createAsset(version, amount, localizeLocation(destChain, assetInfo.location));
   var assetLocalizedToReserve = createAsset(version, amount, api.localizeLocation(reserveChain !== null && reserveChain !== void 0 ? reserveChain : chain, assetInfo.location));
-  var feeAsset = feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo) ? createAsset(version, originFee, feeAssetInfo.location) : undefined;
-  var feeAssetLocalized = feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo) ? createAsset(version, originFee, api.localizeLocation(chain, feeAssetInfo.location)) : undefined;
-  var feeAssetLocalizedToDest = feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo) ? createAsset(version, originFee, localizeLocation(destChain, feeAssetInfo.location)) : undefined;
-  var feeAssetLocalizedToReserve = feeAssetInfo && !isAssetEqual(assetInfo, feeAssetInfo) ? createAsset(version, originFee, api.localizeLocation(reserveChain !== null && reserveChain !== void 0 ? reserveChain : chain, feeAssetInfo.location)) : undefined;
+  var resolvedFeeAssetInfo = getFeeAssetInfo(assetInfo, feeAssetInfo);
+  var feeAssetTotal = originFee + reserveFee + destFee;
+  var feeAsset = resolvedFeeAssetInfo && createAsset(version, feeAssetTotal, resolvedFeeAssetInfo.location);
+  var feeAssetLocalized = resolvedFeeAssetInfo && createAsset(version, feeAssetTotal, api.localizeLocation(chain, resolvedFeeAssetInfo.location));
+  var feeAssetLocalizedToDest = resolvedFeeAssetInfo && createAsset(version, destFee, localizeLocation(destChain, resolvedFeeAssetInfo.location));
+  var feeAssetLocalizedToReserve = resolvedFeeAssetInfo && createAsset(version, reserveFee, api.localizeLocation(reserveChain !== null && reserveChain !== void 0 ? reserveChain : chain, resolvedFeeAssetInfo.location));
+  var feeReserveChain = resolvedFeeAssetInfo && api.getAssetReserveChain(chain, resolvedFeeAssetInfo.location);
   return {
     amount: amount,
     asset: asset,
@@ -9366,6 +9377,7 @@ var prepareExecuteContext = function prepareExecuteContext(_ref) {
     feeAssetLocalized: feeAssetLocalized,
     feeAssetLocalizedToDest: feeAssetLocalizedToDest,
     feeAssetLocalizedToReserve: feeAssetLocalizedToReserve,
+    feeReserveChain: feeReserveChain,
     reserveChain: reserveChain
   };
 };
@@ -9377,6 +9389,12 @@ var updateAsset = function updateAsset(asset, amount) {
     }
   });
 };
+var isTeleportLeg = function isTeleportLeg(api, from, to, assetInfo) {
+  return isTrustedChain(from) && isTrustedChain(to) || isNativeAssetTeleport(api, from, to, assetInfo);
+};
+var isTeleportableAsset = function isTeleportableAsset(api, from, to, assetInfo) {
+  return deepEqual(assetInfo.location, RELAY_LOCATION) || isNativeAssetTeleport(api, from, to, assetInfo);
+};
 var getInstructionType = function getInstructionType(api, version, origin, destination, assetInfo, reserveChain, transactOptions) {
   if (version >= Version.V5 && transactOptions !== null && transactOptions !== void 0 && transactOptions.call) {
     return 'InitiateTransfer';
@@ -9385,7 +9403,7 @@ var getInstructionType = function getInstructionType(api, version, origin, desti
     return 'InitiateTeleportToReserve';
   }
   // Trusted chains (or native-asset teleports to/from AssetHub) can teleport
-  if (isTrustedChain(origin) && isTrustedChain(destination) || isNativeAssetTeleport(api, origin, destination, assetInfo)) {
+  if (isTeleportLeg(api, origin, destination, assetInfo)) {
     return 'InitiateTeleport';
   }
   // If we need intermediary reserve (not on reserve chain)
@@ -9396,7 +9414,7 @@ var getInstructionType = function getInstructionType(api, version, origin, desti
   return 'DepositAsset';
 };
 var getInitiateTransferType = function getInitiateTransferType(api, origin, destination, assetInfo, reserveChain) {
-  if (isTrustedChain(origin) && isTrustedChain(destination) || isNativeAssetTeleport(api, origin, destination, assetInfo)) {
+  if (isTeleportLeg(api, origin, destination, assetInfo)) {
     return 'Teleport';
   }
   if (origin === reserveChain) return 'ReserveDeposit';
@@ -9407,13 +9425,13 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
     chain = options.chain,
     destChain = options.destChain,
     assetInfo = options.assetInfo,
+    feeAssetInfo = options.feeAssetInfo,
     _options$fees = options.fees,
     originFee = _options$fees.originFee,
     reserveFee = _options$fees.reserveFee,
     version = options.version,
     paraIdTo = options.paraIdTo,
     transactOptions = options.transactOptions,
-    useFeeAssetOnHops = options.useFeeAssetOnHops,
     _options$suffixXcm = options.suffixXcm,
     suffixXcm = _options$suffixXcm === void 0 ? [] : _options$suffixXcm;
   var _prepareExecuteContex = prepareExecuteContext(options),
@@ -9422,11 +9440,13 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
     assetLocalizedToReserve = _prepareExecuteContex.assetLocalizedToReserve,
     assetLocalizedToDest = _prepareExecuteContex.assetLocalizedToDest,
     feeAsset = _prepareExecuteContex.feeAsset,
+    feeAssetLocalized = _prepareExecuteContex.feeAssetLocalized,
     feeAssetLocalizedToReserve = _prepareExecuteContex.feeAssetLocalizedToReserve,
     feeAssetLocalizedToDest = _prepareExecuteContex.feeAssetLocalizedToDest,
+    feeReserveChain = _prepareExecuteContex.feeReserveChain,
     reserveChain = _prepareExecuteContex.reserveChain;
-  var hopFeeAssetToReserve = useFeeAssetOnHops ? feeAssetLocalizedToReserve : undefined;
-  var hopFeeAssetToDest = useFeeAssetOnHops ? feeAssetLocalizedToDest : undefined;
+  var isReserveDest = reserveChain === destChain;
+  var hopFeeAssetToReserve = isReserveDest ? feeAssetLocalizedToDest : feeAssetLocalizedToReserve;
   // When fees are paid in a separate asset, originFee is denominated in that asset's
   // currency and must not be subtracted from the transfer amount.
   var originFeeDeduction = feeAsset ? 0n : originFee;
@@ -9434,29 +9454,41 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
   if (chain !== 'AssetHubPolkadot' && reserveChain === undefined) {
     throw new UnsupportedOperationError('Sending local reserve assets with custom fee asset is not yet supported for this chain.');
   }
+  if (feeReserveChain !== undefined && feeReserveChain !== reserveChain) {
+    throw new ScenarioNotSupportedError("Fee asset cannot pay fees on hops and destination because its reserve chain (".concat(feeReserveChain, ") differs from the reserve chain of the transferred asset (").concat(reserveChain, ")."));
+  }
   var transferType = getInstructionType(api, version, chain, destChain, assetInfo, reserveChain, transactOptions);
-  var routingAssetsFilter = feeAsset ? {
-    Wild: {
-      AllCounted: 2
+  var createRoutingFilter = function createRoutingFilter(asset) {
+    return feeAsset ? createAllCountedFilter(2) : createAssetsFilter(asset, version);
+  };
+  var routingAssetsFilter = createRoutingFilter(assetLocalized);
+  var assertFeeAssetTeleportable = function assertFeeAssetTeleportable(from, to) {
+    if (feeAsset && feeAssetInfo && !isTeleportableAsset(api, from, to, feeAssetInfo)) {
+      throw new ScenarioNotSupportedError("Fee asset ".concat(feeAssetInfo.symbol, " cannot be teleported from ").concat(from, " to ").concat(to, ", so it cannot pay fees there."));
     }
-  } : createAssetsFilter(assetLocalized, version);
-  var isReserveDest = reserveChain === destChain;
-  var resolvedDepositInstruction = isReserveDest ? suffixXcm : [{
-    DepositReserveAsset: {
-      assets: createAssetsFilter(assetLocalizedToReserve, version),
+  };
+  var reserveToDestInstruction = isTeleportLeg(api, reserveChain !== null && reserveChain !== void 0 ? reserveChain : chain, destChain, assetInfo) ? 'InitiateTeleport' : 'DepositReserveAsset';
+  var createReserveToDestXcm = function createReserveToDestXcm() {
+    if (isReserveDest) return suffixXcm;
+    if (reserveToDestInstruction === 'InitiateTeleport') {
+      assertFeeAssetTeleportable(reserveChain !== null && reserveChain !== void 0 ? reserveChain : chain, destChain);
+    }
+    return [_defineProperty({}, reserveToDestInstruction, {
+      assets: createRoutingFilter(assetLocalizedToReserve),
       dest: createDestination(api, version, reserveChain !== null && reserveChain !== void 0 ? reserveChain : chain, destChain, paraIdTo),
-      xcm: [].concat(_toConsumableArray(createBuyExecution(hopFeeAssetToDest !== null && hopFeeAssetToDest !== void 0 ? hopFeeAssetToDest : updateAsset(assetLocalizedToDest, reserveFee === 1000n ? amount / 2n : amount - originFeeDeduction - reserveFee))), _toConsumableArray(suffixXcm))
-    }
-  }];
+      xcm: [].concat(_toConsumableArray(createBuyExecution(feeAssetLocalizedToDest !== null && feeAssetLocalizedToDest !== void 0 ? feeAssetLocalizedToDest : updateAsset(assetLocalizedToDest, reserveFee === 1000n ? amount / 2n : amount - originFeeDeduction - reserveFee))), _toConsumableArray(suffixXcm))
+    })];
+  };
   var mainInstructions;
   switch (transferType) {
     case 'InitiateTransfer':
       {
         var transferFilter = getInitiateTransferType(api, chain, destChain, assetInfo, reserveChain);
+        if (transferFilter === 'Teleport') assertFeeAssetTeleportable(chain, destChain);
         mainInstructions = [{
           InitiateTransfer: {
             destination: destLocation,
-            remote_fees: _defineProperty({}, transferFilter, routingAssetsFilter),
+            remote_fees: _defineProperty({}, transferFilter, createAssetsFilter(feeAssetLocalized !== null && feeAssetLocalized !== void 0 ? feeAssetLocalized : assetLocalized, version)),
             preserve_origin: true,
             assets: [_defineProperty({}, transferFilter, routingAssetsFilter)],
             remote_xcm: [{
@@ -9468,21 +9500,23 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
       }
     case 'InitiateTeleport':
       // Use teleport for trusted chains
+      assertFeeAssetTeleportable(chain, destChain);
       mainInstructions = [{
         InitiateTeleport: {
           assets: routingAssetsFilter,
           dest: destLocation,
-          xcm: [].concat(_toConsumableArray(createBuyExecution(hopFeeAssetToDest !== null && hopFeeAssetToDest !== void 0 ? hopFeeAssetToDest : updateAsset(assetLocalizedToDest, amount - originFeeDeduction))), _toConsumableArray(suffixXcm))
+          xcm: [].concat(_toConsumableArray(createBuyExecution(feeAssetLocalizedToDest !== null && feeAssetLocalizedToDest !== void 0 ? feeAssetLocalizedToDest : updateAsset(assetLocalizedToDest, amount - originFeeDeduction))), _toConsumableArray(suffixXcm))
         }
       }];
       break;
     case 'InitiateTeleportToReserve':
       // Teleport to reserve chain first
+      assertFeeAssetTeleportable(chain, reserveChain);
       mainInstructions = [{
         InitiateTeleport: {
           assets: routingAssetsFilter,
           dest: getChainLocation(chain, reserveChain, api._customCtx),
-          xcm: [].concat(_toConsumableArray(createBuyExecution(hopFeeAssetToReserve !== null && hopFeeAssetToReserve !== void 0 ? hopFeeAssetToReserve : updateAsset(assetLocalizedToReserve, amount - originFeeDeduction))), _toConsumableArray(resolvedDepositInstruction))
+          xcm: [].concat(_toConsumableArray(createBuyExecution(hopFeeAssetToReserve !== null && hopFeeAssetToReserve !== void 0 ? hopFeeAssetToReserve : updateAsset(assetLocalizedToReserve, amount - originFeeDeduction))), _toConsumableArray(createReserveToDestXcm()))
         }
       }];
       break;
@@ -9494,12 +9528,12 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
           reserve: getChainLocation(chain, reserveChain, api._customCtx),
           xcm: [].concat(_toConsumableArray(createBuyExecution(// Decrease amount by 2 units because for some reason polkadot withdraws 2 units less
           // than requested, so we need to account for that
-          hopFeeAssetToReserve !== null && hopFeeAssetToReserve !== void 0 ? hopFeeAssetToReserve : updateAsset(assetLocalizedToReserve, amount - 2n))), _toConsumableArray(resolvedDepositInstruction))
+          hopFeeAssetToReserve !== null && hopFeeAssetToReserve !== void 0 ? hopFeeAssetToReserve : updateAsset(assetLocalizedToReserve, amount - 2n))), _toConsumableArray(createReserveToDestXcm()))
         }
       }];
       break;
     case 'DepositAsset':
-      mainInstructions = resolvedDepositInstruction;
+      mainInstructions = createReserveToDestXcm();
   }
   return mainInstructions;
 };
@@ -9624,7 +9658,7 @@ var prepareCommonExecuteXcm = function prepareCommonExecuteXcm(options, assetToD
     WithdrawAsset: withdrawAssets
   });
   if (feeAssetLocalized && !useJitWithdraw) {
-    prefix.push.apply(prefix, _toConsumableArray(createBuyExecution(feeAssetLocalized)));
+    prefix.push.apply(prefix, _toConsumableArray(createBuyExecution(feeAssetLocalized, MIN_WEIGHT)));
   } else {
     prefix.push({
       SetFeesMode: {
@@ -9684,32 +9718,36 @@ var createDirectExecuteXcm = /*#__PURE__*/function () {
   };
 }();
 
-var getReserveFeeFromHops = function getReserveFeeFromHops(hops) {
-  if (!hops || hops.length === 0 || !hops[0].result.success) {
-    return MIN_FEE;
-  }
-  return hops[0].result.fee;
+var getFeeFromResult = function getFeeFromResult(result) {
+  return result !== null && result !== void 0 && result.success ? result.fee : MIN_FEE;
 };
 var FEE_PADDING_PERCENTAGE$1 = 40;
 var handleExecuteTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-    var api, chain, sender, paraIdTo, destChain, assetInfo, currency, feeCurrency, recipient, feeAssetInfo, version, transactOptions, checkAmount, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, call, dryRunResult, originFeeEstimate, originFee, reserveFeeEstimate, reserveFee, xcm, weight, _t, _t2;
+    var _dryRunResult$hops$at;
+    var api, chain, sender, paraIdTo, destChain, assetInfo, currency, feeCurrency, recipient, feeAssetInfo, version, transactOptions, checkAmount, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, resolvedFeeAssetInfo, hopFeeAmount, call, dryRunResult, originFee, reserveFee, destFee, xcm, weight, _t, _t2;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           api = options.api, chain = options.chain, sender = options.sender, paraIdTo = options.paraIdTo, destChain = options.destChain, assetInfo = options.assetInfo, currency = options.currency, feeCurrency = options.feeCurrency, recipient = options.recipient, feeAssetInfo = options.feeAssetInfo, version = options.version, transactOptions = options.transactOptions;
           assertSender(sender);
           assertAddressIsString(recipient);
+          if (!(feeAssetInfo && !supportsFeeAssetPayment(chain))) {
+            _context.n = 1;
+            break;
+          }
+          throw new ScenarioNotSupportedError("Fee asset is not supported on ".concat(chain));
+        case 1:
           checkAmount = function checkAmount(fee) {
             if (assetInfo.amount <= fee) throw new AmountTooLowError();
           };
           checkAmount(MIN_FEE);
           if (!(destChain === undefined)) {
-            _context.n = 1;
+            _context.n = 2;
             break;
           }
           throw new RoutingResolutionError('Could not determine destination chain for execute transfer');
-        case 1:
+        case 2:
           internalOptions = {
             api: api,
             chain: chain,
@@ -9726,18 +9764,21 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           }; // We mint 1000 units of feeAsset and use 100
           FEE_ASSET_AMOUNT = 100;
           feeAssetAmount = feeAssetInfo ? parseUnits(FEE_ASSET_AMOUNT.toString(), feeAssetInfo.decimals) : MIN_FEE;
+          resolvedFeeAssetInfo = getFeeAssetInfo(assetInfo, feeAssetInfo);
+          hopFeeAmount = resolvedFeeAssetInfo ? feeAssetAmount : MIN_FEE;
           _t = createExecuteCall;
           _t2 = chain;
-          _context.n = 2;
+          _context.n = 3;
           return createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
               originFee: feeAssetAmount,
-              reserveFee: MIN_FEE
+              reserveFee: hopFeeAmount,
+              destFee: hopFeeAmount
             }
           }));
-        case 2:
+        case 3:
           call = _t(_t2, _context.v, MAX_WEIGHT);
-          _context.n = 3;
+          _context.n = 4;
           return dryRunInternal({
             api: api,
             tx: api.deserializeExtrinsics(call),
@@ -9749,34 +9790,34 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             feeAsset: feeCurrency,
             useRootOrigin: true
           });
-        case 3:
+        case 4:
           dryRunResult = _context.v;
           if (dryRunResult.origin.success) {
-            _context.n = 4;
+            _context.n = 5;
             break;
           }
           throw new DryRunFailedError(_objectSpread2(_objectSpread2({}, dryRunResult.origin.dryRunError), {}, {
             chainKind: 'origin',
             chain: chain
           }));
-        case 4:
-          originFeeEstimate = dryRunResult.origin.fee;
-          originFee = padValueBy(originFeeEstimate, FEE_PADDING_PERCENTAGE$1);
-          reserveFeeEstimate = getReserveFeeFromHops(dryRunResult.hops);
-          reserveFee = padValueBy(reserveFeeEstimate, FEE_PADDING_PERCENTAGE$1);
-          checkAmount(reserveFee);
-          _context.n = 5;
+        case 5:
+          originFee = padValueBy(dryRunResult.origin.fee, FEE_PADDING_PERCENTAGE$1);
+          reserveFee = padValueBy(getFeeFromResult((_dryRunResult$hops$at = dryRunResult.hops.at(0)) === null || _dryRunResult$hops$at === void 0 ? void 0 : _dryRunResult$hops$at.result), FEE_PADDING_PERCENTAGE$1);
+          destFee = padValueBy(getFeeFromResult(dryRunResult.destination), FEE_PADDING_PERCENTAGE$1);
+          if (!resolvedFeeAssetInfo) checkAmount(reserveFee);
+          _context.n = 6;
           return createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
               originFee: originFee,
-              reserveFee: reserveFee
+              reserveFee: reserveFee,
+              destFee: destFee
             }
           }));
-        case 5:
+        case 6:
           xcm = _context.v;
-          _context.n = 6;
+          _context.n = 7;
           return api.getXcmWeight(xcm);
-        case 6:
+        case 7:
           weight = _context.v;
           return _context.a(2, createExecuteCall(chain, xcm, weight));
       }
@@ -9956,12 +9997,13 @@ var isMultiHopSwap = function isMultiHopSwap(exchangeChain, assetFrom, assetTo)
 };
 
 var createExchangeInstructions = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, assetFrom, assetTo, hasSeparateFeeAsset) {
-    var api, chain, exchangeChain, assetInfoFrom, assetInfoTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, nativeSymbol, needsMultiHop, nativeAsset, nativeAmountOut, assetNative;
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, assetFrom, assetTo, separateFeeAssetInfo) {
+    var api, chain, exchangeChain, assetInfoFrom, assetInfoTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, hasSeparateFeeAsset, nativeSymbol, needsMultiHop, nativeAsset, nativeAmountOut, assetNative;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, assetInfoFrom = options.assetInfoFrom, assetInfoTo = options.assetInfoTo, version = options.version, calculateMinAmountOut = options.calculateMinAmountOut, _options$fees = options.fees, originReserveFee = _options$fees.originReserveFee, exchangeFee = _options$fees.exchangeFee;
+          hasSeparateFeeAsset = separateFeeAssetInfo !== undefined;
           nativeSymbol = getNativeAssetSymbol(exchangeChain);
           needsMultiHop = isMultiHopSwap(exchangeChain, assetInfoFrom, assetInfoTo);
           nativeAsset = api.findAssetInfoOrThrow(exchangeChain, {
@@ -9980,7 +10022,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
           }]);
         case 1:
           _context.n = 2;
-          return calculateMinAmountOut(BigInt(assetInfoFrom.amount) - (chain ? originReserveFee + exchangeFee : 0n), nativeAsset);
+          return calculateMinAmountOut(BigInt(assetInfoFrom.amount) - (chain && !hasSeparateFeeAsset ? originReserveFee + exchangeFee : 0n), nativeAsset);
         case 2:
           nativeAmountOut = _context.v;
           assetNative = createAsset(version, exchangeFee === 0n ? (nativeAmountOut + 1n) / 2n : nativeAmountOut, localizeLocation(exchangeChain, nativeAsset.location));
@@ -9988,11 +10030,13 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             ExchangeAsset: {
               give: createAssetsFilter(assetFrom, version),
               want: [assetNative],
-              maximal: false
+              maximal: hasSeparateFeeAsset
             }
           }, {
             ExchangeAsset: {
-              give: createAssetsFilter(assetNative, version),
+              give: separateFeeAssetInfo && isAssetEqual(separateFeeAssetInfo, nativeAsset) ? {
+                Definite: [assetNative]
+              } : createAssetsFilter(assetNative, version),
               want: [assetTo],
               maximal: true
             }
@@ -10007,19 +10051,18 @@ var createExchangeInstructions = /*#__PURE__*/function () {
 var createSwapExecuteXcm = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
     var _ref3, _ref4;
-    var api, chain, exchangeChain, destChain, assetInfoFrom, assetInfoTo, feeAssetInfo, _options$fees2, originFee, originReserveFee, destReserveFee, sender, recipient, version, paraIdTo, isEthereumDest, resolvedDestChain, assetFrom, amountOut, assetTo, assetToLocalizedToDest, ethFeeAssetInfo, ethBridgeFee, isMainAssetDot, nativeFeeAssetInfo, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, resolvedFeeAssetInfo, hasSeparateFeeAsset, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, ethAsset, messageId, snowbridgeInstructions, finalXcm, fullXcm;
+    var api, chain, exchangeChain, destChain, assetInfoFrom, assetInfoTo, feeAssetInfo, _options$fees2, originFee, originReserveFee, exchangeFee, destReserveFee, destFee, sender, recipient, version, paraIdTo, isEthereumDest, resolvedDestChain, assetFrom, amountOut, assetTo, assetToLocalizedToDest, ethFeeAssetInfo, ethBridgeFee, nativeFeeAssetInfo, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, executionFee, resolvedFeeAssetInfo, hasSeparateFeeAsset, createLegFees, feeAssetBudget, _prepareCommonExecute, prefix, depositInstruction, exchangeInstructions, exchangeToDestXcm, ethAsset, messageId, snowbridgeInstructions, finalXcm, fullXcm;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetInfoFrom = options.assetInfoFrom, assetInfoTo = options.assetInfoTo, feeAssetInfo = options.feeAssetInfo, _options$fees2 = options.fees, originFee = _options$fees2.originFee, originReserveFee = _options$fees2.originReserveFee, destReserveFee = _options$fees2.destReserveFee, sender = options.sender, recipient = options.recipient, version = options.version, paraIdTo = options.paraIdTo;
+          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetInfoFrom = options.assetInfoFrom, assetInfoTo = options.assetInfoTo, feeAssetInfo = options.feeAssetInfo, _options$fees2 = options.fees, originFee = _options$fees2.originFee, originReserveFee = _options$fees2.originReserveFee, exchangeFee = _options$fees2.exchangeFee, destReserveFee = _options$fees2.destReserveFee, destFee = _options$fees2.destFee, sender = options.sender, recipient = options.recipient, version = options.version, paraIdTo = options.paraIdTo;
           isEthereumDest = destChain !== undefined && isExternalChain(destChain); // For Ethereum destination, the actual hop target is AssetHub (bridge hub)
           resolvedDestChain = isEthereumDest ? "AssetHub".concat(getRelayChainOf(chain !== null && chain !== void 0 ? chain : exchangeChain)) : undefined;
           assetFrom = createAsset(version, assetInfoFrom.amount, localizeLocation(exchangeChain, assetInfoFrom.location));
           amountOut = assetInfoTo.amount;
           assetTo = createAsset(version, amountOut, localizeLocation(exchangeChain, assetInfoTo.location)); // For Ethereum, localize to AssetHub since that's where instructions execute
           assetToLocalizedToDest = createAsset(version, amountOut, localizeLocation((_ref3 = resolvedDestChain !== null && resolvedDestChain !== void 0 ? resolvedDestChain : destChain) !== null && _ref3 !== void 0 ? _ref3 : exchangeChain, assetInfoTo.location)); // For Ethereum destination, use DOT as feeAsset for bridge fees
-          ethBridgeFee = 0n; // Whether main asset IS DOT — no separate fee asset needed
-          isMainAssetDot = false;
+          ethBridgeFee = 0n;
           if (!isEthereumDest) {
             _context2.n = 3;
             break;
@@ -10037,14 +10080,21 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
           bridgeFee = _yield$getParaEthTran2[0];
           executionFee = _yield$getParaEthTran2[1];
           ethBridgeFee = bridgeFee + executionFee;
-          isMainAssetDot = isAssetEqual(assetInfoFrom, nativeFeeAssetInfo);
-          if (!isMainAssetDot) {
+          if (!isAssetEqual(assetInfoFrom, nativeFeeAssetInfo)) {
             ethFeeAssetInfo = nativeFeeAssetInfo;
           }
         case 3:
           // Ethereum fee asset takes precedence over user-provided feeAssetInfo
-          resolvedFeeAssetInfo = ethFeeAssetInfo !== null && ethFeeAssetInfo !== void 0 ? ethFeeAssetInfo : feeAssetInfo;
-          hasSeparateFeeAsset = isEthereumDest && !isMainAssetDot || !!feeAssetInfo;
+          resolvedFeeAssetInfo = isEthereumDest ? ethFeeAssetInfo : getFeeAssetInfo(assetInfoFrom, feeAssetInfo);
+          hasSeparateFeeAsset = resolvedFeeAssetInfo !== undefined;
+          createLegFees = function createLegFees(reserveFee, destFee) {
+            return {
+              originFee: hasSeparateFeeAsset ? ethBridgeFee : 0n,
+              reserveFee: ethFeeAssetInfo ? ethBridgeFee : reserveFee,
+              destFee: isEthereumDest ? ethBridgeFee : destFee
+            };
+          };
+          feeAssetBudget = ethFeeAssetInfo ? ethBridgeFee : originFee + originReserveFee + exchangeFee + destReserveFee + destFee;
           _prepareCommonExecute = prepareCommonExecuteXcm({
             api: api,
             chain: chain !== null && chain !== void 0 ? chain : exchangeChain,
@@ -10054,13 +10104,14 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
             useJitWithdraw: isEthereumDest,
             recipient: recipient,
             fees: {
-              originFee: hasSeparateFeeAsset ? ethBridgeFee || originFee : originFee,
-              reserveFee: originReserveFee
+              originFee: hasSeparateFeeAsset ? feeAssetBudget : originFee,
+              reserveFee: 0n,
+              destFee: 0n
             },
             version: version
           }, assetToLocalizedToDest), prefix = _prepareCommonExecute.prefix, depositInstruction = _prepareCommonExecute.depositInstruction;
           _context2.n = 4;
-          return createExchangeInstructions(options, assetFrom, assetTo, isEthereumDest && hasSeparateFeeAsset);
+          return createExchangeInstructions(options, assetFrom, assetTo, resolvedFeeAssetInfo);
         case 4:
           exchangeInstructions = _context2.v;
           if (!isEthereumDest) {
@@ -10088,13 +10139,9 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
             destChain: resolvedDestChain,
             assetInfo: assetInfoTo,
             feeAssetInfo: ethFeeAssetInfo,
-            useFeeAssetOnHops: hasSeparateFeeAsset,
             paraIdTo: getParaId(resolvedDestChain),
             version: version,
-            fees: {
-              originFee: hasSeparateFeeAsset ? ethBridgeFee : 0n,
-              reserveFee: destReserveFee
-            },
+            fees: createLegFees(destReserveFee, destFee),
             suffixXcm: snowbridgeInstructions
           });
           _context2.n = 7;
@@ -10106,13 +10153,10 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
               chain: exchangeChain,
               destChain: destChain,
               assetInfo: assetInfoTo,
+              feeAssetInfo: resolvedFeeAssetInfo,
               paraIdTo: paraIdTo,
               version: version,
-              // Deal with this after feeAsset is supported
-              fees: {
-                originFee: 0n,
-                reserveFee: destReserveFee
-              },
+              fees: createLegFees(destReserveFee, destFee),
               suffixXcm: [depositInstruction]
             });
           } else {
@@ -10124,14 +10168,10 @@ var createSwapExecuteXcm = /*#__PURE__*/function () {
             chain: chain,
             destChain: exchangeChain,
             assetInfo: assetInfoFrom,
-            feeAssetInfo: ethFeeAssetInfo,
-            useFeeAssetOnHops: hasSeparateFeeAsset,
+            feeAssetInfo: resolvedFeeAssetInfo,
             paraIdTo: getParaId(exchangeChain),
             version: version,
-            fees: {
-              originFee: hasSeparateFeeAsset ? ethBridgeFee : 0n,
-              reserveFee: originReserveFee
-            },
+            fees: createLegFees(originReserveFee, exchangeFee),
             suffixXcm: [].concat(_toConsumableArray(exchangeInstructions), _toConsumableArray(exchangeToDestXcm))
           }) : [].concat(_toConsumableArray(exchangeInstructions), _toConsumableArray(exchangeToDestXcm));
           fullXcm = [].concat(_toConsumableArray(prefix), _toConsumableArray(finalXcm));
@@ -10197,12 +10237,14 @@ var findExchangeHopIndex = function findExchangeHopIndex(chain, dryRunResult, ex
   return index;
 };
 var extractFeesFromDryRun = function extractFeesFromDryRun(chain, exchangeChain, dryRunResult, exchangeHopIndex, destChain) {
+  var _dryRunResult$destina;
   var requireHopsSuccess = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var fees = {
     originFee: 0n,
     originReserveFee: 0n,
     exchangeFee: 0n,
-    destReserveFee: 0n
+    destReserveFee: 0n,
+    destFee: 0n
   };
   var hops = dryRunResult.hops;
   // Handle exchange fee
@@ -10282,6 +10324,9 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, exchangeChain,
       fees.destReserveFee = padValueBy(hopAfterExchange.result.fee, FEE_PADDING_PERCENTAGE);
     }
   }
+  if (destChain && (_dryRunResult$destina = dryRunResult.destination) !== null && _dryRunResult$destina !== void 0 && _dryRunResult$destina.success) {
+    fees.destFee = padValueBy(dryRunResult.destination.fee, FEE_PADDING_PERCENTAGE);
+  }
   return fees;
 };
 var createXcmAndCall = /*#__PURE__*/function () {
@@ -10325,8 +10370,8 @@ var createXcmAndCall = /*#__PURE__*/function () {
 }();
 var handleSwapExecuteTransfer = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var _firstDryRunResult$dr;
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, feeAssetInfo, sender, recipient, calculateMinAmountOut, version, isEthereumDest, hasSeparateFeeAsset, internalOptions, dryRunParams, FEE_ASSET_AMOUNT, dummyOriginFee, fees, totalFeesPre, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, extractedFees, totalFees, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, finalCall;
+    var _ref4, _firstDryRunResult$dr;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, feeAssetInfo, sender, recipient, calculateMinAmountOut, version, isEthereumDest, separateFeeAssetInfo, hasSeparateFeeAsset, internalOptions, dryRunParams, FEE_ASSET_AMOUNT, dummyFeeAssetAmount, dummyDestFee, fees, totalFeesPre, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, extractedFees, totalFees, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, finalCall;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
@@ -10337,9 +10382,10 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
         case 1:
           validateAmount(assetFrom.amount, MIN_FEE);
           version = pickRouterCompatibleXcmVersion(api, chain, exchangeChain, destChain);
-          isEthereumDest = destChain !== undefined && isExternalChain(destChain); // When main asset is DOT and dest is Ethereum, fees come from the same asset
+          isEthereumDest = destChain !== undefined && isExternalChain(destChain);
+          separateFeeAssetInfo = isEthereumDest ? undefined : getFeeAssetInfo(assetFrom, feeAssetInfo); // When main asset is DOT and dest is Ethereum, fees come from the same asset
           // (no separate fee asset needed). Only skip fee validation when currencies differ.
-          hasSeparateFeeAsset = isEthereumDest && !isAssetEqual(assetFrom, api.findNativeAssetInfoOrThrow(getRelayChainOf(chain !== null && chain !== void 0 ? chain : exchangeChain)));
+          hasSeparateFeeAsset = separateFeeAssetInfo !== undefined || isEthereumDest && !isAssetEqual(assetFrom, api.findNativeAssetInfoOrThrow(getRelayChainOf(chain !== null && chain !== void 0 ? chain : exchangeChain)));
           internalOptions = _objectSpread2(_objectSpread2({}, options), {}, {
             version: version,
             paraIdTo: getParaId(destChain !== null && destChain !== void 0 ? destChain : exchangeChain)
@@ -10366,12 +10412,14 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             useRootOrigin: true
           };
           FEE_ASSET_AMOUNT = 100;
-          dummyOriginFee = feeAssetInfo ? parseUnits(FEE_ASSET_AMOUNT.toString(), feeAssetInfo.decimals) : 0n;
+          dummyFeeAssetAmount = separateFeeAssetInfo ? parseUnits(FEE_ASSET_AMOUNT.toString(), separateFeeAssetInfo.decimals) : undefined;
+          dummyDestFee = (_ref4 = separateFeeAssetInfo && getFeeAssetInfo(assetTo, separateFeeAssetInfo) && dummyFeeAssetAmount) !== null && _ref4 !== void 0 ? _ref4 : MIN_FEE;
           fees = {
-            originFee: dummyOriginFee,
-            originReserveFee: MIN_FEE,
-            exchangeFee: 0n,
-            destReserveFee: MIN_FEE
+            originFee: dummyFeeAssetAmount !== null && dummyFeeAssetAmount !== void 0 ? dummyFeeAssetAmount : 0n,
+            originReserveFee: dummyFeeAssetAmount !== null && dummyFeeAssetAmount !== void 0 ? dummyFeeAssetAmount : MIN_FEE,
+            exchangeFee: dummyFeeAssetAmount !== null && dummyFeeAssetAmount !== void 0 ? dummyFeeAssetAmount : 0n,
+            destReserveFee: dummyDestFee,
+            destFee: dummyDestFee
           };
           totalFeesPre = calculateTotalFees(chain, fees);
           if (!hasSeparateFeeAsset) {
@@ -10396,14 +10444,20 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
         case 3:
           firstDryRunResult = _context3.v;
           if (!(((_firstDryRunResult$dr = firstDryRunResult.dryRunError) === null || _firstDryRunResult$dr === void 0 ? void 0 : _firstDryRunResult$dr.reason) === 'NotHoldingFees')) {
+            _context3.n = 5;
+            break;
+          }
+          if (!separateFeeAssetInfo) {
             _context3.n = 4;
             break;
           }
-          throw new AmountTooLowError("Asset amount is too low to cover the fees, please increase the amount.");
+          throw new DryRunFailedError(firstDryRunResult.dryRunError);
         case 4:
+          throw new AmountTooLowError("Asset amount is too low to cover the fees, please increase the amount.");
+        case 5:
           exchangeHopIndex = findExchangeHopIndex(chain, firstDryRunResult, exchangeChain, destChain);
           extractedFees = extractFeesFromDryRun(chain, exchangeChain, firstDryRunResult, exchangeHopIndex, destChain, false); // Set originFee from dry run origin fee (padded), same as handleExecuteTransfer
-          extractedFees.originFee = feeAssetInfo && firstDryRunResult.origin.success ? padValueBy(firstDryRunResult.origin.fee, FEE_PADDING_PERCENTAGE) : 0n;
+          extractedFees.originFee = separateFeeAssetInfo && firstDryRunResult.origin.success ? padValueBy(firstDryRunResult.origin.fee, FEE_PADDING_PERCENTAGE) : 0n;
           if (extractedFees.exchangeFee === 0n) {
             // We set the exchange fee to non-zero value to prevent creating dummy tx
             extractedFees.exchangeFee = MIN_FEE;
@@ -10414,26 +10468,26 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           }
           updatedAssetTo = assetTo;
           if (!chain) {
-            _context3.n = 6;
+            _context3.n = 7;
             break;
           }
           // When fees are paid from a separate asset (e.g. DOT for Ethereum),
           // the full main asset amount is available for the swap
           amountAvailableForSwap = hasSeparateFeeAsset ? assetFrom.amount : assetFrom.amount - totalFees;
-          _context3.n = 5;
+          _context3.n = 6;
           return calculateMinAmountOut(amountAvailableForSwap);
-        case 5:
+        case 6:
           recalculatedMinAmountOut = _context3.v;
           updatedAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
             amount: recalculatedMinAmountOut
           });
-        case 6:
-          _context3.n = 7;
+        case 7:
+          _context3.n = 8;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetInfoTo: updatedAssetTo,
             fees: extractedFees
           }), firstDryRunResult.origin.success ? firstDryRunResult.origin.weight : undefined);
-        case 7:
+        case 8:
           _yield$createXcmAndCa2 = _context3.v;
           finalCall = _yield$createXcmAndCa2.call;
           return _context3.a(2, api.deserializeExtrinsics(finalCall));
@@ -10763,7 +10817,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_SubstrateChain) {
       var nativeAsset = api.findNativeAssetInfoOrThrow(this.chain);
       var isNativeAsset = isAssetEqual(nativeAsset, assetInfo);
       var isNativeFeeAsset = isAssetEqual(nativeAsset, feeAssetInfo);
-      return !isNativeAsset || !isNativeFeeAsset;
+      return (!isNativeAsset || !isNativeFeeAsset) && hasMatchingFeeAssetReserve(api, this.chain, assetInfo, feeAssetInfo);
     }
   }, {
     key: "transferPolkadotXCM",
@@ -10974,6 +11028,14 @@ var Hydration = /*#__PURE__*/function (_SubstrateChain) {
         useIdPrefix: false
       };
     }
+  }, {
+    key: "mint",
+    value: function mint(api, address, assetInfo, balance) {
+      if (assetInfo.erc20) {
+        return Promise.resolve(buildErc20StorageMint(api, address, assetInfo, assetInfo.erc20, balance + assetInfo.amount));
+      }
+      return _superPropGet(Hydration, "mint", this, 3)([api, address, assetInfo, balance]);
+    }
   }, {
     key: "shouldUseExecuteTransfer",
     value: function shouldUseExecuteTransfer(input) {
@@ -10985,7 +11047,7 @@ var Hydration = /*#__PURE__*/function (_SubstrateChain) {
       var nativeAsset = api.findNativeAssetInfoOrThrow(this.chain);
       var isNativeAsset = isAssetEqual(nativeAsset, asset);
       var isNativeFeeAsset = isAssetEqual(nativeAsset, feeAsset);
-      return !isNativeAsset || !isNativeFeeAsset;
+      return (!isNativeAsset || !isNativeFeeAsset) && hasMatchingFeeAssetReserve(api, this.chain, asset, feeAsset);
     }
   }, {
     key: "transferPolkadotXCM",
@@ -11041,6 +11103,12 @@ var Hydration = /*#__PURE__*/function (_SubstrateChain) {
         }
       }));
     }
+  }, {
+    key: "getBalanceForeign",
+    value: function getBalanceForeign(api, address, asset) {
+      if (!asset.erc20) return _superPropGet(Hydration, "getBalanceForeign", this, 3)([api, address, asset]);
+      return getPalletInstance('Currencies').getBalance(api, address, asset);
+    }
   }, {
     key: "transferLocalNonNativeAsset",
     value: function transferLocalNonNativeAsset(options) {
@@ -11048,9 +11116,22 @@ var Hydration = /*#__PURE__*/function (_SubstrateChain) {
         asset = options.assetInfo,
         recipient = options.recipient,
         isAmountAll = options.isAmountAll,
-        keepAlive = options.keepAlive;
+        keepAlive = options.keepAlive,
+        balance = options.balance;
       assertHasId(asset);
       var currencyId = Number(asset.assetId);
+      if (asset.erc20) {
+        var amount = isAmountAll ? balance - (keepAlive ? getEdFromAssetOrThrow(asset) : 0n) : asset.amount;
+        return api.deserializeExtrinsics({
+          module: 'Currencies',
+          method: 'transfer',
+          params: {
+            dest: recipient,
+            currency_id: currencyId,
+            amount: amount
+          }
+        });
+      }
       if (isAmountAll) {
         return api.deserializeExtrinsics({
           module: 'Tokens',
@@ -11725,7 +11806,9 @@ var EnergyWebX = /*#__PURE__*/function (_SubstrateChain) {
           scenario: scenario
         });
       }
-      return transferPolkadotXcm(input, 'limited_reserve_transfer_assets', 'Unlimited');
+      // EnergyWebX has to stay on reserve_transfer_assets for now.
+      // limited_reserve_transfer_assets causes 'Extrinsic is now allowed error'
+      return transferPolkadotXcm(input, 'reserve_transfer_assets');
     }
   }, {
     key: "isRelayToParaEnabled",
@@ -12575,6 +12658,10 @@ var DEFAULT_TTL_MS = 60000; // 1 minute
 var MAX_CLIENTS = 100;
 var EXTENSION_MS = 5 * 60000; // 5 minutes
 var MAX_U64 = (1n << 64n) - 1n;
+var MIN_WEIGHT = {
+  proofSize: 1n,
+  refTime: 1n
+};
 var MAX_WEIGHT = {
   proofSize: MAX_U64,
   refTime: MAX_U64
@@ -12767,6 +12854,39 @@ var formatAssetIdToERC20 = function formatAssetIdToERC20(id) {
   return "0xffffffff".concat(BigInt(id).toString(16).padStart(32, '0'));
 };
 
+// twox128("EVM") ++ twox128("AccountStorages") — the pallet_evm::AccountStorages storage prefix.
+var ACCOUNT_STORAGES_PREFIX = '1da53b775b270400e7e61ed5cbc5a146ab1160471b1418779239ba8e2b847e42';
+// "ETH\0" — prefix of account ids that Hydration derives from an EVM address
+var EVM_ACCOUNT_PREFIX = '45544800';
+var word = function word(hex) {
+  return hex.padStart(64, '0');
+};
+var blake2128Concat = function blake2128Concat(hex) {
+  return bytesToHex(blake2b(hexToBytes(hex), {
+    dkLen: 16
+  })) + hex;
+};
+// Mirrors pallet_evm_accounts::evm_address
+var toEvmAddress = function toEvmAddress(accountId) {
+  return accountId.startsWith(EVM_ACCOUNT_PREFIX) && accountId.endsWith('0'.repeat(16)) ? accountId.slice(8, 48) : accountId.slice(0, 40);
+};
+var buildErc20StorageMint = function buildErc20StorageMint(api, address, asset, erc20, balance) {
+  var _erc20$contract, _getJunctionValue;
+  var contract = (_erc20$contract = erc20.contract) !== null && _erc20$contract !== void 0 ? _erc20$contract : (_getJunctionValue = getJunctionValue(asset.location, 'AccountKey20')) === null || _getJunctionValue === void 0 ? void 0 : _getJunctionValue.key;
+  if (!contract) throw new InvalidCurrencyError("Missing ERC20 contract for asset ".concat(asset.symbol));
+  var evmAddress = toEvmAddress(bytesToHex(api.accountToUint8a(address)));
+  var slotKey = bytesToHex(keccak_256(hexToBytes(word(evmAddress) + word(erc20.balanceSlot.toString(16)))));
+  return {
+    balanceTx: {
+      module: 'System',
+      method: 'set_storage',
+      params: {
+        items: [['0x' + ACCOUNT_STORAGES_PREFIX + blake2128Concat(contract.slice(2)) + blake2128Concat(slotKey), '0x' + word(balance.toString(16))]]
+      }
+    }
+  };
+};
+
 var maybeOverrideAssets = function maybeOverrideAssets(version, amount, assets, overriddenCurrency) {
   if (!overriddenCurrency) {
     return assets;
@@ -12797,39 +12917,98 @@ var pickOtherMintPallet = function pickOtherMintPallet(asset, pallets) {
   return pallets[0];
 };
 
-var isHere = function isHere(loc) {
-  var _loc$interior;
-  return loc.interior === 'Here' || ((_loc$interior = loc.interior) === null || _loc$interior === void 0 ? void 0 : _loc$interior.Here) !== undefined;
+// Mirrors the runtime `Ord` of `Location` so that encoded `Assets` decode on chain
+var JUNCTION_ORDER = ['Parachain', 'AccountId32', 'AccountIndex64', 'AccountKey20', 'PalletInstance', 'GeneralIndex', 'GeneralKey', 'OnlyChild', 'Plurality', 'GlobalConsensus'];
+var NETWORK_ORDER = ['bygenesis', 'byfork', 'polkadot', 'kusama', 'westend', 'rococo', 'wococo', 'ethereum', 'bitcoincore', 'bitcoincash', 'polkadotbulletin'];
+var isRecord = function isRecord(value) {
+  return _typeof(value) === 'object' && value !== null;
+};
+var toBigInt = function toBigInt(value) {
+  if (typeof value === 'bigint') return value;
+  if (typeof value === 'number') return BigInt(value);
+  if (typeof value === 'string' && /^\d+$/.test(value)) return BigInt(value);
+  return undefined;
+};
+var _compareValues = function compareValues(a, b) {
+  if (a === b) return 0;
+  if (a === null || a === undefined) return -1;
+  if (b === null || b === undefined) return 1;
+  var aNumber = toBigInt(a);
+  var bNumber = toBigInt(b);
+  if (aNumber !== undefined && bNumber !== undefined) {
+    return aNumber < bNumber ? -1 : aNumber > bNumber ? 1 : 0;
+  }
+  if (typeof a === 'string' && typeof b === 'string') return a < b ? -1 : a > b ? 1 : 0;
+  if (isRecord(a) && isRecord(b)) {
+    for (var _i = 0, _Object$keys = Object.keys(a); _i < _Object$keys.length; _i++) {
+      var key = _Object$keys[_i];
+      var result = _compareValues(a[key], b[key]);
+      if (result !== 0) return result;
+    }
+  }
+  return 0;
+};
+var compareNetworks = function compareNetworks(a, b) {
+  var variant = function variant(value) {
+    return typeof value === 'string' ? [value, null] : isRecord(value) ? Object.entries(value)[0] : [];
+  };
+  var _variant = variant(a),
+    _variant2 = _slicedToArray(_variant, 2),
+    aName = _variant2[0],
+    aValue = _variant2[1];
+  var _variant3 = variant(b),
+    _variant4 = _slicedToArray(_variant3, 2),
+    bName = _variant4[0],
+    bValue = _variant4[1];
+  var order = NETWORK_ORDER.indexOf(String(aName).toLowerCase()) - NETWORK_ORDER.indexOf(String(bName).toLowerCase());
+  return order !== 0 ? order : _compareValues(aValue, bValue);
+};
+var compareJunctions = function compareJunctions(a, b) {
+  var _Object$entries$ = _slicedToArray(Object.entries(a)[0], 2),
+    aType = _Object$entries$[0],
+    aValue = _Object$entries$[1];
+  var _Object$entries$2 = _slicedToArray(Object.entries(b)[0], 2),
+    bType = _Object$entries$2[0],
+    bValue = _Object$entries$2[1];
+  var order = JUNCTION_ORDER.indexOf(aType) - JUNCTION_ORDER.indexOf(bType);
+  if (order !== 0) return order;
+  return aType === 'GlobalConsensus' ? compareNetworks(aValue, bValue) : _compareValues(aValue, bValue);
+};
+var getJunctions = function getJunctions(_ref) {
+  var interior = _ref.interior;
+  if (interior === 'Here') return [];
+  var junctions = Object.values(interior).find(function (value) {
+    return value !== null && value !== undefined;
+  });
+  if (junctions === undefined) return [];
+  return Array.isArray(junctions) ? junctions : [junctions];
+};
+var compareLocationOrder = function compareLocationOrder(a, b) {
+  var parents = Number(a.parents) - Number(b.parents);
+  if (parents !== 0) return parents;
+  var aJunctions = getJunctions(a);
+  var bJunctions = getJunctions(b);
+  if (aJunctions.length !== bJunctions.length) return aJunctions.length - bJunctions.length;
+  var _iterator = _createForOfIteratorHelper(aJunctions.entries()),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _step$value = _slicedToArray(_step.value, 2),
+        index = _step$value[0],
+        junction = _step$value[1];
+      var result = compareJunctions(junction, bJunctions[index]);
+      if (result !== 0) return result;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return 0;
 };
 var sortAssets = function sortAssets(assets) {
   return assets.sort(function (a, b) {
-    var aLoc = extractAssetLocation(a);
-    var bLoc = extractAssetLocation(b);
-    // 1. Sort by parents first
-    if (aLoc.parents !== bLoc.parents) {
-      return Number(aLoc.parents) - Number(bLoc.parents);
-    }
-    // 2. If parents are equal, use priority function
-    var aIsHere = isHere(aLoc);
-    var bIsHere = isHere(bLoc);
-    var aHasGlobal = hasJunction(aLoc, 'GlobalConsensus');
-    var bHasGlobal = hasJunction(bLoc, 'GlobalConsensus');
-    var aGeneralIndex = getJunctionValue(aLoc, 'GeneralIndex');
-    var bGeneralIndex = getJunctionValue(bLoc, 'GeneralIndex');
-    var getPriority = function getPriority(isHere, hasGlobal) {
-      if (isHere) return 0;
-      if (hasGlobal) return 2;
-      return 1;
-    };
-    var aPriority = getPriority(aIsHere, aHasGlobal);
-    var bPriority = getPriority(bIsHere, bHasGlobal);
-    if (aPriority !== bPriority) return aPriority - bPriority;
-    if (aGeneralIndex === undefined && bGeneralIndex === undefined) return 0;
-    if (aGeneralIndex === undefined) return 1;
-    if (bGeneralIndex === undefined) return -1;
-    var aIndex = BigInt(aGeneralIndex);
-    var bIndex = BigInt(bGeneralIndex);
-    return aIndex < bIndex ? -1 : aIndex > bIndex ? 1 : 0;
+    return compareLocationOrder(extractAssetLocation(a), extractAssetLocation(b));
   });
 };
 
@@ -12886,6 +13065,7 @@ var createSwapBuilder = function createSwapBuilder(options) {
   var from = options.from,
     to = options.to,
     currency = options.currency,
+    feeAsset = options.feeAsset,
     _options$swapOptions = options.swapOptions,
     currencyTo = _options$swapOptions.currencyTo,
     evmSenderAddress = _options$swapOptions.evmSenderAddress,
@@ -12900,7 +13080,7 @@ var createSwapBuilder = function createSwapBuilder(options) {
   if (Array.isArray(currency)) {
     throw new UnsupportedOperationError('Swaps with multiple currencies are not supported.');
   }
-  var builder = SwapBuilder(api).from(from).exchange(exchange).to(to).currencyFrom(currency).currencyTo(currencyTo).amount(currency.amount).sender(sender).evmSenderAddress(evmSenderAddress).recipient(address).slippagePct((_slippage$toString = slippage === null || slippage === void 0 ? void 0 : slippage.toString()) !== null && _slippage$toString !== void 0 ? _slippage$toString : DEFAULT_SWAP_SLIPPAGE.toString());
+  var builder = SwapBuilder(api).from(from).exchange(exchange).to(to).currencyFrom(currency).currencyTo(currencyTo).feeAsset(feeAsset).amount(currency.amount).sender(sender).evmSenderAddress(evmSenderAddress).recipient(address).slippagePct((_slippage$toString = slippage === null || slippage === void 0 ? void 0 : slippage.toString()) !== null && _slippage$toString !== void 0 ? _slippage$toString : DEFAULT_SWAP_SLIPPAGE.toString());
   if (onStatusChange) {
     builder = builder.onStatusChange(onStatusChange);
   }
@@ -13079,6 +13259,25 @@ var createChainClient = /*#__PURE__*/function () {
   };
 }();
 
+var createBridgedXcmPrefix = function createBridgedXcmPrefix(version, _ref) {
+  var palletIndex = _ref.palletIndex,
+    relay = _ref.relay,
+    paraId = _ref.paraId;
+  return [{
+    DescendOrigin: createX1Payload(version, {
+      PalletInstance: palletIndex
+    })
+  }, {
+    UniversalOrigin: {
+      GlobalConsensus: _defineProperty({}, relay.toLowerCase(), null)
+    }
+  }, {
+    DescendOrigin: createX1Payload(version, {
+      Parachain: paraId
+    })
+  }];
+};
+
 var getErrorInstruction = function getErrorInstruction(message, index) {
   if (index === undefined || _typeof(message) !== 'object' || message === null) {
     return undefined;
@@ -13589,30 +13788,37 @@ var PolkadotApi = /*#__PURE__*/function () {
             case 0:
               clientTtlMs = _args.length > 1 && _args[1] !== undefined ? _args[1] : DEFAULT_TTL_MS;
               destination = _args.length > 2 ? _args[2] : undefined;
-              if (!(this._chain !== undefined || isExternalChain(chain))) {
+              if (!(this._chain === chain || isExternalChain(chain))) {
                 _context.n = 1;
                 break;
               }
               return _context.a(2);
             case 1:
+              if (!(this._chain !== undefined)) {
+                _context.n = 2;
+                break;
+              }
+              _context.n = 2;
+              return this.disconnect();
+            case 2:
               this._ttlMs = clientTtlMs;
               this._chain = chain;
-              _context.n = 2;
+              _context.n = 3;
               return resolveChainApi(this._config, chain, function (wsUrl) {
                 return _this.leaseClient(wsUrl, _this._ttlMs);
               }, this._customCtx);
-            case 2:
+            case 3:
               this._api = _context.v;
-              _context.n = 3;
+              _context.n = 4;
               return this.maybeHydrateCustomChain(chain);
-            case 3:
+            case 4:
               if (!(typeof destination === 'string' && isCustomChain(destination))) {
-                _context.n = 4;
+                _context.n = 5;
                 break;
               }
-              _context.n = 4;
+              _context.n = 5;
               return this.hydrateCustomChain(destination);
-            case 4:
+            case 5:
               return _context.a(2);
           }
         }, _callee, this);
@@ -13627,6 +13833,11 @@ var PolkadotApi = /*#__PURE__*/function () {
     value: function setCustomCtx(ctx) {
       this._customCtx = ctx;
     }
+  }, {
+    key: "resetChain",
+    value: function resetChain() {
+      this._chain = undefined;
+    }
   }, {
     key: "hydrateCustomChain",
     value: function () {
@@ -13941,4 +14152,4 @@ var createClientCache = function createClientCache(maxSize, pingClient, onEvicti
   };
 };
 
-export { API_TYPES, AmountTooLowError, ApiNotInitializedError, BaseAssetsPallet, BatchMode, BatchValidationError, BridgeHaltedError, Builder, CustomChainConflictError, CustomChainInvalidError, DEFAULT_TTL_MS, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETH_MAINNET_CHAIN_ID, ETH_TESTNET_CHAIN_ID, EXCHANGE_CHAINS, EXTENSION_MS, ExtensionNotInstalledError, FeatureTemporarilyDisabledError, GeneralBuilder, InvalidAddressError, MAX_CLIENTS, MissingChainApiError, MissingParameterError, NoXCMSupportImplementedError, NumberFormatError, OverrideConflictError, PolkadotApi, PolkadotXcmError, PolkadotXcmExecutionError, ProviderUnavailableError, RELAY_LOCATION, RoutingResolutionError, RuntimeApiError, RuntimeApiUnavailableError, ScenarioNotSupportedError, SubmitTransactionError, TRANSACT_ORIGINS, TX_CLIENT_TIMEOUT_MS, TypeAndThenUnavailableError, UnableToComputeError, UnsupportedOperationError, ValidationError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, aggregateHopFees, applyDecimalAbstraction, assertAddressIsString, assertCurrencyCore, assertEvmAddress, assertExtensionInstalled, assertHasId, assertNotEvmTransfer, assertSender, assertSenderSource, assertSubstrateOrigin, assertSwapSupport, assertToIsString, blake2b256, blake2b512, buildCustomChainAssetsInfo, buildCustomChainConfig, buildDestInfo, buildDryRunError, buildHopInfo, buildOriginInfo, calcPreviewMintAmount, compareAddresses, computeOverridenAmount, constructTypeAndThenCall, convertBuilderConfig, convertSs58, createAsset, createAssetId, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createChainClient, createClientCache, createClientPoolHelpers, createCustomXcmOnDest, createDestination, createDirectExecuteXcm, createEthereumBridgeInstructions, createExecuteCall, createExecuteExchangeXcm, createSwapBuilder, createTransfer, createTransferOrSwap, createTransferOrSwapAll, createTxOverrideAmount, createTypeAndThenCall, createTypeThenAutoReserve, createVersionedAssets, createVersionedDestination, createX1Payload, deriveAccountId, dryRun, dryRunInternal, dryRunOrigin, encodeSs58, executeWithSwap, formatAssetIdToERC20, formatUnits, generateMessageId, getAssetBalanceInternal, getAssetReserveChain, getAssetReserveChainImpl, getBalance, getBalanceInternal, getBridgeStatus, getChain, getChainConfig, getChainConfigImpl, getChainLocation, getChainProviders, getChainProvidersImpl, getChainVersion, getDryRunError, getErrorInstruction, getEthErc20Balance, getEvmExtensionOrThrow, getEvmPrivateKeyHex, getEvmSnowbridgeExtensionOrThrow, getLocalTransferAmount, getMinTransferableAmount, getMinTransferableAmountInternal, getOriginXcmFee, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getParaIdImpl, getRelayChainOf, getRelayChainOfImpl, getRelayChainSymbolOf, getSwapExtensionOrThrow, getTChain, getTSubstrateChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeInternal, getXcmFeeOnce, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, isExchange, isNativeAssetTeleport, isSenderSigner, isViemSigner, keyFromWs, localizeLocation, localizeLocationImpl, maybeOverrideAsset, maybeOverrideAssets, normalizeAmount, normalizeCustomChains, normalizeExchange, overrideTxAmount, padFee, padValueBy, parseUnits, pickCompatibleXcmVersion, pickOtherMintPallet, pickRouterCompatibleXcmVersion, registerEvmExtension, registerEvmSnowbridgeExtension, registerSwapExtension, resolveAssetCount, resolveDestChain, resolveModuleError, resolveParaId, resolveTransferParams, reverseTransformLocation, selectXcmVersion, sortAssets, throwUnsupportedCurrency, traverseXcmHops, validateAddress, validateAssetSpecifiers, validateCurrency, validateDestination, validateDestinationAddress, validateTransact, verifyEdOnDestination, wrapTxBypass };
+export { API_TYPES, AmountTooLowError, ApiNotInitializedError, BaseAssetsPallet, BatchMode, BatchValidationError, BridgeHaltedError, Builder, CustomChainConflictError, CustomChainInvalidError, DEFAULT_TTL_MS, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETH_MAINNET_CHAIN_ID, ETH_TESTNET_CHAIN_ID, EXCHANGE_CHAINS, EXTENSION_MS, ExtensionNotInstalledError, FeatureTemporarilyDisabledError, GeneralBuilder, InvalidAddressError, MAX_CLIENTS, MissingChainApiError, MissingParameterError, NoXCMSupportImplementedError, NumberFormatError, OverrideConflictError, PolkadotApi, PolkadotXcmError, PolkadotXcmExecutionError, ProviderUnavailableError, RELAY_LOCATION, RoutingResolutionError, RuntimeApiError, RuntimeApiUnavailableError, ScenarioNotSupportedError, SubmitTransactionError, TRANSACT_ORIGINS, TX_CLIENT_TIMEOUT_MS, TypeAndThenUnavailableError, UnableToComputeError, UnsupportedOperationError, ValidationError, XTokensError, abstractDecimals, addEthereumBridgeFees, addXcmVersionHeader, aggregateHopFees, applyDecimalAbstraction, assertAddressIsString, assertCurrencyCore, assertEvmAddress, assertExtensionInstalled, assertHasId, assertNotEvmTransfer, assertSender, assertSenderSource, assertSubstrateOrigin, assertSwapSupport, assertToIsString, blake2b256, blake2b512, buildCustomChainAssetsInfo, buildCustomChainConfig, buildDestInfo, buildDryRunError, buildErc20StorageMint, buildHopInfo, buildOriginInfo, calcPreviewMintAmount, compareAddresses, compareLocationOrder, computeOverridenAmount, constructTypeAndThenCall, convertBuilderConfig, convertSs58, createAllCountedFilter, createAsset, createAssetId, createAssetsFilter, createBaseExecuteXcm, createBeneficiaryLocXTokens, createBeneficiaryLocation, createBridgedXcmPrefix, createChainClient, createClientCache, createClientPoolHelpers, createCustomXcmOnDest, createDestination, createDirectExecuteXcm, createEthereumBridgeInstructions, createExecuteCall, createExecuteExchangeXcm, createSwapBuilder, createTransfer, createTransferOrSwap, createTransferOrSwapAll, createTxOverrideAmount, createTypeAndThenCall, createTypeThenAutoReserve, createVersionedAssets, createVersionedDestination, createX1Payload, deriveAccountId, dryRun, dryRunInternal, dryRunOrigin, encodeSs58, executeWithSwap, formatAssetIdToERC20, formatUnits, generateMessageId, getAssetBalanceInternal, getAssetReserveChain, getAssetReserveChainImpl, getBalance, getBalanceInternal, getBridgeStatus, getChain, getChainConfig, getChainConfigImpl, getChainLocation, getChainProviders, getChainProvidersImpl, getChainVersion, getDryRunError, getErrorInstruction, getEthErc20Balance, getEvmExtensionOrThrow, getEvmPrivateKeyHex, getEvmSnowbridgeExtensionOrThrow, getLocalTransferAmount, getMinTransferableAmount, getMinTransferableAmountInternal, getOriginXcmFee, getOriginXcmFeeInternal, getParaEthTransferFees, getParaId, getParaIdImpl, getRelayChainOf, getRelayChainOfImpl, getRelayChainSymbolOf, getSwapExtensionOrThrow, getTChain, getTSubstrateChain, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeInternal, getXcmFeeOnce, handleExecuteTransfer, handleSwapExecuteTransfer, handleToAhTeleport, isConfig, isExchange, isNativeAssetTeleport, isSenderSigner, isViemSigner, keyFromWs, localizeLocation, localizeLocationImpl, maybeOverrideAsset, maybeOverrideAssets, normalizeAmount, normalizeCustomChains, normalizeExchange, overrideTxAmount, padFee, padValueBy, parseUnits, pickCompatibleXcmVersion, pickOtherMintPallet, pickRouterCompatibleXcmVersion, registerEvmExtension, registerEvmSnowbridgeExtension, registerSwapExtension, resolveAssetCount, resolveDestChain, resolveModuleError, resolveParaId, resolveTransferParams, reverseTransformLocation, selectXcmVersion, sortAssets, throwUnsupportedCurrency, traverseXcmHops, validateAddress, validateAssetSpecifiers, validateCurrency, validateDestination, validateDestinationAddress, validateFeeAssetSupport, validateTransact, verifyEdOnDestination, wrapTxBypass };