@paraspell/sdk-core 11.8.3 → 11.8.4

package/dist/index.cjs

@@ -4487,7 +4487,9 @@ var getDestXcmFee = /*#__PURE__*/function () {
           return _context3.a(2, {
             fee: _fee,
             feeType: 'paymentInfo',
-            sufficient: sufficient
+            sufficient: sufficient,
+            asset: asset,
+            currency: asset.symbol
           });
         case 3:
           _context3.n = 4;
@@ -4524,7 +4526,9 @@ var getDestXcmFee = /*#__PURE__*/function () {
             fee: _fee2,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
-            sufficient: false
+            sufficient: false,
+            asset: asset,
+            currency: asset.symbol
           });
         case 7:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
@@ -4533,7 +4537,9 @@ var getDestXcmFee = /*#__PURE__*/function () {
             feeType: 'dryRun',
             sufficient: true,
             forwardedXcms: newForwardedXcms,
-            destParaId: destParaId
+            destParaId: destParaId,
+            asset: asset,
+            currency: asset.symbol
           });
       }
     }, _callee3);
@@ -5125,14 +5131,11 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
   };
 }();
 
-function traverseXcmHops(_x) {
-  return _traverseXcmHops.apply(this, arguments);
-}
-function _traverseXcmHops() {
-  _traverseXcmHops = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(config) {
+var traverseXcmHops = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(config) {
     var api, origin, destination, currency, initialForwardedXcms, initialDestParaId, swapConfig, processHop, shouldContinue, extractNextHopData, assetHubChain, bridgeHubChain, currentOrigin, forwardedXcms, nextParaId, asset, currentAsset, hasPassedExchange, hops, intermediateResults, destinationResult, nextChain, hopApi, isDestination, isAssetHub, isBridgeHub, hopResult, _extractNextHopData, newXcms, destParaId;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.p = _context2.n) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
           api = config.api, origin = config.origin, destination = config.destination, currency = config.currency, initialForwardedXcms = config.initialForwardedXcms, initialDestParaId = config.initialDestParaId, swapConfig = config.swapConfig, processHop = config.processHop, shouldContinue = config.shouldContinue, extractNextHopData = config.extractNextHopData;
           assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
@@ -5147,19 +5150,19 @@ function _traverseXcmHops() {
           intermediateResults = {};
         case 1:
           if (!(Array.isArray(forwardedXcms) && forwardedXcms.length > 0 && forwardedXcms[1].length > 0 && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context2.n = 10;
+            _context.n = 10;
             break;
           }
           nextChain = getTChain(nextParaId, getRelayChainOf(origin));
           if (nextChain) {
-            _context2.n = 2;
+            _context.n = 2;
             break;
           }
           throw new InvalidParameterError("Unable to find TChain for paraId ".concat(nextParaId));
         case 2:
           hopApi = api.clone();
-          _context2.p = 3;
-          _context2.n = 4;
+          _context.p = 3;
+          _context.n = 4;
           return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 4:
           // true if this hop should be treated as the destination
@@ -5168,7 +5171,7 @@ function _traverseXcmHops() {
           isDestination = nextChain === destination && (!swapConfig || hasPassedExchange || nextChain === swapConfig.exchangeChain);
           isAssetHub = nextChain === assetHubChain;
           isBridgeHub = nextChain === bridgeHubChain;
-          _context2.n = 5;
+          _context.n = 5;
           return processHop({
             api: hopApi,
             currentChain: nextChain,
@@ -5181,7 +5184,7 @@ function _traverseXcmHops() {
             isBridgeHub: isBridgeHub
           });
         case 5:
-          hopResult = _context2.v;
+          hopResult = _context.v;
           if (!isDestination) {
             hops.push({
               chain: nextChain,
@@ -5196,10 +5199,10 @@ function _traverseXcmHops() {
             intermediateResults.bridgeHub = hopResult;
           }
           if (shouldContinue(hopResult)) {
-            _context2.n = 6;
+            _context.n = 6;
             break;
           }
-          return _context2.a(3, 10);
+          return _context.a(3, 10);
         case 6:
           // Update state for next iteration
           if (swapConfig && nextChain === swapConfig.exchangeChain) {
@@ -5211,16 +5214,16 @@ function _traverseXcmHops() {
           nextParaId = destParaId;
           currentOrigin = nextChain;
         case 7:
-          _context2.p = 7;
-          _context2.n = 8;
+          _context.p = 7;
+          _context.n = 8;
           return hopApi.disconnect();
         case 8:
-          return _context2.f(7);
+          return _context.f(7);
         case 9:
-          _context2.n = 1;
+          _context.n = 1;
           break;
         case 10:
-          return _context2.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+          return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
             hops: hops
           }, intermediateResults.assetHub && {
             assetHub: intermediateResults.assetHub
@@ -5232,40 +5235,42 @@ function _traverseXcmHops() {
             lastProcessedChain: currentOrigin
           }));
       }
-    }, _callee2, null, [[3,, 7, 9]]);
+    }, _callee, null, [[3,, 7, 9]]);
   }));
-  return _traverseXcmHops.apply(this, arguments);
-}
+  return function traverseXcmHops(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var addEthereumBridgeFees = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, bridgeHubResult, destination, assetHubChain) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, bridgeHubResult, destination, assetHubChain) {
     var ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           if (!(!bridgeHubResult || !('fee' in bridgeHubResult) || destination !== 'Ethereum')) {
-            _context.n = 1;
+            _context2.n = 1;
             break;
           }
-          return _context.a(2, bridgeHubResult);
+          return _context2.a(2, bridgeHubResult);
         case 1:
           ahApi = api.clone();
-          _context.n = 2;
+          _context2.n = 2;
           return ahApi.init(assetHubChain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 2:
-          _context.n = 3;
+          _context2.n = 3;
           return getParaEthTransferFees(ahApi);
         case 3:
-          _yield$getParaEthTran = _context.v;
+          _yield$getParaEthTran = _context2.v;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 1);
           bridgeFee = _yield$getParaEthTran2[0];
-          return _context.a(2, _objectSpread2(_objectSpread2({}, bridgeHubResult), {}, {
+          return _context2.a(2, _objectSpread2(_objectSpread2({}, bridgeHubResult), {}, {
             fee: bridgeHubResult.fee + bridgeFee
           }));
       }
-    }, _callee);
+    }, _callee2);
   }));
   return function addEthereumBridgeFees(_x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
 }();
 
