@paraspell/sdk-core 11.8.3 → 11.8.5

package/dist/index.cjs

@@ -3695,6 +3695,44 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
   };
 }();
 
+var getMythosOriginFee = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api) {
+    var ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, ahExecutionFee, nativeAsset, feeConverted;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          ahApi = api.clone();
+          _context.n = 1;
+          return ahApi.init('AssetHubPolkadot');
+        case 1:
+          _context.n = 2;
+          return getParaEthTransferFees(ahApi);
+        case 2:
+          _yield$getParaEthTran = _context.v;
+          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
+          bridgeFee = _yield$getParaEthTran2[0];
+          ahExecutionFee = _yield$getParaEthTran2[1];
+          nativeAsset = assets.findNativeAssetInfoOrThrow('Mythos');
+          assertHasLocation(nativeAsset);
+          _context.n = 3;
+          return ahApi.quoteAhPrice(DOT_LOCATION, nativeAsset.location, bridgeFee + ahExecutionFee);
+        case 3:
+          feeConverted = _context.v;
+          if (feeConverted) {
+            _context.n = 4;
+            break;
+          }
+          throw new InvalidParameterError("Pool DOT -> ".concat(nativeAsset.symbol, " not found."));
+        case 4:
+          return _context.a(2, padFeeBy(feeConverted, 10));
+      }
+    }, _callee);
+  }));
+  return function getMythosOriginFee(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var resolveFeeAsset = function resolveFeeAsset(feeAsset, origin, destination, currency) {
   var asset = assets.findAssetInfo(origin, feeAsset, !sdkCommon.isTLocation(destination) ? destination : null);
   var usesRawOverriddenMultiAssets = Array.isArray(currency) && currency.every(assets.isTAsset);
@@ -4487,7 +4525,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 +4564,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 +4575,9 @@ var getDestXcmFee = /*#__PURE__*/function () {
             feeType: 'dryRun',
             sufficient: true,
             forwardedXcms: newForwardedXcms,
-            destParaId: destParaId
+            destParaId: destParaId,
+            asset: asset,
+            currency: asset.symbol
           });
       }
     }, _callee3);
@@ -5125,14 +5169,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 +5188,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 +5209,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 +5222,7 @@ function _traverseXcmHops() {
             isBridgeHub: isBridgeHub
           });
         case 5:
-          hopResult = _context2.v;
+          hopResult = _context.v;
           if (!isDestination) {
             hops.push({
               chain: nextChain,
@@ -5196,10 +5237,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 +5252,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 +5273,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);
   };
 }();
 
@@ -5303,7 +5346,7 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
     var _traversalResult$brid;
-    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, bypassOptions, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, originDryRun, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, bridgeHubWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
+    var api, origin, destination, currency, tx, senderAddress, feeAsset, swapConfig, bypassOptions, _options$useRootOrigi, useRootOrigin, resolvedFeeAsset, asset, amount, originDryRun, isMythosToEthereum, originDryModified, initialForwardedXcms, initialDestParaId, processHop, traversalResult, assetHubChain, bridgeHubChain, processedBridgeHub, bridgeHubHopIndex, bridgeHubWithCurrency, _getFailureInfo, failureReason, failureChain, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -5315,6 +5358,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           return api.getDryRunCall({
             tx: tx,
             chain: origin,
+            destination: destination,
             address: senderAddress,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
@@ -5336,7 +5380,30 @@ var dryRunInternal = /*#__PURE__*/function () {
             hops: []
           });
         case 2:
-          initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
+          isMythosToEthereum = origin === 'Mythos' && destination === 'Ethereum';
+          if (!isMythosToEthereum) {
+            _context2.n = 4;
+            break;
+          }
+          _t2 = _objectSpread2;
+          _t3 = _objectSpread2({}, originDryRun);
+          _t4 = {};
+          _t5 = originDryRun.fee;
+          _context2.n = 3;
+          return getMythosOriginFee(api);
+        case 3:
+          _t6 = _context2.v;
+          _t7 = _t5 + _t6;
+          _t = _t2(_t3, _t4, {
+            fee: _t7
+          });
+          _context2.n = 5;
+          break;
+        case 4:
+          _t = originDryRun;
+        case 5:
+          originDryModified = _t;
+          initialForwardedXcms = originDryModified.forwardedXcms, initialDestParaId = originDryModified.destParaId;
           processHop = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
               var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, isDestination, hopAsset, hopDryRun;
@@ -5344,8 +5411,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,9 +5438,9 @@ var dryRunInternal = /*#__PURE__*/function () {
                       xcm: forwardedXcms[1][0],
                       chain: currentChain,
                       origin: currentOrigin,
-                      asset: currentAsset,
+                      asset: hopAsset,
                       feeAsset: resolvedFeeAsset,
-                      originFee: originDryRun.fee,
+                      originFee: originDryModified.fee,
                       amount: amount
                     });
                   case 2:
