@paraspell/sdk-core 10.7.2 → 10.8.0

package/dist/index.cjs

@@ -2126,13 +2126,17 @@ var localizeLocation = function localizeLocation(node, multiLocation) {
   var newInterior = multiLocation.interior;
   var parachainRemoved = false;
   if (multiLocation.interior !== 'Here') {
+    var paraId = getParaId(node);
     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;
+        var paraJunctionId = sdkCommon.getJunctionValue(multiLocation, 'Parachain');
+        if (paraJunctionId === paraId) {
+          parachainRemoved = true;
+          return false;
+        }
       }
       return true;
     });
@@ -4268,30 +4272,30 @@ var buildHopInfo = /*#__PURE__*/function () {
 }();
 
 var getTransferInfo = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, destinationInfo, _t;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
+    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, builtHops, destinationInfo, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
           if (!(assets.isNodeEvm(origin) && !ahAddress)) {
-            _context.n = 1;
+            _context2.n = 1;
             break;
           }
           throw new InvalidParameterError("ahAddress is required for EVM origin ".concat(origin, "."));
         case 1:
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          _context.n = 2;
+          _context2.n = 2;
           return api.init(origin);
         case 2:
           api.setDisconnectAllowed(false);
-          _context.p = 3;
+          _context2.p = 3;
           originAsset = assets.findAssetForNodeOrThrow(origin, currency, destination);
           if (!(feeAsset && resolvedFeeAsset)) {
-            _context.n = 5;
+            _context2.n = 5;
             break;
           }
-          _context.n = 4;
+          _context2.n = 4;
           return getAssetBalanceInternal({
             api: api,
             address: senderAddress,
@@ -4299,21 +4303,21 @@ var getTransferInfo = /*#__PURE__*/function () {
             currency: feeAsset
           });
         case 4:
-          _t = _context.v;
-          _context.n = 7;
+          _t = _context2.v;
+          _context2.n = 7;
           break;
         case 5:
-          _context.n = 6;
+          _context2.n = 6;
           return getBalanceNativeInternal({
             api: api,
             address: senderAddress,
             node: origin
           });
         case 6:
-          _t = _context.v;
+          _t = _context2.v;
         case 7:
           originBalanceFee = _t;
-          _context.n = 8;
+          _context2.n = 8;
           return getAssetBalanceInternal({
             api: api,
             address: senderAddress,
@@ -4321,9 +4325,9 @@ var getTransferInfo = /*#__PURE__*/function () {
             currency: currency
           });
         case 8:
-          originBalance = _context.v;
+          originBalance = _context2.v;
           edOrigin = assets.getExistentialDepositOrThrow(origin, currency);
-          _context.n = 9;
+          _context2.n = 9;
           return getXcmFee({
             api: api,
             tx: tx,
@@ -4336,15 +4340,16 @@ var getTransferInfo = /*#__PURE__*/function () {
             disableFallback: false
           });
         case 9:
-          _yield$getXcmFee = _context.v;
+          _yield$getXcmFee = _context2.v;
           _yield$getXcmFee$orig = _yield$getXcmFee.origin;
           originFee = _yield$getXcmFee$orig.fee;
           originFeeCurrency = _yield$getXcmFee$orig.currency;
           assetHubFeeResult = _yield$getXcmFee.assetHub;
           bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
           destFeeDetail = _yield$getXcmFee.destination;
+          hops = _yield$getXcmFee.hops;
           if (!(originFee === undefined)) {
-            _context.n = 10;
+            _context2.n = 10;
             break;
           }
           throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, sdkCommon.replaceBigInt), " on node ").concat(origin, "."));
@@ -4355,10 +4360,10 @@ var getTransferInfo = /*#__PURE__*/function () {
           originBalanceNativeSufficient = originBalanceFee >= originFee;
           originBalanceSufficient = originBalanceAfter >= edOrigin;
           if (!assetHubFeeResult) {
-            _context.n = 12;
+            _context2.n = 12;
             break;
           }
-          _context.n = 11;
+          _context2.n = 11;
           return buildHopInfo({
             api: api,
             node: determineRelayChain(origin) === 'Polkadot' ? 'AssetHubPolkadot' : 'AssetHubKusama',
@@ -4369,14 +4374,14 @@ var getTransferInfo = /*#__PURE__*/function () {
             ahAddress: ahAddress
           });
         case 11:
-          assetHub = _context.v;
+          assetHub = _context2.v;
         case 12:
           if (!bridgeHubFeeResult) {
-            _context.n = 14;
+            _context2.n = 14;
             break;
           }
           bridgeHubNode = determineRelayChain(origin) === 'Polkadot' ? 'BridgeHubPolkadot' : 'BridgeHubKusama';
-          _context.n = 13;
+          _context2.n = 13;
           return buildHopInfo({
             api: api,
             node: bridgeHubNode,
@@ -4387,9 +4392,47 @@ var getTransferInfo = /*#__PURE__*/function () {
             ahAddress: ahAddress
           });
         case 13:
-          bridgeHub = _context.v;
+          bridgeHub = _context2.v;
         case 14:
-          _context.n = 15;
+          builtHops = [];
+          if (!(hops && hops.length > 0)) {
+            _context2.n = 16;
+            break;
+          }
+          _context2.n = 15;
+          return Promise.all(hops.map(/*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(hop) {
+              var result;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    _context.n = 1;
+                    return buildHopInfo({
+                      api: api,
+                      node: hop.chain,
+                      feeData: hop.result,
+                      originNode: origin,
+                      currency: currency,
+                      senderAddress: senderAddress,
+                      ahAddress: ahAddress
+                    });
+                  case 1:
+                    result = _context.v;
+                    return _context.a(2, {
+                      chain: hop.chain,
+                      result: result
+                    });
+                }
+              }, _callee);
+            }));
+            return function (_x2) {
+              return _ref3.apply(this, arguments);
+            };
+          }()));
+        case 15:
+          builtHops = _context2.v;
+        case 16:
+          _context2.n = 17;
           return buildDestInfo({
             api: api,
             origin: origin,
@@ -4402,9 +4445,9 @@ var getTransferInfo = /*#__PURE__*/function () {
             assetHubFee: assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.fee,
             bridgeFee: bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.fee
           });
-        case 15:
-          destinationInfo = _context.v;
-          return _context.a(2, {
+        case 17:
+          destinationInfo = _context2.v;
+          return _context2.a(2, {
             chain: {
               origin: origin,
               destination: destination,
@@ -4428,19 +4471,20 @@ var getTransferInfo = /*#__PURE__*/function () {
             },
             assetHub: assetHub,
             bridgeHub: bridgeHub,
+            hops: builtHops,
             destination: destinationInfo
           });
-        case 16:
-          _context.p = 16;
+        case 18:
+          _context2.p = 18;
           api.setDisconnectAllowed(true);
-          _context.n = 17;
+          _context2.n = 19;
           return api.disconnect();
-        case 17:
-          return _context.f(16);
-        case 18:
-          return _context.a(2);
+        case 19:
+          return _context2.f(18);
+        case 20:
+          return _context2.a(2);
       }
-    }, _callee, null, [[3,, 16, 18]]);
+    }, _callee2, null, [[3,, 18, 20]]);
   }));
   return function getTransferInfo(_x) {
     return _ref2.apply(this, arguments);
@@ -4852,7 +4896,7 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
       if (!hop.result.success && hop.result.failureReason) {
         return {
           failureReason: hop.result.failureReason,
-          failureChain: hop.node
+          failureChain: hop.chain
         };
       }
     }
