@paraspell/sdk-pjs 13.1.0 → 13.2.1

package/README.md

@@ -13,9 +13,6 @@
     <a href="https://github.com/paraspell/xcm-sdk/actions">
       <img alt="build" src="https://github.com/paraspell/xcm-tools/actions/workflows/ci.yml/badge.svg" />
     </a>
-    <a href="https://snyk.io/test/github/paraspell/sdk">
-      <img alt="snyk" src="https://snyk.io/test/github/paraspell/sdk/badge.svg" />
-    </a>
   </p>
   <p>Supporting every XCM Active Parachain <a href = "https://paraspell.github.io/docs/supported.html"\>[list]</p>
   <p>SDK documentation <a href = "https://paraspell.github.io/docs/" \>[here]</p>
@@ -603,7 +600,7 @@ console.log(CHAINS)
 
 - Run unit tests using `pnpm test`
 
-- Run end-to-end tests using `pnpm test:e2e`
+- Run end-to-end tests (SDK+SWAP) using `pnpm test:e2e`
 
 - Run all core tests and checks using `pnpm runAll`
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { getNativeAssetSymbol, getOtherAssets, hasJunction, getJunctionValue, getEvmPrivateKeyHex, UnsupportedOperationError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, isSenderSigner, PolkadotApi, resolveChainApi, DEFAULT_TTL_MS, isExternalChain, findAssetInfoOrThrow, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, localizeLocation, addXcmVersionHeader, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, assertHasId, getParaId, RoutingResolutionError, abstractDecimals, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
+import { getNativeAssetSymbol, getOtherAssets, hasJunction, getJunctionValue, getEvmPrivateKeyHex, UnsupportedOperationError, createClientCache, MAX_CLIENTS, EXTENSION_MS, createClientPoolHelpers, BatchMode, isConfig, findNativeAssetInfoOrThrow, getChainProviders, isSenderSigner, PolkadotApi, resolveChainApi, DEFAULT_TTL_MS, isExternalChain, findAssetInfoOrThrow, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, normalizeLocation, localizeLocation, createAssetId, addXcmVersionHeader, isAssetXcEqual, RELAY_LOCATION, getRelayChainOf, SubmitTransactionError, createChainClient as createChainClient$1, getBalance as getBalance$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, assertHasId, getParaId, RoutingResolutionError, abstractDecimals, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getBridgeStatus as getBridgeStatus$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
 export * from '@paraspell/sdk-core';
 import { Keyring, WsProvider, ApiPromise } from '@polkadot/api';
 import { u8aConcat, compactToU8a, u8aEq, isHex, u8aToHex, hexToU8a, stringToU8a } from '@polkadot/util';
@@ -516,8 +516,8 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
               this._ttlMs = clientTtlMs;
               this._chain = chain;
               _context3.n = 2;
-              return resolveChainApi(this._config, chain, function (wsUrl, c) {
-                return _this2.createApiInstance(wsUrl, c);
+              return resolveChainApi(this._config, chain, function (wsUrl) {
+                return leaseClient(wsUrl, _this2._ttlMs);
               });
             case 2:
               this._api = _context3.v;
@@ -534,7 +534,7 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "createApiInstance",
     value: function createApiInstance(wsUrl, _chain) {
-      return leaseClient(wsUrl, this._ttlMs, false);
+      return leaseClient(wsUrl, this._ttlMs);
     }
   }, {
     key: "accountToHex",
@@ -550,8 +550,8 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
       return decodeAddress(address);
     }
   }, {
-    key: "convertToPjsCall",
-    value: function convertToPjsCall(_ref3) {
+    key: "convertToPjsTxCall",
+    value: function convertToPjsTxCall(_ref3) {
       var module = _ref3.module,
         method = _ref3.method;
       return {
@@ -559,15 +559,25 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
         method: snakeToCamel(method)
       };
     }
+  }, {
+    key: "convertToPjsStateQuery",
+    value: function convertToPjsStateQuery(_ref4) {
+      var module = _ref4.module,
+        method = _ref4.method;
+      return {
+        module: lowercaseFirstLetter(module),
+        method: lowercaseFirstLetter(method)
+      };
+    }
   }, {
     key: "deserializeExtrinsics",
     value: function deserializeExtrinsics(serialized) {
       var _this$api$tx$module;
       var params = serialized.params;
       var values = Object.values(params);
-      var _this$convertToPjsCal = this.convertToPjsCall(serialized),
-        module = _this$convertToPjsCal.module,
-        method = _this$convertToPjsCal.method;
+      var _this$convertToPjsTxC = this.convertToPjsTxCall(serialized),
+        module = _this$convertToPjsTxC.module,
+        method = _this$convertToPjsTxC.method;
       return (_this$api$tx$module = this.api.tx[module])[method].apply(_this$api$tx$module, values);
     }
   }, {
@@ -580,12 +590,12 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
     value: function () {
       var _queryState = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(serialized) {
         var _this$api$query$modul;
-        var params, _this$convertToPjsCal2, module, method, res;
+        var params, _this$convertToPjsSta, module, method, res;
         return _regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
             case 0:
               params = serialized.params;
-              _this$convertToPjsCal2 = this.convertToPjsCall(serialized), module = _this$convertToPjsCal2.module, method = _this$convertToPjsCal2.method;
+              _this$convertToPjsSta = this.convertToPjsStateQuery(serialized), module = _this$convertToPjsSta.module, method = _this$convertToPjsSta.method;
               _context4.n = 1;
               return (_this$api$query$modul = this.api.query[module])[method].apply(_this$api$query$modul, _toConsumableArray(params));
             case 1:
@@ -601,14 +611,28 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
     }()
   }, {
     key: "queryRuntimeApi",
-    value: function queryRuntimeApi(serialized) {
-      var _this$api$call$module;
-      var params = serialized.params;
-      var _this$convertToPjsCal3 = this.convertToPjsCall(serialized),
-        module = _this$convertToPjsCal3.module,
-        method = _this$convertToPjsCal3.method;
-      return (_this$api$call$module = this.api.call[module])[method].apply(_this$api$call$module, _toConsumableArray(params));
-    }
+    value: function () {
+      var _queryRuntimeApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(serialized) {
+        var _this$api$call$module;
+        var params, _this$convertToPjsTxC2, module, method, res;
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
+            case 0:
+              params = serialized.params;
+              _this$convertToPjsTxC2 = this.convertToPjsTxCall(serialized), module = _this$convertToPjsTxC2.module, method = _this$convertToPjsTxC2.method;
+              _context5.n = 1;
+              return (_this$api$call$module = this.api.call[module])[method].apply(_this$api$call$module, _toConsumableArray(params));
+            case 1:
+              res = _context5.v;
+              return _context5.a(2, res.toJSON());
+          }
+        }, _callee5, this);
+      }));
+      function queryRuntimeApi(_x5) {
+        return _queryRuntimeApi.apply(this, arguments);
+      }
+      return queryRuntimeApi;
+    }()
   }, {
     key: "callBatchMethod",
     value: function callBatchMethod(calls, mode) {
@@ -643,20 +667,20 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getPaymentInfo",
     value: function () {
-      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(tx, address) {
+      var _getPaymentInfo = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(tx, address) {
         var _yield$tx$paymentInfo, _yield$tx$paymentInfo2, proofSize, refTime, partialFee;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.n) {
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.n) {
             case 0:
-              _context5.n = 1;
+              _context6.n = 1;
               return tx.paymentInfo(address);
             case 1:
-              _yield$tx$paymentInfo = _context5.v;
+              _yield$tx$paymentInfo = _context6.v;
               _yield$tx$paymentInfo2 = _yield$tx$paymentInfo.weight;
               proofSize = _yield$tx$paymentInfo2.proofSize;
               refTime = _yield$tx$paymentInfo2.refTime;
               partialFee = _yield$tx$paymentInfo.partialFee;
-              return _context5.a(2, {
+              return _context6.a(2, {
                 weight: {
                   proofSize: proofSize.toBigInt(),
                   refTime: refTime.toBigInt()
@@ -664,9 +688,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 partialFee: partialFee.toBigInt()
               });
           }
-        }, _callee5);
+        }, _callee6);
       }));