@@ -5389,7 +5456,7 @@ var dryRunInternal = /*#__PURE__*/function () {
               return _ref2.apply(this, arguments);
             };
           }();
-          _context2.n = 3;
+          _context2.n = 6;
           return traverseXcmHops({
             api: api,
             origin: origin,
@@ -5409,25 +5476,35 @@ var dryRunInternal = /*#__PURE__*/function () {
               };
             }
           });
-        case 3:
+        case 6:
           traversalResult = _context2.v;
           // Process Ethereum bridge fees
           assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
-          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
+          bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin)); // For Mythos → Ethereum, we skip additional Ethereum bridge fees (aligns with getXcmFeeInternal)
+          if (!isMythosToEthereum) {
+            _context2.n = 7;
+            break;
+          }
+          _t8 = traversalResult.bridgeHub;
+          _context2.n = 11;
+          break;
+        case 7:
           if (!((_traversalResult$brid = traversalResult.bridgeHub) !== null && _traversalResult$brid !== void 0 && _traversalResult$brid.success)) {
-            _context2.n = 5;
+            _context2.n = 9;
             break;
           }
-          _context2.n = 4;
+          _context2.n = 8;
           return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
-        case 4:
-          _t = _context2.v;
-          _context2.n = 6;
+        case 8:
+          _t9 = _context2.v;
+          _context2.n = 10;
           break;
