@paraspell/sdk-core 10.10.1 → 10.10.2

package/dist/index.cjs

@@ -4896,11 +4896,11 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _intermediateFees$bri, _intermediateFees$ass, _processedBridgeHubDa, _destinationDryRun;
-    var origin, destination, currency, api, tx, senderAddress, feeAsset, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, hops, destinationDryRun, nextChain, hopApi, hopDryRun, hopCurrency, newXcms, destParaId, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, _getFailureInfo, failureReason, failureChain;
+    var origin, destination, currency, api, tx, senderAddress, feeAsset, swapConfig, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, assetHubNode, bridgeHubNode, currentAsset, hasPassedExchange, currentOrigin, forwardedXcms, nextParaId, intermediateFees, hops, destinationDryRun, nextChain, hopApi, hopDryRun, hopCurrency, newXcms, destParaId, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, _getFailureInfo, failureReason, failureChain;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset;
+          origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           asset = assets.findAssetForNodeOrThrow(origin, currency, destination);
           _context.n = 1;
@@ -4926,6 +4926,8 @@ var dryRunInternal = /*#__PURE__*/function () {
           initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
           assetHubNode = "AssetHub".concat(getRelayChainOf(origin));
           bridgeHubNode = "BridgeHub".concat(getRelayChainOf(origin));
+          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? assets.findAssetForNodeOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
+          hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
           currentOrigin = origin;
           forwardedXcms = initialForwardedXcms;
           nextParaId = initialDestParaId;
@@ -4966,14 +4968,20 @@ var dryRunInternal = /*#__PURE__*/function () {
             xcm: forwardedXcms[1][0],
             node: nextChain,
             origin: currentOrigin,
-            asset: asset,
+            asset: currentAsset,
             feeAsset: resolvedFeeAsset,
             originFee: originDryRun.fee,
             amount: BigInt(currency.amount)
           });
         case 8:
           hopDryRun = _context.v;
-          hopCurrency = asset.symbol; // Add to hops array (only if not the destination)
+          hopCurrency = void 0;
+          if (hasPassedExchange && swapConfig && nextChain !== swapConfig.exchangeChain) {
+            hopCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo).symbol;
+          } else {
+            hopCurrency = asset.symbol;
+          }
+          // Add to hops array (only if not the destination)
           if (nextChain !== destination) {
             hops.push({
               chain: nextChain,
@@ -4996,6 +5004,10 @@ var dryRunInternal = /*#__PURE__*/function () {
           }
           return _context.a(3, 13);
         case 9:
+          if (swapConfig && nextChain === swapConfig.exchangeChain) {
+            hasPassedExchange = true;
+            currentAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
+          }
           newXcms = hopDryRun.forwardedXcms, destParaId = hopDryRun.destParaId;
           forwardedXcms = newXcms;
           nextParaId = destParaId;
@@ -5474,12 +5486,11 @@ var getFailureInfo = function getFailureInfo(nodes, hops) {
 };
 var getXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var _findAssetOnDest2;
-    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, _findAssetOnDest, hopResult, hopCurrency, hopDetail, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, destCurrency, result, _getFailureInfo2, failureChain, failureReason;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, hops, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, currentAsset, hasPassedExchange, 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:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig;
           asset = assets.findAssetForNodeOrThrow(origin, currency, destination); // Origin fee = execution fee + delivery fees
           _context.n = 1;
           return getOriginXcmFee({
@@ -5581,6 +5592,8 @@ var getXcmFee = /*#__PURE__*/function () {
           currentOrigin = origin;
           forwardedXcms = initialForwardedXcm;
           nextParaId = initialDestParaId;
+          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? assets.findAssetForNodeOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
+          hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
           intermediateFees = {};
           destinationFee = 0n;
           destinationFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
@@ -5612,14 +5625,25 @@ var getXcmFee = /*#__PURE__*/function () {
             currency: currency,
             address: address,
             senderAddress: senderAddress,
-            asset: asset,
+            asset: currentAsset,
             feeAsset: feeAsset,
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             disableFallback: disableFallback
           });
         case 13:
           hopResult = _context.v;
-          hopCurrency = hopResult.feeType === 'dryRun' ? destination === nextChain ? ((_findAssetOnDest = assets.findAssetOnDest(origin, nextChain, currency)) !== null && _findAssetOnDest !== void 0 ? _findAssetOnDest : asset).symbol : asset.symbol : assets.getNativeAssetSymbol(nextChain);
+          hopCurrency = void 0;
+          if (hopResult.feeType === 'dryRun') {
+            if (hasPassedExchange && swapConfig && nextChain !== swapConfig.exchangeChain) {
+              hopCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo).symbol;
+            } else if (destination === nextChain) {
+              hopCurrency = assets.findAssetOnDestOrThrow(origin, nextChain, currency).symbol;
+            } else {
+              hopCurrency = asset.symbol;
+            }
+          } else {
+            hopCurrency = assets.getNativeAssetSymbol(nextChain);
+          }
           hopDetail = hopResult.dryRunError ? {
             fee: hopResult.fee,
             feeType: hopResult.feeType,
@@ -5698,6 +5722,10 @@ var getXcmFee = /*#__PURE__*/function () {
           } else if (nextChain === bridgeHubNode) {
             intermediateFees.bridgeHub = hopDetail;
           } else ;
+          if (swapConfig && nextChain === swapConfig.exchangeChain) {
+            hasPassedExchange = true;
+            currentAsset = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
+          }
           forwardedXcms = hopResult.forwardedXcms;
           nextParaId = hopResult.destParaId;
           currentOrigin = nextChain;
@@ -5739,7 +5767,15 @@ var getXcmFee = /*#__PURE__*/function () {
           }
         case 24:
           intermediateFees.bridgeHub = processedBridgeHubData;
-          destCurrency = destinationFeeType === 'dryRun' ? ((_findAssetOnDest2 = assets.findAssetOnDest(origin, destination, currency)) !== null && _findAssetOnDest2 !== void 0 ? _findAssetOnDest2 : asset).symbol : assets.getNativeAssetSymbol(destination);
+          if (destinationFeeType === 'dryRun') {
+            if (hasPassedExchange && swapConfig && destination !== swapConfig.exchangeChain) {
+              destCurrency = assets.findAssetOnDestOrThrow(swapConfig.exchangeChain, destination, swapConfig.currencyTo).symbol;
+            } else {
+              destCurrency = assets.findAssetOnDestOrThrow(origin, destination, currency).symbol;
+            }
+          } else {
+            destCurrency = assets.getNativeAssetSymbol(destination);
+          }
           result = _objectSpread2(_objectSpread2({
             origin: _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, originWeight && {
               weight: originWeight
@@ -6758,7 +6794,8 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             feeCurrency: feeCurrency,
             recipientAddress: address,
             senderAddress: senderAddress,
-            version: version
+            version: version,
+            paraIdTo: paraIdTo
           };
           call = createExecuteCall(chain, createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
@@ -6818,7 +6855,7 @@ var isMultiHopSwap = function isMultiHopSwap(exchangeChain, assetFrom, assetTo)
 
 var createExchangeInstructions = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, multiAssetFrom, multiAssetTo) {
-    var chain, exchangeChain, assetFrom, assetTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, nativeSymbol, needsMultiHop, nativeAsset, nativeAmountOut, multiAssetNative;
+    var chain, exchangeChain, assetFrom, assetTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, nativeSymbol, needsMultiHop, nativeAsset, shouldUseMaximal, nativeAmountOut, multiAssetNative;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -6829,6 +6866,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             symbol: nativeSymbol
           }, null);
           assertHasLocation(nativeAsset);
+          shouldUseMaximal = !chain || exchangeChain === 'Hydration' && exchangeFee === 0n;
           if (needsMultiHop) {
             _context.n = 1;
             break;
@@ -6837,7 +6875,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             ExchangeAsset: {
               give: createAssetsFilter(multiAssetFrom),
               want: [multiAssetTo],
-              maximal: exchangeChain === 'Hydration' && exchangeFee === 0n ? true : false
+              maximal: shouldUseMaximal
             }
           }]);
         case 1:
@@ -6850,7 +6888,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             ExchangeAsset: {
               give: createAssetsFilter(multiAssetFrom),
               want: [multiAssetNative],
-              maximal: exchangeChain === 'Hydration' && exchangeFee === 0n ? true : false
+              maximal: shouldUseMaximal
             }
           }, {
             ExchangeAsset: {
@@ -7013,7 +7051,8 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
     if (!dryRunResult.origin.success) {
       throw new DryRunFailedError("Origin dry run failed: ".concat(dryRunResult.origin.failureReason || 'Unknown reason'));
     }
-    fees.exchangeFee = padFeeBy(dryRunResult.origin.fee, FEE_PADDING_PERCENTAGE);
+    // There is no exchange fee if origin is exchange, because jit_withdraw is used
+    fees.exchangeFee = 0n;
   }
   // Handle origin reserve fee (hop before exchange)
   if (exchangeHopIndex > 0) {
@@ -7078,11 +7117,11 @@ var createXcmAndCall = /*#__PURE__*/function () {
 }();
 var handleSwapExecuteTransfer = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, hasOriginReserveHop, requireExchangeSuccess, extractedFees, exchangeHop, totalFeesInFromAsset, amountAvailableForSwap, recalculatedMinAmountOut, updatedAssetTo, _yield$createXcmAndCa2, secondCall, secondDryRunResult, finalFees, hasHopsInSecondRun, isOnExchangeChain, finalExchangeHopIndex, finalTotalFeesInFromAsset, finalAmountAvailableForSwap, finalMinAmountOut, finalAssetTo, _yield$createXcmAndCa3, finalCall;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, hasOriginReserveHop, requireExchangeSuccess, extractedFees, exchangeHop, totalFeesInFromAsset, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, secondCall, secondDryRunResult, finalFees, hasHopsInSecondRun, isOnExchangeChain, finalExchangeHopIndex, finalTotalFeesInFromAsset, finalAmountAvailableForSwap, finalMinAmountOut, finalAssetTo, _yield$createXcmAndCa3, finalCall;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
-          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetFrom, assetTo = options.assetTo, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, calculateMinAmountOut = options.calculateMinAmountOut;
+          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetFrom, assetTo = options.assetTo, currencyTo = options.currencyTo, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, calculateMinAmountOut = options.calculateMinAmountOut;
           _context3.n = 1;
           return api.init(chain !== null && chain !== void 0 ? chain : exchangeChain);
         case 1:
@@ -7101,6 +7140,10 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             currency: {
               multilocation: assetFrom.multiLocation,
               amount: assetFrom.amount
+            },
+            swapConfig: {
+              currencyTo: currencyTo,
+              exchangeChain: exchangeChain
             }
           }; // First dry run with dummy fees to extract actual fees
           _context3.n = 2;
@@ -7132,6 +7175,10 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             _context3.n = 5;
             break;
           }
+          if (!chain) {
+            _context3.n = 4;
+            break;
+          }
           exchangeHop = firstDryRunResult.hops[exchangeHopIndex];
           if (exchangeHop.result.success) {
             _context3.n = 4;
@@ -7155,6 +7202,11 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           // Calculate actual amount available for swap
           totalFeesInFromAsset = chain ? extractedFees.originReserveFee + extractedFees.exchangeFee : 0n;
           validateAmount(BigInt(assetFrom.amount), totalFeesInFromAsset);
+          updatedAssetTo = assetTo;
+          if (!chain) {
+            _context3.n = 8;
+            break;
+          }
           amountAvailableForSwap = BigInt(assetFrom.amount) - totalFeesInFromAsset;
           _context3.n = 7;
           return calculateMinAmountOut(amountAvailableForSwap);
@@ -7162,20 +7214,21 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           recalculatedMinAmountOut = _context3.v;
           updatedAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
             amount: recalculatedMinAmountOut.toString()
-          }); // Second dry run with actual fees and amounts
-          _context3.n = 8;
+          });
+        case 8:
+          _context3.n = 9;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: updatedAssetTo,
             fees: extractedFees
           }));
-        case 8:
+        case 9:
           _yield$createXcmAndCa2 = _context3.v;
           secondCall = _yield$createXcmAndCa2.call;
-          _context3.n = 9;
+          _context3.n = 10;
           return executeDryRun(_objectSpread2(_objectSpread2({}, dryRunParams), {}, {
             tx: api.callTxMethod(secondCall)
           }));
-        case 9:
+        case 10:
           secondDryRunResult = _context3.v;
           hasHopsInSecondRun = secondDryRunResult.hops && secondDryRunResult.hops.length > 0;
           isOnExchangeChain = chain === exchangeChain;
@@ -7190,27 +7243,27 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           validateAmount(BigInt(assetFrom.amount), finalTotalFeesInFromAsset);
           // If the final fees are different, we might need one more iteration
           if (!(finalFees.exchangeFee !== extractedFees.exchangeFee || finalFees.originReserveFee !== extractedFees.originReserveFee)) {
-            _context3.n = 12;
+            _context3.n = 13;
             break;
           }
           finalAmountAvailableForSwap = BigInt(assetFrom.amount) - finalTotalFeesInFromAsset;
-          _context3.n = 10;
+          _context3.n = 11;
           return calculateMinAmountOut(finalAmountAvailableForSwap);
-        case 10:
+        case 11:
           finalMinAmountOut = _context3.v;
           finalAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
             amount: finalMinAmountOut.toString()
           });
-          _context3.n = 11;
+          _context3.n = 12;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: finalAssetTo,
             fees: finalFees
           }));
-        case 11:
+        case 12:
           _yield$createXcmAndCa3 = _context3.v;
           finalCall = _yield$createXcmAndCa3.call;
           return _context3.a(2, api.callTxMethod(finalCall));
-        case 12:
+        case 13:
           return _context3.a(2, api.callTxMethod(secondCall));
       }
     }, _callee3);

package/dist/index.d.ts

@@ -233,6 +233,7 @@ type TCreateBaseSwapXcmOptions = {
     destChain?: TNodeWithRelayChains;
     assetFrom: WithAmount<TAsset>;
     assetTo: WithAmount<TAsset>;
+    currencyTo: TCurrencyInput;
     senderAddress: string;
     recipientAddress: string;
     calculateMinAmountOut: (amountIn: bigint, assetTo?: TAsset) => Promise<bigint>;
@@ -563,6 +564,10 @@ type TDryRunBaseOptions<TRes> = {
     address: string;
     currency: TCurrencyInputWithAmount;
     feeAsset?: TCurrencyInput;
+    swapConfig?: {
+        currencyTo: TCurrencyCore;
+        exchangeChain: TNodePolkadotKusama;
+    };
 };
 type TDryRunOptions<TApi, TRes> = WithApi<TDryRunBaseOptions<TRes>, TApi, TRes>;
 type TDryRunCallBaseOptions<TRes> = {
@@ -900,6 +905,10 @@ type TGetXcmFeeBaseOptions<TRes> = {
     currency: WithAmount<TCurrencyCore>;
     feeAsset?: TCurrencyInput;
     disableFallback: boolean;
+    swapConfig?: {
+        currencyTo: TCurrencyCore;
+        exchangeChain: TNodePolkadotKusama;
+    };
 };
 type TGetXcmFeeOptions<TApi, TRes> = WithApi<TGetXcmFeeBaseOptions<TRes>, TApi, TRes>;
 type TGetXcmFeeEstimateOptions<TApi, TRes> = Omit<TGetXcmFeeOptions<TApi, TRes>, 'disableFallback'>;
@@ -1897,7 +1906,7 @@ declare const getOriginXcmFee: <TApi, TRes>({ api, tx, origin, destination, send
 
 declare const getOriginXcmFeeEstimate: <TApi, TRes>({ api, tx, origin, destination, currency, senderAddress, feeAsset }: TGetOriginXcmFeeEstimateOptions<TApi, TRes>) => Promise<TGetXcmFeeEstimateDetail>;
 
-declare const getXcmFee: <TApi, TRes>({ api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback }: TGetXcmFeeOptions<TApi, TRes>) => Promise<TGetXcmFeeResult>;
+declare const getXcmFee: <TApi, TRes>({ api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig }: TGetXcmFeeOptions<TApi, TRes>) => Promise<TGetXcmFeeResult>;
 
 declare const getXcmFeeEstimate: <TApi, TRes>(options: TGetXcmFeeEstimateOptions<TApi, TRes>) => Promise<TGetXcmFeeEstimateResult>;
 

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isNodeEvm, getAssetsObject, InvalidCurrencyError, getNativeAssetSymbol, getOtherAssets, extractMultiAssetLoc, isAssetEqual, isForeignAsset, findAssetForNodeOrThrow, getExistentialDeposit, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAsset, isTMultiAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, findAssetOnDest, normalizeMultiLocation, findAssetOnDestOrThrow, normalizeSymbol, getAssetId, getNativeAssets } from '@paraspell/assets';
+import { isNodeEvm, getAssetsObject, InvalidCurrencyError, getNativeAssetSymbol, getOtherAssets, extractMultiAssetLoc, isAssetEqual, isForeignAsset, findAssetForNodeOrThrow, getExistentialDeposit, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAsset, isTMultiAsset, getExistentialDepositOrThrow, isSymbolMatch, hasDryRunSupport, findAssetOnDestOrThrow, hasSupportForAsset, getRelayChainSymbol, isSymbolSpecifier, normalizeMultiLocation, normalizeSymbol, getAssetId, getNativeAssets } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, createPublicClient, http, getContract } from 'viem';
@@ -4897,11 +4897,11 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _intermediateFees$bri, _intermediateFees$ass, _processedBridgeHubDa, _destinationDryRun;
-    var origin, destination, currency, api, tx, senderAddress, feeAsset, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, intermediateFees, hops, destinationDryRun, nextChain, hopApi, hopDryRun, hopCurrency, newXcms, destParaId, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, _getFailureInfo, failureReason, failureChain;
+    var origin, destination, currency, api, tx, senderAddress, feeAsset, swapConfig, resolvedFeeAsset, asset, originDryRun, initialForwardedXcms, initialDestParaId, assetHubNode, bridgeHubNode, currentAsset, hasPassedExchange, currentOrigin, forwardedXcms, nextParaId, intermediateFees, hops, destinationDryRun, nextChain, hopApi, hopDryRun, hopCurrency, newXcms, destParaId, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, _getFailureInfo, failureReason, failureChain;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset;
+          origin = options.origin, destination = options.destination, currency = options.currency, api = options.api, tx = options.tx, senderAddress = options.senderAddress, feeAsset = options.feeAsset, swapConfig = options.swapConfig;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           asset = findAssetForNodeOrThrow(origin, currency, destination);
           _context.n = 1;
@@ -4927,6 +4927,8 @@ var dryRunInternal = /*#__PURE__*/function () {
           initialForwardedXcms = originDryRun.forwardedXcms, initialDestParaId = originDryRun.destParaId;
           assetHubNode = "AssetHub".concat(getRelayChainOf(origin));
           bridgeHubNode = "BridgeHub".concat(getRelayChainOf(origin));
+          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? findAssetForNodeOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
+          hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
           currentOrigin = origin;
           forwardedXcms = initialForwardedXcms;
           nextParaId = initialDestParaId;
@@ -4967,14 +4969,20 @@ var dryRunInternal = /*#__PURE__*/function () {
             xcm: forwardedXcms[1][0],
             node: nextChain,
             origin: currentOrigin,
-            asset: asset,
+            asset: currentAsset,
             feeAsset: resolvedFeeAsset,
             originFee: originDryRun.fee,
             amount: BigInt(currency.amount)
           });
         case 8:
           hopDryRun = _context.v;
-          hopCurrency = asset.symbol; // Add to hops array (only if not the destination)
+          hopCurrency = void 0;
+          if (hasPassedExchange && swapConfig && nextChain !== swapConfig.exchangeChain) {
+            hopCurrency = findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo).symbol;
+          } else {
+            hopCurrency = asset.symbol;
+          }
+          // Add to hops array (only if not the destination)
           if (nextChain !== destination) {
             hops.push({
               chain: nextChain,
@@ -4997,6 +5005,10 @@ var dryRunInternal = /*#__PURE__*/function () {
           }
           return _context.a(3, 13);
         case 9:
+          if (swapConfig && nextChain === swapConfig.exchangeChain) {
+            hasPassedExchange = true;
+            currentAsset = findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
+          }
           newXcms = hopDryRun.forwardedXcms, destParaId = hopDryRun.destParaId;
           forwardedXcms = newXcms;
           nextParaId = destParaId;
@@ -5475,12 +5487,11 @@ var getFailureInfo = function getFailureInfo(nodes, hops) {
 };
 var getXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var _findAssetOnDest2;
-    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, _findAssetOnDest, hopResult, hopCurrency, hopDetail, failingRecord, hopIsDestination, _destApi, destFallback, processedBridgeHubData, ahApi, _yield$getParaEthTran, _yield$getParaEthTran2, bridgeFee, bridgeHubHopIndex, destCurrency, result, _getFailureInfo2, failureChain, failureReason;
+    var api, tx, origin, destination, senderAddress, address, currency, feeAsset, disableFallback, swapConfig, asset, _yield$getOriginXcmFe, originFee, originCurrency, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, hops, destApi, destFeeRes, _result, _getFailureInfo, _failureChain, _failureReason, assetHubNode, bridgeHubNode, currentOrigin, forwardedXcms, nextParaId, currentAsset, hasPassedExchange, 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:
-          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback;
+          api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, senderAddress = _ref.senderAddress, address = _ref.address, currency = _ref.currency, feeAsset = _ref.feeAsset, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig;
           asset = findAssetForNodeOrThrow(origin, currency, destination); // Origin fee = execution fee + delivery fees
           _context.n = 1;
           return getOriginXcmFee({
@@ -5582,6 +5593,8 @@ var getXcmFee = /*#__PURE__*/function () {
           currentOrigin = origin;
           forwardedXcms = initialForwardedXcm;
           nextParaId = initialDestParaId;
+          currentAsset = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain) ? findAssetForNodeOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, null) : asset;
+          hasPassedExchange = origin === (swapConfig === null || swapConfig === void 0 ? void 0 : swapConfig.exchangeChain);
           intermediateFees = {};
           destinationFee = 0n;
           destinationFeeType = destination === 'Ethereum' ? 'noFeeRequired' : 'paymentInfo';
@@ -5613,14 +5626,25 @@ var getXcmFee = /*#__PURE__*/function () {
             currency: currency,
             address: address,
             senderAddress: senderAddress,
-            asset: asset,
+            asset: currentAsset,
             feeAsset: feeAsset,
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             disableFallback: disableFallback
           });
         case 13:
           hopResult = _context.v;
-          hopCurrency = hopResult.feeType === 'dryRun' ? destination === nextChain ? ((_findAssetOnDest = findAssetOnDest(origin, nextChain, currency)) !== null && _findAssetOnDest !== void 0 ? _findAssetOnDest : asset).symbol : asset.symbol : getNativeAssetSymbol(nextChain);
+          hopCurrency = void 0;
+          if (hopResult.feeType === 'dryRun') {
+            if (hasPassedExchange && swapConfig && nextChain !== swapConfig.exchangeChain) {
+              hopCurrency = findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo).symbol;
+            } else if (destination === nextChain) {
+              hopCurrency = findAssetOnDestOrThrow(origin, nextChain, currency).symbol;
+            } else {
+              hopCurrency = asset.symbol;
+            }
+          } else {
+            hopCurrency = getNativeAssetSymbol(nextChain);
+          }
           hopDetail = hopResult.dryRunError ? {
             fee: hopResult.fee,
             feeType: hopResult.feeType,
@@ -5699,6 +5723,10 @@ var getXcmFee = /*#__PURE__*/function () {
           } else if (nextChain === bridgeHubNode) {
             intermediateFees.bridgeHub = hopDetail;
           } else ;
+          if (swapConfig && nextChain === swapConfig.exchangeChain) {
+            hasPassedExchange = true;
+            currentAsset = findAssetOnDestOrThrow(swapConfig.exchangeChain, nextChain, swapConfig.currencyTo);
+          }
           forwardedXcms = hopResult.forwardedXcms;
           nextParaId = hopResult.destParaId;
           currentOrigin = nextChain;
@@ -5740,7 +5768,15 @@ var getXcmFee = /*#__PURE__*/function () {
           }
         case 24:
           intermediateFees.bridgeHub = processedBridgeHubData;
-          destCurrency = destinationFeeType === 'dryRun' ? ((_findAssetOnDest2 = findAssetOnDest(origin, destination, currency)) !== null && _findAssetOnDest2 !== void 0 ? _findAssetOnDest2 : asset).symbol : getNativeAssetSymbol(destination);
+          if (destinationFeeType === 'dryRun') {
+            if (hasPassedExchange && swapConfig && destination !== swapConfig.exchangeChain) {
+              destCurrency = findAssetOnDestOrThrow(swapConfig.exchangeChain, destination, swapConfig.currencyTo).symbol;
+            } else {
+              destCurrency = findAssetOnDestOrThrow(origin, destination, currency).symbol;
+            }
+          } else {
+            destCurrency = getNativeAssetSymbol(destination);
+          }
           result = _objectSpread2(_objectSpread2({
             origin: _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, originWeight && {
               weight: originWeight
@@ -6759,7 +6795,8 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             feeCurrency: feeCurrency,
             recipientAddress: address,
             senderAddress: senderAddress,
-            version: version
+            version: version,
+            paraIdTo: paraIdTo
           };
           call = createExecuteCall(chain, createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
@@ -6819,7 +6856,7 @@ var isMultiHopSwap = function isMultiHopSwap(exchangeChain, assetFrom, assetTo)
 
 var createExchangeInstructions = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, multiAssetFrom, multiAssetTo) {
-    var chain, exchangeChain, assetFrom, assetTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, nativeSymbol, needsMultiHop, nativeAsset, nativeAmountOut, multiAssetNative;
+    var chain, exchangeChain, assetFrom, assetTo, version, calculateMinAmountOut, _options$fees, originReserveFee, exchangeFee, nativeSymbol, needsMultiHop, nativeAsset, shouldUseMaximal, nativeAmountOut, multiAssetNative;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -6830,6 +6867,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             symbol: nativeSymbol
           }, null);
           assertHasLocation(nativeAsset);
+          shouldUseMaximal = !chain || exchangeChain === 'Hydration' && exchangeFee === 0n;
           if (needsMultiHop) {
             _context.n = 1;
             break;
@@ -6838,7 +6876,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             ExchangeAsset: {
               give: createAssetsFilter(multiAssetFrom),
               want: [multiAssetTo],
-              maximal: exchangeChain === 'Hydration' && exchangeFee === 0n ? true : false
+              maximal: shouldUseMaximal
             }
           }]);
         case 1:
@@ -6851,7 +6889,7 @@ var createExchangeInstructions = /*#__PURE__*/function () {
             ExchangeAsset: {
               give: createAssetsFilter(multiAssetFrom),
               want: [multiAssetNative],
-              maximal: exchangeChain === 'Hydration' && exchangeFee === 0n ? true : false
+              maximal: shouldUseMaximal
             }
           }, {
             ExchangeAsset: {
@@ -7014,7 +7052,8 @@ var extractFeesFromDryRun = function extractFeesFromDryRun(chain, dryRunResult,
     if (!dryRunResult.origin.success) {
       throw new DryRunFailedError("Origin dry run failed: ".concat(dryRunResult.origin.failureReason || 'Unknown reason'));
     }
-    fees.exchangeFee = padFeeBy(dryRunResult.origin.fee, FEE_PADDING_PERCENTAGE);
+    // There is no exchange fee if origin is exchange, because jit_withdraw is used
+    fees.exchangeFee = 0n;
   }
   // Handle origin reserve fee (hop before exchange)
   if (exchangeHopIndex > 0) {
@@ -7079,11 +7118,11 @@ var createXcmAndCall = /*#__PURE__*/function () {
 }();
 var handleSwapExecuteTransfer = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
-    var api, chain, exchangeChain, destChain, assetFrom, assetTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, hasOriginReserveHop, requireExchangeSuccess, extractedFees, exchangeHop, totalFeesInFromAsset, amountAvailableForSwap, recalculatedMinAmountOut, updatedAssetTo, _yield$createXcmAndCa2, secondCall, secondDryRunResult, finalFees, hasHopsInSecondRun, isOnExchangeChain, finalExchangeHopIndex, finalTotalFeesInFromAsset, finalAmountAvailableForSwap, finalMinAmountOut, finalAssetTo, _yield$createXcmAndCa3, finalCall;
+    var api, chain, exchangeChain, destChain, assetFrom, assetTo, currencyTo, senderAddress, recipientAddress, calculateMinAmountOut, version, internalOptions, dryRunParams, _yield$createXcmAndCa, initialCall, firstDryRunResult, exchangeHopIndex, hasOriginReserveHop, requireExchangeSuccess, extractedFees, exchangeHop, totalFeesInFromAsset, updatedAssetTo, amountAvailableForSwap, recalculatedMinAmountOut, _yield$createXcmAndCa2, secondCall, secondDryRunResult, finalFees, hasHopsInSecondRun, isOnExchangeChain, finalExchangeHopIndex, finalTotalFeesInFromAsset, finalAmountAvailableForSwap, finalMinAmountOut, finalAssetTo, _yield$createXcmAndCa3, finalCall;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
         case 0:
-          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetFrom, assetTo = options.assetTo, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, calculateMinAmountOut = options.calculateMinAmountOut;
+          api = options.api, chain = options.chain, exchangeChain = options.exchangeChain, destChain = options.destChain, assetFrom = options.assetFrom, assetTo = options.assetTo, currencyTo = options.currencyTo, senderAddress = options.senderAddress, recipientAddress = options.recipientAddress, calculateMinAmountOut = options.calculateMinAmountOut;
           _context3.n = 1;
           return api.init(chain !== null && chain !== void 0 ? chain : exchangeChain);
         case 1:
@@ -7102,6 +7141,10 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             currency: {
               multilocation: assetFrom.multiLocation,
               amount: assetFrom.amount
+            },
+            swapConfig: {
+              currencyTo: currencyTo,
+              exchangeChain: exchangeChain
             }
           }; // First dry run with dummy fees to extract actual fees
           _context3.n = 2;
@@ -7133,6 +7176,10 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
             _context3.n = 5;
             break;
           }
+          if (!chain) {
+            _context3.n = 4;
+            break;
+          }
           exchangeHop = firstDryRunResult.hops[exchangeHopIndex];
           if (exchangeHop.result.success) {
             _context3.n = 4;
@@ -7156,6 +7203,11 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           // Calculate actual amount available for swap
           totalFeesInFromAsset = chain ? extractedFees.originReserveFee + extractedFees.exchangeFee : 0n;
           validateAmount(BigInt(assetFrom.amount), totalFeesInFromAsset);
+          updatedAssetTo = assetTo;
+          if (!chain) {
+            _context3.n = 8;
+            break;
+          }
           amountAvailableForSwap = BigInt(assetFrom.amount) - totalFeesInFromAsset;
           _context3.n = 7;
           return calculateMinAmountOut(amountAvailableForSwap);
@@ -7163,20 +7215,21 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           recalculatedMinAmountOut = _context3.v;
           updatedAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
             amount: recalculatedMinAmountOut.toString()
-          }); // Second dry run with actual fees and amounts
-          _context3.n = 8;
+          });
+        case 8:
+          _context3.n = 9;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: updatedAssetTo,
             fees: extractedFees
           }));
-        case 8:
+        case 9:
           _yield$createXcmAndCa2 = _context3.v;
           secondCall = _yield$createXcmAndCa2.call;
-          _context3.n = 9;
+          _context3.n = 10;
           return executeDryRun(_objectSpread2(_objectSpread2({}, dryRunParams), {}, {
             tx: api.callTxMethod(secondCall)
           }));
-        case 9:
+        case 10:
           secondDryRunResult = _context3.v;
           hasHopsInSecondRun = secondDryRunResult.hops && secondDryRunResult.hops.length > 0;
           isOnExchangeChain = chain === exchangeChain;
@@ -7191,27 +7244,27 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           validateAmount(BigInt(assetFrom.amount), finalTotalFeesInFromAsset);
           // If the final fees are different, we might need one more iteration
           if (!(finalFees.exchangeFee !== extractedFees.exchangeFee || finalFees.originReserveFee !== extractedFees.originReserveFee)) {
-            _context3.n = 12;
+            _context3.n = 13;
             break;
           }
           finalAmountAvailableForSwap = BigInt(assetFrom.amount) - finalTotalFeesInFromAsset;
-          _context3.n = 10;
+          _context3.n = 11;
           return calculateMinAmountOut(finalAmountAvailableForSwap);
-        case 10:
+        case 11:
           finalMinAmountOut = _context3.v;
           finalAssetTo = _objectSpread2(_objectSpread2({}, assetTo), {}, {
             amount: finalMinAmountOut.toString()
           });
-          _context3.n = 11;
+          _context3.n = 12;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             assetTo: finalAssetTo,
             fees: finalFees
           }));
-        case 11:
+        case 12:
           _yield$createXcmAndCa3 = _context3.v;
           finalCall = _yield$createXcmAndCa3.call;
           return _context3.a(2, api.callTxMethod(finalCall));
-        case 12:
+        case 13:
           return _context3.a(2, api.callTxMethod(secondCall));
       }
     }, _callee3);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "10.10.1",
+  "version": "10.10.2",
   "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.31.6",
-    "@paraspell/assets": "10.10.1",
-    "@paraspell/sdk-common": "10.10.1",
-    "@paraspell/pallets": "10.10.1"
+    "@paraspell/assets": "10.10.2",
+    "@paraspell/sdk-common": "10.10.2",
+    "@paraspell/pallets": "10.10.2"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.27.1",