@paraspell/sdk-core 14.5.1 → 14.5.2

package/dist/index.d.ts

@@ -1770,7 +1770,7 @@ type TBuildOriginInfoOptions<TApi, TRes, TSigner, TCustomChain extends string =
     amount: bigint;
     originFee: bigint;
     originFeeAsset: TAssetInfo;
-    isFeeAssetAh: boolean;
+    isOriginFeeAsset: boolean;
 };
 type BuildHopInfoOptions<TApi, TRes, TSigner, TCustomChain extends string = never> = {
     api: PolkadotApi<TApi, TRes, TSigner, TCustomChain>;
@@ -1789,7 +1789,7 @@ type TBuildDestInfoOptions<TApi, TRes, TSigner, TCustomChain extends string = ne
     recipient: string;
     currency: WithAmount<TSingleCurrencyInput>;
     originFee: bigint;
-    isFeeAssetAh: boolean;
+    isOriginFeeAsset: boolean;
     paysDestFee: boolean;
     destFeeDetail: TXcmFeeDetail;
     totalHopFee: bigint;
@@ -2391,7 +2391,7 @@ declare const aggregateHopFees: (hops: TXcmFeeHopInfo[], matchAsset: TAssetInfo)
     bridgeFee?: bigint;
 };
 
-declare const buildDestInfo: <TApi, TRes, TSigner, TCustomChain extends string = never>({ api, origin, destination, recipient, currency, originFee, isFeeAssetAh, paysDestFee, destFeeDetail, totalHopFee, bridgeFee }: TBuildDestInfoOptions<TApi, TRes, TSigner, TCustomChain>) => Promise<{
+declare const buildDestInfo: <TApi, TRes, TSigner, TCustomChain extends string = never>({ api, origin, destination, recipient, currency, originFee, isOriginFeeAsset, paysDestFee, destFeeDetail, totalHopFee, bridgeFee }: TBuildDestInfoOptions<TApi, TRes, TSigner, TCustomChain>) => Promise<{
     receivedCurrency: {
         sufficient: boolean | UnableToComputeError;
         receivedAmount: bigint | UnableToComputeError;
@@ -2415,7 +2415,7 @@ declare const buildHopInfo: <TApi, TRes, TSigner, TCustomChain extends string =
     };
 }>;
 
-declare const buildOriginInfo: <TApi, TRes, TSigner, TCustomChain extends string = never>({ api, origin, sender, assets, amount, originFee, originFeeAsset, isFeeAssetAh }: TBuildOriginInfoOptions<TApi, TRes, TSigner, TCustomChain>) => Promise<{
+declare const buildOriginInfo: <TApi, TRes, TSigner, TCustomChain extends string = never>({ api, origin, sender, assets, amount, originFee, originFeeAsset, isOriginFeeAsset }: TBuildOriginInfoOptions<TApi, TRes, TSigner, TCustomChain>) => Promise<{
     selectedCurrency: TSelectedCurrencyInfo[];
     xcmFee: TOriginXcmFeeInfo;
 }>;

package/dist/index.mjs

@@ -3401,6 +3401,13 @@ var supportsFeeAssetPayment = function supportsFeeAssetPayment(chain) {
   return chain === 'AssetHubPolkadot' || chain.startsWith('Hydration');
 };
 
+var usesOriginFeeAsset = function usesOriginFeeAsset(api, origin, currency, assetInfo, feeAssetInfo, originFeeAsset) {
+  return (
+    // Hydration chain origin delivery fee is 0n so we need to handle it only for AssetHubPolkadot
+    origin === 'AssetHubPolkadot' && !Array.isArray(currency) && !!feeAssetInfo && isAssetEqual(feeAssetInfo, assetInfo) && isAssetEqual(originFeeAsset, feeAssetInfo) && !isAssetEqual(feeAssetInfo, api.findNativeAssetInfoOrThrow(origin))
+  );
+};
+
 var validateCurrency = function validateCurrency(currency, feeAsset) {
   if (Array.isArray(currency)) {
     if (currency.length === 0) {
@@ -6989,15 +6996,192 @@ var getOriginXcmFee = /*#__PURE__*/function () {
   };
 }();
 
+var FEE_PADDING = 30;
+var sumHopFees = function sumHopFees(result, _ref) {
+  var assetInfo = _ref.assetInfo,
+    feeAssetInfo = _ref.feeAssetInfo,
+    isRelayAsset = _ref.isRelayAsset,
+    systemAsset = _ref.systemAsset,
+    overriddenAsset = _ref.options.overriddenAsset;
+  var feeAsset = isRelayAsset || overriddenAsset ? assetInfo : feeAssetInfo !== null && feeAssetInfo !== void 0 ? feeAssetInfo : systemAsset;
+  return result.hops.reduce(function (acc, hop) {
+    // only add if asset is equal
+    return isAssetEqual(hop.result.asset, feeAsset) ? acc + hop.result.fee : acc;
+  }, 0n);
+};
+var computeAllFees = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, buildTx) {
+    var origin, dest, feeAssetInfo, edDeposit, _context$options, sender, recipient, currency, feeCurrency, version, overriddenAsset, result, hopFees, destFee;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          origin = context.origin, dest = context.dest, feeAssetInfo = context.feeAssetInfo, edDeposit = context.edDeposit, _context$options = context.options, sender = _context$options.sender, recipient = _context$options.recipient, currency = _context$options.currency, feeCurrency = _context$options.feeCurrency, version = _context$options.version, overriddenAsset = _context$options.overriddenAsset;
+          assertSender(sender);
+          assertAddressIsString(recipient);
+          if (origin.api.hasDryRunSupport(context.origin.chain)) {
+            _context.n = 2;
+            break;
+          }
+          if (!(feeAssetInfo || overriddenAsset)) {
+            _context.n = 1;
+            break;
+          }
+          throw new ScenarioNotSupportedError("Fee asset cannot be used on ".concat(origin.chain, " because it does not support dry run."));
+        case 1:
+          return _context.a(2, null);
+        case 2:
+          _context.n = 3;
+          return getXcmFeeInternal({
+            api: origin.api,
+            buildTx: buildTx,
+            origin: origin.chain,
+            destination: dest.chain,
+            sender: sender,
+            recipient: recipient,
+            version: version,
+            currency: currency,
+            feeAsset: feeCurrency,
+            disableFallback: false,
+            skipReverseFeeCalculation: true
+          });
+        case 3:
+          result = _context.v;
+          hopFees = sumHopFees(result, context);
+          destFee = result.destination.fee;
+          return _context.a(2, {
+            hopFees: padValueBy(hopFees, FEE_PADDING),
+            destFee: padValueBy(destFee, FEE_PADDING) + (edDeposit !== null && edDeposit !== void 0 ? edDeposit : 0n)
+          });
+      }
+    }, _callee);
+  }));
+  return function computeAllFees(_x, _x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+var isAssetSufficient = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, chain, asset) {
+    var pallets, _state$isSufficient, state;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
+        case 0:
+          pallets = getOtherAssetsPallets(chain, api._customCtx);
+          if (!(asset.isNative || pallets.length === 0)) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, true);
+        case 1:
+          _context.p = 1;
+          _context.n = 2;
+          return getPalletInstance(pickOtherMintPallet(asset, pallets)).getAssetState(api, asset);
+        case 2:
+          state = _context.v;
+          return _context.a(2, (_state$isSufficient = state === null || state === void 0 ? void 0 : state.isSufficient) !== null && _state$isSufficient !== void 0 ? _state$isSufficient : true);
+        case 3:
+          _context.p = 3;
+          _context.v;
+          return _context.a(2, true);
+      }
+    }, _callee, null, [[1, 3]]);
+  }));
+  return function isAssetSufficient(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var resolveEdDeposit = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    var _overriddenAsset$map;
+    var origin, _ref$dest, destApi, destChain, assetInfo, overriddenAsset, feeAssetLocation, recipient, nativeAsset, nativeLocation, feeLocation, isFeeNative, _yield$destApi$queryS, providers, destAssets, sufficiency, ed, feeAmount;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          origin = _ref.origin, _ref$dest = _ref.dest, destApi = _ref$dest.api, destChain = _ref$dest.chain, assetInfo = _ref.assetInfo, overriddenAsset = _ref.overriddenAsset, feeAssetLocation = _ref.feeAssetLocation, recipient = _ref.recipient;
+          if (!(isExternalChain(destChain) || typeof recipient !== 'string')) {
+            _context.n = 1;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 1:
+          nativeAsset = destApi.findNativeAssetInfoOrThrow(destChain);
+          nativeLocation = origin.api.localizeLocation(destChain, nativeAsset.location);
+          feeLocation = origin.api.localizeLocation(destChain, feeAssetLocation, origin.chain);
+          isFeeNative = deepEqual(feeLocation, nativeLocation);
+          if (!(!isFeeNative && !destChain.startsWith('AssetHub'))) {
+            _context.n = 2;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 2:
+          _context.n = 3;
+          return destApi.queryState({
+            module: 'System',
+            method: 'Account',
+            params: [recipient]
+          });
+        case 3:
+          _yield$destApi$queryS = _context.v;
+          providers = _yield$destApi$queryS.providers;
+          if (!(providers > 0)) {
+            _context.n = 4;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 4:
+          destAssets = ((_overriddenAsset$map = overriddenAsset === null || overriddenAsset === void 0 ? void 0 : overriddenAsset.map(function (asset) {
+            return extractAssetLocation(asset);
+          })) !== null && _overriddenAsset$map !== void 0 ? _overriddenAsset$map : [assetInfo.location]).map(function (location) {
+            return origin.api.findAssetOnDestOrThrow(origin.chain, destChain, {
+              location: location
+            });
+          });
+          _context.n = 5;
+          return Promise.all(destAssets.map(function (asset) {
+            return isAssetSufficient(destApi, destChain, asset);
+          }));
+        case 5:
+          sufficiency = _context.v;
+          if (!sufficiency.every(Boolean)) {
+            _context.n = 6;
+            break;
+          }
+          return _context.a(2, undefined);
+        case 6:
+          ed = BigInt(nativeAsset.existentialDeposit);
+          if (!isFeeNative) {
+            _context.n = 7;
+            break;
+          }
+          return _context.a(2, ed);
+        case 7:
+          _context.n = 8;
+          return destApi.queryRuntimeApi({
+            module: 'AssetConversionApi',
+            method: 'quote_price_tokens_for_exact_tokens',
+            params: [feeLocation, nativeLocation, ed, true]
+          });
+        case 8:
+          feeAmount = _context.v;
+          return _context.a(2, feeAmount == null ? undefined : padValueBy(BigInt(feeAmount), FEE_PADDING));
+      }
+    }, _callee);
+  }));
+  return function resolveEdDeposit(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
 var getXcmFeeOnce = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, tx, origin, destination, sender, recipient, currency, feeAsset, version, disableFallback, swapConfig, useRootOrigin, skipReverseFeeCalculation, resolvedFeeAsset, _resolveCurrency, asset, resolvedVersion, _yield$getOriginXcmFe, originFeeRaw, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _dryRunError, processHop, traversalResult, destFee, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, relayChain, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, convertToFeeDetail, result, dryRunError, _t, _t2, _t3, _t4;
+    var api, tx, origin, destination, sender, recipient, currency, feeAsset, version, disableFallback, swapConfig, useRootOrigin, skipReverseFeeCalculation, resolvedFeeAsset, _resolveCurrency, asset, assets, resolvedVersion, _yield$getOriginXcmFe, originFeeRaw, originAsset, originFeeType, originDryRunError, initialForwardedXcm, initialDestParaId, originWeight, sufficientOriginFee, isMythosToEthereum, originFee, destApi, destFeeRes, _result, _dryRunError, processHop, traversalResult, destFee, destAsset, destFeeType, destDryRunError, destSufficient, destResult, _destApi, destFallback, relayChain, bridgeHubChain, assetHubChain, bridgeHubHop, processedBridgeHub, bridgeHubHopIndex, convertToFeeDetail, result, dryRunError, _t, _t2, _t3, _t4;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
           api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, sender = _ref.sender, recipient = _ref.recipient, currency = _ref.currency, feeAsset = _ref.feeAsset, version = _ref.version, disableFallback = _ref.disableFallback, swapConfig = _ref.swapConfig, useRootOrigin = _ref.useRootOrigin, skipReverseFeeCalculation = _ref.skipReverseFeeCalculation;
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(api, feeAsset, origin, destination, currency) : undefined;
-          _resolveCurrency = resolveCurrency(api, currency, resolvedFeeAsset, origin, destination), asset = _resolveCurrency.asset;
+          _resolveCurrency = resolveCurrency(api, currency, resolvedFeeAsset, origin, destination), asset = _resolveCurrency.asset, assets = _resolveCurrency.assets;
           resolvedVersion = pickCompatibleXcmVersion(api, origin, destination, version);
           _context2.n = 1;
           return getOriginXcmFeeInternal({
@@ -7121,11 +7305,11 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
         case 10:
           processHop = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
-              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, resolvedHopAsset, hopResult;
+              var hopApi, currentChain, currentOrigin, currentAsset, forwardedXcms, hasPassedExchange, isDestination, resolvedHopAsset, hopResult, edDeposit;
               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;
+                    hopApi = params.api, currentChain = params.currentChain, currentOrigin = params.currentOrigin, currentAsset = params.currentAsset, forwardedXcms = params.forwardedXcms, hasPassedExchange = params.hasPassedExchange, isDestination = params.isDestination;
                     resolvedHopAsset = resolveHopAsset({
                       api: api,
                       tx: tx,
@@ -7164,7 +7348,36 @@ var getXcmFeeOnce = /*#__PURE__*/function () {
                     });
                   case 1:
                     hopResult = _context.v;
+                    if (!(!isDestination || hopResult.fee === undefined || hopResult.dryRunError || isAssetEqual(hopResult.asset, hopApi.findNativeAssetInfoOrThrow(currentChain)))) {
+                      _context.n = 2;
+                      break;
+                    }
                     return _context.a(2, hopResult);
+                  case 2:
+                    _context.n = 3;
+                    return resolveEdDeposit({
+                      origin: {
+                        api: api,
+                        chain: origin
+                      },
+                      dest: {
+                        api: hopApi,
+                        chain: currentChain
+                      },
+                      assetInfo: asset,
+                      overriddenAsset: assets.map(function (_ref4) {
+                        var amount = _ref4.amount,
+                          location = _ref4.location;
+                        return createAsset(resolvedVersion, amount, location);
+                      }),
+                      feeAssetLocation: hopResult.asset.location,
+                      recipient: recipient
+                    });
+                  case 3:
+                    edDeposit = _context.v;
+                    return _context.a(2, _objectSpread2(_objectSpread2({}, hopResult), {}, {
+                      fee: hopResult.fee + (edDeposit !== null && edDeposit !== void 0 ? edDeposit : 0n)
+                    }));
                 }
               }, _callee);
             }));