@@ -4954,7 +4998,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           // Add to hops array (only if not the destination)
           if (nextChain !== destination) {
             hops.push({
-              node: nextChain,
+              chain: nextChain,
               result: hopDryRun.success && hopCurrency ? _objectSpread2(_objectSpread2({}, hopDryRun), {}, {
                 currency: hopCurrency
               }) : hopDryRun
@@ -5008,7 +5052,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           });
           // Update the hop data if BridgeHub is in the hops array
           bridgeHubHopIndex = hops.findIndex(function (hop) {
-            return hop.node === bridgeHubNode;
+            return hop.chain === bridgeHubNode;
           });
           if (bridgeHubHopIndex !== -1 && hops[bridgeHubHopIndex].result.success) {
             hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, hops[bridgeHubHopIndex].result), {}, {
@@ -5396,8 +5440,9 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   };
 }();
 
-var getFailureInfo = function getFailureInfo(nodes) {
+var getFailureInfo = function getFailureInfo(nodes, hops) {
   var _nodes$origin, _nodes$assetHub, _nodes$bridgeHub, _nodes$destination;
+  // Check standard chains first for backwards compatibility
   if ((_nodes$origin = nodes.origin) !== null && _nodes$origin !== void 0 && _nodes$origin.dryRunError) return {
     failureChain: 'origin',
     failureReason: nodes.origin.dryRunError
@@ -5414,11 +5459,29 @@ var getFailureInfo = function getFailureInfo(nodes) {
     failureChain: 'destination',
     failureReason: nodes.destination.dryRunError
   };
+  // Check hops for failures
+  var _iterator = _createForOfIteratorHelper(hops),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var hop = _step.value;
+      if (hop.result.dryRunError) {
+        return {
+          failureChain: hop.chain,
+          failureReason: hop.result.dryRunError
+        };
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
   return {};
 };
 var getXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, destinationSufficient, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, destCurrency, result, _getFailureInfo2, failureChain, failureReason;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, hops, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, destinationSufficient, nextChain, hopApi, hopResult, hopCurrency, hopDetail, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, destCurrency, result, _getFailureInfo2, failureChain, failureReason;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5449,6 +5512,8 @@ var getXcmFee = /*#__PURE__*/function () {
           _context.n = 2;
           return api.disconnect();
         case 2:
+          // Initialize hops array
+          hops = [];
           if (!(originDryRunError || originFeeType === 'paymentInfo')) {
             _context.n = 8;
             break;
@@ -5498,12 +5563,13 @@ var getXcmFee = /*#__PURE__*/function () {
               sufficient: destFeeRes.sufficient
             }), {}, {
               currency: assets.getNativeAssetSymbol(destination)
-            })
+            }),
+            hops: hops // Include empty hops array
           };
           _getFailureInfo = getFailureInfo({
             origin: _result.origin,
             destination: _result.destination
-          }), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
+          }, hops), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
           return _context.a(2, _objectSpread2(_objectSpread2({}, _result), {}, {
             failureChain: _failureChain,
             failureReason: _failureReason
@@ -5559,17 +5625,38 @@ var getXcmFee = /*#__PURE__*/function () {
           });
         case 13:
           hopResult = _context.v;
-          if (!hopResult.dryRunError) {
-            _context.n = 17;
-            break;
+          // Determine the currency for this hop
+          hopCurrency = void 0;
+          if (nextChain === destination) {
+            hopCurrency = destinationFeeType === 'dryRun' ? assets.findAssetOnDestOrThrow(origin, destination, currency).symbol : assets.getNativeAssetSymbol(destination);
+          } else if (sdkCommon.isRelayChain(nextChain) || nextChain === assetHubNode || nextChain === bridgeHubNode) {
+            hopCurrency = assets.getNativeAssetSymbol(nextChain);
+          } else {
+            hopCurrency = assets.getNativeAssetSymbol(nextChain);
           }
-          failingRecord = {
+          hopDetail = hopResult.dryRunError ? {
+            fee: hopResult.fee,
+            feeType: hopResult.feeType,
+            currency: hopCurrency,
+            sufficient: hopResult.sufficient,
+            dryRunError: hopResult.dryRunError
+          } : {
             fee: hopResult.fee,
             feeType: hopResult.feeType,
-            currency: assets.getNativeAssetSymbol(nextChain),
-            dryRunError: hopResult.dryRunError,
+            currency: hopCurrency,
             sufficient: hopResult.sufficient
           };
+          if (nextChain !== destination) {
+            hops.push({
+              chain: nextChain,
+              result: hopDetail
+            });
+          }
+          if (!hopResult.dryRunError) {
+            _context.n = 17;
+            break;
+          }
+          failingRecord = hopDetail;
           hopIsDestination = nextChain === destination || sdkCommon.isRelayChain(nextChain) && !sdkCommon.isRelayChain(destination);
           if (hopIsDestination) {
             destinationFee = hopResult.fee;
@@ -5621,19 +5708,9 @@ var getXcmFee = /*#__PURE__*/function () {
             destinationFeeType = hopResult.feeType;
             destinationSufficient = hopResult.sufficient;
           } else if (nextChain === assetHubNode) {
-            intermediateFees.assetHub = {
-              fee: hopResult.fee,
-              feeType: hopResult.feeType,
-              currency: assets.getNativeAssetSymbol(nextChain),
-              sufficient: hopResult.sufficient
-            };
+            intermediateFees.assetHub = hopDetail;
           } else if (nextChain === bridgeHubNode) {
-            intermediateFees.bridgeHub = {
-              fee: hopResult.fee,
-              feeType: hopResult.feeType,
-              currency: assets.getNativeAssetSymbol(nextChain),
-              sufficient: hopResult.sufficient
-            };
+            intermediateFees.bridgeHub = hopDetail;
           } else ;
           forwardedXcms = hopResult.forwardedXcms;
           nextParaId = hopResult.destParaId;
@@ -5666,6 +5743,14 @@ var getXcmFee = /*#__PURE__*/function () {
           processedBridgeHubData = _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
             fee: intermediateFees.bridgeHub.fee + bridgeFee
           });
+          bridgeHubHopIndex = hops.findIndex(function (hop) {
+            return hop.chain === bridgeHubNode;
+          });
+          if (bridgeHubHopIndex !== -1) {
+            hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, hops[bridgeHubHopIndex].result), {}, {
+              fee: intermediateFees.bridgeHub.fee + bridgeFee
+            });
+          }
         case 24:
           intermediateFees.bridgeHub = processedBridgeHubData;
           destCurrency = destinationFeeType === 'dryRun' ? assets.findAssetOnDestOrThrow(origin, destination, currency).symbol : assets.getNativeAssetSymbol(destination);
@@ -5693,14 +5778,15 @@ var getXcmFee = /*#__PURE__*/function () {
               currency: destCurrency
             }, destinationDryRunError && {
               dryRunError: destinationDryRunError
-            })
+            }),
+            hops: hops
           });
           _getFailureInfo2 = getFailureInfo({
             origin: result.origin,
             assetHub: result.assetHub,
             bridgeHub: result.bridgeHub,
             destination: result.destination
-          }), failureChain = _getFailureInfo2.failureChain, failureReason = _getFailureInfo2.failureReason;
+          }, hops), failureChain = _getFailureInfo2.failureChain, failureReason = _getFailureInfo2.failureReason;
           return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
             failureChain: failureChain,
             failureReason: failureReason
