@paraspell/sdk-pjs 12.2.0 → 12.2.2

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { getEvmPrivateKeyHex, isConfig, BatchMode, findNativeAssetInfoOrThrow, MissingChainApiError, getChainProviders, UnsupportedOperationError, findAssetInfoOrThrow, computeFeeFromDryRunPjs, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, addXcmVersionHeader, Version, RELAY_LOCATION, getRelayChainOf, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, getParaId, ETH_CHAIN_ID, RoutingResolutionError, abstractDecimals, assertHasId, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, getBridgeStatus as getBridgeStatus$1, send as send$1, dryRun as dryRun$1, dryRunOrigin as dryRunOrigin$1 } from '@paraspell/sdk-core';
+import { getEvmPrivateKeyHex, createClientCache, createClientPoolHelpers, isConfig, getChainProviders, BatchMode, findNativeAssetInfoOrThrow, MissingChainApiError, UnsupportedOperationError, findAssetInfoOrThrow, computeFeeFromDryRunPjs, hasXcmPaymentApiSupport, resolveModuleError, getAssetsObject, RuntimeApiUnavailableError, wrapTxBypass, assertHasLocation, localizeLocation, isAssetXcEqual, addXcmVersionHeader, Version, RELAY_LOCATION, getRelayChainOf, createChainClient as createChainClient$1, getBalance as getBalance$1, claimAssets as claimAssets$1, Foreign, ForeignAbstract, Native, Override, findAssetInfo, getAllAssetsSymbols, getAssetDecimals, getAssetId, getAssets, getExistentialDeposit, getNativeAssetSymbol, getNativeAssets, getOtherAssets, getRelayChainSymbol, getSupportedAssets, getTChain, hasSupportForAsset, isChainEvm, convertSs58 as convertSs58$1, getParaId, ETH_CHAIN_ID, RoutingResolutionError, abstractDecimals, assertHasId, MissingParameterError, isOverrideLocationSpecifier, transferMoonbeamEvm, transferMoonbeamToEth, validateAddress as validateAddress$1, Builder as Builder$1, getParaEthTransferFees as getParaEthTransferFees$1, DRY_RUN_CLIENT_TIMEOUT_MS, getBridgeStatus as getBridgeStatus$1, send as send$1, 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 { isHex, u8aToHex, hexToU8a, stringToU8a } from '@polkadot/util';
@@ -14,6 +14,15 @@ var createKeyringPair = function createKeyringPair(path) {
   return evmPrivateKey ? keyring.createFromUri(evmPrivateKey, undefined, 'ethereum') : keyring.addFromUri(path);
 };
 
+var lowercaseFirstLetter = function lowercaseFirstLetter(value) {
+  return value.charAt(0).toLowerCase() + value.slice(1);
+};
+var snakeToCamel = function snakeToCamel(str) {
+  return str.toLowerCase().replace(/([-_][a-z])/g, function (group) {
+    return group.toUpperCase().replace('-', '').replace('_', '');
+  });
+};
+
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
   for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
@@ -238,17 +247,53 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
-var lowercaseFirstLetter = function lowercaseFirstLetter(value) {
-  return value.charAt(0).toLowerCase() + value.slice(1);
-};
-var snakeToCamel = function snakeToCamel(str) {
-  return str.toLowerCase().replace(/([-_][a-z])/g, function (group) {
-    return group.toUpperCase().replace('-', '').replace('_', '');
-  });
-};
+// Cache settings
+var DEFAULT_TTL_MS = 60000; // 1 minute
+var MAX_CLIENTS = 100;
+var EXTENSION_MS = 5 * 60000; // 5 minutes
+
+var clientPool = createClientCache(MAX_CLIENTS, /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(client) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          _context.n = 1;
+          return client.rpc.system.properties();
+        case 1:
+          return _context.a(2);
+      }
+    }, _callee);
+  }));
+  return function (_x) {
+    return _ref.apply(this, arguments);
+  };
+}(), function (_key, entry) {
+  void entry.client.disconnect();
+}, EXTENSION_MS);
+var createPolkadotJsClient = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(ws) {
+    var wsProvider;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          wsProvider = new WsProvider(ws);
+          return _context2.a(2, ApiPromise.create({
+            provider: wsProvider
+          }));
+      }
+    }, _callee2);
+  }));
+  return function createPolkadotJsClient(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var _createClientPoolHelp = createClientPoolHelpers(clientPool, createPolkadotJsClient),
+  leaseClient = _createClientPoolHelp.leaseClient,
+  releaseClient = _createClientPoolHelp.releaseClient;
 var PolkadotJsApi = /*#__PURE__*/function () {
   function PolkadotJsApi(config) {
     _classCallCheck(this, PolkadotJsApi);
+    this._ttlMs = DEFAULT_TTL_MS;
     this.initialized = false;
     this.disconnectAllowed = true;
     this._config = config;
@@ -266,36 +311,40 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, _clientTtlMs) {
-        var apiConfig;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.n) {
+      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(chain) {
+        var clientTtlMs,
+          apiConfig,
+          _args = arguments;
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
+              clientTtlMs = _args.length > 1 && _args[1] !== undefined ? _args[1] : DEFAULT_TTL_MS;
               if (!(this.initialized || chain === 'Ethereum')) {
-                _context.n = 1;
+                _context3.n = 1;
                 break;
               }
-              return _context.a(2);
+              return _context3.a(2);
             case 1:
+              this._ttlMs = clientTtlMs;
               this._chain = chain;
               apiConfig = this.getApiConfigForChain(chain);
               if (!(isConfig(this._config) && this._config.development && !apiConfig)) {
-                _context.n = 2;
+                _context3.n = 2;
                 break;
               }
               throw new MissingChainApiError(chain);
             case 2:
-              _context.n = 3;
+              _context3.n = 3;
               return this.resolveApi(apiConfig, chain);
             case 3:
-              this.api = _context.v;
+              this.api = _context3.v;
               this.initialized = true;
             case 4:
-              return _context.a(2);
+              return _context3.a(2);
           }
-        }, _callee, this);
+        }, _callee3, this);
       }));