@@ -7490,11 +7703,11 @@ var aggregateHopFees = function aggregateHopFees(hops, matchAsset) {
 
 var buildDestInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, origin, destination, recipient, currency, originFee, isFeeAssetAh, paysDestFee, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, destFeeAssetEqual, effectiveDestFee, effectiveAmountForBalance, destBalanceSufficient, destBalanceAfter, createUnableToComputeError, isUnableToCompute, destbalanceAfterResult, destBalanceSufficientResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
+    var api, origin, destination, recipient, currency, originFee, isOriginFeeAsset, paysDestFee, destFeeDetail, totalHopFee, bridgeFee, destApi, destAsset, edDest, destBalance, destAmount, destFeeAssetEqual, effectiveDestFee, effectiveAmountForBalance, destBalanceSufficient, destBalanceAfter, createUnableToComputeError, isUnableToCompute, destbalanceAfterResult, destBalanceSufficientResult, receivedAmount, isSubBridge, nativeAssetOfOriginSymbol, isOriginAssetNative, destXcmFeeBalance, isDestFeeInNativeCurrency, destRecipientNativeBalance, destXcmFeeBalanceAfter;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, destination = _ref.destination, recipient = _ref.recipient, currency = _ref.currency, originFee = _ref.originFee, isFeeAssetAh = _ref.isFeeAssetAh, paysDestFee = _ref.paysDestFee, destFeeDetail = _ref.destFeeDetail, totalHopFee = _ref.totalHopFee, bridgeFee = _ref.bridgeFee;
+          api = _ref.api, origin = _ref.origin, destination = _ref.destination, recipient = _ref.recipient, currency = _ref.currency, originFee = _ref.originFee, isOriginFeeAsset = _ref.isOriginFeeAsset, paysDestFee = _ref.paysDestFee, destFeeDetail = _ref.destFeeDetail, totalHopFee = _ref.totalHopFee, bridgeFee = _ref.bridgeFee;
           destApi = api.clone();
           _context.n = 1;
           return destApi.init(destination);
@@ -7510,7 +7723,7 @@ var buildDestInfo = /*#__PURE__*/function () {
           });
         case 2:
           destBalance = _context.v;