-      function getPaymentInfo(_x5, _x6) {
+      function getPaymentInfo(_x6, _x7) {
         return _getPaymentInfo.apply(this, arguments);
       }
       return getPaymentInfo;
@@ -674,23 +698,23 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "quoteAhPrice",
     value: function () {
-      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(fromMl, toMl, amountIn) {
+      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(fromMl, toMl, amountIn) {
         var includeFee,
           quoted,
-          _args4 = arguments;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
+          _args5 = arguments;
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
             case 0:
-              includeFee = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : true;
-              _context6.n = 1;
+              includeFee = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : true;
+              _context7.n = 1;
               return this.api.call.assetConversionApi.quotePriceExactTokensForTokens(fromMl, toMl, amountIn.toString(), includeFee);
             case 1:
-              quoted = _context6.v;
-              return _context6.a(2, quoted.toJSON() !== null ? BigInt(quoted.toString()) : undefined);
+              quoted = _context7.v;
+              return _context7.a(2, quoted.toJSON() !== null ? BigInt(quoted.toString()) : undefined);
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function quoteAhPrice(_x7, _x8, _x9) {
+      function quoteAhPrice(_x8, _x9, _x0) {
         return _quoteAhPrice.apply(this, arguments);
       }
       return quoteAhPrice;
@@ -723,27 +747,27 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getFromRpc",
     value: function () {
-      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(module, method, key) {
+      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(module, method, key) {
         var rpcModule, response;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.n) {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
             case 0:
               rpcModule = this.api.rpc[module];
               if (!(!rpcModule || !rpcModule[method])) {
-                _context7.n = 1;
+                _context8.n = 1;
                 break;
               }
               throw new UnsupportedOperationError("RPC method ".concat(module, ".").concat(method, " not available"));
             case 1:
-              _context7.n = 2;
+              _context8.n = 2;
               return rpcModule[method](key);
             case 2:
-              response = _context7.v;
-              return _context7.a(2, response.toHex());
+              response = _context8.v;
+              return _context8.a(2, response.toHex());
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
-      function getFromRpc(_x0, _x1, _x10) {
+      function getFromRpc(_x1, _x10, _x11) {
         return _getFromRpc.apply(this, arguments);
       }
       return getFromRpc;
@@ -761,73 +785,73 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "createApiForChain",
     value: function () {
-      var _createApiForChain = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(chain) {
+      var _createApiForChain = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(chain) {
         var api;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.n) {
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
             case 0:
               api = new PolkadotJsApi(isConfig(this._config) ? this._config : undefined);
-              _context8.n = 1;
+              _context9.n = 1;
               return api.init(chain);
             case 1:
-              return _context8.a(2, api);
+              return _context9.a(2, api);
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function createApiForChain(_x11) {
+      function createApiForChain(_x12) {
         return _createApiForChain.apply(this, arguments);
       }
       return createApiForChain;
     }()
   }, {
     key: "resolveDefaultFeeAsset",
-    value: function resolveDefaultFeeAsset(_ref4) {
-      var chain = _ref4.chain,
-        feeAsset = _ref4.feeAsset;
+    value: function resolveDefaultFeeAsset(_ref5) {
+      var chain = _ref5.chain,
+        feeAsset = _ref5.feeAsset;
       return feeAsset !== null && feeAsset !== void 0 ? feeAsset : findNativeAssetInfoOrThrow(chain);
     }
   }, {
     key: "resolveFeeAsset",
     value: function () {
-      var _resolveFeeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(options) {
+      var _resolveFeeAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(options) {
         var chain, address, response, assetId;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.n) {
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.n) {
             case 0:
               chain = options.chain, address = options.address;
               if (chain.startsWith('Hydration')) {
-                _context9.n = 1;
+                _context0.n = 1;
                 break;
               }
-              return _context9.a(2, {
+              return _context0.a(2, {
                 isCustomAsset: false,
                 asset: this.resolveDefaultFeeAsset(options)
               });
             case 1:
-              _context9.n = 2;
+              _context0.n = 2;
               return this.api.query.multiTransactionPayment.accountCurrencyMap(address);
             case 2:
-              response = _context9.v;
+              response = _context0.v;
               assetId = response.toJSON();
               if (!(assetId === null)) {
-                _context9.n = 3;
+                _context0.n = 3;
                 break;
               }
-              return _context9.a(2, {
+              return _context0.a(2, {
                 isCustomAsset: false,
                 asset: this.resolveDefaultFeeAsset(options)
               });
             case 3:
-              return _context9.a(2, {
+              return _context0.a(2, {
                 isCustomAsset: true,
                 asset: findAssetInfoOrThrow(chain, {
                   id: assetId
                 })
               });
           }
-        }, _callee9, this);
+        }, _callee0, this);
       }));
-      function resolveFeeAsset(_x12) {
+      function resolveFeeAsset(_x13) {
         return _resolveFeeAsset.apply(this, arguments);
       }
       return resolveFeeAsset;
@@ -835,16 +859,16 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(options) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(options) {
         var _this3 = this;
         var tx, address, feeAsset, chain, destination, version, _options$useRootOrigi, useRootOrigin, bypassOptions, supportsDryRunApi, basePayload, resolvedTx, resolvedFeeAsset, performDryRunCall, findFailingEventInResult, getExecutionSuccessFromResult, extractFailureReasonFromResult, response, resultHuman, resultJson, isSuccess, failureErr, shouldRetryWithVersion, msg, _msg, forwardedXcms, actualWeight, weight, destParaId, overriddenWeight, xcmFee, _yield$this$getPaymen, executionFee, fee, _t, _t2, _t3, _t4;
-        return _regenerator().w(function (_context1) {
-          while (1) switch (_context1.p = _context1.n) {
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.p = _context10.n) {
             case 0:
               tx = options.tx, address = options.address, feeAsset = options.feeAsset, chain = options.chain, destination = options.destination, version = options.version, _options$useRootOrigi = options.useRootOrigin, useRootOrigin = _options$useRootOrigi === void 0 ? false : _options$useRootOrigi, bypassOptions = options.bypassOptions;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context1.n = 1;
+                _context10.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
@@ -859,39 +883,39 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 }
               };
               if (!useRootOrigin) {
-                _context1.n = 3;
+                _context10.n = 3;
                 break;
               }
-              _context1.n = 2;
+              _context10.n = 2;
               return wrapTxBypass(_objectSpread2(_objectSpread2({}, options), {}, {
                 api: this
               }), bypassOptions);
             case 2:
-              _t = _context1.v;
-              _context1.n = 4;
+              _t = _context10.v;
+              _context10.n = 4;
               break;
             case 3:
               _t = tx;
             case 4:
               resolvedTx = _t;
-              _context1.n = 5;
+              _context10.n = 5;
               return this.resolveFeeAsset(options);
             case 5:
-              resolvedFeeAsset = _context1.v;
+              resolvedFeeAsset = _context10.v;
               performDryRunCall = /*#__PURE__*/function () {
-                var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(includeVersion) {
+                var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(includeVersion) {
                   var _this3$api$call$dryRu;
                   var versionNum;
-                  return _regenerator().w(function (_context0) {
-                    while (1) switch (_context0.n) {
+                  return _regenerator().w(function (_context1) {
+                    while (1) switch (_context1.n) {
                       case 0:
                         versionNum = Number(version.charAt(1));
-                        return _context0.a(2, (_this3$api$call$dryRu = _this3.api.call.dryRunApi).dryRunCall.apply(_this3$api$call$dryRu, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [versionNum] : []))));
+                        return _context1.a(2, (_this3$api$call$dryRu = _this3.api.call.dryRunApi).dryRunCall.apply(_this3$api$call$dryRu, [basePayload, resolvedTx].concat(_toConsumableArray(includeVersion ? [versionNum] : []))));
                     }
-                  }, _callee0);
+                  }, _callee1);
                 }));
-                return function performDryRunCall(_x14) {
-                  return _ref5.apply(this, arguments);
+                return function performDryRunCall(_x15) {
+                  return _ref6.apply(this, arguments);
                 };
               }();
               findFailingEventInResult = function findFailingEventInResult(resultHuman) {
@@ -907,7 +931,7 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 return Boolean((resultHuman === null || resultHuman === void 0 ? void 0 : resultHuman.Ok) && ((_resultHuman$Ok$execu = resultHuman.Ok.executionResult) === null || _resultHuman$Ok$execu === void 0 ? void 0 : _resultHuman$Ok$execu.Ok) && !errorInEvents);
               };
               extractFailureReasonFromResult = function extractFailureReasonFromResult(resultHuman, resultJson) {
-                var _resultHuman$Ok2, _resultHuman$Ok3, _resultHuman$Ok4, _resultJson$ok, _ref6;
+                var _resultHuman$Ok2, _resultHuman$Ok3, _resultHuman$Ok4, _resultJson$ok, _ref7;
                 var modErrHuman = resultHuman === null || resultHuman === void 0 || (_resultHuman$Ok2 = resultHuman.Ok) === null || _resultHuman$Ok2 === void 0 || (_resultHuman$Ok2 = _resultHuman$Ok2.executionResult) === null || _resultHuman$Ok2 === void 0 || (_resultHuman$Ok2 = _resultHuman$Ok2.Err) === null || _resultHuman$Ok2 === void 0 || (_resultHuman$Ok2 = _resultHuman$Ok2.error) === null || _resultHuman$Ok2 === void 0 ? void 0 : _resultHuman$Ok2.Module;
                 if (modErrHuman) {
                   return resolveModuleError(chain, modErrHuman);
@@ -947,7 +971,7 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                   }
                 }
                 return {
-                  failureReason: JSON.stringify((_ref6 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref6 !== void 0 ? _ref6 : 'Unknown error')
+                  failureReason: JSON.stringify((_ref7 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref7 !== void 0 ? _ref7 : 'Unknown error')
                 };
               }; // Attempt 1: WITHOUT version
               isSuccess = false;
@@ -955,11 +979,11 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 failureReason: ''
               };
               shouldRetryWithVersion = false;
-              _context1.p = 6;
-              _context1.n = 7;
+              _context10.p = 6;
+              _context10.n = 7;
               return performDryRunCall(false);
             case 7:
-              response = _context1.v;
+              response = _context10.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = getExecutionSuccessFromResult(resultHuman);
@@ -969,49 +993,49 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                   shouldRetryWithVersion = true;
                 }
               }
-              _context1.n = 10;
+              _context10.n = 10;
               break;
             case 8:
-              _context1.p = 8;
-              _t2 = _context1.v;
+              _context10.p = 8;
+              _t2 = _context10.v;
               msg = _t2 instanceof Error ? _t2.message : String(_t2);
               if (!msg.includes('Expected 3 arguments')) {
-                _context1.n = 9;
+                _context10.n = 9;
                 break;
               }
               shouldRetryWithVersion = true;
-              _context1.n = 10;
+              _context10.n = 10;
               break;
             case 9:
-              return _context1.a(2, {
+              return _context10.a(2, {
                 success: false,
                 failureReason: msg,
                 asset: resolvedFeeAsset.asset
               });
             case 10:
               if (!shouldRetryWithVersion) {
-                _context1.n = 14;
+                _context10.n = 14;
                 break;
               }
-              _context1.p = 11;
-              _context1.n = 12;
+              _context10.p = 11;
+              _context10.n = 12;
               return performDryRunCall(true);
             case 12:
-              response = _context1.v;
+              response = _context10.v;
               resultHuman = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = getExecutionSuccessFromResult(resultHuman);
               if (!isSuccess) {
                 failureErr = extractFailureReasonFromResult(resultHuman, resultJson);
               }
-              _context1.n = 14;
+              _context10.n = 14;
               break;
             case 13:
-              _context1.p = 13;
-              _t3 = _context1.v;
+              _context10.p = 13;
+              _t3 = _context10.v;
               _msg = _t3 instanceof Error ? _t3.message : String(_t3);
               failureErr = failureErr || _msg;
-              return _context1.a(2, {
+              return _context10.a(2, {
                 success: false,
                 failureReason: failureErr.failureReason,
                 failureSubReason: failureErr.failureSubReason,
@@ -1019,10 +1043,10 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
               });
             case 14:
               if (isSuccess) {
-                _context1.n = 15;
+                _context10.n = 15;
                 break;
               }
-              return _context1.a(2, {
+              return _context10.a(2, {
                 success: false,
                 failureReason: failureErr.failureReason || 'Unknown error',
                 failureSubReason: failureErr.failureSubReason,
@@ -1035,36 +1059,36 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 refTime: BigInt(actualWeight.refTime),
                 proofSize: BigInt(actualWeight.proofSize)
               } : undefined;
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref7) {
-                return i.here === null ? 0 : (_ref7 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref7 === void 0 ? void 0 : _ref7.parachain;
+              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref8) {
+                return i.here === null ? 0 : (_ref8 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref8 === void 0 ? void 0 : _ref8.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
               if (!(hasXcmPaymentApiSupport(chain) && resultJson.ok.local_xcm && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
-                _context1.n = 21;
+                _context10.n = 21;
                 break;
               }
               if (resultJson.ok.local_xcm) {
-                _context1.n = 17;
+                _context10.n = 17;
                 break;
               }
-              _context1.n = 16;
+              _context10.n = 16;
               return this.getPaymentInfo(tx, address);
             case 16:
-              _t4 = _context1.v.weight;
-              _context1.n = 18;
+              _t4 = _context10.v.weight;
+              _context10.n = 18;
               break;
             case 17:
               _t4 = undefined;
             case 18:
               overriddenWeight = _t4;
-              _context1.n = 19;
+              _context10.n = 19;
               return this.getXcmPaymentApiFee(chain, resultJson.ok.local_xcm, forwardedXcms, resolvedFeeAsset.asset, version, false, overriddenWeight);
             case 19:
-              xcmFee = _context1.v;
+              xcmFee = _context10.v;
               if (!(typeof xcmFee === 'bigint')) {
-                _context1.n = 20;
+                _context10.n = 20;
                 break;
               }
-              return _context1.a(2, Promise.resolve({
+              return _context10.a(2, Promise.resolve({
                 success: true,
                 fee: xcmFee,
                 asset: resolvedFeeAsset.asset,
@@ -1078,13 +1102,13 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 asset: this.resolveDefaultFeeAsset(options)
               };
             case 21:
-              _context1.n = 22;
+              _context10.n = 22;
               return this.getPaymentInfo(tx, address);
             case 22:
-              _yield$this$getPaymen = _context1.v;
+              _yield$this$getPaymen = _context10.v;
               executionFee = _yield$this$getPaymen.partialFee;
               fee = computeOriginFee(resultHuman, chain, executionFee);
-              return _context1.a(2, {
+              return _context10.a(2, {
                 success: true,
                 fee: fee,
                 asset: resolvedFeeAsset.asset,
@@ -1093,9 +1117,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 destParaId: destParaId
               });
           }
-        }, _callee1, this, [[11, 13], [6, 8]]);
+        }, _callee10, this, [[11, 13], [6, 8]]);
       }));
-      function getDryRunCall(_x13) {
+      function getDryRunCall(_x14) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -1103,10 +1127,11 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getXcmPaymentApiFee",
     value: function () {
-      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(chain, localXcm, forwardedXcm, asset, version) {
+      var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, localXcm, forwardedXcm, asset, version) {
         var overridenWeight,
           weight,
           assetLocalizedLoc,
+          assetId,
           feeResult,
           execFeeRes,
           execFeeOk,
@@ -1114,56 +1139,57 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
           isAssetNotFound,
           bridgeHubExecFee,
           deliveryFee,
-          _args0 = arguments,
+          _args1 = arguments,
           _t5;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.n) {
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             case 0:
-              overridenWeight = _args0.length > 6 ? _args0[6] : undefined;
+              overridenWeight = _args1.length > 6 ? _args1[6] : undefined;
               if (!(overridenWeight !== null && overridenWeight !== void 0)) {
-                _context10.n = 1;
+                _context11.n = 1;
                 break;
               }
               _t5 = overridenWeight;
-              _context10.n = 3;
+              _context11.n = 3;
               break;
             case 1:
-              _context10.n = 2;
+              _context11.n = 2;
               return this.getXcmWeight(localXcm);
             case 2:
-              _t5 = _context10.v;
+              _t5 = _context11.v;
             case 3:
               weight = _t5;
-              assetLocalizedLoc = localizeLocation(chain, asset.location);
-              _context10.n = 4;
-              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, addXcmVersionHeader(assetLocalizedLoc, version));
+              assetLocalizedLoc = normalizeLocation(localizeLocation(chain, asset.location), version);
+              assetId = createAssetId(version, assetLocalizedLoc);
+              _context11.n = 4;
+              return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weight, addXcmVersionHeader(assetId, version));
             case 4:
-              feeResult = _context10.v;
+              feeResult = _context11.v;
               execFeeRes = feeResult.toJSON();
               execFeeOk = execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.ok;
               execFee = typeof execFeeOk === 'string' || typeof execFeeOk === 'number' ? BigInt(execFeeOk) : 0n;
               isAssetNotFound = (execFeeRes === null || execFeeRes === void 0 ? void 0 : execFeeRes.err) === 'AssetNotFound';
               if (!(chain.startsWith('BridgeHub') && isAssetNotFound)) {
-                _context10.n = 6;
+                _context11.n = 6;
                 break;
               }
-              _context10.n = 5;
+              _context11.n = 5;
               return this.getBridgeHubFallbackExecFee(chain, weight, asset, version);
             case 5:
-              bridgeHubExecFee = _context10.v;
+              bridgeHubExecFee = _context11.v;
               if (typeof bridgeHubExecFee === 'bigint') {
                 execFee = bridgeHubExecFee;
               }
             case 6:
-              _context10.n = 7;
+              _context11.n = 7;
               return this.getDeliveryFee(chain, forwardedXcm, asset, assetLocalizedLoc, version);
             case 7:
-              deliveryFee = _context10.v;
-              return _context10.a(2, execFee + deliveryFee);
+              deliveryFee = _context11.v;
+              return _context11.a(2, execFee + deliveryFee);
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function getXcmPaymentApiFee(_x15, _x16, _x17, _x18, _x19) {
+      function getXcmPaymentApiFee(_x16, _x17, _x18, _x19, _x20) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1171,67 +1197,68 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDeliveryFee",
     value: function () {
-      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
-        var _deliveryFeeRes, _ref8, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref9, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
-        var usedThirdParam, deliveryFeeRes, baseArgs, _this$api$call$xcmPay, message, _this$api$call$xcmPay2, versionedAssetLoc, deliveryFeeResJson, deliveryFeeResolved, nativeAsset, res, _t6;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.p = _context11.n) {
+      var _getDeliveryFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(chain, forwardedXcm, asset, assetLocalizedLoc, version) {
+        var _deliveryFeeRes, _ref9, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref0, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
+        var usedThirdParam, deliveryFeeRes, baseArgs, _this$api$call$xcmPay, message, _this$api$call$xcmPay2, assetId, versionedAssetLoc, deliveryFeeResJson, deliveryFeeResolved, nativeAsset, res, _t6;
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.p = _context12.n) {
             case 0:
               usedThirdParam = false;
               if (!(forwardedXcm.length > 0)) {
-                _context11.n = 6;
+                _context12.n = 6;
                 break;
               }
               baseArgs = [forwardedXcm[0], forwardedXcm[1][0]];
-              _context11.p = 1;
-              _context11.n = 2;
+              _context12.p = 1;
+              _context12.n = 2;
               return (_this$api$call$xcmPay = this.api.call.xcmPaymentApi).queryDeliveryFees.apply(_this$api$call$xcmPay, baseArgs);
             case 2:
-              deliveryFeeRes = _context11.v;
-              _context11.n = 6;
+              deliveryFeeRes = _context12.v;
+              _context12.n = 6;
               break;
             case 3:
-              _context11.p = 3;
-              _t6 = _context11.v;
+              _context12.p = 3;
+              _t6 = _context12.v;
               message = _t6 instanceof Error ? _t6.message : String(_t6);
               if (!message.includes('Expected 3 arguments')) {
-                _context11.n = 5;
+                _context12.n = 5;
                 break;
               }
               usedThirdParam = true;
-              versionedAssetLoc = addXcmVersionHeader(assetLocalizedLoc, version);
-              _context11.n = 4;
+              assetId = createAssetId(version, assetLocalizedLoc);
+              versionedAssetLoc = addXcmVersionHeader(assetId, version);
+              _context12.n = 4;
               return (_this$api$call$xcmPay2 = this.api.call.xcmPaymentApi).queryDeliveryFees.apply(_this$api$call$xcmPay2, baseArgs.concat([versionedAssetLoc]));
             case 4:
-              deliveryFeeRes = _context11.v;
-              _context11.n = 6;
+              deliveryFeeRes = _context12.v;
+              _context12.n = 6;
               break;
             case 5:
               throw _t6;
             case 6:
               deliveryFeeResJson = (_deliveryFeeRes = deliveryFeeRes) === null || _deliveryFeeRes === void 0 ? void 0 : _deliveryFeeRes.toJSON();
-              deliveryFeeResolved = deliveryFeeRes && ((_ref8 = (_deliveryFeeResJson$o = (_deliveryFeeResJson$o2 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o2 === void 0 ? void 0 : _deliveryFeeResJson$o2.v4) !== null && _deliveryFeeResJson$o !== void 0 ? _deliveryFeeResJson$o : (_deliveryFeeResJson$o3 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o3 === void 0 ? void 0 : _deliveryFeeResJson$o3.v3) === null || _ref8 === void 0 ? void 0 : _ref8.length) > 0 ? BigInt((_ref9 = (_deliveryFeeResJson$o4 = deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o5 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o5 === void 0 ? void 0 : _deliveryFeeResJson$o5.v4) !== null && _deliveryFeeResJson$o4 !== void 0 ? _deliveryFeeResJson$o4 : deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o6 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o6 === void 0 ? void 0 : _deliveryFeeResJson$o6.v3) === null || _ref9 === void 0 || (_ref9 = _ref9[0]) === null || _ref9 === void 0 || (_ref9 = _ref9.fun) === null || _ref9 === void 0 ? void 0 : _ref9.fungible) : 0n;
+              deliveryFeeResolved = deliveryFeeRes && ((_ref9 = (_deliveryFeeResJson$o = (_deliveryFeeResJson$o2 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o2 === void 0 ? void 0 : _deliveryFeeResJson$o2.v4) !== null && _deliveryFeeResJson$o !== void 0 ? _deliveryFeeResJson$o : (_deliveryFeeResJson$o3 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o3 === void 0 ? void 0 : _deliveryFeeResJson$o3.v3) === null || _ref9 === void 0 ? void 0 : _ref9.length) > 0 ? BigInt((_ref0 = (_deliveryFeeResJson$o4 = deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o5 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o5 === void 0 ? void 0 : _deliveryFeeResJson$o5.v4) !== null && _deliveryFeeResJson$o4 !== void 0 ? _deliveryFeeResJson$o4 : deliveryFeeResJson === null || deliveryFeeResJson === void 0 || (_deliveryFeeResJson$o6 = deliveryFeeResJson.ok) === null || _deliveryFeeResJson$o6 === void 0 ? void 0 : _deliveryFeeResJson$o6.v3) === null || _ref0 === void 0 || (_ref0 = _ref0[0]) === null || _ref0 === void 0 || (_ref0 = _ref0.fun) === null || _ref0 === void 0 ? void 0 : _ref0.fungible) : 0n;
               nativeAsset = findNativeAssetInfoOrThrow(chain);
               if (!(isAssetXcEqual(asset, nativeAsset) || usedThirdParam)) {
-                _context11.n = 7;
+                _context12.n = 7;
                 break;
               }
-              return _context11.a(2, deliveryFeeResolved);
+              return _context12.a(2, deliveryFeeResolved);
             case 7:
-              _context11.p = 7;
-              _context11.n = 8;
+              _context12.p = 7;
+              _context12.n = 8;
               return this.quoteAhPrice(localizeLocation(chain, nativeAsset.location), assetLocalizedLoc, deliveryFeeResolved, false);
             case 8:
-              res = _context11.v;
-              return _context11.a(2, res !== null && res !== void 0 ? res : 0n);
+              res = _context12.v;
+              return _context12.a(2, res !== null && res !== void 0 ? res : 0n);
             case 9:
-              _context11.p = 9;
-              _context11.v;
-              return _context11.a(2, 0n);
+              _context12.p = 9;
+              _context12.v;
+              return _context12.a(2, 0n);
           }
-        }, _callee11, this, [[7, 9], [1, 3]]);
+        }, _callee12, this, [[7, 9], [1, 3]]);
       }));
-      function getDeliveryFee(_x20, _x21, _x22, _x23, _x24) {
+      function getDeliveryFee(_x21, _x22, _x23, _x24, _x25) {
         return _getDeliveryFee.apply(this, arguments);
       }
       return getDeliveryFee;
@@ -1239,45 +1266,45 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getBridgeHubFallbackExecFee",
     value: function () {
-      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(chain, weightValue, asset, version) {
+      var _getBridgeHubFallbackExecFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(chain, weightValue, asset, version) {
         var fallbackExecFeeRes, fallbackJson, fallbackOk, fallbackExecFee, ahApi, assetHubChain, ahLocalizedLoc, convertedExecFee;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.n) {
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
-              _context12.n = 1;
+              _context13.n = 1;
               return this.api.call.xcmPaymentApi.queryWeightToAssetFee(weightValue, addXcmVersionHeader(RELAY_LOCATION, version));
             case 1:
-              fallbackExecFeeRes = _context12.v;
+              fallbackExecFeeRes = _context13.v;
               fallbackJson = fallbackExecFeeRes.toJSON();
               fallbackOk = fallbackJson === null || fallbackJson === void 0 ? void 0 : fallbackJson.ok;
               fallbackExecFee = typeof fallbackOk === 'string' || typeof fallbackOk === 'number' ? BigInt(fallbackOk) : undefined;
               if (!(fallbackExecFee === undefined)) {
-                _context12.n = 2;
+                _context13.n = 2;
                 break;
               }
-              return _context12.a(2, undefined);
+              return _context13.a(2, undefined);
             case 2:
               ahApi = this.clone();
               assetHubChain = "AssetHub".concat(getRelayChainOf(chain));
-              _context12.n = 3;
+              _context13.n = 3;
               return ahApi.init(assetHubChain);
             case 3:
               ahLocalizedLoc = localizeLocation(assetHubChain, asset.location);
-              _context12.n = 4;
+              _context13.n = 4;
               return ahApi.quoteAhPrice(RELAY_LOCATION, ahLocalizedLoc, fallbackExecFee, false);
             case 4:
-              convertedExecFee = _context12.v;
+              convertedExecFee = _context13.v;
               if (!(typeof convertedExecFee === 'bigint')) {
-                _context12.n = 5;
+                _context13.n = 5;
                 break;
               }
-              return _context12.a(2, convertedExecFee);
+              return _context13.a(2, convertedExecFee);
             case 5:
-              return _context12.a(2, undefined);
+              return _context13.a(2, undefined);
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
-      function getBridgeHubFallbackExecFee(_x25, _x26, _x27, _x28) {
+      function getBridgeHubFallbackExecFee(_x26, _x27, _x28, _x29) {
         return _getBridgeHubFallbackExecFee.apply(this, arguments);
       }
       return getBridgeHubFallbackExecFee;
@@ -1285,21 +1312,21 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getXcmWeight",
     value: function () {
-      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(xcm) {
+      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(xcm) {
         var result, resultJson;
-        return _regenerator().w(function (_context13) {
-          while (1) switch (_context13.n) {
+        return _regenerator().w(function (_context14) {
+          while (1) switch (_context14.n) {
             case 0:
-              _context13.n = 1;
+              _context14.n = 1;
               return this.api.call.xcmPaymentApi.queryXcmWeight(xcm);
             case 1:
-              result = _context13.v;
+              result = _context14.v;
               resultJson = result.toJSON();
-              return _context13.a(2, resultJson.ok);
+              return _context14.a(2, resultJson.ok);
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function getXcmWeight(_x29) {
+      function getXcmWeight(_x30) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -1307,34 +1334,34 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(_ref0) {
-        var _ref10, _ref11, _ref12;
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(_ref1) {
+        var _ref11, _ref12, _ref13;
         var originLocation, xcm, asset, chain, version, origin, supportsDryRunApi, response, result, resultJson, isSuccess, error, failureReason, forwardedXcms, actualWeight, weight, destParaId, _fee, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee;
-        return _regenerator().w(function (_context14) {
-          while (1) switch (_context14.n) {
+        return _regenerator().w(function (_context15) {
+          while (1) switch (_context15.n) {
             case 0:
-              originLocation = _ref0.originLocation, xcm = _ref0.xcm, asset = _ref0.asset, chain = _ref0.chain, version = _ref0.version, origin = _ref0.origin;
+              originLocation = _ref1.originLocation, xcm = _ref1.xcm, asset = _ref1.asset, chain = _ref1.chain, version = _ref1.version, origin = _ref1.origin;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context14.n = 1;
+                _context15.n = 1;
                 break;
               }
               throw new RuntimeApiUnavailableError(chain, 'DryRunApi');
             case 1:
-              _context14.n = 2;
+              _context15.n = 2;
               return this.api.call.dryRunApi.dryRunXcm(originLocation, xcm);
             case 2:
-              response = _context14.v;
+              response = _context15.v;
               result = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = result.Ok && result.Ok.executionResult.Complete;
               if (isSuccess) {
-                _context14.n = 3;
+                _context15.n = 3;
                 break;
               }
               error = result.Ok.executionResult.Incomplete.error;
               failureReason = typeof error === 'string' ? error : error.error;
-              return _context14.a(2, {
+              return _context15.a(2, {
                 success: false,
                 failureReason: failureReason,
                 asset: asset
@@ -1346,22 +1373,22 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 refTime: BigInt(actualWeight.refTime),
                 proofSize: BigInt(actualWeight.proofSize)
               } : undefined;
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref1) {
-                return i.Here ? 0 : (_ref1 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref1 === void 0 ? void 0 : _ref1.parachain;
+              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref10) {
+                return i.Here ? 0 : (_ref10 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref10 === void 0 ? void 0 : _ref10.parachain;
               }(Object.values(forwardedXcms[0])[0].interior);
               if (!(hasXcmPaymentApiSupport(chain) && asset)) {
-                _context14.n = 5;
+                _context15.n = 5;
                 break;
               }
-              _context14.n = 4;
+              _context15.n = 4;
               return this.getXcmPaymentApiFee(chain, xcm, forwardedXcms, asset, version);
             case 4:
-              _fee = _context14.v;
+              _fee = _context15.v;
               if (!(typeof _fee === 'bigint')) {
-                _context14.n = 5;
+                _context15.n = 5;
                 break;
               }
-              return _context14.a(2, {
+              return _context15.a(2, {
                 success: true,
                 fee: _fee,
                 asset: asset,
@@ -1373,24 +1400,24 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
               emitted = result.Ok.emittedEvents; // We want to look for the last event
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['balances', 'foreignAssets', 'assets'];
-              feeEvent = (_ref10 = (_ref11 = (_ref12 = origin === 'Mythos' ? reversedEvents.find(function (event) {
+              feeEvent = (_ref11 = (_ref12 = (_ref13 = origin === 'Mythos' ? reversedEvents.find(function (event) {
                 return event.section === 'assetConversion' && event.method === 'SwapCreditExecuted';
-              }) : undefined) !== null && _ref12 !== void 0 ? _ref12 :
+              }) : undefined) !== null && _ref13 !== void 0 ? _ref13 :
               // Prefer an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.section) && event.method === 'Issued';
-              })) !== null && _ref11 !== void 0 ? _ref11 :
+              })) !== null && _ref12 !== void 0 ? _ref12 :
               // Fallback to Minted event
               reversedEvents.find(function (event) {
                 return ['balances', 'foreignAssets'].includes(event.section) && event.method === 'Minted';
-              })) !== null && _ref10 !== void 0 ? _ref10 : reversedEvents.find(function (event) {
+              })) !== null && _ref11 !== void 0 ? _ref11 : reversedEvents.find(function (event) {
                 return ['currencies', 'tokens'].includes(event.section) && event.method === 'Deposited';
               });
               if (feeEvent) {
-                _context14.n = 6;
+                _context15.n = 6;
                 break;
               }
-              return _context14.a(2, Promise.resolve({
+              return _context15.a(2, Promise.resolve({
                 success: false,
                 failureReason: 'Cannot determine destination fee. No Issued event found',
                 asset: asset
@@ -1398,7 +1425,7 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
             case 6:
               feeAmount = feeEvent.section === 'assetConversion' ? feeEvent.data.amountIn : feeEvent.data.amount;
               fee = BigInt(feeAmount.replace(/,/g, ''));
-              return _context14.a(2, {
+              return _context15.a(2, {
                 success: true,
                 fee: fee,
                 asset: asset,
@@ -1407,9 +1434,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 destParaId: destParaId
               });
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function getDryRunXcm(_x30) {
+      function getDryRunXcm(_x31) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1417,18 +1444,18 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "getBridgeStatus",
     value: function () {
-      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
+      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
         var outboundOperatingMode;
-        return _regenerator().w(function (_context15) {
-          while (1) switch (_context15.n) {
+        return _regenerator().w(function (_context16) {
+          while (1) switch (_context16.n) {
             case 0:
-              _context15.n = 1;
+              _context16.n = 1;
               return this.api.query.ethereumOutboundQueue.operatingMode();
             case 1:
-              outboundOperatingMode = _context15.v;
-              return _context15.a(2, outboundOperatingMode.toPrimitive());
+              outboundOperatingMode = _context16.v;
+              return _context16.a(2, outboundOperatingMode.toPrimitive());
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
       function getBridgeStatus() {
         return _getBridgeStatus.apply(this, arguments);
@@ -1479,35 +1506,35 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "signAndSubmit",
     value: function () {
-      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(tx, sender) {
+      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(tx, sender) {
         var hash, _t8;
-        return _regenerator().w(function (_context16) {
-          while (1) switch (_context16.n) {
+        return _regenerator().w(function (_context17) {
+          while (1) switch (_context17.n) {
             case 0:
               if (!isSenderSigner(sender)) {
-                _context16.n = 2;
+                _context17.n = 2;
                 break;
               }
-              _context16.n = 1;
+              _context17.n = 1;
               return tx.signAndSend(sender.address, {
                 signer: sender.signer
               });
             case 1:
-              _t8 = _context16.v;
-              _context16.n = 4;
+              _t8 = _context17.v;
+              _context17.n = 4;
               break;
             case 2:
-              _context16.n = 3;
+              _context17.n = 3;
               return tx.signAndSend(createKeyringPair(sender));
             case 3:
-              _t8 = _context16.v;
+              _t8 = _context17.v;
             case 4:
               hash = _t8;
-              return _context16.a(2, hash.toHex());
+              return _context17.a(2, hash.toHex());
           }
-        }, _callee16);
+        }, _callee17);
       }));
-      function signAndSubmit(_x31, _x32) {
+      function signAndSubmit(_x32, _x33) {
         return _signAndSubmit.apply(this, arguments);
       }
       return signAndSubmit;
@@ -1515,31 +1542,31 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
   }, {
     key: "signAndSubmitFinalized",
     value: function () {
-      var _signAndSubmitFinalized = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(tx, sender) {
+      var _signAndSubmitFinalized = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(tx, sender) {
         var _this4 = this;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+        return _regenerator().w(function (_context18) {
+          while (1) switch (_context18.n) {
             case 0:
               if (!isSenderSigner(sender)) {
-                _context17.n = 2;
+                _context18.n = 2;
                 break;
               }
-              _context17.n = 1;
+              _context18.n = 1;
               return tx.signAsync(sender.address, {
                 signer: sender.signer
               });
             case 1:
-              _context17.n = 3;
+              _context18.n = 3;
               break;
             case 2:
-              _context17.n = 3;
+              _context18.n = 3;
               return tx.signAsync(createKeyringPair(sender));
             case 3:
-              return _context17.a(2, new Promise(function (resolve, reject) {
-                tx.send(function (_ref13) {
-                  var status = _ref13.status,
-                    dispatchError = _ref13.dispatchError,
-                    txHash = _ref13.txHash;
+              return _context18.a(2, new Promise(function (resolve, reject) {
+                tx.send(function (_ref14) {
+                  var status = _ref14.status,
+                    dispatchError = _ref14.dispatchError,
+                    txHash = _ref14.txHash;
                   if (status.isFinalized) {
                     if (dispatchError !== undefined) {
                       if (dispatchError.isModule) {
@@ -1560,9 +1587,9 @@ var PolkadotJsApi = /*#__PURE__*/function (_PolkadotApi) {
                 });
               }));
           }
-        }, _callee17);
+        }, _callee18);
       }));
-      function signAndSubmitFinalized(_x33, _x34) {
+      function signAndSubmitFinalized(_x34, _x35) {
         return _signAndSubmitFinalized.apply(this, arguments);
       }
       return signAndSubmitFinalized;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-pjs",
-  "version": "13.1.0",
+  "version": "13.2.1",
   "description": "Polkadot.js based SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "@snowbridge/registry": "^0.4.4",
     "ethers": "^6.16.0",
     "viem": "^2.47.6",
-    "@paraspell/sdk-core": "13.1.0"
+    "@paraspell/sdk-core": "13.2.1"
   },
   "peerDependencies": {
     "@polkadot/api": ">= 16.0 < 17",