-      function init(_x, _x2) {
+      function init(_x3) {
         return _init.apply(this, arguments);
       }
       return init;
@@ -311,54 +360,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
     }
   }, {
     key: "resolveApi",
-    value: function () {
-      var _resolveApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(apiConfig, chain) {
-        var wsUrl;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
-            case 0:
-              if (apiConfig) {
-                _context2.n = 1;
-                break;
-              }
-              wsUrl = getChainProviders(chain);
-              return _context2.a(2, this.createApiInstance(wsUrl, chain));
-            case 1:
-              if (!(typeof apiConfig === 'string' || apiConfig instanceof Array)) {
-                _context2.n = 2;
-                break;
-              }
-              return _context2.a(2, this.createApiInstance(apiConfig, chain));
-            case 2:
-              return _context2.a(2, apiConfig);
-          }
-        }, _callee2, this);
-      }));
-      function resolveApi(_x3, _x4) {
-        return _resolveApi.apply(this, arguments);
+    value: function resolveApi(apiConfig, chain) {
+      if (!apiConfig) {
+        var wsUrl = getChainProviders(chain);
+        return this.createApiInstance(wsUrl, chain);
       }
-      return resolveApi;
-    }()
+      if (typeof apiConfig === 'string' || apiConfig instanceof Array) {
+        return this.createApiInstance(apiConfig, chain);
+      }
+      return Promise.resolve(apiConfig);
+    }
   }, {
     key: "createApiInstance",
-    value: function () {
-      var _createApiInstance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(wsUrl, _chain) {
-        var wsProvider;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
-            case 0:
-              wsProvider = new WsProvider(wsUrl);
-              return _context3.a(2, ApiPromise.create({
-                provider: wsProvider
-              }));
-          }
-        }, _callee3);
-      }));
-      function createApiInstance(_x5, _x6) {
-        return _createApiInstance.apply(this, arguments);
-      }
-      return createApiInstance;
-    }()
+    value: function createApiInstance(wsUrl, _chain) {
+      return leaseClient(wsUrl, this._ttlMs, false);
+    }
   }, {
     key: "accountToHex",
     value: function accountToHex(address) {
@@ -374,9 +390,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
     }
   }, {
     key: "convertToPjsCall",
-    value: function convertToPjsCall(_ref) {
-      var module = _ref.module,
-        method = _ref.method;
+    value: function convertToPjsCall(_ref3) {
+      var module = _ref3.module,
+        method = _ref3.method;
       return {
         module: lowercaseFirstLetter(module),
         method: snakeToCamel(method)
@@ -412,7 +428,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee4, this);
       }));
