@paraspell/sdk 11.8.1 → 11.8.3

package/dist/index.cjs

@@ -1508,12 +1508,12 @@ var PapiApi = /*#__PURE__*/function () {
               executionFee = _context20.v;
               nativeAsset = sdkCore.findNativeAssetInfoOrThrow(chain);
               hasLocation = feeAsset ? Boolean(feeAsset.location) : Boolean(nativeAsset === null || nativeAsset === void 0 ? void 0 : nativeAsset.location);
-              if (!(sdkCore.hasXcmPaymentApiSupport(chain) && result.value.local_xcm && hasLocation && !sdkCore.isSystemChain(chain))) {
+              if (!(sdkCore.hasXcmPaymentApiSupport(chain) && result.value.local_xcm && hasLocation && feeAsset)) {
                 _context20.n = 11;
                 break;
               }
               _context20.n = 10;
-              return this.getXcmPaymentApiFee(chain, result.value.local_xcm, feeAsset !== null && feeAsset !== void 0 ? feeAsset : nativeAsset);
+              return this.getXcmPaymentApiFee(chain, result.value.local_xcm, forwardedXcms, feeAsset !== null && feeAsset !== void 0 ? feeAsset : nativeAsset);
             case 10:
               xcmFee = _context20.v;
               if (!(typeof xcmFee === 'bigint')) {
@@ -1576,36 +1576,88 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(chain, xcm, asset) {
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(chain, localXcm, forwardedXcm, asset) {
+        var _deliveryFeeRes$value, _deliveryFeeRes$value2;
         var transformXcm,
+          transformedXcm,
           weight,
-          localizedLocation,
-          transformedLocation,
-          feeResult,
-          _args22 = arguments;
+          assetLocalizedLoc,
+          transformedAssetLoc,
+          execFeeRes,
+          deliveryFeeRes,
+          deliveryFeeResolved,
+          nativeAsset,
+          deliveryFee,
+          res,
+          _args22 = arguments,
+          _t5,
+          _t6;
         return _regenerator().w(function (_context22) {
-          while (1) switch (_context22.n) {
+          while (1) switch (_context22.p = _context22.n) {
             case 0:
-              transformXcm = _args22.length > 3 && _args22[3] !== undefined ? _args22[3] : false;
+              transformXcm = _args22.length > 4 && _args22[4] !== undefined ? _args22[4] : false;
+              transformedXcm = transformXcm ? _transform(localXcm) : localXcm;
               _context22.n = 1;
-              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(transformXcm ? _transform(xcm) : xcm);
+              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(transformedXcm);
             case 1:
               weight = _context22.v;
               sdkCore.assertHasLocation(asset);
-              localizedLocation = chain.startsWith('AssetHub') || sdkCore.isRelayChain(chain) ? sdkCore.localizeLocation(chain, asset.location) : asset.location;
-              transformedLocation = _transform(localizedLocation);
+              assetLocalizedLoc = sdkCore.localizeLocation(chain, asset.location);
+              transformedAssetLoc = _transform(assetLocalizedLoc);
               _context22.n = 2;
               return this.api.getUnsafeApi().apis.XcmPaymentApi.query_weight_to_asset_fee(weight.value, {
                 type: sdkCore.Version.V4,
-                value: transformedLocation
+                value: transformedAssetLoc
               });
             case 2:
-              feeResult = _context22.v;
-              return _context22.a(2, feeResult.value);
+              execFeeRes = _context22.v;
+              if (!(forwardedXcm.length > 0)) {
+                _context22.n = 4;
+                break;
+              }
+              _context22.n = 3;
+              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_delivery_fees(forwardedXcm[0], forwardedXcm[1][0]);
+            case 3:
+              _t5 = _context22.v;
+              _context22.n = 5;
+              break;
+            case 4:
+              _t5 = undefined;
+            case 5:
+              deliveryFeeRes = _t5;
+              deliveryFeeResolved = (deliveryFeeRes === null || deliveryFeeRes === void 0 || (_deliveryFeeRes$value = deliveryFeeRes.value) === null || _deliveryFeeRes$value === void 0 ? void 0 : _deliveryFeeRes$value.value.length) > 0 ? deliveryFeeRes === null || deliveryFeeRes === void 0 || (_deliveryFeeRes$value2 = deliveryFeeRes.value) === null || _deliveryFeeRes$value2 === void 0 ? void 0 : _deliveryFeeRes$value2.value[0].fun.value : 0n;
+              nativeAsset = sdkCore.findNativeAssetInfoOrThrow(chain);
+              if (!sdkCore.isAssetXcEqual(asset, nativeAsset)) {
+                _context22.n = 6;
+                break;
+              }
+              deliveryFee = deliveryFeeResolved;
+              _context22.n = 9;
+              break;
+            case 6:
+              _context22.p = 6;
+              sdkCore.assertHasLocation(nativeAsset);
+              _context22.n = 7;
+              return this.quoteAhPrice(sdkCore.localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
+            case 7:
+              res = _context22.v;
+              deliveryFee = res !== null && res !== void 0 ? res : 0n;
+              _context22.n = 9;
+              break;
+            case 8:
+              _context22.p = 8;
+              _t6 = _context22.v;
+              if (_t6 instanceof Error && /Runtime entry RuntimeCall\(.+\) not found/.test(_t6.message)) {
+                deliveryFee = 0n;
+              } else {
+                deliveryFee = 0n;
+              }
+            case 9:
+              return _context22.a(2, execFeeRes.value + deliveryFee);
           }
-        }, _callee22, this);
+        }, _callee22, this, [[6, 8]]);
       }));
-      function getXcmPaymentApiFee(_x38, _x39, _x40) {
+      function getXcmPaymentApiFee(_x38, _x39, _x40, _x41) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1615,11 +1667,11 @@ var PapiApi = /*#__PURE__*/function () {
     value: function () {
       var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee23(_ref8) {
         var _ref9, _processAssetsDeposit, _ref0, _ref1, _ref10, _ref11, _ref12;
-        var originLocation, xcm, chain, origin, asset, tx, feeAsset, originFee, amount, supportsDryRunApi, transformedOriginLocation, result, symbol, isSuccess, failureReason, actualWeight, weight, forwardedXcms, destParaId, txMethod, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, fee, processedFee;
+        var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, supportsDryRunApi, transformedOriginLocation, result, symbol, isSuccess, failureReason, actualWeight, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, fee, processedFee;
         return _regenerator().w(function (_context23) {
           while (1) switch (_context23.n) {
             case 0:
-              originLocation = _ref8.originLocation, xcm = _ref8.xcm, chain = _ref8.chain, origin = _ref8.origin, asset = _ref8.asset, tx = _ref8.tx, feeAsset = _ref8.feeAsset, originFee = _ref8.originFee, amount = _ref8.amount;
+              originLocation = _ref8.originLocation, xcm = _ref8.xcm, chain = _ref8.chain, origin = _ref8.origin, asset = _ref8.asset, feeAsset = _ref8.feeAsset, originFee = _ref8.originFee, amount = _ref8.amount;
               supportsDryRunApi = sdkCore.getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context23.n = 1;
@@ -1653,16 +1705,12 @@ var PapiApi = /*#__PURE__*/function () {
               } : undefined;
               forwardedXcms = result.value.forwarded_xcms.length > 0 ? result.value.forwarded_xcms[0] : [];
               destParaId = forwardedXcms.length === 0 ? undefined : forwardedXcms[0].value.interior.type === 'Here' ? 0 : forwardedXcms[0].value.interior.value.value;
-              txMethod = this.getMethod(tx);
-              if (!(sdkCore.hasXcmPaymentApiSupport(chain) && asset && (
-              // Do not use XcmPaymentApi if method is `execute` on AssetHub or Polkadot
-              // as fee calculation would be incorrect
-              txMethod !== 'execute' || chain !== 'AssetHubPolkadot' && chain !== 'Polkadot'))) {
+              if (!(sdkCore.hasXcmPaymentApiSupport(chain) && asset)) {
                 _context23.n = 5;
                 break;
               }
               _context23.n = 4;
-              return this.getXcmPaymentApiFee(chain, xcm, asset);
+              return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset);
             case 4:
               _fee = _context23.v;
               if (!(typeof _fee === 'bigint')) {
@@ -1746,7 +1794,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee23, this);
       }));
-      function getDryRunXcm(_x41) {
+      function getDryRunXcm(_x42) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { InvalidParameterError, isConfig, BatchMode, getChainProviders, MissingChainApiError, ChainNotSupportedError, createChainClient as createChainClient$1, Parents, Version, getChain, isForeignAsset, assertHasId, computeFeeFromDryRun, findNativeAssetInfoOrThrow, hasXcmPaymentApiSupport, isSystemChain, replaceBigInt, getAssetsObject, wrapTxBypass, assertHasLocation, localizeLocation, isRelayChain, padFeeBy, isAssetEqual, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, getParaEthTransferFees as getParaEthTransferFees$1, getBridgeStatus as getBridgeStatus$1, getXcmFee as getXcmFee$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1 } from '@paraspell/sdk-core';
+import { InvalidParameterError, isConfig, BatchMode, getChainProviders, MissingChainApiError, ChainNotSupportedError, createChainClient as createChainClient$1, Parents, Version, getChain, isForeignAsset, assertHasId, computeFeeFromDryRun, findNativeAssetInfoOrThrow, hasXcmPaymentApiSupport, replaceBigInt, getAssetsObject, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, padFeeBy, isRelayChain, isAssetEqual, getBalanceNative as getBalanceNative$1, getBalanceForeign as getBalanceForeign$1, getAssetBalance as getAssetBalance$1, claimAssets as claimAssets$1, getOriginFeeDetails as getOriginFeeDetails$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, transferMoonbeamEvm, validateAddress, transferMoonbeamToEth, Builder as Builder$1, getParaEthTransferFees as getParaEthTransferFees$1, getBridgeStatus as getBridgeStatus$1, getXcmFee as getXcmFee$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1, getOriginXcmFee as getOriginXcmFee$1, handleSwapExecuteTransfer as handleSwapExecuteTransfer$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { blake2b } from '@noble/hashes/blake2';
 import { bytesToHex } from '@noble/hashes/utils';
@@ -1507,12 +1507,12 @@ var PapiApi = /*#__PURE__*/function () {
               executionFee = _context20.v;
               nativeAsset = findNativeAssetInfoOrThrow(chain);
               hasLocation = feeAsset ? Boolean(feeAsset.location) : Boolean(nativeAsset === null || nativeAsset === void 0 ? void 0 : nativeAsset.location);
-              if (!(hasXcmPaymentApiSupport(chain) && result.value.local_xcm && hasLocation && !isSystemChain(chain))) {
+              if (!(hasXcmPaymentApiSupport(chain) && result.value.local_xcm && hasLocation && feeAsset)) {
                 _context20.n = 11;
                 break;
               }
               _context20.n = 10;
-              return this.getXcmPaymentApiFee(chain, result.value.local_xcm, feeAsset !== null && feeAsset !== void 0 ? feeAsset : nativeAsset);
+              return this.getXcmPaymentApiFee(chain, result.value.local_xcm, forwardedXcms, feeAsset !== null && feeAsset !== void 0 ? feeAsset : nativeAsset);
             case 10:
               xcmFee = _context20.v;
               if (!(typeof xcmFee === 'bigint')) {
@@ -1575,36 +1575,88 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(chain, xcm, asset) {
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(chain, localXcm, forwardedXcm, asset) {
+        var _deliveryFeeRes$value, _deliveryFeeRes$value2;
         var transformXcm,
+          transformedXcm,
           weight,
-          localizedLocation,
-          transformedLocation,
-          feeResult,
-          _args22 = arguments;
+          assetLocalizedLoc,
+          transformedAssetLoc,
+          execFeeRes,
+          deliveryFeeRes,
+          deliveryFeeResolved,
+          nativeAsset,
+          deliveryFee,
+          res,
+          _args22 = arguments,
+          _t5,
+          _t6;
         return _regenerator().w(function (_context22) {
-          while (1) switch (_context22.n) {
+          while (1) switch (_context22.p = _context22.n) {
             case 0:
-              transformXcm = _args22.length > 3 && _args22[3] !== undefined ? _args22[3] : false;
+              transformXcm = _args22.length > 4 && _args22[4] !== undefined ? _args22[4] : false;
+              transformedXcm = transformXcm ? _transform(localXcm) : localXcm;
               _context22.n = 1;
-              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(transformXcm ? _transform(xcm) : xcm);
+              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_xcm_weight(transformedXcm);
             case 1:
               weight = _context22.v;
               assertHasLocation(asset);
-              localizedLocation = chain.startsWith('AssetHub') || isRelayChain(chain) ? localizeLocation(chain, asset.location) : asset.location;
-              transformedLocation = _transform(localizedLocation);
+              assetLocalizedLoc = localizeLocation(chain, asset.location);
+              transformedAssetLoc = _transform(assetLocalizedLoc);
               _context22.n = 2;
               return this.api.getUnsafeApi().apis.XcmPaymentApi.query_weight_to_asset_fee(weight.value, {
                 type: Version.V4,
-                value: transformedLocation
+                value: transformedAssetLoc
               });
             case 2:
-              feeResult = _context22.v;
-              return _context22.a(2, feeResult.value);
+              execFeeRes = _context22.v;
+              if (!(forwardedXcm.length > 0)) {
+                _context22.n = 4;
+                break;
+              }
+              _context22.n = 3;
+              return this.api.getUnsafeApi().apis.XcmPaymentApi.query_delivery_fees(forwardedXcm[0], forwardedXcm[1][0]);
+            case 3:
+              _t5 = _context22.v;
+              _context22.n = 5;
+              break;
+            case 4:
+              _t5 = undefined;
+            case 5:
+              deliveryFeeRes = _t5;
+              deliveryFeeResolved = (deliveryFeeRes === null || deliveryFeeRes === void 0 || (_deliveryFeeRes$value = deliveryFeeRes.value) === null || _deliveryFeeRes$value === void 0 ? void 0 : _deliveryFeeRes$value.value.length) > 0 ? deliveryFeeRes === null || deliveryFeeRes === void 0 || (_deliveryFeeRes$value2 = deliveryFeeRes.value) === null || _deliveryFeeRes$value2 === void 0 ? void 0 : _deliveryFeeRes$value2.value[0].fun.value : 0n;
+              nativeAsset = findNativeAssetInfoOrThrow(chain);
+              if (!isAssetXcEqual(asset, nativeAsset)) {
+                _context22.n = 6;
+                break;
+              }
+              deliveryFee = deliveryFeeResolved;
+              _context22.n = 9;
+              break;
+            case 6:
+              _context22.p = 6;
+              assertHasLocation(nativeAsset);
+              _context22.n = 7;
+              return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
+            case 7:
+              res = _context22.v;
+              deliveryFee = res !== null && res !== void 0 ? res : 0n;
+              _context22.n = 9;
+              break;
+            case 8:
+              _context22.p = 8;
+              _t6 = _context22.v;
+              if (_t6 instanceof Error && /Runtime entry RuntimeCall\(.+\) not found/.test(_t6.message)) {
+                deliveryFee = 0n;
+              } else {
+                deliveryFee = 0n;
+              }
+            case 9:
+              return _context22.a(2, execFeeRes.value + deliveryFee);
           }
-        }, _callee22, this);
+        }, _callee22, this, [[6, 8]]);
       }));
-      function getXcmPaymentApiFee(_x38, _x39, _x40) {
+      function getXcmPaymentApiFee(_x38, _x39, _x40, _x41) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1614,11 +1666,11 @@ var PapiApi = /*#__PURE__*/function () {
     value: function () {
       var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee23(_ref8) {
         var _ref9, _processAssetsDeposit, _ref0, _ref1, _ref10, _ref11, _ref12;
-        var originLocation, xcm, chain, origin, asset, tx, feeAsset, originFee, amount, supportsDryRunApi, transformedOriginLocation, result, symbol, isSuccess, failureReason, actualWeight, weight, forwardedXcms, destParaId, txMethod, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, fee, processedFee;
+        var originLocation, xcm, chain, origin, asset, feeAsset, originFee, amount, supportsDryRunApi, transformedOriginLocation, result, symbol, isSuccess, failureReason, actualWeight, weight, forwardedXcms, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, isFeeAsset, feeAssetFeeEvent, processedAssetsAmount, feeEvent, fee, processedFee;
         return _regenerator().w(function (_context23) {
           while (1) switch (_context23.n) {
             case 0:
-              originLocation = _ref8.originLocation, xcm = _ref8.xcm, chain = _ref8.chain, origin = _ref8.origin, asset = _ref8.asset, tx = _ref8.tx, feeAsset = _ref8.feeAsset, originFee = _ref8.originFee, amount = _ref8.amount;
+              originLocation = _ref8.originLocation, xcm = _ref8.xcm, chain = _ref8.chain, origin = _ref8.origin, asset = _ref8.asset, feeAsset = _ref8.feeAsset, originFee = _ref8.originFee, amount = _ref8.amount;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context23.n = 1;
@@ -1652,16 +1704,12 @@ var PapiApi = /*#__PURE__*/function () {
               } : undefined;
               forwardedXcms = result.value.forwarded_xcms.length > 0 ? result.value.forwarded_xcms[0] : [];
               destParaId = forwardedXcms.length === 0 ? undefined : forwardedXcms[0].value.interior.type === 'Here' ? 0 : forwardedXcms[0].value.interior.value.value;
-              txMethod = this.getMethod(tx);
-              if (!(hasXcmPaymentApiSupport(chain) && asset && (
-              // Do not use XcmPaymentApi if method is `execute` on AssetHub or Polkadot
-              // as fee calculation would be incorrect
-              txMethod !== 'execute' || chain !== 'AssetHubPolkadot' && chain !== 'Polkadot'))) {
+              if (!(hasXcmPaymentApiSupport(chain) && asset)) {
                 _context23.n = 5;
                 break;
               }
               _context23.n = 4;
-              return this.getXcmPaymentApiFee(chain, xcm, asset);
+              return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset);
             case 4:
               _fee = _context23.v;
               if (!(typeof _fee === 'bigint')) {
@@ -1745,7 +1793,7 @@ var PapiApi = /*#__PURE__*/function () {
           }
         }, _callee23, this);
       }));
-      function getDryRunXcm(_x41) {
+      function getDryRunXcm(_x42) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk",
-  "version": "11.8.1",
+  "version": "11.8.3",
   "description": "SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@noble/hashes": "^1.8.0",
     "viem": "^2.36.0",
-    "@paraspell/sdk-core": "11.8.1"
+    "@paraspell/sdk-core": "11.8.3"
   },
   "peerDependencies": {
     "polkadot-api": ">= 1.17.2 < 2"