@paraspell/sdk-core 10.5.2 → 10.7.0

package/dist/index.cjs

@@ -720,6 +720,11 @@ var assertAddressIsString = function assertAddressIsString(address) {
     throw new InvalidParameterError('Multi-Location address is not supported for XCM fee calculation.');
   }
 };
+var assertHasLocation = function assertHasLocation(asset) {
+  if (!asset.multiLocation) {
+    throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is missing multi-location"));
+  }
+};
 
 var AssetHubPolkadot$1 = {
 	name: "AssetHub",
@@ -2108,6 +2113,42 @@ var createBeneficiaryMultiLocation = function createBeneficiaryMultiLocation(_re
   }
 };
 
+/**
+ * This function localizes a multiLocation 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 node is a relay chain.
+ *
+ * @param node - The current node
+ * @param multiLocation - The multiLocation to localize
+ * @returns The localized multiLocation
+ */
+var localizeLocation = function localizeLocation(node, multiLocation) {
+  var newInterior = multiLocation.interior;
+  var parachainRemoved = false;
+  if (multiLocation.interior !== 'Here') {
+    var junctions = Object.values(multiLocation.interior).flat().filter(function (junction) {
+      return _typeof(junction) === 'object' && junction !== null;
+    });
+    var filteredJunctions = junctions.filter(function (junction) {
+      if ('Parachain' in junction) {
+        parachainRemoved = true;
+        return false;
+      }
+      return true;
+    });
+    if (filteredJunctions.length === 0) {
+      newInterior = 'Here';
+    } else {
+      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
+    }
+  }
+  var shouldSetParentsToZero = parachainRemoved || newInterior === 'Here' && sdkCommon.isRelayChain(node);
+  return {
+    parents: shouldSetParentsToZero ? sdkCommon.Parents.ZERO : multiLocation.parents,
+    interior: newInterior
+  };
+};
+
 var reverseTransformMultiLocation = function reverseTransformMultiLocation(multiLocation) {
   var parachainJunction = {
     Parachain: 1000
@@ -2130,36 +2171,6 @@ var reverseTransformMultiLocation = function reverseTransformMultiLocation(multi
   });
 };
 
-/**
- * This function transforms a multiLocation by removing the `Parachain` junction
- * if it exists and setting the `parents` to `0`.
- *
- * @param multiLocation - The multiLocation to transform
- * @returns The transformed multiLocation
- */
-var transformMultiLocation = function transformMultiLocation(multiLocation) {
-  var newInterior;
-  if (multiLocation.interior === 'Here') {
-    newInterior = 'Here';
-  } else {
-    var junctions = Object.values(multiLocation.interior).flat().filter(function (junction) {
-      return _typeof(junction) === 'object' && junction !== null;
-    });
-    var filteredJunctions = junctions.filter(function (junction) {
-      return !('Parachain' in junction);
-    });
-    if (filteredJunctions.length === 0) {
-      newInterior = 'Here';
-    } else {
-      newInterior = _defineProperty({}, "X".concat(filteredJunctions.length), filteredJunctions);
-    }
-  }
-  return _objectSpread2(_objectSpread2({}, multiLocation), {}, {
-    parents: sdkCommon.Parents.ZERO,
-    interior: newInterior
-  });
-};
-
 var createBeneficiary = function createBeneficiary(options) {
   return createBeneficiaryMultiLocation(options);
 };
@@ -2396,15 +2407,6 @@ var resolveModuleError = function resolveModuleError(node, error) {
   return failureReason;
 };
 
-var getFees = function getFees(scenario) {
-  if (scenario === 'ParaToRelay') {
-    return 4600000000;
-  } else if (scenario === 'ParaToPara') {
-    return 399600000000;
-  }
-  throw new InvalidParameterError("Fees for scenario ".concat(scenario, " are not defined."));
-};
-
 /**
  * Retrieves the node instance for a given node.
  *
@@ -2417,7 +2419,7 @@ var getNode = function getNode(node) {
 };
 
 var resolveParaId = function resolveParaId(paraId, destination) {
-  if (sdkCommon.isTMultiLocation(destination) || sdkCommon.isRelayChain(destination) || destination === 'Ethereum') {
+  if (sdkCommon.isTMultiLocation(destination)) {
     return undefined;
   }
   return paraId !== null && paraId !== void 0 ? paraId : getParaId(destination);
@@ -2555,14 +2557,14 @@ var getModifiedCurrencySelection = function getModifiedCurrencySelection(input)
   return createDefaultCurrencySelection(input);
 };
 
-var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, currencySelection, destLocation, amount, fees, version, overriddenAsset) {
+var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, currencySelection, destLocation, amount, weightLimit, version, overriddenAsset) {
   var versionedDestLocation = addXcmVersionHeader(destLocation, version);
   if (!isMultiAssetTransfer) {
     return {
       currency_id: currencySelection,
       amount: BigInt(amount),
       dest: versionedDestLocation,
-      dest_weight_limit: fees
+      dest_weight_limit: weightLimit
     };
   }
   var isOverriddenMultiAssets = overriddenAsset && !sdkCommon.isTMultiLocation(overriddenAsset);
@@ -2575,7 +2577,7 @@ var getXTokensParameters = function getXTokensParameters(isMultiAssetTransfer, c
     fee_item: feeIndexWithFallback
   }), {}, {
     dest: versionedDestLocation,
-    dest_weight_limit: fees
+    dest_weight_limit: weightLimit
   });
 };
 
@@ -3436,8 +3438,9 @@ var transferMoonbeamEvm = /*#__PURE__*/function () {
   };
 }();
 
-var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, messageId) {
+var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, messageId, feeAmount) {
   var api = _ref.api,
+    destination = _ref.destination,
     address = _ref.address,
     asset = _ref.asset,
     scenario = _ref.scenario,
@@ -3447,9 +3450,7 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, message
   if (!assets.isForeignAsset(asset)) {
     throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
   }
-  if (!asset.multiLocation) {
-    throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-  }
+  assertHasLocation(asset);
   if (!senderAddress) {
     throw new InvalidParameterError("Please provide senderAddress");
   }
@@ -3471,7 +3472,41 @@ var createCustomXcmOnDest = function createCustomXcmOnDest(_ref, origin, message
     }]
   };
   return _defineProperty({}, version, [{
-    SetAppendix: [{
+    SetAppendix: [origin === 'Mythos' ? {
+      DepositReserveAsset: {
+        assets: {
+          Wild: 'All'
+        },
+        dest: createDestination(scenario, version, destination, getParaId(origin), undefined, sdkCommon.Parents.ONE),
+        xcm: [{
+          BuyExecution: {
+            fees: {
+              id: {
+                parents: sdkCommon.Parents.ZERO,
+                interior: 'Here'
+              },
+              fun: {
+                Fungible: feeAmount
+              }
+            },
+            weight_limit: 'Unlimited'
+          }
+        }, {
+          DepositAsset: {
+            assets: {
+              Wild: 'All'
+            },
+            beneficiary: createBeneficiaryMultiLocation({
+              api: api,
+              scenario: scenario,
+              pallet: 'PolkadotXcm',
+              recipientAddress: address,
+              version: version
+            })
+          }
+        }]
+      }
+    } : {
       DepositAsset: {
         assets: {
           Wild: 'All'
@@ -3738,6 +3773,7 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
           messageId = _context.v;
           customXcm = createCustomXcmOnDest({
             api: api,
+            destination: to,
             address: address,
             scenario: 'ParaToPara',
             senderAddress: senderAddress,
@@ -4796,7 +4832,8 @@ var getDestXcmFee = /*#__PURE__*/function () {
   };
 }();
 
-var getFailureInfo$1 = function getFailureInfo(results) {
+var getFailureInfo$1 = function getFailureInfo(results, hops) {
+  // Check standard chains first for backwards compatibility
   for (var _i = 0, _arr = ['destination', 'assetHub', 'bridgeHub']; _i < _arr.length; _i++) {
     var chain = _arr[_i];
     var res = results[chain];
@@ -4807,17 +4844,34 @@ var getFailureInfo$1 = function getFailureInfo(results) {
       };
     }
   }
+  var _iterator = _createForOfIteratorHelper(hops),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var hop = _step.value;
+      if (!hop.result.success && hop.result.failureReason) {
+        return {
+          failureReason: hop.result.failureReason,
+          failureChain: hop.node
+        };
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
   return {};
 };
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _intermediateFees$bri, _intermediateFees$ass, _processedBridgeHubDa, _destinationDryRun;
-    var origin, destination, currency, api, tx, senderAddress, feeAsset, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationDryRun, nextChain, hopApi, hopDryRun, newXcms, destParaId, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, _getFailureInfo, failureReason, failureChain;
+    var origin, destination, currency, api, tx, senderAddress, feeAsset, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, hops, destinationDryRun, nextChain, hopApi, hopDryRun, hopCurrency, newXcms, destParaId, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, _getFailureInfo, failureReason, failureChain;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset;
-          resolvedFeeAsset = feeAsset && origin === 'AssetHubPolkadot' ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
+          resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           asset = assets.findAssetForNodeOrThrow(origin, currency, destination);
           _context.n = 1;
           return api.getDryRunCall({
@@ -4836,7 +4890,8 @@ var dryRunInternal = /*#__PURE__*/function () {
           return _context.a(2, {
             failureReason: originDryRun.failureReason,
             failureChain: 'origin',
-            origin: originDryRun
+            origin: originDryRun,
+            hops: []
           });
         case 2:
           initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
@@ -4846,6 +4901,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           forwardedXcms = initialForwardedXcms;
           nextParaId = initialDestParaId;
           intermediateFees = {};
+          hops = [];
         case 3:
           if (!(Array.isArray(forwardedXcms) && forwardedXcms.length && forwardedXcms[1].length && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
             _context.n = 13;
@@ -4888,6 +4944,23 @@ var dryRunInternal = /*#__PURE__*/function () {
           });
         case 8:
           hopDryRun = _context.v;
+          // Determine the currency for this hop
+          hopCurrency = void 0;
+          if (nextChain === destination) {
+            hopCurrency = asset === null || asset === void 0 ? void 0 : asset.symbol;
+          } else if (sdkCommon.isRelayChain(nextChain) || nextChain === assetHubNode || nextChain === bridgeHubNode) {
+            hopCurrency = resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(nextChain);
+          }
+          // Add to hops array (only if not the destination)
+          if (nextChain !== destination) {
+            hops.push({
+              node: nextChain,
+              result: hopDryRun.success && hopCurrency ? _objectSpread2(_objectSpread2({}, hopDryRun), {}, {
+                currency: hopCurrency
+              }) : hopDryRun
+            });
+          }
+          // Keep existing logic for backwards compatibility
           if (nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination)) {
             destinationDryRun = hopDryRun;
           } else if (nextChain === assetHubNode) {
@@ -4933,12 +5006,21 @@ var dryRunInternal = /*#__PURE__*/function () {
           processedBridgeHubData = _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
             fee: intermediateFees.bridgeHub.fee + bridgeFee
           });
+          // Update the hop data if BridgeHub is in the hops array
+          bridgeHubHopIndex = hops.findIndex(function (hop) {
+            return hop.node === bridgeHubNode;
+          });
+          if (bridgeHubHopIndex !== -1 && hops[bridgeHubHopIndex].result.success) {
+            hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, hops[bridgeHubHopIndex].result), {}, {
+              fee: intermediateFees.bridgeHub.fee + bridgeFee
+            });
+          }
         case 16:
           _getFailureInfo = getFailureInfo$1({
             destination: destinationDryRun,
             assetHub: intermediateFees.assetHub,
             bridgeHub: intermediateFees.bridgeHub
-          }), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
+          }, hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
           return _context.a(2, {
             failureReason: failureReason,
             failureChain: failureChain,
@@ -4946,14 +5028,15 @@ var dryRunInternal = /*#__PURE__*/function () {
               currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(origin)
             }) : originDryRun,
             assetHub: (_intermediateFees$ass = intermediateFees.assetHub) !== null && _intermediateFees$ass !== void 0 && _intermediateFees$ass.success ? _objectSpread2(_objectSpread2({}, intermediateFees.assetHub), {}, {
-              currency: assets.getNativeAssetSymbol(assetHubNode)
+              currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(assetHubNode)
             }) : intermediateFees.assetHub,
             bridgeHub: (_processedBridgeHubDa = processedBridgeHubData) !== null && _processedBridgeHubDa !== void 0 && _processedBridgeHubDa.success ? _objectSpread2(_objectSpread2({}, processedBridgeHubData), {}, {
               currency: assets.getNativeAssetSymbol(bridgeHubNode)
             }) : processedBridgeHubData,
             destination: (_destinationDryRun = destinationDryRun) !== null && _destinationDryRun !== void 0 && _destinationDryRun.success ? _objectSpread2(_objectSpread2({}, destinationDryRun), {}, {
               currency: asset === null || asset === void 0 ? void 0 : asset.symbol
-            }) : destinationDryRun
+            }) : destinationDryRun,
+            hops: hops // Add the hops array to the return value
           });
       }
     }, _callee, null, [[5,, 10, 12]]);
@@ -5258,7 +5341,7 @@ var validateDestination = function validateDestination(origin, destination) {
   if (sdkCommon.isRelayChain(origin) && !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination) && origin !== destination) {
     throw new IncompatibleNodesError('Direct relay chain to relay chain transfers are not supported. Please use Polkadot <-> Kusama bridge through AssetHub.');
   }
-  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam'];
+  var allowedChainsToEthereum = ['AssetHubPolkadot', 'Hydration', 'BifrostPolkadot', 'Moonbeam', 'Mythos'];
   if (destination === 'Ethereum' && !allowedChainsToEthereum.includes(origin)) {
     throw new IncompatibleNodesError("Transfers to Ethereum are only supported from: ".concat(allowedChainsToEthereum.join(', ')));
   }
@@ -5850,13 +5933,14 @@ var send = /*#__PURE__*/function () {
           });
           finalVersion = selectXcmVersion(version, originVersion, destVersion);
           normalizedAsset = finalAsset.multiLocation ? _objectSpread2(_objectSpread2({}, finalAsset), {}, {
-            multilocation: assets.normalizeMultiLocation(finalAsset.multiLocation, finalVersion)
+            multiLocation: assets.normalizeMultiLocation(finalAsset.multiLocation, finalVersion)
           }) : finalAsset;
           return _context.a(2, getNode(origin).transfer({
             api: api,
             asset: normalizedAsset,
             currency: currency,
             feeAsset: resolvedFeeAsset,
+            feeCurrency: feeAsset,
             address: address,
             to: destination,
             paraIdTo: paraIdTo,
@@ -5923,11 +6007,11 @@ var ParachainNode = /*#__PURE__*/function () {
     key: "transfer",
     value: function () {
       var _transfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-        var api, asset, currency, feeAsset, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, isRelayDestination, scenario, paraId, isLocalTransfer, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest;
+        var api, asset, currency, feeAsset, feeCurrency, address, destination, paraIdTo, overriddenAsset, version, senderAddress, ahAddress, pallet, method, isRelayDestination, scenario, paraId, isLocalTransfer, isBifrostOrigin, isAssetHubDest, shouldUseMultiasset, input, _options, isEthAsset, isAHPOrigin, isAHPDest, isEthDest;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              api = options.api, asset = options.asset, currency = options.currency, feeAsset = options.feeAsset, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
+              api = options.api, asset = options.asset, currency = options.currency, feeAsset = options.feeAsset, feeCurrency = options.feeCurrency, address = options.address, destination = options.to, paraIdTo = options.paraIdTo, overriddenAsset = options.overriddenAsset, version = options.version, senderAddress = options.senderAddress, ahAddress = options.ahAddress, pallet = options.pallet, method = options.method;
               isRelayDestination = !sdkCommon.isTMultiLocation(destination) && sdkCommon.isRelayChain(destination);
               scenario = isRelayDestination ? 'ParaToRelay' : 'ParaToPara';
               paraId = resolveParaId(paraIdTo, destination);
@@ -5963,7 +6047,6 @@ var ParachainNode = /*#__PURE__*/function () {
                   version: version,
                   paraId: paraId
                 }),
-                fees: getFees(scenario),
                 origin: this.node,
                 scenario: scenario,
                 paraIdTo: paraId,
@@ -6019,6 +6102,7 @@ var ParachainNode = /*#__PURE__*/function () {
                 asset: asset,
                 currency: currency,
                 feeAsset: feeAsset,
+                feeCurrency: feeCurrency,
                 scenario: scenario,
                 destination: destination,
                 paraIdTo: paraId,
@@ -6032,13 +6116,13 @@ var ParachainNode = /*#__PURE__*/function () {
               isAHPOrigin = this.node === 'AssetHubPolkadot' || this.node === 'AssetHubKusama';
               isAHPDest = destination === 'AssetHubPolkadot' || destination === 'AssetHubKusama';
               isEthDest = destination === 'Ethereum'; // Eth asset - Any origin to any dest via AH - DestinationReserve - multiple instructions
-              if (!(isEthAsset && !isAHPOrigin && !isAHPDest && !isEthDest)) {
+              if (!(isEthAsset && !isAHPOrigin && !isAHPDest && !isEthDest && !feeAsset)) {
                 _context.n = 6;
                 break;
               }
               return _context.a(2, this.transferEthAssetViaAH(_options));
             case 6:
-              if (!(isEthAsset && isAHPDest && !isAHPOrigin && !isEthDest)) {
+              if (!(isEthAsset && isAHPDest && !isAHPOrigin && !isEthDest && !feeAsset)) {
                 _context.n = 7;
                 break;
               }
@@ -6164,41 +6248,36 @@ var ParachainNode = /*#__PURE__*/function () {
           while (1) switch (_context2.n) {
             case 0:
               api = input.api, asset = input.asset, scenario = input.scenario, version = input.version, destination = input.destination, address = input.address, senderAddress = input.senderAddress, feeAsset = input.feeAsset, paraIdTo = input.paraIdTo;
-              if (asset.multiLocation) {
-                _context2.n = 1;
-                break;
-              }
-              throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-            case 1:
+              assertHasLocation(asset);
               if (!(senderAddress === undefined)) {
-                _context2.n = 2;
+                _context2.n = 1;
                 break;
               }
               throw new InvalidParameterError('Sender address is required for transfers to Ethereum');
-            case 2:
+            case 1:
               if (!sdkCommon.isTMultiLocation(address)) {
-                _context2.n = 3;
+                _context2.n = 2;
                 break;
               }
               throw new InvalidParameterError('Multi-location address is not supported for Ethereum transfers');
-            case 3:
+            case 2:
               ethMultiAsset = createMultiAsset(version, asset.amount, asset.multiLocation);
               PARA_TO_PARA_FEE_DOT = 500000000n; // 0.5 DOT
               // Pad by 25%
               AH_EXECUTION_FEE_PADDED = ASSET_HUB_EXECUTION_FEE * 125n / 100n; // Perform a dry run AH -> dest to calculate the BuyExecution amount
-              _context2.n = 4;
+              _context2.n = 3;
               return Builder(api.clone()).from('AssetHubPolkadot').to(destination).currency({
                 symbol: 'DOT',
                 amount: AH_EXECUTION_FEE_PADDED
               }).address(address).senderAddress(senderAddress).dryRun();
-            case 4:
+            case 3:
               dryRunResult = _context2.v;
               if (dryRunResult.origin.success) {
-                _context2.n = 5;
+                _context2.n = 4;
                 break;
               }
               throw new DryRunFailedError(dryRunResult.origin.failureReason);
-            case 5:
+            case 4:
               // Pad fee by 50%
               dryRunFeePadded = BigInt(dryRunResult.origin.fee) * 3n / 2n;
               dest = createDestination(scenario, version, destination, paraIdTo);
@@ -6313,32 +6392,27 @@ var ParachainNode = /*#__PURE__*/function () {
               }
               throw new BridgeHaltedError();
             case 2:
-              if (asset.multiLocation) {
-                _context3.n = 3;
-                break;
-              }
-              throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-            case 3:
+              assertHasLocation(asset);
               if (!(senderAddress === undefined)) {
-                _context3.n = 4;
+                _context3.n = 3;
                 break;
               }
               throw new InvalidParameterError('Sender address is required for transfers to Ethereum');
-            case 4:
+            case 3:
               if (!sdkCommon.isTMultiLocation(address)) {
-                _context3.n = 5;
+                _context3.n = 4;
                 break;
               }
               throw new InvalidParameterError('Multi-location address is not supported for Ethereum transfers');
-            case 5:
+            case 4:
               ethMultiAsset = createMultiAsset(version, asset.amount, asset.multiLocation);
-              _context3.n = 6;
+              _context3.n = 5;
               return api.createApiForNode('AssetHubPolkadot');
-            case 6:
+            case 5:
               ahApi = _context3.v;
-              _context3.n = 7;
+              _context3.n = 6;
               return getParaEthTransferFees(ahApi);
-            case 7:
+            case 6:
               _yield$getParaEthTran = _context3.v;
               _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
               bridgeFee = _yield$getParaEthTran2[0];
@@ -6347,13 +6421,13 @@ var ParachainNode = /*#__PURE__*/function () {
               fee = useOnlyDepositInstruction ? PARA_TO_PARA_FEE_DOT : (bridgeFee + executionFee).toString();
               ethAsset = assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
               if (ethAsset) {
-                _context3.n = 8;
+                _context3.n = 7;
                 break;
               }
               throw new assets.InvalidCurrencyError("Could not obtain Ethereum asset address for ".concat(JSON.stringify(asset)));
-            case 8:
+            case 7:
               if (!useOnlyDepositInstruction) {
-                _context3.n = 9;
+                _context3.n = 8;
                 break;
               }
               customXcmOnDest = addXcmVersionHeader([{
@@ -6372,21 +6446,21 @@ var ParachainNode = /*#__PURE__*/function () {
                   })
                 }
               }], version);
-              _context3.n = 12;
+              _context3.n = 11;
               break;
-            case 9:
+            case 8:
               if (ethAsset.assetId) {
-                _context3.n = 10;
+                _context3.n = 9;
                 break;
               }
               throw new assets.InvalidCurrencyError("Ethereum asset ".concat(JSON.stringify(ethAsset), " has no assetId"));
-            case 10:
-              _context3.n = 11;
+            case 9:
+              _context3.n = 10;
               return generateMessageId(api, senderAddress, getParaId(this.node), ethAsset.assetId, address, asset.amount);
-            case 11:
+            case 10:
               messageId = _context3.v;
               customXcmOnDest = createCustomXcmOnDest(input, this.node, messageId);
-            case 12:
+            case 11:
               call = {
                 module: 'PolkadotXcm',
                 method: 'transfer_assets_using_type_and_then',
@@ -6722,10 +6796,8 @@ var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, weight,
     version: version,
     paraId: paraIdTo
   });
-  if (!asset.multiLocation) {
-    throw new InvalidParameterError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-  }
-  var transformedMultiLocation = transformMultiLocation(asset.multiLocation);
+  assertHasLocation(asset);
+  var transformedMultiLocation = localizeLocation('AssetHubPolkadot', asset.multiLocation);
   var call = {
     module: 'PolkadotXcm',
     method: 'execute',
@@ -6801,8 +6873,97 @@ var createExecuteExchangeXcm = function createExecuteExchangeXcm(input, weight,
   return api.callTxMethod(call);
 };
 
-var createExecuteXcm = function createExecuteXcm(input, executionFee, version) {
-  var _feeAsset$multiLocati;
+var getReserveParaId = function getReserveParaId(assetLocation) {
+  var hasParaJunction = sdkCommon.hasJunction(assetLocation, 'Parachain');
+  var hasGlobalConsensusJunction = sdkCommon.hasJunction(assetLocation, 'GlobalConsensus');
+  if (hasParaJunction) {
+    return sdkCommon.getJunctionValue(assetLocation, 'Parachain');
+  }
+  if (hasGlobalConsensusJunction) {
+    return getParaId('AssetHubPolkadot');
+  }
+  if (sdkCommon.deepEqual(assetLocation, {
+    parents: sdkCommon.Parents.ONE,
+    interior: {
+      Here: null
+    }
+  })) {
+    return getParaId('Polkadot');
+  }
+};
+var isOnReserveChain = function isOnReserveChain(node, reserveParaId) {
+  if (reserveParaId === undefined) return false;
+  var currentParaId = getParaId(node);
+  return currentParaId === reserveParaId;
+};
+var getChainLocation = function getChainLocation(paraId) {
+  var interior = paraId === getParaId('Polkadot') ? 'Here' : {
+    X1: [{
+      Parachain: paraId
+    }]
+  };
+  return {
+    parents: sdkCommon.Parents.ONE,
+    interior: interior
+  };
+};
+var createAssetsFilter = function createAssetsFilter(asset, feeAsset) {
+  return !feeAsset ?
+  // For same fee asset, deposit only this one asset
+  {
+    Wild: {
+      AllCounted: 1
+    }
+  } :
+  // For different fee asset, specify which one to deposit by location and amount
+  {
+    Definite: [asset]
+  };
+};
+var sortMultiAssets = function sortMultiAssets(assets$1) {
+  return assets$1.sort(function (a, b) {
+    var aLoc = assets.extractMultiAssetLoc(a);
+    var bLoc = assets.extractMultiAssetLoc(b);
+    var aIsHere = isHere(aLoc);
+    var bIsHere = isHere(bLoc);
+    var aHasGlobal = sdkCommon.hasJunction(aLoc, 'GlobalConsensus');
+    var bHasGlobal = sdkCommon.hasJunction(bLoc, 'GlobalConsensus');
+    var aGeneralIndex = sdkCommon.getJunctionValue(aLoc, 'GeneralIndex');
+    var bGeneralIndex = sdkCommon.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;
+    return aGeneralIndex - bGeneralIndex;
+  });
+};
+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;
+}
+var updateAsset = function updateAsset(asset, amount) {
+  return _objectSpread2(_objectSpread2({}, asset), {}, {
+    fun: {
+      Fungible: amount
+    }
+  });
+};
+var createWithdrawAssets = function createWithdrawAssets(asset, feeAsset) {
+  var assetsToWithdraw = [asset];
+  if (feeAsset) {
+    assetsToWithdraw.push(feeAsset);
+  }
+  return sortMultiAssets(assetsToWithdraw);
+};
+var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopExecutionFee, version) {
+  var _ref;
   var api = input.api,
     asset = input.asset,
     scenario = input.scenario,
@@ -6810,6 +6971,7 @@ var createExecuteXcm = function createExecuteXcm(input, executionFee, version) {
     paraIdTo = input.paraIdTo,
     address = input.address,
     feeAsset = input.feeAsset;
+  var amount = BigInt(asset.amount);
   var dest = createDestination(scenario, version, destination, paraIdTo);
   var beneficiary = createBeneficiary({
     api: api,
@@ -6819,78 +6981,36 @@ var createExecuteXcm = function createExecuteXcm(input, executionFee, version) {
     version: version,
     paraId: paraIdTo
   });
-  if (!assets.isForeignAsset(asset) || !asset.multiLocation || !asset.assetId) {
-    throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is missing multiLocation or assetId"));
-  }
-  if (feeAsset && (!assets.isForeignAsset(feeAsset) || !feeAsset.multiLocation || !feeAsset.assetId)) {
-    throw new assets.InvalidCurrencyError("Fee asset ".concat(JSON.stringify(feeAsset), " is missing multiLocation or assetId"));
-  }
-  var assetML = transformMultiLocation(asset.multiLocation);
-  var feeML = transformMultiLocation((_feeAsset$multiLocati = feeAsset === null || feeAsset === void 0 ? void 0 : feeAsset.multiLocation) !== null && _feeAsset$multiLocati !== void 0 ? _feeAsset$multiLocati : asset.multiLocation);
-  var sameFeeAsset = feeAsset && assets.isAssetEqual(asset, feeAsset);
-  var amountWithoutFee = BigInt(asset.amount) - executionFee;
-  var assetsToWithdraw = [{
-    assetId: asset.assetId,
-    multiasset: {
-      id: assetML,
-      fun: {
-        Fungible: BigInt(asset.amount)
-      }
-    }
-  }];
-  if (!sameFeeAsset && feeAsset !== null && feeAsset !== void 0 && feeAsset.multiLocation) {
-    assetsToWithdraw.push({
-      assetId: feeAsset.assetId,
-      multiasset: {
-        id: feeML,
-        fun: {
-          Fungible: executionFee
-        }
-      }
-    });
-  }
-  assetsToWithdraw.sort(function (a, b) {
-    return a.assetId > b.assetId ? 1 : -1;
-  });
-  var xcm = [{
-    WithdrawAsset: assetsToWithdraw.map(function (_ref) {
-      var multiasset = _ref.multiasset;
-      return multiasset;
-    })
-  }, {
-    BuyExecution: {
-      fees: {
-        id: feeML,
-        fun: {
-          Fungible: executionFee
-        }
-      },
-      weight_limit: {
-        Limited: {
-          ref_time: 150n,
-          proof_size: 0n
-        }
-      }
+  assertHasLocation(asset);
+  if (feeAsset) {
+    assertHasLocation(feeAsset);
+  }
+  var reserveParaId = getReserveParaId(asset.multiLocation);
+  var reserveChain = reserveParaId !== undefined ? getTNode(reserveParaId, determineRelayChain(node) === 'Polkadot' ? 'polkadot' : 'kusama') : undefined;
+  var isReserveDest = reserveParaId === paraIdTo;
+  var multiAsset = createMultiAsset(version, amount, asset.multiLocation);
+  var multiAssetLocalized = createMultiAsset(version, amount, localizeLocation(node, asset.multiLocation));
+  var multiAssetLocalizedToReserve = createMultiAsset(version, amount, localizeLocation(reserveChain !== null && reserveChain !== void 0 ? reserveChain : node, asset.multiLocation));
+  var feeMultiAsset = feeAsset && !assets.isAssetEqual(asset, feeAsset) ? createMultiAsset(version, executionFee, feeAsset.multiLocation) : undefined;
+  var feeMultiAssetLocalized = feeAsset && !assets.isAssetEqual(asset, feeAsset) ? createMultiAsset(version, executionFee, localizeLocation(node, feeAsset.multiLocation)) : undefined;
+  var feeMultiAssetLocalizedToReserve = feeAsset && !assets.isAssetEqual(asset, feeAsset) ? createMultiAsset(version, executionFee, localizeLocation(reserveChain !== null && reserveChain !== void 0 ? reserveChain : node, feeAsset.multiLocation)) : undefined;
+  var withdrawAssets = createWithdrawAssets(node === 'AssetHubPolkadot' ? multiAssetLocalized : multiAsset, node === 'AssetHubPolkadot' ? feeMultiAssetLocalized : feeMultiAsset);
+  var assetsFilter = createAssetsFilter(multiAsset, feeMultiAsset);
+  if (node !== 'AssetHubPolkadot' && reserveParaId === undefined) {
+    throw new InvalidParameterError('Sending local reserve assets with custom fee asset is not yet supported for this chain.');
+  }
+  var depositInstruction = isReserveDest ? {
+    DepositAsset: {
+      assets: createAssetsFilter(multiAssetLocalizedToReserve, feeMultiAssetLocalizedToReserve),
+      beneficiary: beneficiary
     }
-  }, {
+  } : {
     DepositReserveAsset: {
-      assets: {
-        Definite: [{
-          id: assetML,
-          fun: {
-            Fungible: sameFeeAsset ? amountWithoutFee : BigInt(asset.amount)
-          }
-        }]
-      },
+      assets: createAssetsFilter(multiAssetLocalized, feeMultiAssetLocalized),
       dest: dest,
       xcm: [{
         BuyExecution: {
-          fees: {
-            id: asset.multiLocation,
-            fun: {
-              Fungible: sameFeeAsset ? amountWithoutFee - executionFee : BigInt(asset.amount)
-            }
-          },
+          fees: updateAsset(multiAsset, amount - (feeMultiAsset ? hopExecutionFee : executionFee + hopExecutionFee)),
           weight_limit: 'Unlimited'
         }
       }, {
@@ -6904,10 +7024,149 @@ var createExecuteXcm = function createExecuteXcm(input, executionFee, version) {
         }
       }]
     }
-  }];
+  };
+  var needsIntermediaryReserve = reserveParaId !== undefined &&
+  // Has a reserve
+  !isOnReserveChain(node, reserveParaId); // Not on reserve
+  var lastInstruction = needsIntermediaryReserve ? {
+    InitiateReserveWithdraw: {
+      assets: assetsFilter,
+      reserve: getChainLocation(reserveParaId),
+      xcm: [{
+        BuyExecution: {
+          fees:
+          // Decrease amount by 2 units becuase for some reason polkadot withdraws 2 units less
+          // than requested, so we need to account for that
+          updateAsset(multiAssetLocalizedToReserve, amount - 2n),
+          weight_limit: 'Unlimited'
+        }
+      }, depositInstruction]
+    }
+  } : depositInstruction;
+  var xcm = [{
+    WithdrawAsset: withdrawAssets
+  }, {
+    BuyExecution: {
+      fees: (_ref = node === 'AssetHubPolkadot' ? feeMultiAssetLocalized : feeMultiAsset) !== null && _ref !== void 0 ? _ref : node === 'AssetHubPolkadot' ? multiAssetLocalized : multiAsset,
+      weight_limit: {
+        Limited: {
+          ref_time: 450n,
+          proof_size: 0n
+        }
+      }
+    }
+  }, lastInstruction];
   return addXcmVersionHeader(xcm, version);
 };
 
+var handleExecuteTransfer = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(node, input) {
+    var api, senderAddress, paraIdTo, asset, currency, feeCurrency, address, feeAsset, version, feeAssetBalance, checkAmount, MIN_FEE, call, destNode, dryRunResult, paddedFee, hopFee, paddedHopFee, xcm, weight, _t;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = input.api, senderAddress = input.senderAddress, paraIdTo = input.paraIdTo, asset = input.asset, currency = input.currency, feeCurrency = input.feeCurrency, address = input.address, feeAsset = input.feeAsset, version = input.version;
+          if (senderAddress) {
+            _context.n = 1;
+            break;
+          }
+          throw new InvalidParameterError('Please provide senderAddress');
+        case 1:
+          assertAddressIsString(address);
+          validateAddress(senderAddress, node, false);
+          if (!(feeCurrency && feeAsset && !assets.isAssetEqual(asset, feeAsset))) {
+            _context.n = 3;
+            break;
+          }
+          _context.n = 2;
+          return getAssetBalanceInternal({
+            api: api,
+            address: senderAddress,
+            node: node,
+            currency: feeCurrency
+          });
+        case 2:
+          _t = _context.v;
+          _context.n = 4;
+          break;
+        case 3:
+          _t = undefined;
+        case 4:
+          feeAssetBalance = _t;
+          checkAmount = function checkAmount(fee) {
+            if (BigInt(asset.amount) <= fee) {
+              throw new InvalidParameterError("Asset amount is too low, please increase the amount or use a different fee asset.");
+            }
+          };
+          MIN_FEE = 1000n;
+          checkAmount(MIN_FEE);
+          call = createExecuteCall(createExecuteXcm(node, input, feeAssetBalance && feeAssetBalance > 1n ? feeAssetBalance : MIN_FEE, MIN_FEE, version), MAX_WEIGHT);
+          destNode = getTNode(paraIdTo, determineRelayChain(node) === 'Polkadot' ? 'polkadot' : 'kusama');
+          _context.n = 5;
+          return dryRunInternal({
+            api: api,
+            tx: api.callTxMethod(call),
+            origin: node,
+            destination: destNode,
+            senderAddress: senderAddress,
+            address: address,
+            currency: currency,
+            feeAsset: feeCurrency
+          });
+        case 5:
+          dryRunResult = _context.v;
+          if (dryRunResult.origin.success) {
+            _context.n = 6;
+            break;
+          }
+          throw new DryRunFailedError(dryRunResult.failureReason);
+        case 6:
+          if (!(dryRunResult.assetHub && !dryRunResult.assetHub.success)) {
+            _context.n = 7;
+            break;
+          }
+          throw new DryRunFailedError(dryRunResult.failureReason);
+        case 7:
+          if (!(!dryRunResult.assetHub && dryRunResult.hops)) {
+            _context.n = 9;
+            break;
+          }
+          if (!(dryRunResult.hops.length > 1)) {
+            _context.n = 8;
+            break;
+          }
+          throw new InvalidParameterError("Multiple intermediate hops detected (".concat(dryRunResult.hops.length, "). Only single hop transfers are supported."));
+        case 8:
+          if (!(dryRunResult.hops.length === 1 && !dryRunResult.hops[0].result.success)) {
+            _context.n = 9;
+            break;
+          }
+          throw new DryRunFailedError(dryRunResult.failureReason);
+        case 9:
+          paddedFee = padFeeBy(dryRunResult.origin.fee, 20);
+          if (dryRunResult.assetHub) {
+            hopFee = dryRunResult.assetHub.fee;
+          } else if (dryRunResult.hops && dryRunResult.hops.length === 1 && dryRunResult.hops[0].result.success) {
+            hopFee = dryRunResult.hops[0].result.fee;
+          } else {
+            hopFee = MIN_FEE;
+          }
+          paddedHopFee = padFeeBy(hopFee, 40);
+          checkAmount(feeAsset && !assets.isAssetEqual(asset, feeAsset) ? paddedHopFee : paddedFee + paddedHopFee);
+          xcm = createExecuteXcm(node, input, paddedFee, paddedHopFee, version);
+          _context.n = 10;
+          return api.getXcmWeight(xcm);
+        case 10:
+          weight = _context.v;
+          return _context.a(2, createExecuteCall(xcm, weight));
+      }
+    }, _callee);
+  }));
+  return function handleExecuteTransfer(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var handleToAhTeleport = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(origin, input, defaultTx) {
     var _dryRunResult$destina, _feeResult$origin$wei;
@@ -7017,9 +7276,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
       if (!assets.isForeignAsset(asset)) {
         throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
       }
-      if (!asset.multiLocation) {
-        throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-      }
+      assertHasLocation(asset);
       var PARA_TO_PARA_FEE_DOT = 500000000n; // 0.5 DOT
       var call = {
         module: 'PolkadotXcm',
@@ -7110,15 +7367,10 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               }
               throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
             case 5:
-              if (asset.multiLocation) {
-                _context.n = 6;
-                break;
-              }
-              throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-            case 6:
-              _context.n = 7;
+              assertHasLocation(asset);
+              _context.n = 6;
               return generateMessageId(api, senderAddress, getParaId(this.node), JSON.stringify(asset.multiLocation), address, asset.amount);
-            case 7:
+            case 6:
               messageId = _context.v;
               multiLocation = asset.symbol === this.getNativeAssetSymbol() ? DOT_MULTILOCATION : asset.multiLocation;
               call = {
@@ -7185,18 +7437,13 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               }
               throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " is not a foreign asset"));
             case 3:
-              if (asset.multiLocation) {
-                _context2.n = 4;
-                break;
-              }
-              throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset), " has no multiLocation"));
-            case 4:
+              assertHasLocation(asset);
               if (!(asset.symbol === this.getNativeAssetSymbol() || asset.symbol === assets.getNativeAssetSymbol('Kusama'))) {
-                _context2.n = 5;
+                _context2.n = 4;
                 break;
               }
               return _context2.a(2, this.handleEthBridgeNativeTransfer(input));
-            case 5:
+            case 4:
               modifiedInput = _objectSpread2(_objectSpread2({}, input), {}, {
                 destLocation: createDestination(scenario, this.version, destination, paraIdTo, ETHEREUM_JUNCTION, sdkCommon.Parents.TWO),
                 beneficiaryLocation: createBeneficiary({
@@ -7272,154 +7519,94 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
       if (destination === 'Polimec' || destination === 'Moonbeam') return 'transfer_assets';
       return scenario === 'ParaToPara' && !isSystemNode ? 'limited_reserve_transfer_assets' : 'limited_teleport_assets';
     }
-  }, {
-    key: "handleExecuteTransfer",
-    value: function () {
-      var _handleExecuteTransfer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, senderAddress, asset, feeAsset, version, decimals, multiplier, base, scaledMultiplier, MIN_FEE, checkAmount, call, dryRunResult, paddedFee, xcm, weight;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
-            case 0:
-              api = input.api, senderAddress = input.senderAddress, asset = input.asset, feeAsset = input.feeAsset, version = input.version;
-              if (senderAddress) {
-                _context3.n = 1;
-                break;
-              }
-              throw new InvalidParameterError('Please provide senderAddress');
-            case 1:
-              validateAddress(senderAddress, this.node, false);
-              decimals = asset.decimals;
-              multiplier = decimals > 10 ? 0.4 : 0.15;
-              base = BigInt(Math.pow(10, decimals));
-              scaledMultiplier = BigInt(Math.floor(multiplier * Math.pow(10, decimals)));
-              MIN_FEE = base * scaledMultiplier / BigInt(Math.pow(10, decimals));
-              checkAmount = function checkAmount(fee) {
-                if (feeAsset && assets.isAssetEqual(asset, feeAsset) && BigInt(asset.amount) <= fee * 2n) {
-                  throw new InvalidParameterError("Asset amount ".concat(asset.amount, " is too low, please increase the amount or use a different fee asset."));
-                }
-              };
-              checkAmount(MIN_FEE);
-              call = createExecuteCall(createExecuteXcm(input, MIN_FEE, version), MAX_WEIGHT);
-              _context3.n = 2;
-              return api.getDryRunCall({
-                node: this.node,
-                tx: api.callTxMethod(call),
-                address: senderAddress,
-                asset: asset,
-                feeAsset: feeAsset
-              });
-            case 2:
-              dryRunResult = _context3.v;
-              if (dryRunResult.success) {
-                _context3.n = 3;
-                break;
-              }
-              throw new DryRunFailedError(dryRunResult.failureReason);
-            case 3:
-              paddedFee = dryRunResult.fee * 120n / 100n;
-              checkAmount(paddedFee);
-              xcm = createExecuteXcm(input, paddedFee, version);
-              _context3.n = 4;
-              return api.getXcmWeight(xcm);
-            case 4:
-              weight = _context3.v;
-              return _context3.a(2, createExecuteCall(createExecuteXcm(input, paddedFee, version), weight));
-          }
-        }, _callee3, this);
-      }));
-      function handleExecuteTransfer(_x3) {
-        return _handleExecuteTransfer.apply(this, arguments);
-      }
-      return handleExecuteTransfer;
-    }()
   }, {
     key: "transferPolkadotXCM",
     value: function () {
-      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(input) {
+      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
         var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isEthereumAsset, isSystemNode, method, modifiedInput, _t, _t2;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
               api = input.api, scenario = input.scenario, asset = input.asset, destination = input.destination, feeAsset = input.feeAsset, overriddenAsset = input.overriddenAsset;
               if (!feeAsset) {
-                _context4.n = 4;
+                _context3.n = 4;
                 break;
               }
               if (!overriddenAsset) {
-                _context4.n = 1;
+                _context3.n = 1;
                 break;
               }
               throw new assets.InvalidCurrencyError('Cannot use overridden multi-assets with XCM execute');
             case 1:
-              if (!(assets.normalizeSymbol(asset.symbol) === assets.normalizeSymbol('KSM'))) {
-                _context4.n = 2;
+              if (!assets.isSymbolMatch(asset.symbol, 'KSM')) {
+                _context3.n = 2;
                 break;
               }
-              return _context4.a(2, this.handleLocalReserveTransfer(input));
+              return _context3.a(2, this.handleLocalReserveTransfer(input));
             case 2:
-              isNativeAsset = asset.symbol === this.getNativeAssetSymbol();
+              isNativeAsset = assets.isSymbolMatch(asset.symbol, this.getNativeAssetSymbol());
               if (isNativeAsset) {
-                _context4.n = 4;
+                _context3.n = 4;
                 break;
               }
               _t = api;
-              _context4.n = 3;
-              return this.handleExecuteTransfer(input);
+              _context3.n = 3;
+              return handleExecuteTransfer(this.node, input);
             case 3:
-              _t2 = _context4.v;
-              return _context4.a(2, _t.callTxMethod.call(_t, _t2));
+              _t2 = _context3.v;
+              return _context3.a(2, _t.callTxMethod.call(_t, _t2));
             case 4:
               if (!(destination === 'AssetHubKusama')) {
-                _context4.n = 5;
+                _context3.n = 5;
                 break;
               }
-              return _context4.a(2, this.handleBridgeTransfer(input, 'Kusama'));
+              return _context3.a(2, this.handleBridgeTransfer(input, 'Kusama'));
             case 5:
               if (!(destination === 'Ethereum')) {
-                _context4.n = 6;
+                _context3.n = 6;
                 break;
               }
-              return _context4.a(2, this.handleEthBridgeTransfer(input));
+              return _context3.a(2, this.handleEthBridgeTransfer(input));
             case 6:
               if (!(destination === 'Mythos')) {
-                _context4.n = 7;
+                _context3.n = 7;
                 break;
               }
-              return _context4.a(2, this.handleMythosTransfer(input));
+              return _context3.a(2, this.handleMythosTransfer(input));
             case 7:
               isEthereumAsset = asset.multiLocation && assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
               if (!(destination === 'BifrostPolkadot' && isEthereumAsset)) {
-                _context4.n = 8;
+                _context3.n = 8;
                 break;
               }
-              return _context4.a(2, this.handleLocalReserveTransfer(input));
+              return _context3.a(2, this.handleLocalReserveTransfer(input));
             case 8:
               if (!isEthereumAsset) {
-                _context4.n = 9;
+                _context3.n = 9;
                 break;
               }
-              return _context4.a(2, this.handleLocalReserveTransfer(input, true));
+              return _context3.a(2, this.handleLocalReserveTransfer(input, true));
             case 9:
               isSystemNode = !sdkCommon.isTMultiLocation(destination) && SYSTEM_NODES_POLKADOT.includes(destination);
               if (!(scenario === 'ParaToPara' && asset.symbol === 'DOT' && !assets.isForeignAsset(asset) && destination !== 'Hydration' && destination !== 'Polimec' && destination !== 'Moonbeam' && destination !== 'BifrostPolkadot' && destination !== 'PeoplePolkadot' && destination !== 'Ajuna' && !isSystemNode)) {
-                _context4.n = 10;
+                _context3.n = 10;
                 break;
               }
               throw new ScenarioNotSupportedError(this.node, scenario, 'Some Parachains do not have a reserve for DOT on AssetHub. This can also include multihop transfers that have AssetHub as a hop chain and the call contains DOT. Chains that do not have a DOT reserve on AssetHub are not allowed to transfer DOT to it or through it because this transfer will result in asset loss.');
             case 10:
               if (!(scenario === 'ParaToPara' && asset.symbol === 'KSM' && !assets.isForeignAsset(asset))) {
-                _context4.n = 11;
+                _context3.n = 11;
                 break;
               }
               throw new ScenarioNotSupportedError(this.node, scenario, 'Bridged KSM cannot currently be transfered from AssetHubPolkadot, if you are sending different KSM asset, please specify {id: <KSMID>}.');
             case 11:
               method = this.getMethod(scenario, destination);
               modifiedInput = this.patchInput(input);
-              return _context4.a(2, transferPolkadotXcm(modifiedInput, method, 'Unlimited'));
+              return _context3.a(2, transferPolkadotXcm(modifiedInput, method, 'Unlimited'));
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
-      function transferPolkadotXCM(_x4) {
+      function transferPolkadotXCM(_x3) {
         return _transferPolkadotXCM.apply(this, arguments);
       }
       return transferPolkadotXCM;
@@ -7445,7 +7632,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
         if (!multiLocation) {
           throw new assets.InvalidCurrencyError('Asset does not have a multiLocation defined');
         }
-        var transformedMultiLocation = sdkCommon.hasJunction(multiLocation, 'Parachain', 1000) ? transformMultiLocation(multiLocation) : multiLocation;
+        var transformedMultiLocation = sdkCommon.hasJunction(multiLocation, 'Parachain', getParaId(this.node)) ? localizeLocation(this.node, multiLocation) : multiLocation;
         return createMultiAsset(version, amount, transformedMultiLocation);
       } else {
         return _superPropGet(AssetHubPolkadot, "createCurrencySpec", this, 3)([amount, scenario, version, asset]);
@@ -8173,7 +8360,7 @@ var createTypeAndThenDest = function createTypeAndThenDest(destination, scenario
     })
   };
 };
-var createTypeAndThenTransfer = function createTypeAndThenTransfer(_ref, version) {
+var createTypeAndThenTransfer$1 = function createTypeAndThenTransfer(_ref, version) {
   var api = _ref.api,
     asset = _ref.asset,
     address = _ref.address,
@@ -8262,7 +8449,7 @@ var Polimec = /*#__PURE__*/function (_ParachainNode) {
                 _context.n = 1;
                 break;
               }
-              _call = createTypeAndThenTransfer(input, version);
+              _call = createTypeAndThenTransfer$1(input, version);
               return _context.a(2, api.callTxMethod(_call));
             case 1:
               if (!(scenario === 'ParaToPara' && (destination === 'AssetHubPolkadot' || destination === 'Hydration'))) {
@@ -8277,7 +8464,7 @@ var Polimec = /*#__PURE__*/function (_ParachainNode) {
               }
               throw new ScenarioNotSupportedError(this.node, scenario);
             case 3:
-              call = createTypeAndThenTransfer(input, version, 'Teleport');
+              call = createTypeAndThenTransfer$1(input, version, 'Teleport');
               return _context.a(2, api.callTxMethod(call));
           }
         }, _callee, this);
@@ -8292,7 +8479,7 @@ var Polimec = /*#__PURE__*/function (_ParachainNode) {
     value: function transferRelayToPara(options) {
       var _options$version = options.version,
         version = _options$version === void 0 ? this.version : _options$version;
-      var call = createTypeAndThenTransfer(_objectSpread2(_objectSpread2({}, options), {}, {
+      var call = createTypeAndThenTransfer$1(_objectSpread2(_objectSpread2({}, options), {}, {
         scenario: 'RelayToPara'
       }), version, 'Teleport');
       return call;
@@ -8386,7 +8573,7 @@ var Hydration = /*#__PURE__*/function (_ParachainNode) {
         version = _options$version === void 0 ? this.version : _options$version;
       var symbol = asset.symbol.toUpperCase();
       if (symbol === 'DOT') {
-        var call = createTypeAndThenTransfer(options, version);
+        var call = createTypeAndThenTransfer$1(options, version);
         return Promise.resolve(api.callTxMethod(call));
       }
       if ((symbol === 'USDC' || symbol === 'USDT') && !sdkCommon.hasJunction(asset.multiLocation, 'Parachain', getParaId('AssetHubPolkadot'))) {
@@ -8398,23 +8585,46 @@ var Hydration = /*#__PURE__*/function (_ParachainNode) {
     key: "transferPolkadotXCM",
     value: function () {
       var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(input) {
-        var destination;
+        var api, destination, feeAsset, asset, overriddenAsset, isNativeAsset, isNativeFeeAsset, _t, _t2;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              destination = input.destination;
+              api = input.api, destination = input.destination, feeAsset = input.feeAsset, asset = input.asset, overriddenAsset = input.overriddenAsset;
               if (!(destination === 'Ethereum')) {
                 _context.n = 1;
                 break;
               }
               return _context.a(2, this.transferToEthereum(input));
             case 1:
-              if (!(destination === 'Polimec')) {
+              if (!feeAsset) {
+                _context.n = 4;
+                break;
+              }
+              if (!overriddenAsset) {
                 _context.n = 2;
                 break;
               }
-              return _context.a(2, this.transferToPolimec(input));
+              throw new assets.InvalidCurrencyError('Cannot use overridden multi-assets with XCM execute');
             case 2:
+              isNativeAsset = assets.isSymbolMatch(asset.symbol, this.getNativeAssetSymbol());
+              isNativeFeeAsset = assets.isSymbolMatch(feeAsset.symbol, this.getNativeAssetSymbol());
+              if (!(!isNativeAsset || !isNativeFeeAsset)) {
+                _context.n = 4;
+                break;
+              }
+              _t = api;
+              _context.n = 3;
+              return handleExecuteTransfer(this.node, input);
+            case 3:
+              _t2 = _context.v;
+              return _context.a(2, _t.callTxMethod.call(_t, _t2));
+            case 4:
+              if (!(destination === 'Polimec')) {
+                _context.n = 5;
+                break;
+              }
+              return _context.a(2, this.transferToPolimec(input));
+            case 5:
               return _context.a(2, this.transferToAssetHub(input));
           }
         }, _callee, this);
@@ -8440,9 +8650,10 @@ var Hydration = /*#__PURE__*/function (_ParachainNode) {
     key: "canUseXTokens",
     value: function canUseXTokens(_ref3) {
       var destination = _ref3.to,
-        asset = _ref3.asset;
+        asset = _ref3.asset,
+        feeAsset = _ref3.feeAsset;
       var isEthAsset = asset.multiLocation && assets.findAssetByMultiLocation(assets.getOtherAssets('Ethereum'), asset.multiLocation);
-      return destination !== 'Ethereum' && destination !== 'Polimec' && !(destination === 'AssetHubPolkadot' && asset.symbol === 'DOT') && !isEthAsset;
+      return destination !== 'Ethereum' && destination !== 'Polimec' && !(destination === 'AssetHubPolkadot' && asset.symbol === 'DOT') && !isEthAsset && !feeAsset;
     }
   }, {
     key: "transferLocalNativeAsset",
@@ -8695,9 +8906,7 @@ var Moonbeam = /*#__PURE__*/function (_ParachainNode) {
           }
         }
       };
-      if (!asset.multiLocation) {
-        throw new assets.InvalidCurrencyError('throw new InvalidCurrencyError(`Asset ${JSON.stringify(asset)} has no assetId`)');
-      }
+      assertHasLocation(asset);
       return asset.multiLocation;
     }
   }, {
@@ -8767,9 +8976,7 @@ var Moonriver = /*#__PURE__*/function (_ParachainNode) {
           }
         }
       };
-      if (!asset.multiLocation) {
-        throw new assets.InvalidCurrencyError('throw new InvalidCurrencyError(`Asset ${JSON.stringify(asset)} has no multiLocation`)');
-      }
+      assertHasLocation(asset);
       return asset.multiLocation;
     }
   }, {
@@ -8800,6 +9007,94 @@ var Moonriver = /*#__PURE__*/function (_ParachainNode) {
   }]);
 }(ParachainNode);
 
+var createTypeAndThenTransfer = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, node, version) {
+    var api, scenario, asset, currency, senderAddress, address, destination, messageId, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, ahExecutionFee, feeConverted, nativeMythAmount, nativeMythBalance;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          api = options.api, scenario = options.scenario, asset = options.asset, currency = options.currency, senderAddress = options.senderAddress, address = options.address, destination = options.destination;
+          assertHasLocation(asset);
+          assertAddressIsString(address);
+          if (senderAddress) {
+            _context.n = 1;
+            break;
+          }
+          throw new assets.InvalidCurrencyError("Sender address is required for Mythos transfer");
+        case 1:
+          if (!(!assets.isForeignAsset(asset) || !asset.assetId)) {
+            _context.n = 2;
+            break;
+          }
+          throw new assets.InvalidCurrencyError("Asset ".concat(JSON.stringify(asset, sdkCommon.replaceBigInt), " is not a foreign asset"));
+        case 2:
+          _context.n = 3;
+          return generateMessageId(api, senderAddress, getParaId(node), asset.assetId, address, asset.amount);
+        case 3:
+          messageId = _context.v;
+          ahApi = api.clone();
+          _context.n = 4;
+          return ahApi.init('AssetHubPolkadot');
+        case 4:
+          _context.n = 5;
+          return getParaEthTransferFees(ahApi);
+        case 5:
+          _yield$getParaEthTran = _context.v;
+          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
+          bridgeFee = _yield$getParaEthTran2[0];
+          ahExecutionFee = _yield$getParaEthTran2[1];
+          _context.n = 6;
+          return ahApi.quoteAhPrice(DOT_MULTILOCATION, assets.getNativeAssets(node)[0].multiLocation, bridgeFee + ahExecutionFee);
+        case 6:
+          feeConverted = _context.v;
+          if (feeConverted) {
+            _context.n = 7;
+            break;
+          }
+          throw new InvalidParameterError("Pool DOT -> ".concat(asset.symbol, " not found."));
+        case 7:
+          nativeMythAmount = padFeeBy(feeConverted, 10);
+          _context.n = 8;
+          return getAssetBalanceInternal({
+            api: api,
+            address: senderAddress,
+            node: node,
+            currency: currency
+          });
+        case 8:
+          nativeMythBalance = _context.v;
+          if (!(nativeMythBalance - nativeMythAmount < 0)) {
+            _context.n = 9;
+            break;
+          }
+          throw new assets.InvalidCurrencyError("Insufficient balance. Fee: ".concat(nativeMythAmount, ", Amount: ").concat(asset.amount));
+        case 9:
+          return _context.a(2, {
+            module: 'PolkadotXcm',
+            method: 'transfer_assets_using_type_and_then',
+            parameters: {
+              dest: createVersionedDestination(scenario, version, destination, getParaId('AssetHubPolkadot')),
+              assets: _defineProperty({}, version, [createMultiAsset(version, nativeMythAmount, {
+                parents: sdkCommon.Parents.ZERO,
+                interior: 'Here'
+              }), createMultiAsset(version, asset.amount, asset.multiLocation)]),
+              assets_transfer_type: 'DestinationReserve',
+              remote_fees_id: _defineProperty({}, version, {
+                parents: sdkCommon.Parents.ZERO,
+                interior: 'Here'
+              }),
+              fees_transfer_type: 'Teleport',
+              custom_xcm_on_dest: createCustomXcmOnDest(options, node, messageId, nativeMythAmount),
+              weight_limit: 'Unlimited'
+            }
+          });
+      }
+    }, _callee);
+  }));
+  return function createTypeAndThenTransfer(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var Mythos = /*#__PURE__*/function (_ParachainNode) {
   function Mythos() {
     _classCallCheck(this, Mythos);
@@ -8824,27 +9119,38 @@ var Mythos = /*#__PURE__*/function (_ParachainNode) {
   }, {
     key: "transferPolkadotXCM",
     value: function () {
-      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(input) {
-        var destination, defaultTx;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
+      var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(input) {
+        var api, destination, defaultTx, _t, _t2;
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
             case 0:
-              destination = input.destination;
-              _context.n = 1;
+              api = input.api, destination = input.destination;
+              _context2.n = 1;
               return this.createTx(input);
             case 1:
-              defaultTx = _context.v;
+              defaultTx = _context2.v;
               if (!(destination === 'AssetHubPolkadot')) {
-                _context.n = 2;
+                _context2.n = 2;
                 break;
               }
-              return _context.a(2, handleToAhTeleport('Mythos', input, defaultTx));
+              return _context2.a(2, handleToAhTeleport('Mythos', input, defaultTx));
             case 2:
-              return _context.a(2, defaultTx);
+              if (!(destination == 'Ethereum')) {
+                _context2.n = 4;
+                break;
+              }
+              _t = api;
+              _context2.n = 3;
+              return createTypeAndThenTransfer(input, this.node, this.version);
+            case 3:
+              _t2 = _context2.v;
+              return _context2.a(2, _t.callTxMethod.call(_t, _t2));
+            case 4:
+              return _context2.a(2, defaultTx);
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function transferPolkadotXCM(_x) {
+      function transferPolkadotXCM(_x4) {
         return _transferPolkadotXCM.apply(this, arguments);
       }
       return transferPolkadotXCM;
@@ -10187,11 +10493,11 @@ var GeneralBuilder = /*#__PURE__*/function () {
     key: "getTransferInfo",
     value: (function () {
       var _getTransferInfo2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
-        var _this$_options9, from, to, address, currency, senderAddress, feeAsset, tx;
+        var _this$_options9, from, to, address, currency, ahAddress, senderAddress, feeAsset, tx;
         return _regenerator().w(function (_context0) {
           while (1) switch (_context0.n) {
             case 0:
-              _this$_options9 = this._options, from = _this$_options9.from, to = _this$_options9.to, address = _this$_options9.address, currency = _this$_options9.currency, senderAddress = _this$_options9.senderAddress, feeAsset = _this$_options9.feeAsset;
+              _this$_options9 = this._options, from = _this$_options9.from, to = _this$_options9.to, address = _this$_options9.address, currency = _this$_options9.currency, ahAddress = _this$_options9.ahAddress, senderAddress = _this$_options9.senderAddress, feeAsset = _this$_options9.feeAsset;
               assertToIsString(to);
               assertAddressIsString(address);
               _context0.n = 1;
@@ -10205,6 +10511,7 @@ var GeneralBuilder = /*#__PURE__*/function () {
                 destination: to,
                 address: address,
                 senderAddress: senderAddress,
+                ahAddress: ahAddress,
                 currency: currency,
                 feeAsset: feeAsset
               }));
@@ -10268,6 +10575,7 @@ exports.TransferToAhNotSupported = TransferToAhNotSupported;
 exports.UnableToComputeError = UnableToComputeError;
 exports.addXcmVersionHeader = addXcmVersionHeader;
 exports.assertAddressIsString = assertAddressIsString;
+exports.assertHasLocation = assertHasLocation;
 exports.assertToIsString = assertToIsString;
 exports.blake2b256 = blake2b256;
 exports.blake2b512 = blake2b512;
@@ -10292,7 +10600,6 @@ exports.getBalanceForeignInternal = getBalanceForeignInternal;
 exports.getBalanceNative = getBalanceNative;
 exports.getBalanceNativeInternal = getBalanceNativeInternal;
 exports.getBridgeStatus = getBridgeStatus;
-exports.getFees = getFees;
 exports.getNode = getNode;
 exports.getNodeConfig = getNodeConfig;
 exports.getNodeProviders = getNodeProviders;
@@ -10308,6 +10615,7 @@ exports.getTransferableAmount = getTransferableAmount;
 exports.getTransferableAmountInternal = getTransferableAmountInternal;
 exports.getXcmFee = getXcmFee;
 exports.getXcmFeeEstimate = getXcmFeeEstimate;
+exports.localizeLocation = localizeLocation;
 exports.resolveModuleError = resolveModuleError;
 exports.resolveParaId = resolveParaId;
 exports.reverseTransformMultiLocation = reverseTransformMultiLocation;
@@ -10315,7 +10623,6 @@ exports.send = send;
 exports.transferMoonbeamEvm = transferMoonbeamEvm;
 exports.transferMoonbeamToEth = transferMoonbeamToEth;
 exports.transferRelayToPara = transferRelayToPara;
-exports.transformMultiLocation = transformMultiLocation;
 exports.validateAddress = validateAddress;
 exports.verifyEdOnDestination = verifyEdOnDestination;
 Object.keys(assets).forEach(function (k) {