@paraspell/sdk-core 10.5.1 → 10.5.2

package/dist/index.cjs

@@ -4559,8 +4559,8 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
 }();
 
 var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee, feeAsset) {
-    var existentialDeposit, nativeBalance;
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, senderAddress, feeNative, currency, asset, feeAsset) {
+    var edNative, balanceNative, isNativeAssetToOrigin, isNativeAssetToDest, isSufficientNative, balanceAsset, edAsset, isSufficientAsset;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -4570,30 +4570,57 @@ var isSufficientOrigin = /*#__PURE__*/function () {
           }
           return _context.a(2, undefined);
         case 1:
-          existentialDeposit = assets.getExistentialDepositOrThrow(node);
+          edNative = assets.getExistentialDepositOrThrow(origin);
           _context.n = 2;
           return getBalanceNativeInternal({
             api: api,
-            node: node,
+            node: origin,
             address: senderAddress
           });
         case 2:
-          nativeBalance = _context.v;
-          return _context.a(2, nativeBalance - existentialDeposit - fee > 0n);
+          balanceNative = _context.v;
+          isNativeAssetToOrigin = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(origin));
+          isNativeAssetToDest = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(destination));
+          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
+            _context.n = 3;
+            break;
+          }
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+        case 3:
+          if (isNativeAssetToOrigin) {
+            _context.n = 5;
+            break;
+          }
+          isSufficientNative = balanceNative - edNative - feeNative > 0n;
+          _context.n = 4;
+          return getAssetBalance({
+            api: api,
+            node: origin,
+            address: senderAddress,
+            currency: currency
+          });
+        case 4:
+          balanceAsset = _context.v;
+          edAsset = assets.getExistentialDepositOrThrow(origin, currency);
+          isSufficientAsset = balanceAsset - edAsset > 0n;
+          return _context.a(2, isSufficientNative && isSufficientAsset);
+        case 5:
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
       }
     }, _callee);
   }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5) {
+  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
     return _ref.apply(this, arguments);
   };
 }();
 var isSufficientDestination = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset) {
-    var existentialDeposit, nativeBalance;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset, feeNative) {
+    var isNativeAsset, existentialDeposit, nativeBalance;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          if (!(assets.normalizeSymbol(asset.symbol) !== assets.normalizeSymbol(assets.getNativeAssetSymbol(destination)))) {
+          isNativeAsset = assets.isSymbolMatch(asset.symbol, assets.getNativeAssetSymbol(destination));
+          if (isNativeAsset) {
             _context2.n = 1;
             break;
           }
@@ -4608,11 +4635,11 @@ var isSufficientDestination = /*#__PURE__*/function () {
           });
         case 2:
           nativeBalance = _context2.v;
-          return _context2.a(2, nativeBalance + amount - existentialDeposit > 0n);
+          return _context2.a(2, nativeBalance + amount - existentialDeposit - feeNative > 0n);
       }
     }, _callee2);
   }));
-  return function isSufficientDestination(_x6, _x7, _x8, _x9, _x0) {
+  return function isSufficientDestination(_x9, _x0, _x1, _x10, _x11, _x12) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -4630,7 +4657,7 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
 };
 var getDestXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, origin, hopNode, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, sufficient, dryRunResult, _sufficient, fee, newForwardedXcms, destParaId, _t2, _t3, _t4, _t5, _t6;
+    var api, origin, hopNode, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, _sufficient, fee, newForwardedXcms, destParaId;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -4700,18 +4727,17 @@ var getDestXcmFee = /*#__PURE__*/function () {
             break;
           }
           _context2.n = 1;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset);
+          return calcPaymentInfoFee();
         case 1:
-          sufficient = _context2.v;
+          _fee = _context2.v;
           _context2.n = 2;
-          return calcPaymentInfoFee();
+          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
         case 2:
-          _t2 = _context2.v;
-          _t3 = sufficient;
+          sufficient = _context2.v;
           return _context2.a(2, {
-            fee: _t2,
+            fee: _fee,
             feeType: 'paymentInfo',
-            sufficient: _t3
+            sufficient: sufficient
           });
         case 3:
           _context2.n = 4;
@@ -4740,20 +4766,18 @@ var getDestXcmFee = /*#__PURE__*/function () {
           });
         case 5:
           _context2.n = 6;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset);
+          return calcPaymentInfoFee();
         case 6:
-          _sufficient = _context2.v;
+          _fee2 = _context2.v;
           _context2.n = 7;
-          return calcPaymentInfoFee();
+          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee2);
         case 7:
-          _t4 = _context2.v;
-          _t5 = dryRunResult.failureReason;
-          _t6 = _sufficient;
+          _sufficient = _context2.v;
           return _context2.a(2, {
-            fee: _t4,
+            fee: _fee2,
             feeType: 'paymentInfo',
-            dryRunError: _t5,
-            sufficient: _t6
+            dryRunError: dryRunResult.failureReason,
+            sufficient: _sufficient
           });
         case 8:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
@@ -5014,11 +5038,12 @@ var dryRunOrigin = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, asset, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
+    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, asset, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
     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, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency;
+          asset = assets.findAssetForNodeOrThrow(origin, currency, destination);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
@@ -5034,7 +5059,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           rawFee = _context.v;
           paddedFee = padFee(rawFee, origin, destination, 'origin');
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, paddedFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, paddedFee, currency, asset, resolvedFeeAsset);
         case 3:
           sufficient = _context.v;
           return _context.a(2, {
@@ -5044,7 +5069,6 @@ var getOriginXcmFee = /*#__PURE__*/function () {
             sufficient: sufficient
           });
         case 4:
-          asset = assets.findAssetForNodeOrThrow(origin, currency, destination);
           _context.n = 5;
           return api.getDryRunCall({
             tx: tx,
@@ -5073,7 +5097,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _rawFee = _context.v;
           _paddedFee = padFee(_rawFee, origin, destination, 'origin');
           _context.n = 8;
-          return isSufficientOrigin(api, origin, senderAddress, _paddedFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, _paddedFee, currency, asset, resolvedFeeAsset);
         case 8:
           _sufficient = _context.v;
           return _context.a(2, {
@@ -5260,11 +5284,12 @@ var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled
 
 var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, currency, senderAddress, feeAsset, rawOriginFee, originFee, resolvedFeeAsset, sufficient;
+    var api, tx, origin, destination, currency, senderAddress, feeAsset, originAsset, rawOriginFee, originFee, resolvedFeeAsset, sufficient;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, currency = _ref.currency, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset;
+          originAsset = assets.findAssetForNodeOrThrow(origin, currency, destination);
           _context.n = 1;
           return api.calculateTransactionFee(tx, senderAddress);
         case 1:
@@ -5272,7 +5297,7 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
           originFee = padFee(rawOriginFee, origin, destination, 'origin');
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 2;
-          return isSufficientOrigin(api, origin, senderAddress, originFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, originFee, currency, originAsset, resolvedFeeAsset);
         case 2:
           sufficient = _context.v;
           return _context.a(2, {
@@ -5629,11 +5654,11 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
           }
           _ref2 = origin === 'AssetHubPolkadot' ? [BRIDGE_FEE_DOT, BRIDGE_FEE_KSM] : [BRIDGE_FEE_KSM, BRIDGE_FEE_DOT], _ref3 = _slicedToArray(_ref2, 2), fixedOriginFee = _ref3[0], fixedDestinationFee = _ref3[1];
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, fixedOriginFee, currency, originAsset, resolvedFeeAsset);
         case 3:
           originSufficient = _context.v;
           _context.n = 4;
-          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset);
+          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset, fixedDestinationFee);
         case 4:
           _destinationSufficient = _context.v;
           return _context.a(2, {
@@ -5676,7 +5701,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
         case 9:
           destinationFee = _t;
           _context.n = 10;
-          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset);
+          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset, destinationFee);
         case 10:
           destinationSufficient = _context.v;
           destFeeDetails = {

package/dist/index.d.ts

@@ -354,7 +354,7 @@ type TGetTransferableAmountOptionsBase<TRes> = {
     /**
      * The currency to query.
      */
-    currency: TCurrencyCore;
+    currency: WithAmount<TCurrencyCore>;
     /**
      * The transaction to calculate the fee for
      */
@@ -855,7 +855,7 @@ type TGetOriginXcmFeeBaseOptions<TRes> = {
     origin: TNodeDotKsmWithRelayChains;
     destination: TNodeWithRelayChains;
     senderAddress: string;
-    currency: TCurrencyInput;
+    currency: WithAmount<TCurrencyCore>;
     feeAsset?: TCurrencyInput;
     disableFallback: boolean;
 };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { blake2b } from '@noble/hashes/blake2';
-import { isNodeEvm, getAssetsObject, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, isForeignAsset, InvalidCurrencyError, findAssetForNodeOrThrow, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAsset, isTMultiAsset, getExistentialDeposit, getExistentialDepositOrThrow, isAssetEqual, findAssetOnDestOrThrow, normalizeSymbol, hasDryRunSupport, hasSupportForAsset, extractMultiAssetLoc, isSymbolSpecifier, normalizeMultiLocation, getAssetId } from '@paraspell/assets';
+import { isNodeEvm, getAssetsObject, getNativeAssetSymbol, getOtherAssets, getRelayChainSymbol, isForeignAsset, InvalidCurrencyError, findAssetForNodeOrThrow, isOverrideMultiLocationSpecifier, findAssetByMultiLocation, findAsset, isTMultiAsset, getExistentialDeposit, getExistentialDepositOrThrow, isAssetEqual, findAssetOnDestOrThrow, normalizeSymbol, isSymbolMatch, hasDryRunSupport, hasSupportForAsset, extractMultiAssetLoc, isSymbolSpecifier, normalizeMultiLocation, getAssetId } from '@paraspell/assets';
 export * from '@paraspell/assets';
 import { base58 } from '@scure/base';
 import { isAddress, createPublicClient, http, getContract } from 'viem';
@@ -4560,8 +4560,8 @@ var verifyEdOnDestination = /*#__PURE__*/function () {
 }();
 
 var isSufficientOrigin = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, node, senderAddress, fee, feeAsset) {
-    var existentialDeposit, nativeBalance;
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(api, origin, destination, senderAddress, feeNative, currency, asset, feeAsset) {
+    var edNative, balanceNative, isNativeAssetToOrigin, isNativeAssetToDest, isSufficientNative, balanceAsset, edAsset, isSufficientAsset;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -4571,30 +4571,57 @@ var isSufficientOrigin = /*#__PURE__*/function () {
           }
           return _context.a(2, undefined);
         case 1:
-          existentialDeposit = getExistentialDepositOrThrow(node);
+          edNative = getExistentialDepositOrThrow(origin);
           _context.n = 2;
           return getBalanceNativeInternal({
             api: api,
-            node: node,
+            node: origin,
             address: senderAddress
           });
         case 2:
-          nativeBalance = _context.v;
-          return _context.a(2, nativeBalance - existentialDeposit - fee > 0n);
+          balanceNative = _context.v;
+          isNativeAssetToOrigin = isSymbolMatch(asset.symbol, getNativeAssetSymbol(origin));
+          isNativeAssetToDest = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
+          if (!(isNativeAssetToOrigin && isNativeAssetToDest)) {
+            _context.n = 3;
+            break;
+          }
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
+        case 3:
+          if (isNativeAssetToOrigin) {
+            _context.n = 5;
+            break;
+          }
+          isSufficientNative = balanceNative - edNative - feeNative > 0n;
+          _context.n = 4;
+          return getAssetBalance({
+            api: api,
+            node: origin,
+            address: senderAddress,
+            currency: currency
+          });
+        case 4:
+          balanceAsset = _context.v;
+          edAsset = getExistentialDepositOrThrow(origin, currency);
+          isSufficientAsset = balanceAsset - edAsset > 0n;
+          return _context.a(2, isSufficientNative && isSufficientAsset);
+        case 5:
+          return _context.a(2, balanceNative - edNative - feeNative - BigInt(currency.amount) > 0n);
       }
     }, _callee);
   }));