-          destAmount = isFeeAssetAh ? currency.amount - originFee : currency.amount;
+          destAmount = isOriginFeeAsset ? currency.amount - originFee : currency.amount;
           destFeeAssetEqual = isSymbolMatch(destFeeDetail.asset.symbol, destAsset.symbol);
           effectiveDestFee = paysDestFee && destFeeAssetEqual ? destFeeDetail.fee : 0n;
           effectiveAmountForBalance = destAmount - totalHopFee;
@@ -7564,7 +7777,7 @@ var buildDestInfo = /*#__PURE__*/function () {
         case 4:
           destXcmFeeBalance = destBalance;
         case 5:
-          destXcmFeeBalanceAfter = isFeeAssetAh ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeAssetEqual ? effectiveAmountForBalance : 0n);
+          destXcmFeeBalanceAfter = isOriginFeeAsset ? destBalanceAfter : destXcmFeeBalance - destFeeDetail.fee + (destFeeAssetEqual ? effectiveAmountForBalance : 0n);
           return _context.a(2, {
             receivedCurrency: {
               sufficient: destBalanceSufficientResult,
@@ -7641,11 +7854,11 @@ var buildHopInfo = /*#__PURE__*/function () {
 var _excluded$1 = ["amount"];
 var buildOriginInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, origin, sender, assets, amount, originFee, originFeeAsset, isFeeAssetAh, buildSelectedCurrency, selectedCurrency, originBalanceFee, originBalanceFeeAfter;
+    var api, origin, sender, assets, amount, originFee, originFeeAsset, isOriginFeeAsset, buildSelectedCurrency, selectedCurrency, originBalanceFee, originBalanceFeeAfter;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          api = _ref.api, origin = _ref.origin, sender = _ref.sender, assets = _ref.assets, amount = _ref.amount, originFee = _ref.originFee, originFeeAsset = _ref.originFeeAsset, isFeeAssetAh = _ref.isFeeAssetAh;
+          api = _ref.api, origin = _ref.origin, sender = _ref.sender, assets = _ref.assets, amount = _ref.amount, originFee = _ref.originFee, originFeeAsset = _ref.originFeeAsset, isOriginFeeAsset = _ref.isOriginFeeAsset;
           buildSelectedCurrency = /*#__PURE__*/function () {
             var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref3) {
               var assetAmount, asset, balance, balanceAfter;
@@ -7689,7 +7902,7 @@ var buildOriginInfo = /*#__PURE__*/function () {
           });
         case 2:
           originBalanceFee = _context2.v;
-          originBalanceFeeAfter = isFeeAssetAh ? originBalanceFee - amount : originBalanceFee - originFee;
+          originBalanceFeeAfter = isOriginFeeAsset ? originBalanceFee - amount : originBalanceFee - originFee;
           return _context2.a(2, {
             selectedCurrency: selectedCurrency,
             xcmFee: {
@@ -7710,7 +7923,7 @@ var buildOriginInfo = /*#__PURE__*/function () {
 
 var getTransferInfo = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref) {
-    var api, buildTx, origin, destination, sender, ahAddress, recipient, currency, feeAsset, version, resolvedFeeAsset, _resolveCurrency, assets, originAsset, amount, _yield$getXcmFeeInter, _yield$getXcmFeeInter2, originFee, originFeeAsset, destFeeDetail, hops, isFeeAssetAh, feeAssetIndex, feeCurrency, _yield$buildOriginInf, selectedCurrency, originXcmFee, builtHops, _aggregateHopFees, totalHopFee, bridgeFee, buildDestInfoForAsset, destResults, feeResult, result, _t, _t2;
+    var api, buildTx, origin, destination, sender, ahAddress, recipient, currency, feeAsset, version, resolvedFeeAsset, _resolveCurrency, assets, originAsset, amount, _yield$getXcmFeeInter, _yield$getXcmFeeInter2, originFee, originFeeAsset, destFeeDetail, hops, isOriginFeeAsset, feeAssetIndex, feeCurrency, _yield$buildOriginInf, selectedCurrency, originXcmFee, builtHops, _aggregateHopFees, totalHopFee, bridgeFee, buildDestInfoForAsset, destResults, feeResult, result, _t, _t2;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
@@ -7749,7 +7962,7 @@ var getTransferInfo = /*#__PURE__*/function () {
           originFeeAsset = _yield$getXcmFeeInter2.asset;
           destFeeDetail = _yield$getXcmFeeInter.destination;
           hops = _yield$getXcmFeeInter.hops;
-          isFeeAssetAh = origin === 'AssetHubPolkadot' && !!resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, originAsset);
+          isOriginFeeAsset = usesOriginFeeAsset(api, origin, currency, originAsset, resolvedFeeAsset, originFeeAsset);
           feeAssetIndex = assets.findIndex(function (asset) {
             return isAssetEqual(asset, originAsset);
           });
@@ -7763,7 +7976,7 @@ var getTransferInfo = /*#__PURE__*/function () {
             amount: amount,
             originFee: originFee,
             originFeeAsset: originFeeAsset,
-            isFeeAssetAh: isFeeAssetAh
+            isOriginFeeAsset: isOriginFeeAsset
           });
         case 5:
           _yield$buildOriginInf = _context2.v;
@@ -7817,7 +8030,7 @@ var getTransferInfo = /*#__PURE__*/function () {
               recipient: recipient,
               currency: item,
               originFee: originFee,
-              isFeeAssetAh: isFeeAssetAh && isFeeElement,
+              isOriginFeeAsset: isOriginFeeAsset && isFeeElement,
               paysDestFee: isFeeElement,
               destFeeDetail: destFeeDetail,
               totalHopFee: isFeeElement ? totalHopFee : 0n,
@@ -7885,76 +8098,12 @@ var getTransferInfo = /*#__PURE__*/function () {
   };
 }();
 
-var FEE_PADDING = 30;
-var sumHopFees = function sumHopFees(result, _ref) {
-  var assetInfo = _ref.assetInfo,
-    feeAssetInfo = _ref.feeAssetInfo,
-    isRelayAsset = _ref.isRelayAsset,
-    systemAsset = _ref.systemAsset,
-    overriddenAsset = _ref.options.overriddenAsset;
-  var feeAsset = isRelayAsset || overriddenAsset ? assetInfo : feeAssetInfo !== null && feeAssetInfo !== void 0 ? feeAssetInfo : systemAsset;
-  return result.hops.reduce(function (acc, hop) {
-    // only add if asset is equal
-    return isAssetEqual(hop.result.asset, feeAsset) ? acc + hop.result.fee : acc;
-  }, 0n);
-};
-var computeAllFees = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(context, buildTx) {
-    var origin, dest, feeAssetInfo, edDeposit, _context$options, sender, recipient, currency, feeCurrency, version, overriddenAsset, result, hopFees, destFee;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          origin = context.origin, dest = context.dest, feeAssetInfo = context.feeAssetInfo, edDeposit = context.edDeposit, _context$options = context.options, sender = _context$options.sender, recipient = _context$options.recipient, currency = _context$options.currency, feeCurrency = _context$options.feeCurrency, version = _context$options.version, overriddenAsset = _context$options.overriddenAsset;
-          assertSender(sender);
-          assertAddressIsString(recipient);
-          if (origin.api.hasDryRunSupport(context.origin.chain)) {
-            _context.n = 2;
-            break;
-          }
-          if (!(feeAssetInfo || overriddenAsset)) {
-            _context.n = 1;
-            break;
-          }
-          throw new ScenarioNotSupportedError("Fee asset cannot be used on ".concat(origin.chain, " because it does not support dry run."));
-        case 1:
-          return _context.a(2, null);
-        case 2:
-          _context.n = 3;
-          return getXcmFeeInternal({
-            api: origin.api,
-            buildTx: buildTx,
-            origin: origin.chain,
-            destination: dest.chain,
-            sender: sender,
-            recipient: recipient,
-            version: version,
-            currency: currency,
-            feeAsset: feeCurrency,
-            disableFallback: false,
-            skipReverseFeeCalculation: true
-          });
-        case 3:
-          result = _context.v;
-          hopFees = sumHopFees(result, context);
-          destFee = result.destination.fee;
-          return _context.a(2, {
-            hopFees: padValueBy(hopFees, FEE_PADDING),
-            destFee: padValueBy(destFee, FEE_PADDING) + (edDeposit !== null && edDeposit !== void 0 ? edDeposit : 0n)
-          });
-      }
-    }, _callee);
-  }));
-  return function computeAllFees(_x, _x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
 var toSelectors = function toSelectors(currency) {
   return Array.isArray(currency) ? currency : [currency];
 };
 var getMinTransferableAmountInternal = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(_ref) {
-    var api, origin, sender, recipient, destination, currency, feeAsset, buildTx, builder, version, resolvedFeeAsset, _resolveCurrency, assets, isMulti, selectors, toResult, destApi, nativeAssetInfo, result, minAmounts, buildMinCurrency, createTx, amounts, tx, dryRunResult, _t;
+    var api, origin, sender, recipient, destination, currency, feeAsset, buildTx, builder, version, resolvedFeeAsset, _resolveCurrency, assets, isMulti, selectors, toResult, destApi, result, minAmounts, buildMinCurrency, createTx, amounts, tx, dryRunResult, _t;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.p = _context3.n) {
         case 0:
@@ -7971,7 +8120,6 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
           _context3.n = 1;
           return destApi.init(destination);
         case 1:
-          nativeAssetInfo = api.findNativeAssetInfoOrThrow(origin);
           _context3.n = 2;
           return getXcmFee({
             api: api,
@@ -7992,7 +8140,7 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
           _context3.n = 3;
           return Promise.all(assets.map(/*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(asset, index) {
-              var destAsset, destBalance, destEd, paysOriginInSendingAsset, originFee, originChainAsset, hopFeeTotal, destinationFee, edComponent;
+              var destAsset, destBalance, destEd, isOriginFeeAsset, originFee, originChainAsset, hopFeeTotal, destinationFee, edComponent;
               return _regenerator().w(function (_context) {
                 while (1) switch (_context.n) {
                   case 0:
@@ -8007,8 +8155,8 @@ var getMinTransferableAmountInternal = /*#__PURE__*/function () {
                   case 1:
                     destBalance = _context.v;
                     destEd = BigInt(destAsset.existentialDeposit);
-                    paysOriginInSendingAsset = !resolvedFeeAsset && isAssetEqual(nativeAssetInfo, asset) || resolvedFeeAsset && isAssetEqual(resolvedFeeAsset, asset);
-                    originFee = result.origin && paysOriginInSendingAsset && isAssetEqual(result.origin.asset, asset) ? result.origin.fee : 0n;
+                    isOriginFeeAsset = usesOriginFeeAsset(api, origin, currency, asset, resolvedFeeAsset, result.origin.asset);
+                    originFee = isOriginFeeAsset ? result.origin.fee : 0n;
                     originChainAsset = {
                       chain: origin,
                       asset: asset
@@ -8326,119 +8474,6 @@ var getTransferableAmount = /*#__PURE__*/function () {
   };
 }();
 
-var isAssetSufficient = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, chain, asset) {
-    var pallets, _state$isSufficient, state;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.p = _context.n) {
-        case 0:
-          pallets = getOtherAssetsPallets(chain, api._customCtx);
-          if (!(asset.isNative || pallets.length === 0)) {
-            _context.n = 1;
-            break;
-          }
-          return _context.a(2, true);
-        case 1:
-          _context.p = 1;
-          _context.n = 2;
-          return getPalletInstance(pickOtherMintPallet(asset, pallets)).getAssetState(api, asset);
-        case 2:
-          state = _context.v;
-          return _context.a(2, (_state$isSufficient = state === null || state === void 0 ? void 0 : state.isSufficient) !== null && _state$isSufficient !== void 0 ? _state$isSufficient : true);
-        case 3:
-          _context.p = 3;
-          _context.v;
-          return _context.a(2, true);
-      }
-    }, _callee, null, [[1, 3]]);
-  }));
-  return function isAssetSufficient(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var resolveEdDeposit = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var _overriddenAsset$map;
-    var origin, _ref$dest, destApi, destChain, assetInfo, overriddenAsset, feeAssetLocation, recipient, nativeAsset, nativeLocation, feeLocation, isFeeNative, _yield$destApi$queryS, providers, destAssets, sufficiency, ed, feeAmount;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          origin = _ref.origin, _ref$dest = _ref.dest, destApi = _ref$dest.api, destChain = _ref$dest.chain, assetInfo = _ref.assetInfo, overriddenAsset = _ref.overriddenAsset, feeAssetLocation = _ref.feeAssetLocation, recipient = _ref.recipient;
-          if (!(isExternalChain(destChain) || typeof recipient !== 'string')) {
-            _context.n = 1;
-            break;
-          }
-          return _context.a(2, undefined);
-        case 1:
-          nativeAsset = destApi.findNativeAssetInfoOrThrow(destChain);
-          nativeLocation = origin.api.localizeLocation(destChain, nativeAsset.location);
-          feeLocation = origin.api.localizeLocation(destChain, feeAssetLocation, origin.chain);
-          isFeeNative = deepEqual(feeLocation, nativeLocation);
-          if (!(!isFeeNative && !destChain.startsWith('AssetHub'))) {
-            _context.n = 2;
-            break;
-          }
-          return _context.a(2, undefined);
-        case 2:
-          _context.n = 3;
-          return destApi.queryState({
-            module: 'System',
-            method: 'Account',
-            params: [recipient]
-          });
-        case 3:
-          _yield$destApi$queryS = _context.v;
-          providers = _yield$destApi$queryS.providers;
-          if (!(providers > 0)) {
-            _context.n = 4;
-            break;
-          }
-          return _context.a(2, undefined);
-        case 4:
-          destAssets = ((_overriddenAsset$map = overriddenAsset === null || overriddenAsset === void 0 ? void 0 : overriddenAsset.map(function (asset) {
-            return extractAssetLocation(asset);
-          })) !== null && _overriddenAsset$map !== void 0 ? _overriddenAsset$map : [assetInfo.location]).map(function (location) {
-            return origin.api.findAssetOnDestOrThrow(origin.chain, destChain, {
-              location: location
-            });
-          });
-          _context.n = 5;
-          return Promise.all(destAssets.map(function (asset) {
-            return isAssetSufficient(destApi, destChain, asset);
-          }));
-        case 5:
-          sufficiency = _context.v;
-          if (!sufficiency.every(Boolean)) {
-            _context.n = 6;
-            break;
-          }
-          return _context.a(2, undefined);
-        case 6:
-          ed = BigInt(nativeAsset.existentialDeposit);
-          if (!isFeeNative) {
-            _context.n = 7;
-            break;
-          }
-          return _context.a(2, ed);
-        case 7:
-          _context.n = 8;
-          return destApi.queryRuntimeApi({
-            module: 'AssetConversionApi',
-            method: 'quote_price_tokens_for_exact_tokens',
-            params: [feeLocation, nativeLocation, ed, true]
-          });
-        case 8:
-          feeAmount = _context.v;
-          return _context.a(2, feeAmount == null ? undefined : padValueBy(BigInt(feeAmount), FEE_PADDING));
-      }
-    }, _callee);
-  }));
-  return function resolveEdDeposit(_x) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
 var PINK_LOCATION = {
   parents: 1,
   interior: {
@@ -9609,7 +9644,7 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
   var hopFeeAssetToReserve = isReserveDest ? feeAssetLocalizedToDest : feeAssetLocalizedToReserve;
   // When fees are paid in a separate asset, originFee is denominated in that asset's
   // currency and must not be subtracted from the transfer amount.
-  var originFeeDeduction = feeAsset ? 0n : originFee;
+  var originFeeDeduction = feeAssetInfo && !feeAsset ? originFee : 0n;
   var destLocation = createDestination(api, version, chain, destChain, paraIdTo);
   if (chain !== 'AssetHubPolkadot' && reserveChain === undefined) {
     throw new UnsupportedOperationError('Sending local reserve assets with custom fee asset is not yet supported for this chain.');
@@ -9688,7 +9723,7 @@ var createBaseExecuteXcm = function createBaseExecuteXcm(options) {
           reserve: getChainLocation(chain, reserveChain, api._customCtx),
           xcm: [].concat(_toConsumableArray(createBuyExecution(// Decrease amount by 2 units because for some reason polkadot withdraws 2 units less
           // than requested, so we need to account for that
-          hopFeeAssetToReserve !== null && hopFeeAssetToReserve !== void 0 ? hopFeeAssetToReserve : updateAsset(assetLocalizedToReserve, amount - 2n))), _toConsumableArray(createReserveToDestXcm()))
+          hopFeeAssetToReserve !== null && hopFeeAssetToReserve !== void 0 ? hopFeeAssetToReserve : updateAsset(assetLocalizedToReserve, amount - originFeeDeduction - 2n))), _toConsumableArray(createReserveToDestXcm()))
         }
       }];
       break;
@@ -9717,6 +9752,7 @@ xcm, maxWeight) {
 var prepareCommonExecuteXcm = function prepareCommonExecuteXcm(options, assetToDeposit) {
   var depositFeeAsset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var api = options.api,
+    feeAssetInfo = options.feeAssetInfo,
     useJitWithdraw = options.useJitWithdraw,
     recipient = options.recipient,
     version = options.version,
@@ -9730,8 +9766,8 @@ var prepareCommonExecuteXcm = function prepareCommonExecuteXcm(options, assetToD
   prefix.push({
     WithdrawAsset: withdrawAssets
   });
-  if (feeAssetLocalized && !useJitWithdraw) {
-    prefix.push.apply(prefix, _toConsumableArray(createBuyExecution(feeAssetLocalized, MIN_WEIGHT)));
+  if (feeAssetInfo && !useJitWithdraw) {
+    prefix.push.apply(prefix, _toConsumableArray(createBuyExecution(feeAssetLocalized !== null && feeAssetLocalized !== void 0 ? feeAssetLocalized : assetLocalized, MIN_WEIGHT)));
   } else {
     prefix.push({
       SetFeesMode: {
@@ -9800,7 +9836,7 @@ var FEE_PADDING_PERCENTAGE$1 = 40;
 var handleExecuteTransfer = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
     var _dryRunResult$hops$at;
-    var api, chain, sender, paraIdTo, destChain, assetInfo, currency, feeCurrency, recipient, feeAssetInfo, version, transactOptions, checkAmount, resolvedFeeAssetInfo, destApi, edDeposit, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, hopFeeAmount, call, dryRunResult, originFee, reserveFee, destFee, xcm, weight, _t, _t2;
+    var api, chain, sender, paraIdTo, destChain, assetInfo, currency, feeCurrency, recipient, feeAssetInfo, version, transactOptions, checkAmount, resolvedFeeAssetInfo, destApi, edDeposit, internalOptions, FEE_ASSET_AMOUNT, feeAssetAmount, call, dryRunResult, originFee, reserveFee, destFee, xcm, weight, _t, _t2;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -9863,16 +9899,15 @@ var handleExecuteTransfer = /*#__PURE__*/function () {
             edDeposit: edDeposit
           }; // We mint 1000 units of feeAsset and use 100
           FEE_ASSET_AMOUNT = 100;
-          feeAssetAmount = feeAssetInfo ? parseUnits(FEE_ASSET_AMOUNT.toString(), feeAssetInfo.decimals) : MIN_FEE;
-          hopFeeAmount = resolvedFeeAssetInfo ? feeAssetAmount : MIN_FEE;
+          feeAssetAmount = resolvedFeeAssetInfo ? parseUnits(FEE_ASSET_AMOUNT.toString(), resolvedFeeAssetInfo.decimals) : MIN_FEE;
           _t = createExecuteCall;
           _t2 = chain;
           _context.n = 6;
           return createDirectExecuteXcm(_objectSpread2(_objectSpread2({}, internalOptions), {}, {
             fees: {
               originFee: feeAssetAmount,
-              reserveFee: hopFeeAmount,
-              destFee: hopFeeAmount
+              reserveFee: feeAssetAmount,
+              destFee: feeAssetAmount
             }
           }));
         case 6:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-core",
-  "version": "14.5.1",
+  "version": "14.5.2",
   "description": "SDK core for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -23,9 +23,9 @@
   ],
   "dependencies": {
     "@noble/hashes": "^2.4.0",
-    "@paraspell/assets": "14.5.1",
-    "@paraspell/pallets": "14.5.1",
-    "@paraspell/sdk-common": "14.5.1",
+    "@paraspell/assets": "14.5.2",
+    "@paraspell/pallets": "14.5.2",
+    "@paraspell/sdk-common": "14.5.2",
     "@scure/base": "^2.4.0",
     "viem": "^2.57.13"
   },