@@ -5315,6 +5320,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           return api.getDryRunCall({
             tx: tx,
             chain: origin,
+            destination: destination,
             address: senderAddress,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
@@ -5344,8 +5350,8 @@ var dryRunInternal = /*#__PURE__*/function () {
                 while (1) switch (_context.n) {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange, isDestination = params.isDestination;
-                    if (destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub'))) {
-                      hopAsset = assets.findNativeAssetInfoOrThrow(currentChain);
+                    if (asset.location && asset.location.parents === sdkCommon.Parents.TWO) {
+                      hopAsset = assets.findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
                     } else if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
                       hopAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
                     } else if (isDestination) {
@@ -5371,7 +5377,7 @@ var dryRunInternal = /*#__PURE__*/function () {
                       xcm: forwardedXcms[1][0],
                       chain: currentChain,
                       origin: currentOrigin,
-                      asset: currentAsset,
+                      asset: hopAsset,
                       feeAsset: resolvedFeeAsset,
                       originFee: originDryRun.fee,
                       amount: amount
@@ -10104,7 +10110,7 @@ var createMintTxs = function createMintTxs(chain, asset, balance, address, api)
   var nativePallet = pallets.getNativeAssetsPallet(chain);
   var otherPallets = pallets.getOtherAssetsPallets(chain);
   var isMainNativeAsset = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(chain));
-  var pallet = assets.isForeignAsset(asset) || !isMainNativeAsset ? pickOtherPallet(asset, otherPallets) : nativePallet;
+  var pallet = assets.isForeignAsset(asset) && chain !== 'Mythos' || !isMainNativeAsset ? pickOtherPallet(asset, otherPallets) : nativePallet;
   var palletInstance = getPalletInstance(pallet);
   return palletInstance.mint(address, asset, balance, chain, api);
 };
@@ -10465,6 +10471,7 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
           return api.getDryRunCall({
             tx: tx,
             chain: origin,
+            destination: destination,
             address: senderAddress,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
@@ -10901,11 +10908,22 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
         case 7:
           processHop = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
-              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopResult, hopAsset;
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopAsset, hopResult;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange;
+                    if (!(currentAsset.location && currentAsset.location.parents === sdkCommon.Parents.TWO)) {
+                      if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
+                        hopAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
+                      } else if (destination === currentChain) {
+                        hopAsset = assets.findAssetOnDestOrThrow(origin, currentChain, currency);
+                      } else {
+                        hopAsset = currentAsset;
+                      }
+                    } else {
+                      hopAsset = assets.findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
+                    }
                     _context.n = 1;
                     return getDestXcmFee({
                       api: hopApi,
@@ -10918,7 +10936,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                       }),
                       address: address,
                       senderAddress: senderAddress,
-                      asset: currentAsset,
+                      asset: hopAsset,
                       feeAsset: feeAsset,
                       tx: tx,
                       originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
@@ -10928,21 +10946,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                     });
                   case 1:
                     hopResult = _context.v;
-                    if (hopResult.feeType === 'dryRun' && !(destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub')))) {
-                      if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
-                        hopAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
-                      } else if (destination === currentChain) {
-                        hopAsset = assets.findAssetOnDestOrThrow(origin, currentChain, currency);
-                      } else {
-                        hopAsset = asset;
-                      }
-                    } else {
-                      hopAsset = assets.findNativeAssetInfoOrThrow(currentChain);
-                    }
-                    return _context.a(2, _objectSpread2(_objectSpread2({}, hopResult), {}, {
-                      currency: hopAsset.symbol,
-                      asset: hopAsset
-                    }));
+                    return _context.a(2, hopResult);
                 }
               }, _callee);
             }));