-      function queryState(_x7) {
+      function queryState(_x4) {
         return _queryState.apply(this, arguments);
       }
       return queryState;
@@ -475,7 +491,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee5);
       }));
-      function calculateTransactionFee(_x8, _x9) {
+      function calculateTransactionFee(_x5, _x6) {
         return _calculateTransactionFee.apply(this, arguments);
       }
       return calculateTransactionFee;
@@ -486,11 +502,11 @@ var PolkadotJsApi = /*#__PURE__*/function () {
       var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(fromMl, toMl, amountIn) {
         var includeFee,
           quoted,
-          _args6 = arguments;
+          _args4 = arguments;
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.n) {
             case 0:
-              includeFee = _args6.length > 3 && _args6[3] !== undefined ? _args6[3] : true;
+              includeFee = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : true;
               _context6.n = 1;
               return this.api.call.assetConversionApi.quotePriceExactTokensForTokens(fromMl, toMl, amountIn.toString(), includeFee);
             case 1:
@@ -499,7 +515,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function quoteAhPrice(_x0, _x1, _x10) {
+      function quoteAhPrice(_x7, _x8, _x9) {
         return _quoteAhPrice.apply(this, arguments);
       }
       return quoteAhPrice;
@@ -552,7 +568,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee7, this);
       }));
-      function getFromRpc(_x11, _x12, _x13) {
+      function getFromRpc(_x0, _x1, _x10) {
         return _getFromRpc.apply(this, arguments);
       }
       return getFromRpc;
@@ -583,16 +599,16 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee8);
       }));
-      function createApiForChain(_x14) {
+      function createApiForChain(_x11) {
         return _createApiForChain.apply(this, arguments);
       }
       return createApiForChain;
     }()
   }, {
     key: "resolveDefaultFeeAsset",
-    value: function resolveDefaultFeeAsset(_ref2) {
-      var chain = _ref2.chain,
-        feeAsset = _ref2.feeAsset;
+    value: function resolveDefaultFeeAsset(_ref4) {
+      var chain = _ref4.chain,
+        feeAsset = _ref4.feeAsset;
       return feeAsset !== null && feeAsset !== void 0 ? feeAsset : findNativeAssetInfoOrThrow(chain);
     }
   }, {
@@ -636,7 +652,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function resolveFeeAsset(_x15) {
+      function resolveFeeAsset(_x12) {
         return _resolveFeeAsset.apply(this, arguments);
       }
       return resolveFeeAsset;
@@ -689,7 +705,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
             case 5:
               resolvedFeeAsset = _context10.v;
               performDryRunCall = /*#__PURE__*/function () {
-                var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(includeVersion) {
+                var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(includeVersion) {
                   var _this$api$call$dryRun;
                   return _regenerator().w(function (_context0) {
                     while (1) switch (_context0.n) {
@@ -698,8 +714,8 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                     }
                   }, _callee0);
                 }));
-                return function performDryRunCall(_x17) {
-                  return _ref3.apply(this, arguments);
+                return function performDryRunCall(_x14) {
+                  return _ref5.apply(this, arguments);
                 };
               }();
               getExecutionSuccessFromResult = function getExecutionSuccessFromResult(resultHuman) {
@@ -707,7 +723,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 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));
               };
               extractFailureReasonFromResult = function extractFailureReasonFromResult(resultHuman, resultJson) {
-                var _resultHuman$Ok, _resultHuman$Ok2, _resultJson$ok, _ref4;
+                var _resultHuman$Ok, _resultHuman$Ok2, _resultJson$ok, _ref6;
                 var modErrHuman = resultHuman === null || resultHuman === void 0 || (_resultHuman$Ok = resultHuman.Ok) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.executionResult) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.Err) === null || _resultHuman$Ok === void 0 || (_resultHuman$Ok = _resultHuman$Ok.error) === null || _resultHuman$Ok === void 0 ? void 0 : _resultHuman$Ok.Module;
                 if (modErrHuman) {
                   return resolveModuleError(chain, modErrHuman);
@@ -728,7 +744,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                   };
                 }
                 return {
-                  failureReason: JSON.stringify((_ref4 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref4 !== void 0 ? _ref4 : 'Unknown error')
+                  failureReason: JSON.stringify((_ref6 = resultJson !== null && resultJson !== void 0 ? resultJson : resultHuman) !== null && _ref6 !== void 0 ? _ref6 : 'Unknown error')
                 };
               }; // Attempt 1: WITHOUT version
               isSuccess = false;