-  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5) {
+  return function isSufficientOrigin(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
     return _ref.apply(this, arguments);
   };
 }();
 var isSufficientDestination = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset) {
-    var existentialDeposit, nativeBalance;
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(api, destination, address, amount, asset, feeNative) {
+    var isNativeAsset, existentialDeposit, nativeBalance;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          if (!(normalizeSymbol(asset.symbol) !== normalizeSymbol(getNativeAssetSymbol(destination)))) {
+          isNativeAsset = isSymbolMatch(asset.symbol, getNativeAssetSymbol(destination));
+          if (isNativeAsset) {
             _context2.n = 1;
             break;
           }
@@ -4609,11 +4636,11 @@ var isSufficientDestination = /*#__PURE__*/function () {
           });
         case 2:
           nativeBalance = _context2.v;
-          return _context2.a(2, nativeBalance + amount - existentialDeposit > 0n);
+          return _context2.a(2, nativeBalance + amount - existentialDeposit - feeNative > 0n);
       }
     }, _callee2);
   }));
-  return function isSufficientDestination(_x6, _x7, _x8, _x9, _x0) {
+  return function isSufficientDestination(_x9, _x0, _x1, _x10, _x11, _x12) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -4631,7 +4658,7 @@ var createOriginLocation = function createOriginLocation(origin, destination) {
 };
 var getDestXcmFee = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(options) {
-    var api, origin, hopNode, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, sufficient, dryRunResult, _sufficient, fee, newForwardedXcms, destParaId, _t2, _t3, _t4, _t5, _t6;
+    var api, origin, hopNode, destination, currency, forwardedXcms, asset, address, feeAsset, originFee, disableFallback, resolvedFeeAsset, calcPaymentInfoFee, _fee, sufficient, dryRunResult, _fee2, _sufficient, fee, newForwardedXcms, destParaId;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -4701,18 +4728,17 @@ var getDestXcmFee = /*#__PURE__*/function () {
             break;
           }
           _context2.n = 1;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset);
+          return calcPaymentInfoFee();
         case 1:
-          sufficient = _context2.v;
+          _fee = _context2.v;
           _context2.n = 2;
-          return calcPaymentInfoFee();
+          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee);
         case 2:
-          _t2 = _context2.v;
-          _t3 = sufficient;
+          sufficient = _context2.v;
           return _context2.a(2, {
-            fee: _t2,
+            fee: _fee,
             feeType: 'paymentInfo',
-            sufficient: _t3
+            sufficient: sufficient
           });
         case 3:
           _context2.n = 4;
@@ -4741,20 +4767,18 @@ var getDestXcmFee = /*#__PURE__*/function () {
           });
         case 5:
           _context2.n = 6;
-          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset);
+          return calcPaymentInfoFee();
         case 6:
-          _sufficient = _context2.v;
+          _fee2 = _context2.v;
           _context2.n = 7;
-          return calcPaymentInfoFee();
+          return isSufficientDestination(api, destination, address, BigInt(currency.amount), asset, _fee2);
         case 7:
-          _t4 = _context2.v;
-          _t5 = dryRunResult.failureReason;
-          _t6 = _sufficient;
+          _sufficient = _context2.v;
           return _context2.a(2, {
-            fee: _t4,
+            fee: _fee2,
             feeType: 'paymentInfo',
-            dryRunError: _t5,
-            sufficient: _t6
+            dryRunError: dryRunResult.failureReason,
+            sufficient: _sufficient
           });
         case 8:
           fee = dryRunResult.fee, newForwardedXcms = dryRunResult.forwardedXcms, destParaId = dryRunResult.destParaId;
@@ -5015,11 +5039,12 @@ var dryRunOrigin = /*#__PURE__*/function () {
 
 var getOriginXcmFee = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, asset, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
+    var api, tx, origin, destination, senderAddress, disableFallback, feeAsset, currency, asset, resolvedFeeAsset, nativeAssetSymbol, rawFee, paddedFee, sufficient, dryRunResult, _rawFee, _paddedFee, _sufficient, fee, forwardedXcms, destParaId, weight, currencySymbol;
     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, disableFallback = _ref.disableFallback, feeAsset = _ref.feeAsset, currency = _ref.currency;
+          asset = findAssetForNodeOrThrow(origin, currency, destination);
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 1;
           return api.init(origin, DRY_RUN_CLIENT_TIMEOUT_MS);
@@ -5035,7 +5060,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           rawFee = _context.v;
           paddedFee = padFee(rawFee, origin, destination, 'origin');
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, paddedFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, paddedFee, currency, asset, resolvedFeeAsset);
         case 3:
           sufficient = _context.v;
           return _context.a(2, {
@@ -5045,7 +5070,6 @@ var getOriginXcmFee = /*#__PURE__*/function () {
             sufficient: sufficient
           });
         case 4:
-          asset = findAssetForNodeOrThrow(origin, currency, destination);
           _context.n = 5;
           return api.getDryRunCall({
             tx: tx,
@@ -5074,7 +5098,7 @@ var getOriginXcmFee = /*#__PURE__*/function () {
           _rawFee = _context.v;
           _paddedFee = padFee(_rawFee, origin, destination, 'origin');
           _context.n = 8;
-          return isSufficientOrigin(api, origin, senderAddress, _paddedFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, _paddedFee, currency, asset, resolvedFeeAsset);
         case 8:
           _sufficient = _context.v;
           return _context.a(2, {
@@ -5261,11 +5285,12 @@ var validateAssetSpecifiers = function validateAssetSpecifiers(assetCheckEnabled
 
 var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
-    var api, tx, origin, destination, currency, senderAddress, feeAsset, rawOriginFee, originFee, resolvedFeeAsset, sufficient;
+    var api, tx, origin, destination, currency, senderAddress, feeAsset, originAsset, rawOriginFee, originFee, resolvedFeeAsset, sufficient;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           api = _ref.api, tx = _ref.tx, origin = _ref.origin, destination = _ref.destination, currency = _ref.currency, senderAddress = _ref.senderAddress, feeAsset = _ref.feeAsset;
+          originAsset = findAssetForNodeOrThrow(origin, currency, destination);
           _context.n = 1;
           return api.calculateTransactionFee(tx, senderAddress);
         case 1:
@@ -5273,7 +5298,7 @@ var getOriginXcmFeeEstimate = /*#__PURE__*/function () {
           originFee = padFee(rawOriginFee, origin, destination, 'origin');
           resolvedFeeAsset = feeAsset ? resolveFeeAsset(feeAsset, origin, destination, currency) : undefined;
           _context.n = 2;
-          return isSufficientOrigin(api, origin, senderAddress, originFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, originFee, currency, originAsset, resolvedFeeAsset);
         case 2:
           sufficient = _context.v;
           return _context.a(2, {
@@ -5630,11 +5655,11 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
           }
           _ref2 = origin === 'AssetHubPolkadot' ? [BRIDGE_FEE_DOT, BRIDGE_FEE_KSM] : [BRIDGE_FEE_KSM, BRIDGE_FEE_DOT], _ref3 = _slicedToArray(_ref2, 2), fixedOriginFee = _ref3[0], fixedDestinationFee = _ref3[1];
           _context.n = 3;
-          return isSufficientOrigin(api, origin, senderAddress, fixedOriginFee, resolvedFeeAsset);
+          return isSufficientOrigin(api, origin, destination, senderAddress, fixedOriginFee, currency, originAsset, resolvedFeeAsset);
         case 3:
           originSufficient = _context.v;
           _context.n = 4;
-          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset);
+          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset, fixedDestinationFee);
         case 4:
           _destinationSufficient = _context.v;
           return _context.a(2, {
@@ -5677,7 +5702,7 @@ var getXcmFeeEstimate = /*#__PURE__*/function () {
         case 9:
           destinationFee = _t;
           _context.n = 10;
-          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset);
+          return isSufficientDestination(destApi, destination, address, BigInt(currency.amount), originAsset, destinationFee);
         case 10:
           destinationSufficient = _context.v;
           destFeeDetails = {

package/package.json

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