@@ -10996,10 +11000,6 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           }
           // We failed before reaching destination, use fallback
           _destApi = api.clone();
-          if (!(destination !== 'Ethereum')) {
-            _context2.n = 10;
-            break;
-          }
           _context2.n = 10;
           return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 10:
@@ -12356,12 +12356,14 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
   return depositInstruction;
 };
 
-var createRefundInstruction = function createRefundInstruction(api, senderAddress, version) {
+var createRefundInstruction = function createRefundInstruction(api, senderAddress, version, assetCount) {
   return {
     SetAppendix: [{
       DepositAsset: {
         assets: {
-          Wild: 'All'
+          Wild: {
+            AllCounted: assetCount
+          }
         },
         beneficiary: createBeneficiaryLocation({
           api: api,
@@ -12386,7 +12388,7 @@ var buildAssets = function buildAssets(chain, asset, feeAmount, isDotAsset, vers
  */
 var createTypeAndThenCall = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
-    var api, senderAddress, version, context, assetInfo, isDotAsset, customXcm, refundInstruction, fees, finalCustomXcm, totalFee, assets;
+    var api, senderAddress, version, context, assetInfo, isDotAsset, customXcm, assetCount, refundInstruction, fees, finalCustomXcm, totalFee, assets;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -12407,7 +12409,8 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
             }
           });
           customXcm = createCustomXcm(context, isDotAsset);
-          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version) : null;
+          assetCount = isDotAsset ? 1 : 2;
+          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version, assetCount) : null;
           _context.n = 2;
           return computeAllFees(context, customXcm, isDotAsset, refundInstruction);
         case 2:

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _paraspell_sdk_common from '@paraspell/sdk-common';
-import { TLocation, TSubstrateChain, TChain, Version, TRelaychain, TParachain, TExternalChain, TJunction, TJunctions } from '@paraspell/sdk-common';
+import { TChain, TLocation, TSubstrateChain, Version, TRelaychain, TParachain, TExternalChain, TJunction, TJunctions } from '@paraspell/sdk-common';
 export * from '@paraspell/sdk-common';
 import * as _paraspell_assets from '@paraspell/assets';
 import { TCurrencyInputWithAmount, TCurrencyInput, WithAmount, TAssetInfo, TAsset, TAssetWithFee, WithComplexAmount, TCurrencyCore, TAmount, TAssetWithLocation, TForeignAssetWithId, TForeignAssetInfo } from '@paraspell/assets';
@@ -635,7 +635,7 @@ type TXcmFeeHopResult = {
     asset: TAssetInfo;
 };
 type TConditionalXcmFeeDetail<TDisableFallback extends boolean> = TDisableFallback extends false ? TXcmFeeDetailWithFallback : TXcmFeeDetail;
-type TDestXcmFeeDetail<TDisableFallback extends boolean> = Omit<TConditionalXcmFeeDetail<TDisableFallback>, 'currency'> & {
+type TDestXcmFeeDetail<TDisableFallback extends boolean> = TConditionalXcmFeeDetail<TDisableFallback> & {
     forwardedXcms?: any;
     destParaId?: number;
 };
@@ -978,6 +978,10 @@ type TDryRunCallBaseOptions<TRes> = {
      * The chain to dry-run on
      */
     chain: TSubstrateChain;
+    /**
+     * The destination chain
+     */
+    destination: TDestination;
     /**
      * The address to dry-run with
      */
@@ -990,7 +994,7 @@ type TDryRunCallBaseOptions<TRes> = {
     bypassOptions?: TBypassOptions;
     feeAsset?: TAssetInfo;
 };
-type TDryRunBypassOptions<TApi, TRes> = WithApi<Omit<TDryRunCallBaseOptions<TRes>, 'useRootOrigin'>, TApi, TRes>;
+type TDryRunBypassOptions<TApi, TRes> = WithApi<Omit<TDryRunCallBaseOptions<TRes>, 'useRootOrigin' | 'destination'>, TApi, TRes>;
 type TDryRunCallOptions<TApi, TRes> = WithApi<TDryRunCallBaseOptions<TRes>, TApi, TRes>;
 type TDryRunXcmBaseOptions<TRes> = {
     originLocation: any;
@@ -2119,7 +2123,7 @@ declare const dryRunInternal: <TApi, TRes>(options: TDryRunOptions<TApi, TRes>)
 
 declare const dryRunOrigin: <TApi, TRes>(options: TDryRunCallOptions<TApi, TRes>) => Promise<TDryRunChainResult>;
 
-declare function traverseXcmHops<TApi, TRes, THopResult>(config: HopTraversalConfig<TApi, TRes, THopResult>): Promise<HopTraversalResult<THopResult>>;
+declare const traverseXcmHops: <TApi, TRes, THopResult>(config: HopTraversalConfig<TApi, TRes, THopResult>) => Promise<HopTraversalResult<THopResult>>;
 declare const addEthereumBridgeFees: <TApi, TRes, TResult extends {
     fee?: bigint;
 }>(api: IPolkadotApi<TApi, TRes>, bridgeHubResult: TResult | undefined, destination: TChain, assetHubChain: TSubstrateChain) => Promise<TResult | undefined>;

package/dist/index.mjs

@@ -4488,7 +4488,9 @@ var getDestXcmFee = /*#__PURE__*/function () {
           return _context3.a(2, {
             fee: _fee,
             feeType: 'paymentInfo',
-            sufficient: sufficient
+            sufficient: sufficient,
+            asset: asset,
+            currency: asset.symbol
           });
         case 3:
           _context3.n = 4;
@@ -4525,7 +4527,9 @@ var getDestXcmFee = /*#__PURE__*/function () {
             fee: _fee2,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
-            sufficient: false
+            sufficient: false,
+            asset: asset,
+            currency: asset.symbol
           });
         case 7:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
@@ -4534,7 +4538,9 @@ var getDestXcmFee = /*#__PURE__*/function () {
             feeType: 'dryRun',
             sufficient: true,
             forwardedXcms: newForwardedXcms,
-            destParaId: destParaId
+            destParaId: destParaId,
+            asset: asset,
+            currency: asset.symbol
           });
       }
     }, _callee3);
@@ -5126,14 +5132,11 @@ var transferMoonbeamToEth = /*#__PURE__*/function () {
   };
 }();
 
-function traverseXcmHops(_x) {
-  return _traverseXcmHops.apply(this, arguments);
-}
-function _traverseXcmHops() {
-  _traverseXcmHops = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(config) {
+var traverseXcmHops = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(config) {
     var api, origin, destination, currency, initialForwardedXcms, initialDestParaId, swapConfig, processHop, shouldContinue, extractNextHopData, assetHubChain, bridgeHubChain, currentOrigin, forwardedXcms, nextParaId, asset, currentAsset, hasPassedExchange, hops, intermediateResults, destinationResult, nextChain, hopApi, isDestination, isAssetHub, isBridgeHub, hopResult, _extractNextHopData, newXcms, destParaId;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.p = _context2.n) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
           api = config.api, origin = config.origin, destination = config.destination, currency = config.currency, initialForwardedXcms = config.initialForwardedXcms, initialDestParaId = config.initialDestParaId, swapConfig = config.swapConfig, processHop = config.processHop, shouldContinue = config.shouldContinue, extractNextHopData = config.extractNextHopData;
           assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
@@ -5148,19 +5151,19 @@ function _traverseXcmHops() {
           intermediateResults = {};
         case 1:
           if (!(Array.isArray(forwardedXcms) && forwardedXcms.length > 0 && forwardedXcms[1].length > 0 && ('disconnect' in api.getApi() ? Object.values(forwardedXcms[1][0]).length : forwardedXcms[1][0].value.length) > 0 && nextParaId !== undefined)) {
-            _context2.n = 10;
+            _context.n = 10;
             break;
           }
           nextChain = getTChain(nextParaId, getRelayChainOf(origin));
           if (nextChain) {
-            _context2.n = 2;
+            _context.n = 2;
             break;
           }
           throw new InvalidParameterError("Unable to find TChain for paraId ".concat(nextParaId));
         case 2:
           hopApi = api.clone();
-          _context2.p = 3;
-          _context2.n = 4;
+          _context.p = 3;
+          _context.n = 4;
           return hopApi.init(nextChain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 4:
           // true if this hop should be treated as the destination
@@ -5169,7 +5172,7 @@ function _traverseXcmHops() {
           isDestination = nextChain === destination && (!swapConfig || hasPassedExchange || nextChain === swapConfig.exchangeChain);
           isAssetHub = nextChain === assetHubChain;
           isBridgeHub = nextChain === bridgeHubChain;
-          _context2.n = 5;
+          _context.n = 5;
           return processHop({
             api: hopApi,
             currentChain: nextChain,
@@ -5182,7 +5185,7 @@ function _traverseXcmHops() {
             isBridgeHub: isBridgeHub
           });
         case 5:
-          hopResult = _context2.v;
+          hopResult = _context.v;
           if (!isDestination) {
             hops.push({
               chain: nextChain,
@@ -5197,10 +5200,10 @@ function _traverseXcmHops() {
             intermediateResults.bridgeHub = hopResult;
           }
           if (shouldContinue(hopResult)) {
-            _context2.n = 6;
+            _context.n = 6;
             break;
           }
-          return _context2.a(3, 10);
+          return _context.a(3, 10);
         case 6:
           // Update state for next iteration
           if (swapConfig && nextChain === swapConfig.exchangeChain) {
@@ -5212,16 +5215,16 @@ function _traverseXcmHops() {
           nextParaId = destParaId;
           currentOrigin = nextChain;
         case 7:
-          _context2.p = 7;
-          _context2.n = 8;
+          _context.p = 7;
+          _context.n = 8;
           return hopApi.disconnect();
         case 8:
-          return _context2.f(7);
+          return _context.f(7);
         case 9:
-          _context2.n = 1;
+          _context.n = 1;
           break;
         case 10:
-          return _context2.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+          return _context.a(2, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
             hops: hops
           }, intermediateResults.assetHub && {
             assetHub: intermediateResults.assetHub
@@ -5233,40 +5236,42 @@ function _traverseXcmHops() {
             lastProcessedChain: currentOrigin
           }));
       }
-    }, _callee2, null, [[3,, 7, 9]]);
+    }, _callee, null, [[3,, 7, 9]]);
   }));
-  return _traverseXcmHops.apply(this, arguments);
-}
+  return function traverseXcmHops(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var addEthereumBridgeFees = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, bridgeHubResult, destination, assetHubChain) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, bridgeHubResult, destination, assetHubChain) {
     var ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           if (!(!bridgeHubResult || !('fee' in bridgeHubResult) || destination !== 'Ethereum')) {
-            _context.n = 1;
+            _context2.n = 1;
             break;
           }
-          return _context.a(2, bridgeHubResult);
+          return _context2.a(2, bridgeHubResult);
         case 1:
           ahApi = api.clone();
-          _context.n = 2;
+          _context2.n = 2;
           return ahApi.init(assetHubChain, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 2:
-          _context.n = 3;
+          _context2.n = 3;
           return getParaEthTransferFees(ahApi);
         case 3:
-          _yield$getParaEthTran = _context.v;
+          _yield$getParaEthTran = _context2.v;
           _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 1);
           bridgeFee = _yield$getParaEthTran2[0];
-          return _context.a(2, _objectSpread2(_objectSpread2({}, bridgeHubResult), {}, {
+          return _context2.a(2, _objectSpread2(_objectSpread2({}, bridgeHubResult), {}, {
             fee: bridgeHubResult.fee + bridgeFee
           }));
       }
-    }, _callee);
+    }, _callee2);
   }));
   return function addEthereumBridgeFees(_x2, _x3, _x4, _x5) {
-    return _ref.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
 }();
 
@@ -5316,6 +5321,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           return api.getDryRunCall({
             tx: tx,
             chain: origin,
+            destination: destination,
             address: senderAddress,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
@@ -5345,8 +5351,8 @@ var dryRunInternal = /*#__PURE__*/function () {
                 while (1) switch (_context.n) {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange, isDestination = params.isDestination;
-                    if (destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub'))) {
-                      hopAsset = findNativeAssetInfoOrThrow(currentChain);
+                    if (asset.location && asset.location.parents === Parents.TWO) {
+                      hopAsset = findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
                     } else if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
                       hopAsset = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
                     } else if (isDestination) {
@@ -5372,7 +5378,7 @@ var dryRunInternal = /*#__PURE__*/function () {
                       xcm: forwardedXcms[1][0],
                       chain: currentChain,
                       origin: currentOrigin,
-                      asset: currentAsset,
+                      asset: hopAsset,
                       feeAsset: resolvedFeeAsset,
                       originFee: originDryRun.fee,
                       amount: amount
@@ -10105,7 +10111,7 @@ var createMintTxs = function createMintTxs(chain, asset, balance, address, api)
   var nativePallet = getNativeAssetsPallet(chain);
   var otherPallets = getOtherAssetsPallets(chain);
   var isMainNativeAsset = isSymbolMatch(asset.symbol, getNativeAssetSymbol(chain));
-  var pallet = isForeignAsset(asset) || !isMainNativeAsset ? pickOtherPallet(asset, otherPallets) : nativePallet;
+  var pallet = isForeignAsset(asset) && chain !== 'Mythos' || !isMainNativeAsset ? pickOtherPallet(asset, otherPallets) : nativePallet;
   var palletInstance = getPalletInstance(pallet);
   return palletInstance.mint(address, asset, balance, chain, api);
 };
@@ -10466,6 +10472,7 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
           return api.getDryRunCall({
             tx: tx,
             chain: origin,
+            destination: destination,
             address: senderAddress,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
@@ -10902,11 +10909,22 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
         case 7:
           processHop = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
-              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopResult, hopAsset;
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, hopAsset, hopResult;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
                     hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange;
+                    if (!(currentAsset.location && currentAsset.location.parents === Parents.TWO)) {
+                      if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
+                        hopAsset = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
+                      } else if (destination === currentChain) {
+                        hopAsset = findAssetOnDestOrThrow(origin, currentChain, currency);
+                      } else {
+                        hopAsset = currentAsset;
+                      }
+                    } else {
+                      hopAsset = findNativeAssetInfoOrThrow(getRelayChainOf(currentChain));
+                    }
                     _context.n = 1;
                     return getDestXcmFee({
                       api: hopApi,
@@ -10919,7 +10937,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                       }),
                       address: address,
                       senderAddress: senderAddress,
-                      asset: currentAsset,
+                      asset: hopAsset,
                       feeAsset: feeAsset,
                       tx: tx,
                       originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
@@ -10929,21 +10947,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                     });
                   case 1:
                     hopResult = _context.v;
-                    if (hopResult.feeType === 'dryRun' && !(destination === 'Ethereum' && (currentChain.includes('AssetHub') || currentChain.includes('BridgeHub')))) {
-                      if (hasPassedExchange && swapConfig && currentChain !== swapConfig.exchangeChain) {
-                        hopAsset = findAssetOnDestOrThrow(swapConfig.exchangeChain, currentChain, swapConfig.currencyTo);
-                      } else if (destination === currentChain) {
-                        hopAsset = findAssetOnDestOrThrow(origin, currentChain, currency);
-                      } else {
-                        hopAsset = asset;
-                      }
-                    } else {
-                      hopAsset = findNativeAssetInfoOrThrow(currentChain);
-                    }
-                    return _context.a(2, _objectSpread2(_objectSpread2({}, hopResult), {}, {
-                      currency: hopAsset.symbol,
-                      asset: hopAsset
-                    }));
+                    return _context.a(2, hopResult);
                 }
               }, _callee);
             }));
@@ -10997,10 +11001,6 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           }
           // We failed before reaching destination, use fallback
           _destApi = api.clone();
-          if (!(destination !== 'Ethereum')) {
-            _context2.n = 10;
-            break;
-          }
           _context2.n = 10;
           return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
         case 10:
@@ -12357,12 +12357,14 @@ var createCustomXcm = function createCustomXcm(_ref, isDotAsset) {
   return depositInstruction;
 };
 
-var createRefundInstruction = function createRefundInstruction(api, senderAddress, version) {
+var createRefundInstruction = function createRefundInstruction(api, senderAddress, version, assetCount) {
   return {
     SetAppendix: [{
       DepositAsset: {
         assets: {
-          Wild: 'All'
+          Wild: {
+            AllCounted: assetCount
+          }
         },
         beneficiary: createBeneficiaryLocation({
           api: api,
@@ -12387,7 +12389,7 @@ var buildAssets = function buildAssets(chain, asset, feeAmount, isDotAsset, vers
  */
 var createTypeAndThenCall = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, options) {
-    var api, senderAddress, version, context, assetInfo, isDotAsset, customXcm, refundInstruction, fees, finalCustomXcm, totalFee, assets;
+    var api, senderAddress, version, context, assetInfo, isDotAsset, customXcm, assetCount, refundInstruction, fees, finalCustomXcm, totalFee, assets;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -12408,7 +12410,8 @@ var createTypeAndThenCall = /*#__PURE__*/function () {
             }
           });
           customXcm = createCustomXcm(context, isDotAsset);
-          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version) : null;
+          assetCount = isDotAsset ? 1 : 2;
+          refundInstruction = senderAddress ? createRefundInstruction(api, senderAddress, version, assetCount) : null;
           _context.n = 2;
           return computeAllFees(context, customXcm, isDotAsset, refundInstruction);
         case 2:

package/package.json

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