@@ -818,15 +834,15 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               } : undefined;
               nativeAsset = findNativeAssetInfoOrThrow(chain);
               hasLocation = feeAsset ? Boolean(feeAsset.location) : Boolean(nativeAsset === null || nativeAsset === void 0 ? void 0 : nativeAsset.location);
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref5) {
-                return i.here === null ? 0 : (_ref5 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref5 === void 0 ? void 0 : _ref5.parachain;
+              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;
               }(Object.values(forwardedXcms[0])[0].interior);
               if (!(hasXcmPaymentApiSupport(chain) && resultJson.ok.local_xcm && hasLocation && (feeAsset || chain.startsWith('AssetHub') && destination === 'Ethereum') || resolvedFeeAsset.isCustomAsset)) {
                 _context10.n = 21;
                 break;
               }
               getPaymentInfoWeight = /*#__PURE__*/function () {
-                var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+                var _ref8 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
                   var _yield$tx$paymentInfo2, weight;
                   return _regenerator().w(function (_context1) {
                     while (1) switch (_context1.n) {
@@ -841,7 +857,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                   }, _callee1);
                 }));
                 return function getPaymentInfoWeight() {
-                  return _ref6.apply(this, arguments);
+                  return _ref8.apply(this, arguments);
                 };
               }();
               if (resultJson.ok.local_xcm) {
@@ -896,7 +912,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee10, this, [[11, 13], [6, 8]]);
       }));
-      function getDryRunCall(_x16) {
+      function getDryRunCall(_x13) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -905,7 +921,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
     key: "getXcmPaymentApiFee",
     value: function () {
       var _getXcmPaymentApiFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(chain, localXcm, forwardedXcm, asset) {
-        var _ref7, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref8, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
+        var _ref9, _deliveryFeeResJson$o, _deliveryFeeResJson$o2, _deliveryFeeResJson$o3, _ref0, _deliveryFeeResJson$o4, _deliveryFeeResJson$o5, _deliveryFeeResJson$o6;
         var overridenWeight,
           weight,
           assetLocalizedLoc,
@@ -921,13 +937,13 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           nativeAsset,
           deliveryFee,
           res,
-          _args11 = arguments,
+          _args1 = arguments,
           _t5,
           _t6;
         return _regenerator().w(function (_context11) {
           while (1) switch (_context11.p = _context11.n) {
             case 0:
-              overridenWeight = _args11.length > 5 ? _args11[5] : undefined;
+              overridenWeight = _args1.length > 5 ? _args1[5] : undefined;
               if (!(overridenWeight !== null && overridenWeight !== void 0)) {
                 _context11.n = 1;
                 break;
@@ -979,7 +995,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
             case 9:
               deliveryFeeRes = _t6;
               deliveryFeeResJson = deliveryFeeRes === null || deliveryFeeRes === void 0 ? void 0 : deliveryFeeRes.toJSON();
-              deliveryFeeResolved = deliveryFeeRes && ((_ref7 = (_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 || _ref7 === void 0 ? void 0 : _ref7.length) > 0 ? BigInt((_ref8 = (_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 || _ref8 === void 0 || (_ref8 = _ref8[0]) === null || _ref8 === void 0 || (_ref8 = _ref8.fun) === null || _ref8 === void 0 ? void 0 : _ref8.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)) {
                 _context11.n = 10;
@@ -1007,7 +1023,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee11, this, [[10, 12]]);
       }));
-      function getXcmPaymentApiFee(_x18, _x19, _x20, _x21) {
+      function getXcmPaymentApiFee(_x15, _x16, _x17, _x18) {
         return _getXcmPaymentApiFee.apply(this, arguments);
       }
       return getXcmPaymentApiFee;
@@ -1054,7 +1070,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function getBridgeHubFallbackExecFee(_x22, _x23, _x24) {
+      function getBridgeHubFallbackExecFee(_x19, _x20, _x21) {
         return _getBridgeHubFallbackExecFee.apply(this, arguments);
       }
       return getBridgeHubFallbackExecFee;
@@ -1076,7 +1092,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee13, this);
       }));
-      function getXcmWeight(_x25) {
+      function getXcmWeight(_x22) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -1084,13 +1100,13 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(_ref9) {
-        var _ref1, _ref10, _ref11;
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(_ref1) {
+        var _ref11, _ref12, _ref13;
         var originLocation, xcm, asset, chain, 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) {
             case 0:
-              originLocation = _ref9.originLocation, xcm = _ref9.xcm, asset = _ref9.asset, chain = _ref9.chain, origin = _ref9.origin;
+              originLocation = _ref1.originLocation, xcm = _ref1.xcm, asset = _ref1.asset, chain = _ref1.chain, origin = _ref1.origin;
               supportsDryRunApi = getAssetsObject(chain).supportsDryRunApi;
               if (supportsDryRunApi) {
                 _context14.n = 1;
@@ -1123,8 +1139,8 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 refTime: BigInt(actualWeight.refTime),
                 proofSize: BigInt(actualWeight.proofSize)
               } : undefined;
-              destParaId = forwardedXcms.length === 0 ? undefined : function (i, _ref0) {
-                return i.Here ? 0 : (_ref0 = Array.isArray(i.x1) ? i.x1[0] : i.x1) === null || _ref0 === void 0 ? void 0 : _ref0.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;
@@ -1150,17 +1166,17 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               emitted = result.Ok.emittedEvents; // We want to look for the last event
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['balances', 'foreignAssets', 'assets'];
-              feeEvent = (_ref1 = (_ref10 = (_ref11 = 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 && _ref11 !== void 0 ? _ref11 :
+              }) : undefined) !== null && _ref13 !== void 0 ? _ref13 :
               // Prefer an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.section) && event.method === 'Issued';
-              })) !== null && _ref10 !== void 0 ? _ref10 :
+              })) !== null && _ref12 !== void 0 ? _ref12 :
               // Fallback to Minted event
               reversedEvents.find(function (event) {
                 return ['balances', 'foreignAssets'].includes(event.section) && event.method === 'Minted';
-              })) !== null && _ref1 !== void 0 ? _ref1 : reversedEvents.find(function (event) {
+              })) !== null && _ref11 !== void 0 ? _ref11 : reversedEvents.find(function (event) {
                 return ['currencies', 'tokens'].includes(event.section) && event.method === 'Deposited';
               });
               if (feeEvent) {
@@ -1186,7 +1202,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function getDryRunXcm(_x26) {
+      function getDryRunXcm(_x23) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1224,45 +1240,27 @@ var PolkadotJsApi = /*#__PURE__*/function () {
     }
   }, {
     key: "disconnect",
-    value: function () {
-      var _disconnect = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
-        var _this$_config$apiOver2;
-        var force,
-          api,
-          _args16 = arguments;
-        return _regenerator().w(function (_context16) {
-          while (1) switch (_context16.n) {
-            case 0:
-              force = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : false;
-              if (this.initialized) {
-                _context16.n = 1;
-                break;
-              }
-              return _context16.a(2, Promise.resolve());
-            case 1:
-              if (!(!force && !this.disconnectAllowed)) {
-                _context16.n = 2;
-                break;
-              }
-              return _context16.a(2);
-            case 2:
-              api = isConfig(this._config) ? (_this$_config$apiOver2 = this._config.apiOverrides) === null || _this$_config$apiOver2 === void 0 ? void 0 : _this$_config$apiOver2[this._chain] : this._config; // Disconnect api only if it was created automatically
-              if (!(force || typeof api === 'string' || api === undefined)) {
-                _context16.n = 3;
-                break;
-              }
-              _context16.n = 3;
-              return this.api.disconnect();
-            case 3:
-              return _context16.a(2);
-          }
-        }, _callee16, this);
-      }));
-      function disconnect() {
-        return _disconnect.apply(this, arguments);
+    value: function disconnect() {
+      var _this$_config$apiOver2;
+      var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      if (!this.initialized) return Promise.resolve();
+      if (!force && !this.disconnectAllowed) return Promise.resolve();
+      var api = isConfig(this._config) ? (_this$_config$apiOver2 = this._config.apiOverrides) === null || _this$_config$apiOver2 === void 0 ? void 0 : _this$_config$apiOver2[this._chain] : this._config;
+      // Own client provided, destroy only if force true
+      if (force && _typeof(api) === 'object') {
+        void this.api.disconnect();
       }
-      return disconnect;
-    }()
+      // Client created automatically
+      if (typeof api === 'string' || Array.isArray(api) || api === undefined) {
+        if (force) {
+          void this.api.disconnect();
+        } else {
+          var key = api === undefined ? getChainProviders(this._chain) : api;
+          releaseClient(key);
+        }
+      }
+      return Promise.resolve();
+    }
   }, {
     key: "validateSubstrateAddress",
     value: function validateSubstrateAddress(address) {
@@ -1283,21 +1281,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "signAndSubmit",
     value: function () {
-      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(tx, path) {
+      var _signAndSubmit = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(tx, path) {
         var pair, hash;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+        return _regenerator().w(function (_context16) {
+          while (1) switch (_context16.n) {
             case 0:
               pair = createKeyringPair(path);
-              _context17.n = 1;
+              _context16.n = 1;
               return tx.signAndSend(pair);
             case 1:
-              hash = _context17.v;
-              return _context17.a(2, hash.toHex());
+              hash = _context16.v;
+              return _context16.a(2, hash.toHex());
           }
-        }, _callee17);
+        }, _callee16);
       }));
-      function signAndSubmit(_x27, _x28) {
+      function signAndSubmit(_x24, _x25) {
         return _signAndSubmit.apply(this, arguments);
       }
       return signAndSubmit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraspell/sdk-pjs",
-  "version": "12.2.0",
+  "version": "12.2.2",
   "description": "Polkadot.js based SDK for ParaSpell XCM/XCMP tool for developers",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "@snowbridge/contract-types": "0.2.20",
     "ethers": "6.15.0",
     "viem": "2.40.3",
-    "@paraspell/sdk-core": "12.2.0"
+    "@paraspell/sdk-core": "12.2.2"
   },
   "peerDependencies": {
     "@polkadot/api": ">= 16.0 < 17",