@@ -6924,6 +7010,11 @@ var sortMultiAssets = function sortMultiAssets(assets$1) {
   return assets$1.sort(function (a, b) {
     var aLoc = assets.extractMultiAssetLoc(a);
     var bLoc = assets.extractMultiAssetLoc(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 = sdkCommon.hasJunction(aLoc, 'GlobalConsensus');
@@ -6944,10 +7035,10 @@ var sortMultiAssets = function sortMultiAssets(assets$1) {
     return aGeneralIndex - bGeneralIndex;
   });
 };
-function isHere(loc) {
+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;
-}
+};
 var updateAsset = function updateAsset(asset, amount) {
   return _objectSpread2(_objectSpread2({}, asset), {}, {
     fun: {
@@ -6962,7 +7053,7 @@ var createWithdrawAssets = function createWithdrawAssets(asset, feeAsset) {
   }
   return sortMultiAssets(assetsToWithdraw);
 };
-var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopExecutionFee, version) {
+var createExecuteXcm = function createExecuteXcm(node, destChain, input, executionFee, hopExecutionFee, version) {
   var _ref;
   var api = input.api,
     asset = input.asset,
@@ -6991,6 +7082,7 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
   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 multiAssetLocalizedToDest = createMultiAsset(version, amount, localizeLocation(destChain, 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;
@@ -6999,7 +7091,8 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
   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 ? {
+  var chainsAreTrusted = sdkCommon.isSystemChain(node) && sdkCommon.isSystemChain(destChain);
+  var depositInstruction = isReserveDest || chainsAreTrusted ? {
     DepositAsset: {
       assets: createAssetsFilter(multiAssetLocalizedToReserve, feeMultiAssetLocalizedToReserve),
       beneficiary: beneficiary
@@ -7028,7 +7121,31 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
   var needsIntermediaryReserve = reserveParaId !== undefined &&
   // Has a reserve
   !isOnReserveChain(node, reserveParaId); // Not on reserve
-  var lastInstruction = needsIntermediaryReserve ? {
+  var lastInstruction = chainsAreTrusted ?
+  // Use teleport for trusted chains
+  {
+    InitiateTeleport: {
+      assets: assetsFilter,
+      dest: dest,
+      xcm: [{
+        BuyExecution: {
+          fees: updateAsset(multiAssetLocalizedToDest, feeMultiAsset ? amount : amount - executionFee),
+          weight_limit: 'Unlimited'
+        }
+      }, {
+        DepositAsset: {
+          assets: {
+            Wild: {
+              AllCounted: 1
+            }
+          },
+          beneficiary: beneficiary
+        }
+      }]
+    }
+  } : needsIntermediaryReserve ?
+  // Use reserve for non-trusted chains
+  {
     InitiateReserveWithdraw: {
       assets: assetsFilter,
       reserve: getChainLocation(reserveParaId),
@@ -7061,7 +7178,7 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
 
 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;
+    var api, senderAddress, paraIdTo, asset, currency, feeCurrency, address, feeAsset, version, feeAssetBalance, checkAmount, MIN_FEE, destChain, call, dryRunResult, paddedFee, hopFee, paddedHopFee, xcm, weight, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -7100,14 +7217,14 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           };
           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');
+          destChain = getTNode(paraIdTo, determineRelayChain(node) === 'Polkadot' ? 'polkadot' : 'kusama');
+          call = createExecuteCall(createExecuteXcm(node, destChain, input, feeAssetBalance && feeAssetBalance > 1n ? feeAssetBalance : MIN_FEE, MIN_FEE, version), MAX_WEIGHT);
           _context.n = 5;
           return dryRunInternal({
             api: api,
             tx: api.callTxMethod(call),
             origin: node,
-            destination: destNode,
+            destination: destChain,
             senderAddress: senderAddress,
             address: address,
             currency: currency,
@@ -7153,7 +7270,7 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           }
           paddedHopFee = padFeeBy(hopFee, 40);
           checkAmount(feeAsset && !assets.isAssetEqual(asset, feeAsset) ? paddedHopFee : paddedFee + paddedHopFee);
-          xcm = createExecuteXcm(node, input, paddedFee, paddedHopFee, version);
+          xcm = createExecuteXcm(node, destChain, input, paddedFee, paddedHopFee, version);
           _context.n = 10;
           return api.getXcmWeight(xcm);
         case 10:
@@ -7523,7 +7640,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "transferPolkadotXCM",
     value: function () {
       var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isEthereumAsset, isSystemNode, method, modifiedInput, _t, _t2;
+        var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isNativeFeeAsset, isEthereumAsset, isSystemNode, method, modifiedInput, _t, _t2;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
@@ -7545,7 +7662,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               return _context3.a(2, this.handleLocalReserveTransfer(input));
             case 2:
               isNativeAsset = assets.isSymbolMatch(asset.symbol, this.getNativeAssetSymbol());
-              if (isNativeAsset) {
+              isNativeFeeAsset = assets.isSymbolMatch(feeAsset.symbol, this.getNativeAssetSymbol());
+              if (!(!isNativeAsset || !isNativeFeeAsset)) {
                 _context3.n = 4;
                 break;
               }

package/dist/index.d.ts

@@ -580,7 +580,7 @@ type TDryRunNodeResult = (TDryRunNodeSuccess & {
     currency: string;
 }) | TDryRunNodeFailure;
 type THopInfo = {
-    node: TNodeWithRelayChains;
+    chain: TNodeWithRelayChains;
     result: TDryRunNodeResultInternal & {
         currency?: string;
     };
@@ -766,6 +766,15 @@ declare class UnableToComputeError extends Error {
     constructor(message: string);
 }
 
+type THopTransferInfo = {
+    chain: TNodeWithRelayChains;
+    result: {
+        xcmFee: TXcmFeeBase;
+        balance?: bigint;
+        existentialDeposit?: bigint;
+        currencySymbol: string;
+    };
+};
 type TXcmFeeBase = {
     fee: bigint;
     balance: bigint;
@@ -800,6 +809,7 @@ type TTransferInfo = {
         currencySymbol: string;
         xcmFee: TXcmFeeBase;
     };
+    hops?: THopTransferInfo[];
     destination: {
         receivedCurrency: {
             sufficient: boolean | UnableToComputeError;
@@ -902,7 +912,11 @@ type TXcmFeeDetail = {
     sufficient?: boolean;
     dryRunError: string;
 };
-type TXcmFeeChain = 'origin' | 'destination' | 'assetHub' | 'bridgeHub';
+type TXcmFeeChain = 'origin' | 'destination' | 'assetHub' | 'bridgeHub' | TNodeWithRelayChains;
+type TXcmFeeHopInfo = {
+    chain: TNodeWithRelayChains;
+    result: TXcmFeeDetail;
+};
 type TGetXcmFeeResult = {
     failureReason?: string;
     failureChain?: TXcmFeeChain;
@@ -910,6 +924,7 @@ type TGetXcmFeeResult = {
     destination: TXcmFeeDetail;
     assetHub?: TXcmFeeDetail;
     bridgeHub?: TXcmFeeDetail;
+    hops: TXcmFeeHopInfo[];
 };
 type TGetXcmFeeEstimateDetail = {
     fee: bigint;
@@ -1794,4 +1809,4 @@ declare const validateAddress: (address: TAddress, node: TNodeWithRelayChains, i
 declare const determineRelayChain: (node: TNodeWithRelayChains) => TRelaychain;
 
 export { AssetClaimBuilder, BatchMode, BridgeHaltedError, Builder, DRY_RUN_CLIENT_TIMEOUT_MS, DryRunFailedError, ETHEREUM_JUNCTION, ETH_CHAIN_ID, GeneralBuilder, IncompatibleNodesError, InvalidAddressError, InvalidParameterError, NoXCMSupportImplementedError, NodeNotSupportedError, PolkadotXcmError, ScenarioNotSupportedError, TX_CLIENT_TIMEOUT_MS, TransferToAhNotSupported, UnableToComputeError, XTokensError, addXcmVersionHeader, assertAddressIsString, assertHasLocation, assertToIsString, blake2b256, blake2b512, claimAssets, computeFeeFromDryRun, computeFeeFromDryRunPjs, convertSs58, createApiInstanceForNode, createBeneficiary, createBeneficiaryMultiLocation, createVersionedBeneficiary, createX1Payload, deriveAccountId, determineRelayChain, dryRun, dryRunOrigin, encodeSs58, getAssetBalance, getAssetBalanceInternal, getBalanceForeign, getBalanceForeignInternal, getBalanceNative, getBalanceNativeInternal, getBridgeStatus, getNode, getNodeConfig, getNodeProviders, getOriginFeeDetails, getOriginFeeDetailsInternal, getOriginXcmFee, getOriginXcmFeeEstimate, getParaEthTransferFees, getParaId, getTNode, getTransferInfo, getTransferableAmount, getTransferableAmountInternal, getXcmFee, getXcmFeeEstimate, localizeLocation, resolveModuleError, resolveParaId, reverseTransformMultiLocation, send, transferMoonbeamEvm, transferMoonbeamToEth, transferRelayToPara, validateAddress, verifyEdOnDestination };
-export type { IPolkadotApi, IPolkadotXCMTransfer, IXTokensTransfer, IXTransferTransfer, OneKey, TAddress, TApiOrUrl, TAssetClaimOptions, TAssetClaimOptionsBase, TBalanceResponse, TBatchOptions, TBifrostToken, TBridgeStatus, TCreateBeneficiaryOptions, TDestWeight, TDestination, TDryRunBaseOptions, TDryRunCallBaseOptions, TDryRunCallOptions, TDryRunChain, TDryRunNodeFailure, TDryRunNodeResult, TDryRunNodeResultInternal, TDryRunNodeSuccess, TDryRunOptions, TDryRunResult, TDryRunXcmBaseOptions, TDryRunXcmOptions, TEdJsonMap, TEvmBuilderOptions, TEvmBuilderOptionsBase, TEvmNodeFrom, TFeeType, TForeignAssetId, TForeignOrNativeAsset, TForeignOrTokenAsset, TGetAssetBalanceOptions, TGetAssetBalanceOptionsBase, TGetBalanceForeignOptions, TGetBalanceForeignOptionsBase, TGetBalanceNativeOptions, TGetBalanceNativeOptionsBase, TGetFeeForDestNodeBaseOptions, TGetFeeForDestNodeOptions, TGetMaxForeignTransferableAmountOptions, TGetMaxForeignTransferableAmountOptionsBase, TGetMaxNativeTransferableAmountOptions, TGetMaxNativeTransferableAmountOptionsBase, TGetOriginFeeDetailsOptions, TGetOriginFeeDetailsOptionsBase, TGetOriginXcmFeeBaseOptions, TGetOriginXcmFeeEstimateOptions, TGetOriginXcmFeeOptions, TGetReverseTxFeeOptions, TGetTransferInfoOptions, TGetTransferInfoOptionsBase, TGetTransferableAmountOptions, TGetTransferableAmountOptionsBase, TGetXcmFeeBaseOptions, TGetXcmFeeBuilderOptions, TGetXcmFeeEstimateDetail, TGetXcmFeeEstimateOptions, TGetXcmFeeEstimateResult, TGetXcmFeeOptions, TGetXcmFeeResult, THopInfo, THubKey, TMantaAsset, TModuleError, TNativeTokenAsset, TNodeConfig, TNodeConfigMap, TNodleAsset, TOriginFeeDetails, TOtherReserveAsset, TPolkadotXCMTransferOptions, TPolkadotXcmMethod, TProviderEntry, TRelayToParaDestination, TRelayToParaOptions, TRelayToParaOverrides, TRelaychain, TReserveAsset, TScenario, TSelfReserveAsset, TSendBaseOptions, TSendBaseOptionsWithSenderAddress, TSendInternalOptions, TSendOptions, TSerializeEthTransferOptions, TSerializedApiCall, TSerializedEthTransfer, TTransferInfo, TTransferLocalOptions, TVerifyEdOnDestinationOptions, TVerifyEdOnDestinationOptionsBase, TWeight, TXTokensCurrencySelection, TXTokensMethod, TXTokensTransferOptions, TXTransferMethod, TXTransferTransferOptions, TXcmAsset, TXcmFeeBase, TXcmFeeChain, TXcmFeeDetail, TXcmForeignAsset, TXcmPalletMethod, TXcmVersioned, TZeitgeistAsset, WithApi, WithRequiredSenderAddress };
+export type { IPolkadotApi, IPolkadotXCMTransfer, IXTokensTransfer, IXTransferTransfer, OneKey, TAddress, TApiOrUrl, TAssetClaimOptions, TAssetClaimOptionsBase, TBalanceResponse, TBatchOptions, TBifrostToken, TBridgeStatus, TCreateBeneficiaryOptions, TDestWeight, TDestination, TDryRunBaseOptions, TDryRunCallBaseOptions, TDryRunCallOptions, TDryRunChain, TDryRunNodeFailure, TDryRunNodeResult, TDryRunNodeResultInternal, TDryRunNodeSuccess, TDryRunOptions, TDryRunResult, TDryRunXcmBaseOptions, TDryRunXcmOptions, TEdJsonMap, TEvmBuilderOptions, TEvmBuilderOptionsBase, TEvmNodeFrom, TFeeType, TForeignAssetId, TForeignOrNativeAsset, TForeignOrTokenAsset, TGetAssetBalanceOptions, TGetAssetBalanceOptionsBase, TGetBalanceForeignOptions, TGetBalanceForeignOptionsBase, TGetBalanceNativeOptions, TGetBalanceNativeOptionsBase, TGetFeeForDestNodeBaseOptions, TGetFeeForDestNodeOptions, TGetMaxForeignTransferableAmountOptions, TGetMaxForeignTransferableAmountOptionsBase, TGetMaxNativeTransferableAmountOptions, TGetMaxNativeTransferableAmountOptionsBase, TGetOriginFeeDetailsOptions, TGetOriginFeeDetailsOptionsBase, TGetOriginXcmFeeBaseOptions, TGetOriginXcmFeeEstimateOptions, TGetOriginXcmFeeOptions, TGetReverseTxFeeOptions, TGetTransferInfoOptions, TGetTransferInfoOptionsBase, TGetTransferableAmountOptions, TGetTransferableAmountOptionsBase, TGetXcmFeeBaseOptions, TGetXcmFeeBuilderOptions, TGetXcmFeeEstimateDetail, TGetXcmFeeEstimateOptions, TGetXcmFeeEstimateResult, TGetXcmFeeOptions, TGetXcmFeeResult, THopInfo, THopTransferInfo, THubKey, TMantaAsset, TModuleError, TNativeTokenAsset, TNodeConfig, TNodeConfigMap, TNodleAsset, TOriginFeeDetails, TOtherReserveAsset, TPolkadotXCMTransferOptions, TPolkadotXcmMethod, TProviderEntry, TRelayToParaDestination, TRelayToParaOptions, TRelayToParaOverrides, TRelaychain, TReserveAsset, TScenario, TSelfReserveAsset, TSendBaseOptions, TSendBaseOptionsWithSenderAddress, TSendInternalOptions, TSendOptions, TSerializeEthTransferOptions, TSerializedApiCall, TSerializedEthTransfer, TTransferInfo, TTransferLocalOptions, TVerifyEdOnDestinationOptions, TVerifyEdOnDestinationOptionsBase, TWeight, TXTokensCurrencySelection, TXTokensMethod, TXTokensTransferOptions, TXTransferMethod, TXTransferTransferOptions, TXcmAsset, TXcmFeeBase, TXcmFeeChain, TXcmFeeDetail, TXcmFeeHopInfo, TXcmForeignAsset, TXcmPalletMethod, TXcmVersioned, TZeitgeistAsset, WithApi, WithRequiredSenderAddress };

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { isNodeEvm, getAssetsObject, InvalidCurrencyError, getNativeAssetSymbol,
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, createPublicClient, http, getContract } from 'viem';
-import { Parents, isTMultiLocation, Version, isRelayChain, replaceBigInt, NODE_NAMES_DOT_KSM, hasJunction, deepEqual, isDotKsmBridge, getJunctionValue } from '@paraspell/sdk-common';
+import { Parents, isTMultiLocation, Version, getJunctionValue, isRelayChain, replaceBigInt, NODE_NAMES_DOT_KSM, hasJunction, deepEqual, isDotKsmBridge, isSystemChain } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import { getSupportedPalletsDetails, getDefaultPallet } from '@paraspell/pallets';
 export * from '@paraspell/pallets';
@@ -2127,13 +2127,17 @@ var localizeLocation = function localizeLocation(node, multiLocation) {
   var newInterior = multiLocation.interior;
   var parachainRemoved = false;
   if (multiLocation.interior !== 'Here') {
+    var paraId = getParaId(node);
     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;
+        var paraJunctionId = getJunctionValue(multiLocation, 'Parachain');
+        if (paraJunctionId === paraId) {
+          parachainRemoved = true;
+          return false;
+        }
       }
       return true;
     });
@@ -4269,30 +4273,30 @@ var buildHopInfo = /*#__PURE__*/function () {
 }();
 
 var getTransferInfo = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, destinationInfo, _t;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
+    var api, tx, origin, destination, senderAddress, ahAddress, address, currency, feeAsset, resolvedFeeAsset, originAsset, originBalanceFee, originBalance, edOrigin, _yield$getXcmFee, _yield$getXcmFee$orig, originFee, originFeeCurrency, assetHubFeeResult, bridgeHubFeeResult, destFeeDetail, hops, isFeeAssetAh, originBalanceAfter, originBalanceFeeAfter, originBalanceNativeSufficient, originBalanceSufficient, assetHub, bridgeHub, bridgeHubNode, builtHops, destinationInfo, _t;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, ahAddress = _ref.ahAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset;
           if (!(isNodeEvm(origin) && !ahAddress)) {
-            _context.n = 1;
+            _context2.n = 1;
             break;
           }
           throw new InvalidParameterError("ahAddress is required for EVM origin ".concat(origin, "."));
         case 1:
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
-          _context.n = 2;
+          _context2.n = 2;
           return api.init(origin);
         case 2:
           api.setDisconnectAllowed(false);
-          _context.p = 3;
+          _context2.p = 3;
           originAsset = findAssetForNodeOrThrow(origin, currency, destination);
           if (!(feeAsset && resolvedFeeAsset)) {
-            _context.n = 5;
+            _context2.n = 5;
             break;
           }
-          _context.n = 4;
+          _context2.n = 4;
           return getAssetBalanceInternal({
             api: api,
             address: senderAddress,
@@ -4300,21 +4304,21 @@ var getTransferInfo = /*#__PURE__*/function () {
             currency: feeAsset
           });
         case 4:
-          _t = _context.v;
-          _context.n = 7;
+          _t = _context2.v;
+          _context2.n = 7;
           break;
         case 5:
-          _context.n = 6;
+          _context2.n = 6;
           return getBalanceNativeInternal({
             api: api,
             address: senderAddress,
             node: origin
           });
         case 6:
-          _t = _context.v;
+          _t = _context2.v;
         case 7:
           originBalanceFee = _t;
-          _context.n = 8;
+          _context2.n = 8;
           return getAssetBalanceInternal({
             api: api,
             address: senderAddress,
@@ -4322,9 +4326,9 @@ var getTransferInfo = /*#__PURE__*/function () {
             currency: currency
           });
         case 8:
-          originBalance = _context.v;
+          originBalance = _context2.v;
           edOrigin = getExistentialDepositOrThrow(origin, currency);
-          _context.n = 9;
+          _context2.n = 9;
           return getXcmFee({
             api: api,
             tx: tx,
@@ -4337,15 +4341,16 @@ var getTransferInfo = /*#__PURE__*/function () {
             disableFallback: false
           });
         case 9:
-          _yield$getXcmFee = _context.v;
+          _yield$getXcmFee = _context2.v;
           _yield$getXcmFee$orig = _yield$getXcmFee.origin;
           originFee = _yield$getXcmFee$orig.fee;
           originFeeCurrency = _yield$getXcmFee$orig.currency;
           assetHubFeeResult = _yield$getXcmFee.assetHub;
           bridgeHubFeeResult = _yield$getXcmFee.bridgeHub;
           destFeeDetail = _yield$getXcmFee.destination;
+          hops = _yield$getXcmFee.hops;
           if (!(originFee === undefined)) {
-            _context.n = 10;
+            _context2.n = 10;
             break;
           }
           throw new InvalidParameterError("Cannot get origin xcm fee for currency ".concat(JSON.stringify(currency, replaceBigInt), " on node ").concat(origin, "."));
@@ -4356,10 +4361,10 @@ var getTransferInfo = /*#__PURE__*/function () {
           originBalanceNativeSufficient = originBalanceFee >= originFee;
           originBalanceSufficient = originBalanceAfter >= edOrigin;
           if (!assetHubFeeResult) {
-            _context.n = 12;
+            _context2.n = 12;
             break;
           }
-          _context.n = 11;
+          _context2.n = 11;
           return buildHopInfo({
             api: api,
             node: determineRelayChain(origin) === 'Polkadot' ? 'AssetHubPolkadot' : 'AssetHubKusama',
@@ -4370,14 +4375,14 @@ var getTransferInfo = /*#__PURE__*/function () {
             ahAddress: ahAddress
           });
         case 11:
-          assetHub = _context.v;
+          assetHub = _context2.v;
         case 12:
           if (!bridgeHubFeeResult) {
-            _context.n = 14;
+            _context2.n = 14;
             break;
           }
           bridgeHubNode = determineRelayChain(origin) === 'Polkadot' ? 'BridgeHubPolkadot' : 'BridgeHubKusama';
-          _context.n = 13;
+          _context2.n = 13;
           return buildHopInfo({
             api: api,
             node: bridgeHubNode,
@@ -4388,9 +4393,47 @@ var getTransferInfo = /*#__PURE__*/function () {
             ahAddress: ahAddress
           });
         case 13:
-          bridgeHub = _context.v;
+          bridgeHub = _context2.v;
         case 14:
-          _context.n = 15;
+          builtHops = [];
+          if (!(hops && hops.length > 0)) {
+            _context2.n = 16;
+            break;
+          }
+          _context2.n = 15;
+          return Promise.all(hops.map(/*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(hop) {
+              var result;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    _context.n = 1;
+                    return buildHopInfo({
+                      api: api,
+                      node: hop.chain,
+                      feeData: hop.result,
+                      originNode: origin,
+                      currency: currency,
+                      senderAddress: senderAddress,
+                      ahAddress: ahAddress
+                    });
+                  case 1:
+                    result = _context.v;
+                    return _context.a(2, {
+                      chain: hop.chain,
+                      result: result
+                    });
+                }
+              }, _callee);
+            }));
+            return function (_x2) {
+              return _ref3.apply(this, arguments);
+            };
+          }()));
+        case 15:
+          builtHops = _context2.v;
+        case 16:
+          _context2.n = 17;
           return buildDestInfo({
             api: api,
             origin: origin,
@@ -4403,9 +4446,9 @@ var getTransferInfo = /*#__PURE__*/function () {
             assetHubFee: assetHubFeeResult === null || assetHubFeeResult === void 0 ? void 0 : assetHubFeeResult.fee,
             bridgeFee: bridgeHubFeeResult === null || bridgeHubFeeResult === void 0 ? void 0 : bridgeHubFeeResult.fee
           });
-        case 15:
-          destinationInfo = _context.v;
-          return _context.a(2, {
+        case 17:
+          destinationInfo = _context2.v;
+          return _context2.a(2, {
             chain: {
               origin: origin,
               destination: destination,
@@ -4429,19 +4472,20 @@ var getTransferInfo = /*#__PURE__*/function () {
             },
             assetHub: assetHub,
             bridgeHub: bridgeHub,
+            hops: builtHops,
             destination: destinationInfo
           });
-        case 16:
-          _context.p = 16;
+        case 18:
+          _context2.p = 18;
           api.setDisconnectAllowed(true);
-          _context.n = 17;
+          _context2.n = 19;
           return api.disconnect();
-        case 17:
-          return _context.f(16);
-        case 18:
-          return _context.a(2);
+        case 19:
+          return _context2.f(18);
+        case 20:
+          return _context2.a(2);
       }
-    }, _callee, null, [[3,, 16, 18]]);
+    }, _callee2, null, [[3,, 18, 20]]);
   }));
   return function getTransferInfo(_x) {
     return _ref2.apply(this, arguments);
@@ -4853,7 +4897,7 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
       if (!hop.result.success && hop.result.failureReason) {
         return {
           failureReason: hop.result.failureReason,
-          failureChain: hop.node
+          failureChain: hop.chain
         };
       }
     }
@@ -4955,7 +4999,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           // Add to hops array (only if not the destination)
           if (nextChain !== destination) {
             hops.push({
-              node: nextChain,
+              chain: nextChain,
               result: hopDryRun.success && hopCurrency ? _objectSpread2(_objectSpread2({}, hopDryRun), {}, {
                 currency: hopCurrency
               }) : hopDryRun
@@ -5009,7 +5053,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           });
           // Update the hop data if BridgeHub is in the hops array
           bridgeHubHopIndex = hops.findIndex(function (hop) {
-            return hop.node === bridgeHubNode;
+            return hop.chain === bridgeHubNode;
           });
           if (bridgeHubHopIndex !== -1 && hops[bridgeHubHopIndex].result.success) {
             hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, hops[bridgeHubHopIndex].result), {}, {
@@ -5397,8 +5441,9 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   };
 }();
 
-var getFailureInfo = function getFailureInfo(nodes) {
+var getFailureInfo = function getFailureInfo(nodes, hops) {
   var _nodes$origin, _nodes$assetHub, _nodes$bridgeHub, _nodes$destination;
+  // Check standard chains first for backwards compatibility
   if ((_nodes$origin = nodes.origin) !== null && _nodes$origin !== void 0 && _nodes$origin.dryRunError) return {
     failureChain: 'origin',
     failureReason: nodes.origin.dryRunError
@@ -5415,11 +5460,29 @@ var getFailureInfo = function getFailureInfo(nodes) {
     failureChain: 'destination',
     failureReason: nodes.destination.dryRunError
   };
+  // Check hops for failures
+  var _iterator = _createForOfIteratorHelper(hops),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var hop = _step.value;
+      if (hop.result.dryRunError) {
+        return {
+          failureChain: hop.chain,
+          failureReason: hop.result.dryRunError
+        };
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
   return {};
 };
 var getXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, destinationSufficient, nextChain, hopApi, hopResult, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, destCurrency, result, _getFailureInfo2, failureChain, failureReason;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, hops, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, destinationFee, destinationFeeType, destinationDryRunError, destinationSufficient, nextChain, hopApi, hopResult, hopCurrency, hopDetail, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, destCurrency, result, _getFailureInfo2, failureChain, failureReason;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -5450,6 +5513,8 @@ var getXcmFee = /*#__PURE__*/function () {
           _context.n = 2;
           return api.disconnect();
         case 2:
+          // Initialize hops array
+          hops = [];
           if (!(originDryRunError || originFeeType === 'paymentInfo')) {
             _context.n = 8;
             break;
@@ -5499,12 +5564,13 @@ var getXcmFee = /*#__PURE__*/function () {
               sufficient: destFeeRes.sufficient
             }), {}, {
               currency: getNativeAssetSymbol(destination)
-            })
+            }),
+            hops: hops // Include empty hops array
           };
           _getFailureInfo = getFailureInfo({
             origin: _result.origin,
             destination: _result.destination
-          }), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
+          }, hops), _failureChain = _getFailureInfo.failureChain, _failureReason = _getFailureInfo.failureReason;
           return _context.a(2, _objectSpread2(_objectSpread2({}, _result), {}, {
             failureChain: _failureChain,
             failureReason: _failureReason
@@ -5560,17 +5626,38 @@ var getXcmFee = /*#__PURE__*/function () {
           });
         case 13:
           hopResult = _context.v;
-          if (!hopResult.dryRunError) {
-            _context.n = 17;
-            break;
+          // Determine the currency for this hop
+          hopCurrency = void 0;
+          if (nextChain === destination) {
+            hopCurrency = destinationFeeType === 'dryRun' ? findAssetOnDestOrThrow(origin, destination, currency).symbol : getNativeAssetSymbol(destination);
+          } else if (isRelayChain(nextChain) || nextChain === assetHubNode || nextChain === bridgeHubNode) {
+            hopCurrency = getNativeAssetSymbol(nextChain);
+          } else {
+            hopCurrency = getNativeAssetSymbol(nextChain);
           }
-          failingRecord = {
+          hopDetail = hopResult.dryRunError ? {
+            fee: hopResult.fee,
+            feeType: hopResult.feeType,
+            currency: hopCurrency,
+            sufficient: hopResult.sufficient,
+            dryRunError: hopResult.dryRunError
+          } : {
             fee: hopResult.fee,
             feeType: hopResult.feeType,
-            currency: getNativeAssetSymbol(nextChain),
-            dryRunError: hopResult.dryRunError,
+            currency: hopCurrency,
             sufficient: hopResult.sufficient
           };
+          if (nextChain !== destination) {
+            hops.push({
+              chain: nextChain,
+              result: hopDetail
+            });
+          }
+          if (!hopResult.dryRunError) {
+            _context.n = 17;
+            break;
+          }
+          failingRecord = hopDetail;
           hopIsDestination = nextChain === destination || isRelayChain(nextChain) && !isRelayChain(destination);
           if (hopIsDestination) {
             destinationFee = hopResult.fee;
@@ -5622,19 +5709,9 @@ var getXcmFee = /*#__PURE__*/function () {
             destinationFeeType = hopResult.feeType;
             destinationSufficient = hopResult.sufficient;
           } else if (nextChain === assetHubNode) {
-            intermediateFees.assetHub = {
-              fee: hopResult.fee,
-              feeType: hopResult.feeType,
-              currency: getNativeAssetSymbol(nextChain),
-              sufficient: hopResult.sufficient
-            };
+            intermediateFees.assetHub = hopDetail;
           } else if (nextChain === bridgeHubNode) {
-            intermediateFees.bridgeHub = {
-              fee: hopResult.fee,
-              feeType: hopResult.feeType,
-              currency: getNativeAssetSymbol(nextChain),
-              sufficient: hopResult.sufficient
-            };
+            intermediateFees.bridgeHub = hopDetail;
           } else ;
           forwardedXcms = hopResult.forwardedXcms;
           nextParaId = hopResult.destParaId;
@@ -5667,6 +5744,14 @@ var getXcmFee = /*#__PURE__*/function () {
           processedBridgeHubData = _objectSpread2(_objectSpread2({}, intermediateFees.bridgeHub), {}, {
             fee: intermediateFees.bridgeHub.fee + bridgeFee
           });
+          bridgeHubHopIndex = hops.findIndex(function (hop) {
+            return hop.chain === bridgeHubNode;
+          });
+          if (bridgeHubHopIndex !== -1) {
+            hops[bridgeHubHopIndex].result = _objectSpread2(_objectSpread2({}, hops[bridgeHubHopIndex].result), {}, {
+              fee: intermediateFees.bridgeHub.fee + bridgeFee
+            });
+          }
         case 24:
           intermediateFees.bridgeHub = processedBridgeHubData;
           destCurrency = destinationFeeType === 'dryRun' ? findAssetOnDestOrThrow(origin, destination, currency).symbol : getNativeAssetSymbol(destination);
@@ -5694,14 +5779,15 @@ var getXcmFee = /*#__PURE__*/function () {
               currency: destCurrency
             }, destinationDryRunError && {
               dryRunError: destinationDryRunError
-            })
+            }),
+            hops: hops
           });
           _getFailureInfo2 = getFailureInfo({
             origin: result.origin,
             assetHub: result.assetHub,
             bridgeHub: result.bridgeHub,
             destination: result.destination
-          }), failureChain = _getFailureInfo2.failureChain, failureReason = _getFailureInfo2.failureReason;
+          }, hops), failureChain = _getFailureInfo2.failureChain, failureReason = _getFailureInfo2.failureReason;
           return _context.a(2, _objectSpread2(_objectSpread2({}, result), {}, {
             failureChain: failureChain,
             failureReason: failureReason
@@ -6925,6 +7011,11 @@ var sortMultiAssets = function sortMultiAssets(assets) {
   return assets.sort(function (a, b) {
     var aLoc = extractMultiAssetLoc(a);
     var bLoc = extractMultiAssetLoc(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');
@@ -6945,10 +7036,10 @@ var sortMultiAssets = function sortMultiAssets(assets) {
     return aGeneralIndex - bGeneralIndex;
   });
 };
-function isHere(loc) {
+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;
-}
+};
 var updateAsset = function updateAsset(asset, amount) {
   return _objectSpread2(_objectSpread2({}, asset), {}, {
     fun: {
@@ -6963,7 +7054,7 @@ var createWithdrawAssets = function createWithdrawAssets(asset, feeAsset) {
   }
   return sortMultiAssets(assetsToWithdraw);
 };
-var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopExecutionFee, version) {
+var createExecuteXcm = function createExecuteXcm(node, destChain, input, executionFee, hopExecutionFee, version) {
   var _ref;
   var api = input.api,
     asset = input.asset,
@@ -6992,6 +7083,7 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
   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 multiAssetLocalizedToDest = createMultiAsset(version, amount, localizeLocation(destChain, asset.multiLocation));
   var feeMultiAsset = feeAsset && !isAssetEqual(asset, feeAsset) ? createMultiAsset(version, executionFee, feeAsset.multiLocation) : undefined;
   var feeMultiAssetLocalized = feeAsset && !isAssetEqual(asset, feeAsset) ? createMultiAsset(version, executionFee, localizeLocation(node, feeAsset.multiLocation)) : undefined;
   var feeMultiAssetLocalizedToReserve = feeAsset && !isAssetEqual(asset, feeAsset) ? createMultiAsset(version, executionFee, localizeLocation(reserveChain !== null && reserveChain !== void 0 ? reserveChain : node, feeAsset.multiLocation)) : undefined;
@@ -7000,7 +7092,8 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
   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 ? {
+  var chainsAreTrusted = isSystemChain(node) && isSystemChain(destChain);
+  var depositInstruction = isReserveDest || chainsAreTrusted ? {
     DepositAsset: {
       assets: createAssetsFilter(multiAssetLocalizedToReserve, feeMultiAssetLocalizedToReserve),
       beneficiary: beneficiary
@@ -7029,7 +7122,31 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
   var needsIntermediaryReserve = reserveParaId !== undefined &&
   // Has a reserve
   !isOnReserveChain(node, reserveParaId); // Not on reserve
-  var lastInstruction = needsIntermediaryReserve ? {
+  var lastInstruction = chainsAreTrusted ?
+  // Use teleport for trusted chains
+  {
+    InitiateTeleport: {
+      assets: assetsFilter,
+      dest: dest,
+      xcm: [{
+        BuyExecution: {
+          fees: updateAsset(multiAssetLocalizedToDest, feeMultiAsset ? amount : amount - executionFee),
+          weight_limit: 'Unlimited'
+        }
+      }, {
+        DepositAsset: {
+          assets: {
+            Wild: {
+              AllCounted: 1
+            }
+          },
+          beneficiary: beneficiary
+        }
+      }]
+    }
+  } : needsIntermediaryReserve ?
+  // Use reserve for non-trusted chains
+  {
     InitiateReserveWithdraw: {
       assets: assetsFilter,
       reserve: getChainLocation(reserveParaId),
@@ -7062,7 +7179,7 @@ var createExecuteXcm = function createExecuteXcm(node, input, executionFee, hopE
 
 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;
+    var api, senderAddress, paraIdTo, asset, currency, feeCurrency, address, feeAsset, version, feeAssetBalance, checkAmount, MIN_FEE, destChain, call, dryRunResult, paddedFee, hopFee, paddedHopFee, xcm, weight, _t;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -7101,14 +7218,14 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           };
           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');
+          destChain = getTNode(paraIdTo, determineRelayChain(node) === 'Polkadot' ? 'polkadot' : 'kusama');
+          call = createExecuteCall(createExecuteXcm(node, destChain, input, feeAssetBalance && feeAssetBalance > 1n ? feeAssetBalance : MIN_FEE, MIN_FEE, version), MAX_WEIGHT);
           _context.n = 5;
           return dryRunInternal({
             api: api,
             tx: api.callTxMethod(call),
             origin: node,
-            destination: destNode,
+            destination: destChain,
             senderAddress: senderAddress,
             address: address,
             currency: currency,
@@ -7154,7 +7271,7 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
           }
           paddedHopFee = padFeeBy(hopFee, 40);
           checkAmount(feeAsset && !isAssetEqual(asset, feeAsset) ? paddedHopFee : paddedFee + paddedHopFee);
-          xcm = createExecuteXcm(node, input, paddedFee, paddedHopFee, version);
+          xcm = createExecuteXcm(node, destChain, input, paddedFee, paddedHopFee, version);
           _context.n = 10;
           return api.getXcmWeight(xcm);
         case 10:
@@ -7524,7 +7641,7 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
     key: "transferPolkadotXCM",
     value: function () {
       var _transferPolkadotXCM = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(input) {
-        var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isEthereumAsset, isSystemNode, method, modifiedInput, _t, _t2;
+        var api, scenario, asset, destination, feeAsset, overriddenAsset, isNativeAsset, isNativeFeeAsset, isEthereumAsset, isSystemNode, method, modifiedInput, _t, _t2;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
@@ -7546,7 +7663,8 @@ var AssetHubPolkadot = /*#__PURE__*/function (_ParachainNode) {
               return _context3.a(2, this.handleLocalReserveTransfer(input));
             case 2:
               isNativeAsset = isSymbolMatch(asset.symbol, this.getNativeAssetSymbol());
-              if (isNativeAsset) {
+              isNativeFeeAsset = isSymbolMatch(feeAsset.symbol, this.getNativeAssetSymbol());
+              if (!(!isNativeAsset || !isNativeFeeAsset)) {
                 _context3.n = 4;
                 break;
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "10.7.2",
+  "version": "10.8.0",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "@noble/hashes": "^1.8.0",
     "@scure/base": "^1.2.6",
     "viem": "^2.30.5",
-    "@paraspell/assets": "10.7.2",
-    "@paraspell/sdk-common": "10.7.2",
-    "@paraspell/pallets": "10.7.2"
+    "@paraspell/pallets": "10.8.0",
+    "@paraspell/sdk-common": "10.8.0",
+    "@paraspell/assets": "10.8.0"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",