-        case 5:
-          _t = traversalResult.bridgeHub;
-        case 6:
-          processedBridgeHub = _t;
+        case 9:
+          _t9 = traversalResult.bridgeHub;
+        case 10:
+          _t8 = _t9;
+        case 11:
+          processedBridgeHub = _t8;
           // Update bridge hub in hops if needed
           if (processedBridgeHub && processedBridgeHub.success && traversalResult.bridgeHub && traversalResult.bridgeHub.success && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
             bridgeHubHopIndex = traversalResult.hops.findIndex(function (hop) {
@@ -5451,7 +5528,7 @@ var dryRunInternal = /*#__PURE__*/function () {
           return _context2.a(2, {
             failureReason: failureReason,
             failureChain: failureChain,
-            origin: originDryRun,
+            origin: originDryModified,
             assetHub: traversalResult.assetHub,
             bridgeHub: bridgeHubWithCurrency,
             destination: traversalResult.destination,
@@ -8878,7 +8955,7 @@ var Moonriver = /*#__PURE__*/function (_Parachain) {
 
 var createTypeAndThenTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, chain, version) {
-    var api, asset, senderAddress, address, destination, messageId, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, ahExecutionFee, feeConverted, nativeMythAmount;
+    var api, asset, senderAddress, address, destination, messageId, nativeMythAmount;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -8896,28 +8973,10 @@ var createTypeAndThenTransfer = /*#__PURE__*/function () {
           return generateMessageId(api, senderAddress, getParaId(chain), asset.assetId, address, asset.amount);
         case 2:
           messageId = _context.v;
-          ahApi = api.clone();
           _context.n = 3;
-          return ahApi.init('AssetHubPolkadot');
+          return getMythosOriginFee(api);
         case 3:
-          _context.n = 4;
-          return getParaEthTransferFees(ahApi);
-        case 4:
-          _yield$getParaEthTran = _context.v;
-          _yield$getParaEthTran2 = _slicedToArray(_yield$getParaEthTran, 2);
-          bridgeFee = _yield$getParaEthTran2[0];
-          ahExecutionFee = _yield$getParaEthTran2[1];
-          _context.n = 5;
-          return ahApi.quoteAhPrice(DOT_LOCATION, assets.getNativeAssets(chain)[0].location, bridgeFee + ahExecutionFee);
-        case 5:
-          feeConverted = _context.v;
-          if (feeConverted) {
-            _context.n = 6;
-            break;
-          }
-          throw new InvalidParameterError("Pool DOT -> ".concat(asset.symbol, " not found."));
-        case 6:
-          nativeMythAmount = padFeeBy(feeConverted, 10);
+          nativeMythAmount = _context.v;
           return _context.a(2, {
             module: 'PolkadotXcm',
             method: 'transfer_assets_using_type_and_then',
@@ -10104,7 +10163,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 +10524,7 @@ var getOriginXcmFeeInternal = /*#__PURE__*/function () {
           return api.getDryRunCall({
             tx: tx,
             chain: origin,
+            destination: destination,
             address: senderAddress,
             asset: _objectSpread2(_objectSpread2({}, asset), {}, {
               amount: amount
@@ -10796,7 +10856,7 @@ var getFailureInfo = function getFailureInfo(chains, hops) {
 };
 var getXcmFeeInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, useRootOrigin, asset, amount, _yield$getOriginXcmFe, originFee, originCurrency, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, assetHubChain, processedBridgeHub, bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, useRootOrigin, asset, amount, _yield$getOriginXcmFe, originFeeRaw, originCurrency, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, processHop, traversalResult, destFee, destCurrency, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, assetHubChain, processedBridgeHub, bridgeHubChain, bridgeHubHopIndex, convertToFeeDetail, result, _getFailureInfo2, failureChain, failureReason, _t, _t2, _t3, _t4;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
@@ -10817,7 +10877,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           });
         case 1:
           _yield$getOriginXcmFe = _context2.v;
-          originFee = _yield$getOriginXcmFe.fee;
+          originFeeRaw = _yield$getOriginXcmFe.fee;
           originCurrency = _yield$getOriginXcmFe.currency;
           originAsset = _yield$getOriginXcmFe.asset;
           originFeeType = _yield$getOriginXcmFe.feeType;
@@ -10826,17 +10886,34 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           initialDestParaId = _yield$getOriginXcmFe.destParaId;
           originWeight = _yield$getOriginXcmFe.weight;
           sufficientOriginFee = _yield$getOriginXcmFe.sufficient;
+          isMythosToEthereum = origin === 'Mythos' && destination === 'Ethereum';
+          if (!isMythosToEthereum) {
+            _context2.n = 3;
+            break;
+          }
+          _context2.n = 2;
+          return getMythosOriginFee(api);
+        case 2:
+          _t2 = _context2.v;
+          _t3 = originFeeRaw !== null && originFeeRaw !== void 0 ? originFeeRaw : 0n;
+          _t = _t2 + _t3;
+          _context2.n = 4;
+          break;
+        case 3:
+          _t = originFeeRaw;
+        case 4:
+          originFee = _t;
           if (!(originDryRunError || originFeeType === 'paymentInfo')) {
-            _context2.n = 7;
+            _context2.n = 10;
             break;
           }
           destApi = api.clone();
-          _context2.p = 2;
-          _context2.n = 3;
+          _context2.p = 5;
+          _context2.n = 6;
           return destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 3:
+        case 6:
           destApi.setDisconnectAllowed(false);
-          _context2.n = 4;
+          _context2.n = 7;
           return getDestXcmFee({
             api: destApi,
             forwardedXcms: undefined,
@@ -10855,7 +10932,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             disableFallback: disableFallback,
             swapConfig: swapConfig
           });
-        case 4:
+        case 7:
           destFeeRes = _context2.v;
           _result = {
             origin: _objectSpread2(_objectSpread2(_objectSpread2({}, originFee && {
@@ -10891,21 +10968,32 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             failureChain: _failureChain,
             failureReason: _failureReason
           }));
-        case 5:
-          _context2.p = 5;
+        case 8:
+          _context2.p = 8;
           destApi.setDisconnectAllowed(true);
-          _context2.n = 6;
+          _context2.n = 9;
           return destApi.disconnect();
-        case 6:
-          return _context2.f(5);
-        case 7:
+        case 9:
+          return _context2.f(8);
+        case 10:
           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 +11006,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 +11016,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);
             }));
@@ -10950,7 +11024,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               return _ref3.apply(this, arguments);
             };
           }();
-          _context2.n = 8;
+          _context2.n = 11;
           return traverseXcmHops({
             api: api,
             origin: origin,
@@ -10970,14 +11044,14 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
               };
             }
           });
-        case 8:
+        case 11:
           traversalResult = _context2.v;
           // Handle case where we failed before reaching destination
           destFee = 0n;
           destFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
           destSufficient = undefined;
           if (!traversalResult.destination) {
-            _context2.n = 9;
+            _context2.n = 12;
             break;
           }
           destResult = traversalResult.destination;
@@ -10987,23 +11061,19 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
           destSufficient = destResult.sufficient;
           destCurrency = destResult.currency;
           destAsset = destResult.asset;
-          _context2.n = 13;
+          _context2.n = 16;
           break;
-        case 9:
+        case 12:
           if (!(traversalResult.hops.length > 0 && traversalResult.hops[traversalResult.hops.length - 1].result.dryRunError)) {
-            _context2.n = 12;
+            _context2.n = 15;
             break;
           }
           // We failed before reaching destination, use fallback
           _destApi = api.clone();
-          if (!(destination !== 'Ethereum')) {
-            _context2.n = 10;
-            break;
-          }
-          _context2.n = 10;
+          _context2.n = 13;
           return _destApi.init(destination, DRY_RUN_CLIENT_TIMEOUT_MS);
-        case 10:
-          _context2.n = 11;
+        case 13:
+          _context2.n = 14;
           return getDestXcmFee({
             api: _destApi,
             forwardedXcms: undefined,
@@ -11021,28 +11091,38 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             disableFallback: disableFallback,
             swapConfig: swapConfig
           });
-        case 11:
+        case 14:
           destFallback = _context2.v;
           destFee = destFallback.fee;
           destFeeType = destFallback.feeType;
           destSufficient = destFallback.sufficient;
           destCurrency = assets.getNativeAssetSymbol(destination);
           destAsset = assets.findNativeAssetInfoOrThrow(destination);
-          _context2.n = 13;
+          _context2.n = 16;
           break;
-        case 12:
+        case 15:
           destFee = 0n;
           destFeeType = 'noFeeRequired';
           destSufficient = true;
           destCurrency = assets.getNativeAssetSymbol(destination);
           destAsset = assets.findNativeAssetInfoOrThrow(destination);
-        case 13:
+        case 16:
           // Process Ethereum bridge fees
           assetHubChain = "AssetHub".concat(getRelayChainOf(origin));
-          _context2.n = 14;
+          if (!isMythosToEthereum) {
+            _context2.n = 17;
+            break;
+          }
+          _t4 = traversalResult.bridgeHub;
+          _context2.n = 19;
+          break;
+        case 17:
+          _context2.n = 18;
           return addEthereumBridgeFees(api, traversalResult.bridgeHub, destination, assetHubChain);
-        case 14:
-          processedBridgeHub = _context2.v;
+        case 18:
+          _t4 = _context2.v;
+        case 19:
+          processedBridgeHub = _t4;
           // Update bridge hub fee in hops if needed
           if (processedBridgeHub && traversalResult.bridgeHub && processedBridgeHub.fee !== traversalResult.bridgeHub.fee) {
             bridgeHubChain = "BridgeHub".concat(getRelayChainOf(origin));
@@ -11118,7 +11198,7 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             failureReason: failureReason
           }));
       }
-    }, _callee2, null, [[2,, 5, 7]]);
+    }, _callee2, null, [[5,, 8, 10]]);
   }));
   return function getXcmFeeInternal(_x) {
     return _ref2.apply(this, arguments);
@@ -12356,12 +12436,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 +12468,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 +12489,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: