@paraspell/sdk-core 11.8.1 → 11.8.3

package/dist/index.cjs

@@ -838,8 +838,8 @@ var computeOverridenAmount = function computeOverridenAmount(options, increaseAm
     api = options.api;
   var amount = options.currency.amount;
   var config = api.getConfig();
-  if (isConfig(config) && config.abstractDecimals) {
-    return BigInt(increaseAmount) + BigInt(amount);
+  if (isConfig(config) && config.abstractDecimals && typeof amount !== 'bigint') {
+    return Number(increaseAmount) + Number(amount);
   } else {
     assertToIsString(to);
     var asset = assets.findAssetInfoOrThrow(from, currency, to);
@@ -4372,95 +4372,125 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
   };
 };
 var getDestXcmFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
     var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, tx, disableFallback, swapConfig, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
           api = options.api, origin = options.origin, hopChain = options.prevChain, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, tx = options.tx, disableFallback = options.disableFallback, swapConfig = options.swapConfig;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           calcPaymentInfoFee = /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-              var originAsset, amount, _t;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.p = _context.n) {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+              var attempt, _t2;
+              return _regenerator().w(function (_context2) {
+                while (1) switch (_context2.p = _context2.n) {
                   case 0:
                     if (!(destination === 'Ethereum')) {
-                      _context.n = 1;
+                      _context2.n = 1;
                       break;
                     }
-                    return _context.a(2, 0n);
+                    return _context2.a(2, 0n);
                   case 1:
-                    originAsset = swapConfig !== null && swapConfig !== void 0 && swapConfig.currencyTo ? assets.findAssetInfoOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, destination) : assets.findAssetInfoOrThrow(origin, currency, destination);
-                    amount = swapConfig !== null && swapConfig !== void 0 && swapConfig.currencyTo ? swapConfig.amountOut : currency.amount;
-                    if (!originAsset.location) {
-                      _context.n = 7;
-                      break;
-                    }
-                    _context.p = 2;
-                    _context.n = 3;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      location: originAsset.location,
-                      amount: amount
-                    });
+                    attempt = /*#__PURE__*/function () {
+                      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, curr, amt) {
+                        var assetInfo, _t;
+                        return _regenerator().w(function (_context) {
+                          while (1) switch (_context.p = _context.n) {
+                            case 0:
+                              assetInfo = assets.findAssetInfoOrThrow(chain, curr, destination);
+                              if (!assetInfo.location) {
+                                _context.n = 6;
+                                break;
+                              }
+                              _context.p = 1;
+                              _context.n = 2;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                location: assetInfo.location,
+                                amount: amt
+                              });
+                            case 2:
+                              return _context.a(2, _context.v);
+                            case 3:
+                              _context.p = 3;
+                              _t = _context.v;
+                              if (!(_t instanceof assets.InvalidCurrencyError)) {
+                                _context.n = 5;
+                                break;
+                              }
+                              _context.n = 4;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                symbol: assetInfo.symbol,
+                                amount: amt
+                              });
+                            case 4:
+                              return _context.a(2, _context.v);
+                            case 5:
+                              throw _t;
+                            case 6:
+                              _context.n = 7;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                symbol: assetInfo.symbol,
+                                amount: amt
+                              });
+                            case 7:
+                              return _context.a(2, _context.v);
+                          }
+                        }, _callee, null, [[1, 3]]);
+                      }));
+                      return function attempt(_x2, _x3, _x4) {
+                        return _ref3.apply(this, arguments);
+                      };
+                    }();
+                    _context2.p = 2;
+                    _context2.n = 3;
+                    return attempt(origin, currency, currency.amount);
                   case 3:
-                    return _context.a(2, _context.v);
+                    return _context2.a(2, _context2.v);
                   case 4:
-                    _context.p = 4;
-                    _t = _context.v;
-                    if (!(_t instanceof assets.InvalidCurrencyError)) {
-                      _context.n = 6;
+                    _context2.p = 4;
+                    _t2 = _context2.v;
+                    if (!(!(_t2 instanceof assets.InvalidCurrencyError) || !swapConfig)) {
+                      _context2.n = 5;
                       break;
                     }
-                    _context.n = 5;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol,
-                      amount: amount
-                    });
+                    throw _t2;
                   case 5:
-                    return _context.a(2, _context.v);
+                    _context2.n = 6;
+                    return attempt(swapConfig.exchangeChain, swapConfig.currencyTo, swapConfig.amountOut);
                   case 6:
-                    throw _t;
-                  case 7:
-                    _context.n = 8;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol,
-                      amount: amount
-                    });
-                  case 8:
-                    return _context.a(2, _context.v);
+                    return _context2.a(2, _context2.v);
                 }
-              }, _callee, null, [[2, 4]]);
+              }, _callee2, null, [[2, 4]]);
             }));
             return function calcPaymentInfoFee() {
               return _ref2.apply(this, arguments);
             };
           }();
           if (!(!assets.hasDryRunSupport(destination) || !forwardedXcms || destination === 'Ethereum')) {
-            _context2.n = 3;
+            _context3.n = 3;
             break;
           }
-          _context2.n = 1;
+          _context3.n = 1;
           return calcPaymentInfoFee();
         case 1:
-          _fee = _context2.v;
-          _context2.n = 2;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
+          _fee = _context3.v;
+          _context3.n = 2;
+          return isSufficientDestination(api, destination, address, currency.amount, asset, _fee);
         case 2:
-          sufficient = _context2.v;
-          return _context2.a(2, {
+          sufficient = _context3.v;
+          return _context3.a(2, {
             fee: _fee,
             feeType: 'paymentInfo',
-            sufficient: !assets.hasDryRunSupport(destination) ? sufficient : false
+            sufficient: sufficient
           });
         case 3:
-          _context2.n = 4;
+          _context3.n = 4;
           return api.getDryRunXcm({
             originLocation: addXcmVersionHeader(createOriginLocation(hopChain, destination), sdkCommon.Version.V4),
             tx: tx,
@@ -4470,27 +4500,27 @@ var getDestXcmFee = /*#__PURE__*/function () {
             asset: asset,
             originFee: originFee,
             feeAsset: resolvedFeeAsset,
-            amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
+            amount: currency.amount < 2n ? 2n : currency.amount
           });
         case 4:
-          dryRunResult = _context2.v;
+          dryRunResult = _context3.v;
           if (dryRunResult.success) {
-            _context2.n = 7;
+            _context3.n = 7;
             break;
           }
           if (!disableFallback) {
-            _context2.n = 5;
+            _context3.n = 5;
             break;
           }
-          return _context2.a(2, {
+          return _context3.a(2, {
             dryRunError: dryRunResult.failureReason
           });
         case 5:
-          _context2.n = 6;
+          _context3.n = 6;
           return calcPaymentInfoFee();
         case 6:
-          _fee2 = _context2.v;
-          return _context2.a(2, {
+          _fee2 = _context3.v;
+          return _context3.a(2, {
             fee: _fee2,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
@@ -4498,7 +4528,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
           });
         case 7:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
-          return _context2.a(2, {
+          return _context3.a(2, {
             fee: fee,
             feeType: 'dryRun',
             sufficient: true,
@@ -4506,7 +4536,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
             destParaId: destParaId
           });
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return function getDestXcmFee(_x) {
     return _ref.apply(this, arguments);
@@ -5134,7 +5164,7 @@ function _traverseXcmHops() {
         case 4:
           // true if this hop should be treated as the destination
           // - normally when nextChain === destination
-          // - but if swap is required, only after (or on) the exchange hop      const isDestination =
+          // - but if swap is required, only after (or on) the exchange hop
           isDestination = nextChain === destination && (!swapConfig || hasPassedExchange || nextChain === swapConfig.exchangeChain);
           isAssetHub = nextChain === assetHubChain;
           isBridgeHub = nextChain === bridgeHubChain;
@@ -5272,8 +5302,8 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
 };
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var _traversalResult$brid, _traversalResult$asse;
-    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, assetHubWithCurrency, bridgeHubWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
+    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;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -5409,24 +5439,20 @@ var dryRunInternal = /*#__PURE__*/function () {
               });
             }
           }
-          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
-            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : assets.getNativeAssetSymbol(assetHubChain),
-            asset: resolvedFeeAsset !== null && resolvedFeeAsset !== void 0 ? resolvedFeeAsset : assets.findNativeAssetInfoOrThrow(assetHubChain)
-          }) : traversalResult.assetHub;
           bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
             currency: assets.getNativeAssetSymbol(bridgeHubChain),
             asset: assets.findNativeAssetInfoOrThrow(bridgeHubChain)
           }) : processedBridgeHub;
           _getFailureInfo = getFailureInfo$1({
             destination: traversalResult.destination,
-            assetHub: assetHubWithCurrency,
+            assetHub: traversalResult.assetHub,
             bridgeHub: bridgeHubWithCurrency
           }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
           return _context2.a(2, {
             failureReason: failureReason,
             failureChain: failureChain,
             origin: originDryRun,
-            assetHub: assetHubWithCurrency,
+            assetHub: traversalResult.assetHub,
             bridgeHub: bridgeHubWithCurrency,
             destination: traversalResult.destination,
             hops: traversalResult.hops
@@ -5761,6 +5787,10 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           // First dry run with dummy fees to extract actual fees
           _context3.n = 2;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
+            assetInfoTo: _objectSpread2(_objectSpread2({}, assetTo), {}, {
+              // Use half of the amountOut in initial dryRun to prevent NoDeal error in dry run
+              amount: assetTo.amount / 2n
+            }),
             fees: fees
           }));
         case 2:
@@ -10892,7 +10922,9 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                       feeAsset: feeAsset,
                       tx: tx,
                       originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
-                      disableFallback: disableFallback
+                      disableFallback: disableFallback,
+                      hasPassedExchange: hasPassedExchange,
+                      swapConfig: swapConfig
                     });
                   case 1:
                     hopResult = _context.v;
@@ -10986,7 +11018,8 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             tx: tx,
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             senderAddress: senderAddress,
-            disableFallback: disableFallback
+            disableFallback: disableFallback,
+            swapConfig: swapConfig
           });
         case 11:
           destFallback = _context2.v;
@@ -11225,7 +11258,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
         case 3:
           originSufficient = _context.v;
           _context.n = 4;
-          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset, fixedDestinationFee);
+          return isSufficientDestination(destApi, destination, address, currency.amount, originAsset, fixedDestinationFee);
         case 4:
           _destinationSufficient = _context.v;
           return _context.a(2, {
@@ -12117,7 +12150,7 @@ var computeInstructionFee = /*#__PURE__*/function () {
           chain = _ref.chain, api = _ref.api;
           _t = padFeeBy;
           _context.n = 1;
-          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), {
+          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), [], {
             location: DOT_LOCATION
           }, true);
         case 1:

package/dist/index.d.ts

@@ -595,6 +595,7 @@ type TGetFeeForDestChainBaseOptions<TRes> = {
     originFee: bigint;
     feeAsset?: TCurrencyInput;
     disableFallback: boolean;
+    hasPassedExchange?: boolean;
     swapConfig?: TSwapConfig;
 };
 type TGetFeeForDestChainOptions<TApi, TRes> = WithApi<TGetFeeForDestChainBaseOptions<TRes>, TApi, TRes>;
@@ -1425,7 +1426,7 @@ interface IPolkadotApi<TApi, TRes> {
     calculateTransactionFee(tx: TRes, address: string): Promise<bigint>;
     quoteAhPrice(fromMl: TLocation, toMl: TLocation, amountIn: bigint, includeFee?: boolean): Promise<bigint | undefined>;
     getXcmWeight(xcm: any): Promise<TWeight>;
-    getXcmPaymentApiFee(chain: TSubstrateChain, xcm: any, asset: TAssetInfo, transformXcm: boolean): Promise<bigint>;
+    getXcmPaymentApiFee(chain: TSubstrateChain, localXcm: any, forwardedXcm: any, asset: TAssetInfo, transformXcm: boolean): Promise<bigint>;
     getEvmStorage(contract: string, slot: string): Promise<string>;
     getBalanceNative(address: string): Promise<bigint>;
     getBalanceNativeAcala(address: string, symbol: string): Promise<bigint>;
@@ -2189,7 +2190,7 @@ declare const maybeOverrideAsset: (version: Version, amount: bigint, asset: TAss
 
 declare const sortAssets: (assets: TAsset[]) => TAsset[];
 
-declare const computeOverridenAmount: <TApi, TRes>(options: TCreateTxsOptions<TApi, TRes>, increaseAmount: string) => bigint;
+declare const computeOverridenAmount: <TApi, TRes>(options: TCreateTxsOptions<TApi, TRes>, increaseAmount: string) => number | bigint;
 declare const overrideTxAmount: <TApi, TRes>(options: TCreateTxsOptions<TApi, TRes>, builder: GeneralBuilder<TApi, TRes, TSendBaseOptionsWithSenderAddress>, amount: string) => Promise<TRes>;
 declare const createTx: <TApi, TRes>(options: TCreateTxsOptions<TApi, TRes>, builder: GeneralBuilder<TApi, TRes, TSendBaseOptionsWithSenderAddress>, amount: string | undefined) => Promise<TRes>;
 

package/dist/index.mjs

@@ -839,8 +839,8 @@ var computeOverridenAmount = function computeOverridenAmount(options, increaseAm
     api = options.api;
   var amount = options.currency.amount;
   var config = api.getConfig();
-  if (isConfig(config) && config.abstractDecimals) {
-    return BigInt(increaseAmount) + BigInt(amount);
+  if (isConfig(config) && config.abstractDecimals && typeof amount !== 'bigint') {
+    return Number(increaseAmount) + Number(amount);
   } else {
     assertToIsString(to);
     var asset = findAssetInfoOrThrow(from, currency, to);
@@ -4373,95 +4373,125 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
   };
 };
 var getDestXcmFee = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(options) {
     var api, origin, hopChain, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, tx, disableFallback, swapConfig, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, fee, newForwardedXcms, destParaId;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
           api = options.api, origin = options.origin, hopChain = options.prevChain, destination = options.destination, currency = options.currency, forwardedXcms = options.forwardedXcms, asset = options.asset, address = options.address, feeAsset = options.feeAsset, originFee = options.originFee, tx = options.tx, disableFallback = options.disableFallback, swapConfig = options.swapConfig;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           calcPaymentInfoFee = /*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-              var originAsset, amount, _t;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.p = _context.n) {
+            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+              var attempt, _t2;
+              return _regenerator().w(function (_context2) {
+                while (1) switch (_context2.p = _context2.n) {
                   case 0:
                     if (!(destination === 'Ethereum')) {
-                      _context.n = 1;
+                      _context2.n = 1;
                       break;
                     }
-                    return _context.a(2, 0n);
+                    return _context2.a(2, 0n);
                   case 1:
-                    originAsset = swapConfig !== null && swapConfig !== void 0 && swapConfig.currencyTo ? findAssetInfoOrThrow(swapConfig.exchangeChain, swapConfig.currencyTo, destination) : findAssetInfoOrThrow(origin, currency, destination);
-                    amount = swapConfig !== null && swapConfig !== void 0 && swapConfig.currencyTo ? swapConfig.amountOut : currency.amount;
-                    if (!originAsset.location) {
-                      _context.n = 7;
-                      break;
-                    }
-                    _context.p = 2;
-                    _context.n = 3;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      location: originAsset.location,
-                      amount: amount
-                    });
+                    attempt = /*#__PURE__*/function () {
+                      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, curr, amt) {
+                        var assetInfo, _t;
+                        return _regenerator().w(function (_context) {
+                          while (1) switch (_context.p = _context.n) {
+                            case 0:
+                              assetInfo = findAssetInfoOrThrow(chain, curr, destination);
+                              if (!assetInfo.location) {
+                                _context.n = 6;
+                                break;
+                              }
+                              _context.p = 1;
+                              _context.n = 2;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                location: assetInfo.location,
+                                amount: amt
+                              });
+                            case 2:
+                              return _context.a(2, _context.v);
+                            case 3:
+                              _context.p = 3;
+                              _t = _context.v;
+                              if (!(_t instanceof InvalidCurrencyError)) {
+                                _context.n = 5;
+                                break;
+                              }
+                              _context.n = 4;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                symbol: assetInfo.symbol,
+                                amount: amt
+                              });
+                            case 4:
+                              return _context.a(2, _context.v);
+                            case 5:
+                              throw _t;
+                            case 6:
+                              _context.n = 7;
+                              return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
+                                destination: destination
+                              }), {
+                                symbol: assetInfo.symbol,
+                                amount: amt
+                              });
+                            case 7:
+                              return _context.a(2, _context.v);
+                          }
+                        }, _callee, null, [[1, 3]]);
+                      }));
+                      return function attempt(_x2, _x3, _x4) {
+                        return _ref3.apply(this, arguments);
+                      };
+                    }();
+                    _context2.p = 2;
+                    _context2.n = 3;
+                    return attempt(origin, currency, currency.amount);
                   case 3:
-                    return _context.a(2, _context.v);
+                    return _context2.a(2, _context2.v);
                   case 4:
-                    _context.p = 4;
-                    _t = _context.v;
-                    if (!(_t instanceof InvalidCurrencyError)) {
-                      _context.n = 6;
+                    _context2.p = 4;
+                    _t2 = _context2.v;
+                    if (!(!(_t2 instanceof InvalidCurrencyError) || !swapConfig)) {
+                      _context2.n = 5;
                       break;
                     }
-                    _context.n = 5;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol,
-                      amount: amount
-                    });
+                    throw _t2;
                   case 5:
-                    return _context.a(2, _context.v);
+                    _context2.n = 6;
+                    return attempt(swapConfig.exchangeChain, swapConfig.currencyTo, swapConfig.amountOut);
                   case 6:
-                    throw _t;
-                  case 7:
-                    _context.n = 8;
-                    return getReverseTxFee(_objectSpread2(_objectSpread2({}, options), {}, {
-                      destination: destination
-                    }), {
-                      symbol: originAsset.symbol,
-                      amount: amount
-                    });
-                  case 8:
-                    return _context.a(2, _context.v);
+                    return _context2.a(2, _context2.v);
                 }
-              }, _callee, null, [[2, 4]]);
+              }, _callee2, null, [[2, 4]]);
             }));
             return function calcPaymentInfoFee() {
               return _ref2.apply(this, arguments);
             };
           }();
           if (!(!hasDryRunSupport(destination) || !forwardedXcms || destination === 'Ethereum')) {
-            _context2.n = 3;
+            _context3.n = 3;
             break;
           }
-          _context2.n = 1;
+          _context3.n = 1;
           return calcPaymentInfoFee();
         case 1:
-          _fee = _context2.v;
-          _context2.n = 2;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
+          _fee = _context3.v;
+          _context3.n = 2;
+          return isSufficientDestination(api, destination, address, currency.amount, asset, _fee);
         case 2:
-          sufficient = _context2.v;
-          return _context2.a(2, {
+          sufficient = _context3.v;
+          return _context3.a(2, {
             fee: _fee,
             feeType: 'paymentInfo',
-            sufficient: !hasDryRunSupport(destination) ? sufficient : false
+            sufficient: sufficient
           });
         case 3:
-          _context2.n = 4;
+          _context3.n = 4;
           return api.getDryRunXcm({
             originLocation: addXcmVersionHeader(createOriginLocation(hopChain, destination), Version.V4),
             tx: tx,
@@ -4471,27 +4501,27 @@ var getDestXcmFee = /*#__PURE__*/function () {
             asset: asset,
             originFee: originFee,
             feeAsset: resolvedFeeAsset,
-            amount: BigInt(currency.amount) < 2n ? 2n : BigInt(currency.amount)
+            amount: currency.amount < 2n ? 2n : currency.amount
           });
         case 4:
-          dryRunResult = _context2.v;
+          dryRunResult = _context3.v;
           if (dryRunResult.success) {
-            _context2.n = 7;
+            _context3.n = 7;
             break;
           }
           if (!disableFallback) {
-            _context2.n = 5;
+            _context3.n = 5;
             break;
           }
-          return _context2.a(2, {
+          return _context3.a(2, {
             dryRunError: dryRunResult.failureReason
           });
         case 5:
-          _context2.n = 6;
+          _context3.n = 6;
           return calcPaymentInfoFee();
         case 6:
-          _fee2 = _context2.v;
-          return _context2.a(2, {
+          _fee2 = _context3.v;
+          return _context3.a(2, {
             fee: _fee2,
             feeType: 'paymentInfo',
             dryRunError: dryRunResult.failureReason,
@@ -4499,7 +4529,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
           });
         case 7:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
-          return _context2.a(2, {
+          return _context3.a(2, {
             fee: fee,
             feeType: 'dryRun',
             sufficient: true,
@@ -4507,7 +4537,7 @@ var getDestXcmFee = /*#__PURE__*/function () {
             destParaId: destParaId
           });
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return function getDestXcmFee(_x) {
     return _ref.apply(this, arguments);
@@ -5135,7 +5165,7 @@ function _traverseXcmHops() {
         case 4:
           // true if this hop should be treated as the destination
           // - normally when nextChain === destination
-          // - but if swap is required, only after (or on) the exchange hop      const isDestination =
+          // - but if swap is required, only after (or on) the exchange hop
           isDestination = nextChain === destination && (!swapConfig || hasPassedExchange || nextChain === swapConfig.exchangeChain);
           isAssetHub = nextChain === assetHubChain;
           isBridgeHub = nextChain === bridgeHubChain;
@@ -5273,8 +5303,8 @@ var getFailureInfo$1 = function getFailureInfo(results, hops) {
 };
 var dryRunInternal = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var _traversalResult$brid, _traversalResult$asse;
-    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, assetHubWithCurrency, bridgeHubWithCurrency, _getFailureInfo, failureReason, failureChain, _t;
+    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;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -5410,24 +5440,20 @@ var dryRunInternal = /*#__PURE__*/function () {
               });
             }
           }
-          assetHubWithCurrency = (_traversalResult$asse = traversalResult.assetHub) !== null && _traversalResult$asse !== void 0 && _traversalResult$asse.success ? _objectSpread2(_objectSpread2({}, traversalResult.assetHub), {}, {
-            currency: resolvedFeeAsset ? resolvedFeeAsset.symbol : getNativeAssetSymbol(assetHubChain),
-            asset: resolvedFeeAsset !== null && resolvedFeeAsset !== void 0 ? resolvedFeeAsset : findNativeAssetInfoOrThrow(assetHubChain)
-          }) : traversalResult.assetHub;
           bridgeHubWithCurrency = processedBridgeHub !== null && processedBridgeHub !== void 0 && processedBridgeHub.success ? _objectSpread2(_objectSpread2({}, processedBridgeHub), {}, {
             currency: getNativeAssetSymbol(bridgeHubChain),
             asset: findNativeAssetInfoOrThrow(bridgeHubChain)
           }) : processedBridgeHub;
           _getFailureInfo = getFailureInfo$1({
             destination: traversalResult.destination,
-            assetHub: assetHubWithCurrency,
+            assetHub: traversalResult.assetHub,
             bridgeHub: bridgeHubWithCurrency
           }, traversalResult.hops), failureReason = _getFailureInfo.failureReason, failureChain = _getFailureInfo.failureChain;
           return _context2.a(2, {
             failureReason: failureReason,
             failureChain: failureChain,
             origin: originDryRun,
-            assetHub: assetHubWithCurrency,
+            assetHub: traversalResult.assetHub,
             bridgeHub: bridgeHubWithCurrency,
             destination: traversalResult.destination,
             hops: traversalResult.hops
@@ -5762,6 +5788,10 @@ var handleSwapExecuteTransfer = /*#__PURE__*/function () {
           // First dry run with dummy fees to extract actual fees
           _context3.n = 2;
           return createXcmAndCall(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
+            assetInfoTo: _objectSpread2(_objectSpread2({}, assetTo), {}, {
+              // Use half of the amountOut in initial dryRun to prevent NoDeal error in dry run
+              amount: assetTo.amount / 2n
+            }),
             fees: fees
           }));
         case 2:
@@ -10893,7 +10923,9 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
                       feeAsset: feeAsset,
                       tx: tx,
                       originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
-                      disableFallback: disableFallback
+                      disableFallback: disableFallback,
+                      hasPassedExchange: hasPassedExchange,
+                      swapConfig: swapConfig
                     });
                   case 1:
                     hopResult = _context.v;
@@ -10987,7 +11019,8 @@ var getXcmFeeInternal = /*#__PURE__*/function () {
             tx: tx,
             originFee: originFee !== null && originFee !== void 0 ? originFee : 0n,
             senderAddress: senderAddress,
-            disableFallback: disableFallback
+            disableFallback: disableFallback,
+            swapConfig: swapConfig
           });
         case 11:
           destFallback = _context2.v;
@@ -11226,7 +11259,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
         case 3:
           originSufficient = _context.v;
           _context.n = 4;
-          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset, fixedDestinationFee);
+          return isSufficientDestination(destApi, destination, address, currency.amount, originAsset, fixedDestinationFee);
         case 4:
           _destinationSufficient = _context.v;
           return _context.a(2, {
@@ -12118,7 +12151,7 @@ var computeInstructionFee = /*#__PURE__*/function () {
           chain = _ref.chain, api = _ref.api;
           _t = padFeeBy;
           _context.n = 1;
-          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), {
+          return api.getXcmPaymentApiFee(chain, addXcmVersionHeader(xcm, version), [], {
             location: DOT_LOCATION
           }, true);
         case 1:

package/package.json

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