@paraspell/sdk 8.13.1 → 8.14.0

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var sdkCore = require('@paraspell/sdk-core');
-var blake2b = require('@noble/hashes/blake2b');
+var blake2 = require('@noble/hashes/blake2');
 var utils = require('@noble/hashes/utils');
 var ethers = require('ethers');
 var polkadotApi = require('polkadot-api');
@@ -628,6 +628,269 @@ var _transform = function transform(obj) {
   }
 };
 
+function createClientCache(maxSize, onEviction) {
+  var extensionMs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 5 * 60000;
+  var data = new Map();
+  var timers = new Map();
+  var now = function now() {
+    return Date.now();
+  };
+  var timeLeft = function timeLeft(w) {
+    return Math.max(w.expireAt - now(), 0);
+  };
+  var schedule = function schedule(k, delay) {
+    if (timers.has(k)) clearTimeout(timers.get(k));
+    timers.set(k, setTimeout(function () {
+      return handleTimeout(k);
+    }, delay));
+  };
+  var handleTimeout = function handleTimeout(k) {
+    var w = data.get(k);
+    if (!w) return;
+    if (!w.extended && w.value.refs > 0) {
+      // first expiry while still in use - Extend grace period
+      // Call rpc.properties to keep the connection alive
+      void _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 3;
+              return w.value.client.getChainSpecData();
+            case 3:
+              _context.next = 7;
+              break;
+            case 5:
+              _context.prev = 5;
+              _context.t0 = _context["catch"](0);
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[0, 5]]);
+      }))();
+      w.value.destroyWanted = true;
+      w.extended = true;
+      w.expireAt = now() + extensionMs;
+      schedule(k, extensionMs);
+      return;
+    }
+    evict(k); // second expiry or unused - real eviction
+  };
+  var evict = function evict(k) {
+    var w = data.get(k);
+    if (!w) return;
+    clearTimeout(timers.get(k));
+    timers["delete"](k);
+    data["delete"](k);
+    onEviction === null || onEviction === void 0 || onEviction(k, w.value);
+  };
+  var evictIfNeeded = function evictIfNeeded() {
+    if (data.size <= maxSize) return;
+    var victimKey;
+    var victim;
+    var _iterator = _createForOfIteratorHelper(data),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _step$value = _slicedToArray(_step.value, 2),
+          k = _step$value[0],
+          w = _step$value[1];
+        if (!victim) {
+          victimKey = k;
+          victim = w;
+          continue;
+        }
+        var better = w.extended && !victim.extended ||
+        // Prefer extended over normal
+        w.extended === victim.extended && w.value.destroyWanted && !victim.value.destroyWanted || w.extended === victim.extended && w.value.destroyWanted === victim.value.destroyWanted && timeLeft(w) < timeLeft(victim) || w.extended === victim.extended && w.value.destroyWanted === victim.value.destroyWanted && timeLeft(w) === timeLeft(victim) && w.value.refs < victim.value.refs; // Prefer with less refs
+        if (better) {
+          victimKey = k;
+          victim = w;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    if (victimKey !== undefined) evict(victimKey);
+  };
+  var set = function set(k, v, ttl) {
+    var existing = data.get(k);
+    if (existing) {
+      existing.value = v;
+      existing.ttl = ttl;
+      existing.extended = false;
+      existing.expireAt = now() + ttl;
+      schedule(k, ttl);
+    } else {
+      data.set(k, {
+        value: v,
+        ttl: ttl,
+        extended: false,
+        expireAt: now() + ttl
+      });
+      schedule(k, ttl);
+    }
+    evictIfNeeded();
+  };
+  var get = function get(k) {
+    var w = data.get(k);
+    if (!w) return undefined;
+    if (!w.extended && timeLeft(w) < w.ttl) {
+      w.expireAt = now() + w.ttl; // refresh normal life
+      schedule(k, w.ttl);
+    }
+    return w.value;
+  };
+  var revive = function revive(k, ttl) {
+    var w = data.get(k);
+    if (!w) return;
+    var remaining = timeLeft(w);
+    w.extended = false;
+    if (ttl < remaining) {
+      w.ttl = ttl;
+      w.expireAt = now() + ttl;
+      schedule(k, ttl);
+    }
+    // if ttl ≥ remaining - keep current timer
+  };
+  var del = function del(k) {
+    if (!data.has(k)) return false;
+    evict(k);
+    return true;
+  };
+  var clear = function clear() {
+    var _iterator2 = _createForOfIteratorHelper(timers.values()),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var t = _step2.value;
+        clearTimeout(t);
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    timers.clear();
+    data.clear();
+  };
+  return {
+    set: set,
+    get: get,
+    "delete": del,
+    has: function has(k) {
+      return data.has(k);
+    },
+    clear: clear,
+    peek: function peek(k) {
+      var _data$get;
+      return (_data$get = data.get(k)) === null || _data$get === void 0 ? void 0 : _data$get.value;
+    },
+    remainingTtl: function remainingTtl(k) {
+      var w = data.get(k);
+      return w ? timeLeft(w) : undefined;
+    },
+    revive: revive
+  };
+}
+
+var DEFAULT_TTL_MS = 60000; // 1 minute
+var MAX_CLIENTS = 100;
+var EXTENSION_MS = 5 * 60000; // 5 minutes
+var clientPool = createClientCache(MAX_CLIENTS, function (_key, entry) {
+  entry.client.destroy();
+}, EXTENSION_MS);
+var keyFromWs = function keyFromWs(ws) {
+  return Array.isArray(ws) ? JSON.stringify(ws) : ws;
+};
+var createPolkadotClient = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(ws) {
+    var isNodeJs, _ref2, getWsProvider, provider;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          isNodeJs = typeof window === 'undefined';
+          if (!isNodeJs) {
+            _context.next = 7;
+            break;
+          }
+          _context.next = 4;
+          return import('polkadot-api/ws-provider/node');
+        case 4:
+          _context.t0 = _context.sent;
+          _context.next = 10;
+          break;
+        case 7:
+          _context.next = 9;
+          return import('polkadot-api/ws-provider/web');
+        case 9:
+          _context.t0 = _context.sent;
+        case 10:
+          _ref2 = _context.t0;
+          getWsProvider = _ref2.getWsProvider;
+          provider = Array.isArray(ws) ? getWsProvider(ws) : getWsProvider(ws);
+          return _context.abrupt("return", polkadotApi.createClient(polkadotSdkCompat.withPolkadotSdkCompat(provider)));
+        case 14:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function createPolkadotClient(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var leasePolkadotClient = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(ws, ttlMs) {
+    var key, entry;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          key = keyFromWs(ws);
+          entry = clientPool.peek(key);
+          if (entry) {
+            _context2.next = 8;
+            break;
+          }
+          _context2.next = 5;
+          return createPolkadotClient(ws);
+        case 5:
+          _context2.t0 = _context2.sent;
+          entry = {
+            client: _context2.t0,
+            refs: 0,
+            destroyWanted: false
+          };
+          clientPool.set(key, entry, ttlMs);
+        case 8:
+          entry.refs += 1;
+          clientPool.revive(key, ttlMs);
+          entry.destroyWanted = false;
+          return _context2.abrupt("return", entry.client);
+        case 12:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function leasePolkadotClient(_x2, _x3) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+var releasePolkadotClient = function releasePolkadotClient(ws) {
+  var key = keyFromWs(ws);
+  var entry = clientPool.peek(key);
+  if (!entry) {
+    return;
+  }
+  entry.refs -= 1;
+  if (entry.refs === 0 && entry.destroyWanted) {
+    clientPool["delete"](key);
+  }
+};
 var unsupportedNodes = ['ComposableFinance', 'Interlay', 'CrustShadow', 'Kintsugi', 'RobonomicsKusama', 'Turing', 'Pendulum', 'Subsocial'];
 var isHex = function isHex(str) {
   return typeof str === 'string' && /^0x[0-9a-fA-F]+$/.test(str);
@@ -635,6 +898,7 @@ var isHex = function isHex(str) {
 var PapiApi = /*#__PURE__*/function () {
   function PapiApi() {
     _classCallCheck(this, PapiApi);
+    this._ttlMs = DEFAULT_TTL_MS;
     this.initialized = false;
     this.disconnectAllowed = true;
   }
@@ -656,57 +920,62 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(node) {
-        var _this$_api;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(node) {
+        var clientTtlMs,
+          _this$_api,
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              clientTtlMs = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : DEFAULT_TTL_MS;
               if (!this.initialized) {
-                _context.next = 2;
+                _context3.next = 3;
                 break;
               }
-              return _context.abrupt("return");
-            case 2:
+              return _context3.abrupt("return");
+            case 3:
               if (!unsupportedNodes.includes(node)) {
-                _context.next = 4;
+                _context3.next = 5;
                 break;
               }
               throw new sdkCore.NodeNotSupportedError("The node ".concat(node, " is not yet supported by the Polkadot API."));
-            case 4:
+            case 5:
+              this._ttlMs = clientTtlMs;
               if (!(typeof this._api === 'string' || this._api instanceof Array)) {
-                _context.next = 10;
+                _context3.next = 12;
                 break;
               }
-              _context.next = 7;
+              _context3.next = 9;
               return this.createApiInstance(this._api);
-            case 7:
-              this.api = _context.sent;
-              _context.next = 18;
+            case 9:
+              this.api = _context3.sent;
+              _context3.next = 20;
               break;
-            case 10:
+            case 12:
               if (!((_this$_api = this._api) !== null && _this$_api !== void 0)) {
-                _context.next = 14;
+                _context3.next = 16;
                 break;
               }
-              _context.t0 = _this$_api;
-              _context.next = 17;
+              _context3.t0 = _this$_api;
+              _context3.next = 19;
               break;
-            case 14:
-              _context.next = 16;
-              return sdkCore.createApiInstanceForNode(this, node);
             case 16:
-              _context.t0 = _context.sent;
-            case 17:
-              this.api = _context.t0;
+              _context3.next = 18;
+              return sdkCore.createApiInstanceForNode(this, node);
             case 18:
-              this.initialized = true;
+              _context3.t0 = _context3.sent;
             case 19:
+              this.api = _context3.t0;
+            case 20:
+              this._node = node;
+              this.initialized = true;
+            case 22:
             case "end":
-              return _context.stop();
+              return _context3.stop();
           }
-        }, _callee, this);
+        }, _callee3, this);
       }));
-      function init(_x) {
+      function init(_x4) {
         return _init.apply(this, arguments);
       }
       return init;
@@ -714,37 +983,18 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "createApiInstance",
     value: function () {
-      var _createApiInstance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(wsUrl) {
-        var isNodeJs, getWsProvider, provider;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _createApiInstance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(wsUrl) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              isNodeJs = typeof window === 'undefined';
-              if (!isNodeJs) {
-                _context2.next = 7;
-                break;
-              }
-              _context2.next = 4;
-              return import('polkadot-api/ws-provider/node');
-            case 4:
-              getWsProvider = _context2.sent.getWsProvider;
-              _context2.next = 10;
-              break;
-            case 7:
-              _context2.next = 9;
-              return import('polkadot-api/ws-provider/web');
-            case 9:
-              getWsProvider = _context2.sent.getWsProvider;
-            case 10:
-              provider = wsUrl instanceof Array ? getWsProvider(wsUrl) : getWsProvider(wsUrl);
-              return _context2.abrupt("return", Promise.resolve(polkadotApi.createClient(polkadotSdkCompat.withPolkadotSdkCompat(provider))));
-            case 12:
+              return _context4.abrupt("return", leasePolkadotClient(wsUrl, this._ttlMs));
+            case 1:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2);
+        }, _callee4, this);
       }));
-      function createApiInstance(_x2) {
+      function createApiInstance(_x5) {
         return _createApiInstance.apply(this, arguments);
       }
       return createApiInstance;
@@ -759,10 +1009,10 @@ var PapiApi = /*#__PURE__*/function () {
     }
   }, {
     key: "callTxMethod",
-    value: function callTxMethod(_ref) {
-      var module = _ref.module,
-        section = _ref.section,
-        parameters = _ref.parameters;
+    value: function callTxMethod(_ref4) {
+      var module = _ref4.module,
+        section = _ref4.section,
+        parameters = _ref4.parameters;
       var transformedParameters = _transform(parameters);
       return this.api.getUnsafeApi().tx[module][section](transformedParameters);
     }
@@ -779,10 +1029,10 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "objectToHex",
     value: function () {
-      var _objectToHex = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(obj) {
+      var _objectToHex = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(obj) {
         var transformedObj, tx, removeFirst5Bytes, encodedData;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               transformedObj = _transform(obj);
               tx = this.api.getUnsafeApi().tx.PolkadotXcm.send({
@@ -800,18 +1050,18 @@ var PapiApi = /*#__PURE__*/function () {
               removeFirst5Bytes = function removeFirst5Bytes(hexString) {
                 return '0x' + hexString.slice(12);
               };
-              _context3.next = 5;
+              _context5.next = 5;
               return tx.getEncodedData();
             case 5:
-              encodedData = _context3.sent;
-              return _context3.abrupt("return", removeFirst5Bytes(encodedData.asHex()));
+              encodedData = _context5.sent;
+              return _context5.abrupt("return", removeFirst5Bytes(encodedData.asHex()));
             case 7:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }));
-      function objectToHex(_x3) {
+      function objectToHex(_x6) {
         return _objectToHex.apply(this, arguments);
       }
       return objectToHex;
@@ -829,25 +1079,25 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "blake2AsHex",
     value: function blake2AsHex(data) {
-      return "0x".concat(utils.bytesToHex(blake2b.blake2b(data, {
+      return "0x".concat(utils.bytesToHex(blake2.blake2b(data, {
         dkLen: 32
       })));
     }
   }, {
     key: "calculateTransactionFee",
     value: function () {
-      var _calculateTransactionFee = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(tx, address) {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _calculateTransactionFee = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(tx, address) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              return _context4.abrupt("return", tx.getEstimatedFees(address));
+              return _context6.abrupt("return", tx.getEstimatedFees(address));
             case 1:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4);
+        }, _callee6);
       }));
-      function calculateTransactionFee(_x4, _x5) {
+      function calculateTransactionFee(_x7, _x8) {
         return _calculateTransactionFee.apply(this, arguments);
       }
       return calculateTransactionFee;
@@ -855,30 +1105,30 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "quoteAhPrice",
     value: function () {
-      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(fromMl, toMl, amountIn) {
+      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(fromMl, toMl, amountIn) {
         var includeFee,
           transformedFromMl,
           transformedToMl,
           response,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              includeFee = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : true;
+              includeFee = _args7.length > 3 && _args7[3] !== undefined ? _args7[3] : true;
               transformedFromMl = _transform(fromMl);
               transformedToMl = _transform(toMl);
-              _context5.next = 5;
+              _context7.next = 5;
               return this.api.getUnsafeApi().apis.AssetConversionApi.quote_price_exact_tokens_for_tokens(transformedFromMl, transformedToMl, amountIn, includeFee);
             case 5:
-              response = _context5.sent;
-              return _context5.abrupt("return", response ? BigInt(response) : undefined);
+              response = _context7.sent;
+              return _context7.abrupt("return", response ? BigInt(response) : undefined);
             case 7:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5, this);
+        }, _callee7, this);
       }));
-      function quoteAhPrice(_x6, _x7, _x8) {
+      function quoteAhPrice(_x9, _x0, _x1) {
         return _quoteAhPrice.apply(this, arguments);
       }
       return quoteAhPrice;
@@ -886,23 +1136,23 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceNative",
     value: function () {
-      var _getBalanceNative = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(address) {
+      var _getBalanceNative = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(address) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context6.next = 2;
+              _context8.next = 2;
               return this.api.getUnsafeApi().query.System.Account.getValue(address);
             case 2:
-              res = _context6.sent;
-              return _context6.abrupt("return", res.data.free);
+              res = _context8.sent;
+              return _context8.abrupt("return", res.data.free);
             case 4:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this);
+        }, _callee8, this);
       }));
-      function getBalanceNative(_x9) {
+      function getBalanceNative(_x10) {
         return _getBalanceNative.apply(this, arguments);
       }
       return getBalanceNative;
@@ -910,23 +1160,23 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignPolkadotXcm",
     value: function () {
-      var _getBalanceForeignPolkadotXcm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(address, id) {
+      var _getBalanceForeignPolkadotXcm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(address, id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context7.next = 2;
+              _context9.next = 2;
               return this.api.getUnsafeApi().query.Assets.Account.getValue(id, address);
             case 2:
-              res = _context7.sent;
-              return _context7.abrupt("return", res && res.balance ? BigInt(res.balance) : 0n);
+              res = _context9.sent;
+              return _context9.abrupt("return", res && res.balance ? BigInt(res.balance) : 0n);
             case 4:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this);
+        }, _callee9, this);
       }));
-      function getBalanceForeignPolkadotXcm(_x0, _x1) {
+      function getBalanceForeignPolkadotXcm(_x11, _x12) {
         return _getBalanceForeignPolkadotXcm.apply(this, arguments);
       }
       return getBalanceForeignPolkadotXcm;
@@ -934,23 +1184,23 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getMythosForeignBalance",
     value: function () {
-      var _getMythosForeignBalance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(address) {
+      var _getMythosForeignBalance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(address) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee0$(_context0) {
+          while (1) switch (_context0.prev = _context0.next) {
             case 0:
-              _context8.next = 2;
+              _context0.next = 2;
               return this.api.getUnsafeApi().query.Balances.Account.getValue(address);
             case 2:
-              res = _context8.sent;
-              return _context8.abrupt("return", res && res.free ? BigInt(res.free) : 0n);
+              res = _context0.sent;
+              return _context0.abrupt("return", res && res.free ? BigInt(res.free) : 0n);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context0.stop();
           }
-        }, _callee8, this);
+        }, _callee0, this);
       }));
-      function getMythosForeignBalance(_x10) {
+      function getMythosForeignBalance(_x13) {
         return _getMythosForeignBalance.apply(this, arguments);
       }
       return getMythosForeignBalance;
@@ -958,24 +1208,24 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignAssetsPallet",
     value: function () {
-      var _getBalanceForeignAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(address, multiLocation) {
+      var _getBalanceForeignAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee1(address, multiLocation) {
         var transformedMultiLocation, res;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee1$(_context1) {
+          while (1) switch (_context1.prev = _context1.next) {
             case 0:
               transformedMultiLocation = _transform(multiLocation);
-              _context9.next = 3;
+              _context1.next = 3;
               return this.api.getUnsafeApi().query.ForeignAssets.Account.getValue(transformedMultiLocation, address);
             case 3:
-              res = _context9.sent;
-              return _context9.abrupt("return", BigInt(res === undefined ? 0 : res.balance));
+              res = _context1.sent;
+              return _context1.abrupt("return", BigInt(res === undefined ? 0 : res.balance));
             case 5:
             case "end":
-              return _context9.stop();
+              return _context1.stop();
           }
-        }, _callee9, this);
+        }, _callee1, this);
       }));
-      function getBalanceForeignAssetsPallet(_x11, _x12) {
+      function getBalanceForeignAssetsPallet(_x14, _x15) {
         return _getBalanceForeignAssetsPallet.apply(this, arguments);
       }
       return getBalanceForeignAssetsPallet;
@@ -983,23 +1233,23 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getForeignAssetsByIdBalance",
     value: function () {
-      var _getForeignAssetsByIdBalance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(address, assetId) {
+      var _getForeignAssetsByIdBalance = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(address, assetId) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee0$(_context0) {
-          while (1) switch (_context0.prev = _context0.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context0.next = 2;
+              _context10.next = 2;
               return this.api.getUnsafeApi().query.ForeignAssets.Account.getValue(assetId, address);
             case 2:
-              res = _context0.sent;
-              return _context0.abrupt("return", BigInt(res === undefined ? 0 : res.balance));
+              res = _context10.sent;
+              return _context10.abrupt("return", BigInt(res === undefined ? 0 : res.balance));
             case 4:
             case "end":
-              return _context0.stop();
+              return _context10.stop();
           }
-        }, _callee0, this);
+        }, _callee10, this);
       }));
-      function getForeignAssetsByIdBalance(_x13, _x14) {
+      function getForeignAssetsByIdBalance(_x16, _x17) {
         return _getForeignAssetsByIdBalance.apply(this, arguments);
       }
       return getForeignAssetsByIdBalance;
@@ -1007,26 +1257,26 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignBifrost",
     value: function () {
-      var _getBalanceForeignBifrost = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee1(address, asset) {
+      var _getBalanceForeignBifrost = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(address, asset) {
         var currencySelection, transformedParameters, response, accountData;
-        return _regeneratorRuntime().wrap(function _callee1$(_context1) {
-          while (1) switch (_context1.prev = _context1.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               currencySelection = sdkCore.getNode('BifrostPolkadot').getCurrencySelection(asset);
               transformedParameters = _transform(currencySelection);
-              _context1.next = 4;
+              _context11.next = 4;
               return this.api.getUnsafeApi().query.Tokens.Accounts.getValue(address, transformedParameters);
             case 4:
-              response = _context1.sent;
+              response = _context11.sent;
               accountData = response ? response : null;
-              return _context1.abrupt("return", accountData ? BigInt(accountData.free.toString()) : 0n);
+              return _context11.abrupt("return", accountData ? BigInt(accountData.free.toString()) : 0n);
             case 7:
             case "end":
-              return _context1.stop();
+              return _context11.stop();
           }
-        }, _callee1, this);
+        }, _callee11, this);
       }));
-      function getBalanceForeignBifrost(_x15, _x16) {
+      function getBalanceForeignBifrost(_x18, _x19) {
         return _getBalanceForeignBifrost.apply(this, arguments);
       }
       return getBalanceForeignBifrost;
@@ -1034,27 +1284,27 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceNativeAcala",
     value: function () {
-      var _getBalanceNativeAcala = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(address, symbol) {
+      var _getBalanceNativeAcala = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(address, symbol) {
         var transformedParameters, response, accountData;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               transformedParameters = _transform({
                 Token: symbol
               });
-              _context10.next = 3;
+              _context12.next = 3;
               return this.api.getUnsafeApi().query.Tokens.Accounts.getValue(address, transformedParameters);
             case 3:
-              response = _context10.sent;
+              response = _context12.sent;
               accountData = response ? response : null;
-              return _context10.abrupt("return", accountData ? BigInt(accountData.free.toString()) : 0n);
+              return _context12.abrupt("return", accountData ? BigInt(accountData.free.toString()) : 0n);
             case 6:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
-      function getBalanceNativeAcala(_x17, _x18) {
+      function getBalanceNativeAcala(_x20, _x21) {
         return _getBalanceNativeAcala.apply(this, arguments);
       }
       return getBalanceNativeAcala;
@@ -1062,35 +1312,35 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignXTokens",
     value: function () {
-      var _getBalanceForeignXTokens = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(node, address, asset) {
+      var _getBalanceForeignXTokens = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(node, address, asset) {
         var pallet, response, entry;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               pallet = 'Tokens';
               if (node === 'Centrifuge' || node === 'Altair') {
                 pallet = 'OrmlTokens';
               }
-              _context11.next = 4;
+              _context13.next = 4;
               return this.api.getUnsafeApi().query[pallet].Accounts.getEntries(address);
             case 4:
-              response = _context11.sent;
-              entry = response.find(function (_ref2) {
+              response = _context13.sent;
+              entry = response.find(function (_ref5) {
                 var _asset$symbol, _asset$assetId, _asset$symbol2, _asset$assetId2;
-                var keyArgs = _ref2.keyArgs;
+                var keyArgs = _ref5.keyArgs;
                 var _keyArgs = _slicedToArray(keyArgs, 2);
                   _keyArgs[0];
                   var assetItem = _keyArgs[1];
                 return assetItem.toString().toLowerCase() === ((_asset$symbol = asset.symbol) === null || _asset$symbol === void 0 ? void 0 : _asset$symbol.toLowerCase()) || sdkCore.isForeignAsset(asset) && assetItem.toString().toLowerCase() === ((_asset$assetId = asset.assetId) === null || _asset$assetId === void 0 ? void 0 : _asset$assetId.toLowerCase()) || _typeof(assetItem) === 'object' && 'value' in assetItem && assetItem.value.toString().toLowerCase() === ((_asset$symbol2 = asset.symbol) === null || _asset$symbol2 === void 0 ? void 0 : _asset$symbol2.toLowerCase()) || _typeof(assetItem) === 'object' && 'value' in assetItem && sdkCore.isForeignAsset(asset) && assetItem.value.toString().toLowerCase() === ((_asset$assetId2 = asset.assetId) === null || _asset$assetId2 === void 0 ? void 0 : _asset$assetId2.toLowerCase());
               });
-              return _context11.abrupt("return", entry !== null && entry !== void 0 && entry.value ? BigInt(entry.value.free.toString()) : 0n);
+              return _context13.abrupt("return", entry !== null && entry !== void 0 && entry.value ? BigInt(entry.value.free.toString()) : 0n);
             case 7:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }));
-      function getBalanceForeignXTokens(_x19, _x20, _x21) {
+      function getBalanceForeignXTokens(_x22, _x23, _x24) {
         return _getBalanceForeignXTokens.apply(this, arguments);
       }
       return getBalanceForeignXTokens;
@@ -1098,23 +1348,23 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceAssetsPallet",
     value: function () {
-      var _getBalanceAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(address, assetId) {
+      var _getBalanceAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(address, assetId) {
         var response;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              _context12.next = 2;
+              _context14.next = 2;
               return this.api.getUnsafeApi().query.Assets.Account.getValue(assetId, address);
             case 2:
-              response = _context12.sent;
-              return _context12.abrupt("return", BigInt(response === undefined ? 0 : response.balance));
+              response = _context14.sent;
+              return _context14.abrupt("return", BigInt(response === undefined ? 0 : response.balance));
             case 4:
             case "end":
-              return _context12.stop();
+              return _context14.stop();
           }
-        }, _callee12, this);
+        }, _callee14, this);
       }));
-      function getBalanceAssetsPallet(_x22, _x23) {
+      function getBalanceAssetsPallet(_x25, _x26) {
         return _getBalanceAssetsPallet.apply(this, arguments);
       }
       return getBalanceAssetsPallet;
@@ -1122,24 +1372,24 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getFromRpc",
     value: function () {
-      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(module, method, key) {
+      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(module, method, key) {
         var toSS58, value;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               toSS58 = polkadotApi.AccountId().dec;
-              _context13.next = 3;
+              _context15.next = 3;
               return this.api._request("".concat(module, "_").concat(method), [module === 'system' && isHex(key) && !ethers.ethers.isAddress(key) ? toSS58(key) : key]);
             case 3:
-              value = _context13.sent;
-              return _context13.abrupt("return", isHex(value) ? value : '0x' + value.toString(16).padStart(8, '0'));
+              value = _context15.sent;
+              return _context15.abrupt("return", isHex(value) ? value : '0x' + value.toString(16).padStart(8, '0'));
             case 5:
             case "end":
-              return _context13.stop();
+              return _context15.stop();
           }
-        }, _callee13, this);
+        }, _callee15, this);
       }));
-      function getFromRpc(_x24, _x25, _x26) {
+      function getFromRpc(_x27, _x28, _x29) {
         return _getFromRpc.apply(this, arguments);
       }
       return getFromRpc;
@@ -1152,23 +1402,23 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "createApiForNode",
     value: function () {
-      var _createApiForNode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(node) {
+      var _createApiForNode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(node) {
         var api;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               api = new PapiApi();
-              _context14.next = 3;
+              _context16.next = 3;
               return api.init(node);
             case 3:
-              return _context14.abrupt("return", api);
+              return _context16.abrupt("return", api);
             case 4:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14);
+        }, _callee16);
       }));
-      function createApiForNode(_x27) {
+      function createApiForNode(_x30) {
         return _createApiForNode.apply(this, arguments);
       }
       return createApiForNode;
@@ -1176,24 +1426,24 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(_ref3) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17(_ref6) {
         var _this$api$getUnsafeAp;
         var tx, address, node, supportsDryRunApi, isBifrost, DEFAULT_XCM_VERSION, result, isSuccess, failureReason, executionFee, fee, actualWeight, weight, forwardedXcms, destParaId;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              tx = _ref3.tx, address = _ref3.address, node = _ref3.node;
+              tx = _ref6.tx, address = _ref6.address, node = _ref6.node;
               supportsDryRunApi = sdkCore.getAssetsObject(node).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context15.next = 4;
+                _context17.next = 4;
                 break;
               }
               throw new sdkCore.NodeNotSupportedError("DryRunApi is not available on node ".concat(node));
             case 4:
-              // Bifrost requires a third parameter XCM version
-              isBifrost = node === 'BifrostPolkadot' || node === 'BifrostKusama';
+              // These nodes require a third parameter XCM version
+              isBifrost = node === 'BifrostPolkadot' || node === 'BifrostKusama' || node === 'AssetHubKusama';
               DEFAULT_XCM_VERSION = 3;
-              _context15.next = 8;
+              _context17.next = 8;
               return (_this$api$getUnsafeAp = this.api.getUnsafeApi().apis.DryRunApi).dry_run_call.apply(_this$api$getUnsafeAp, [{
                 type: 'system',
                 value: {
@@ -1202,22 +1452,22 @@ var PapiApi = /*#__PURE__*/function () {
                 }
               }, tx.decodedCall].concat(_toConsumableArray(isBifrost ? [DEFAULT_XCM_VERSION] : [])));
             case 8:
-              result = _context15.sent;
+              result = _context17.sent;
               isSuccess = result.success && result.value.execution_result.success;
               if (isSuccess) {
-                _context15.next = 13;
+                _context17.next = 13;
                 break;
               }
               failureReason = result.value.execution_result.value.error.value.value.type;
-              return _context15.abrupt("return", Promise.resolve({
+              return _context17.abrupt("return", Promise.resolve({
                 success: false,
                 failureReason: failureReason
               }));
             case 13:
-              _context15.next = 15;
+              _context17.next = 15;
               return this.calculateTransactionFee(tx, address);
             case 15:
-              executionFee = _context15.sent;
+              executionFee = _context17.sent;
               fee = sdkCore.computeFeeFromDryRun(result, node, executionFee);
               actualWeight = result.value.execution_result.value.actual_weight;
               weight = actualWeight ? {
@@ -1226,7 +1476,7 @@ 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;
-              return _context15.abrupt("return", Promise.resolve({
+              return _context17.abrupt("return", Promise.resolve({
                 success: true,
                 fee: fee,
                 weight: weight,
@@ -1235,11 +1485,11 @@ var PapiApi = /*#__PURE__*/function () {
               }));
             case 22:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15, this);
+        }, _callee17, this);
       }));
-      function getDryRunCall(_x28) {
+      function getDryRunCall(_x31) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -1247,32 +1497,32 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(_ref4) {
-        var _ref5, _ref6, _ref7;
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee18(_ref7) {
+        var _ref8, _ref9, _ref0;
         var originLocation, xcm, node, origin, supportsDryRunApi, transformedOriginLocation, result, isSuccess, failureReason, emitted, reversedEvents, palletsWithIssued, feeEvent, fee, actualWeight, weight, forwardedXcms, destParaId;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              originLocation = _ref4.originLocation, xcm = _ref4.xcm, node = _ref4.node, origin = _ref4.origin;
+              originLocation = _ref7.originLocation, xcm = _ref7.xcm, node = _ref7.node, origin = _ref7.origin;
               supportsDryRunApi = sdkCore.getAssetsObject(node).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context16.next = 4;
+                _context18.next = 4;
                 break;
               }
               throw new sdkCore.NodeNotSupportedError("DryRunApi is not available on node ".concat(node));
             case 4:
               transformedOriginLocation = _transform(originLocation);
-              _context16.next = 7;
+              _context18.next = 7;
               return this.api.getUnsafeApi().apis.DryRunApi.dry_run_xcm(transformedOriginLocation, xcm);
             case 7:
-              result = _context16.sent;
+              result = _context18.sent;
               isSuccess = result.success && result.value.execution_result.type === 'Complete';
               if (isSuccess) {
-                _context16.next = 12;
+                _context18.next = 12;
                 break;
               }
               failureReason = result.value.execution_result.value.error.type;
-              return _context16.abrupt("return", Promise.resolve({
+              return _context18.abrupt("return", Promise.resolve({
                 success: false,
                 failureReason: failureReason
               }));
@@ -1280,24 +1530,24 @@ var PapiApi = /*#__PURE__*/function () {
               emitted = result.value.emitted_events; // We want to look for the last event
               reversedEvents = _toConsumableArray(emitted).reverse();
               palletsWithIssued = ['Balances', 'ForeignAssets', 'Assets'];
-              feeEvent = (_ref5 = (_ref6 = (_ref7 = origin === 'Mythos' ? reversedEvents.find(function (event) {
+              feeEvent = (_ref8 = (_ref9 = (_ref0 = origin === 'Mythos' ? reversedEvents.find(function (event) {
                 return event.type === 'AssetConversion' && event.value.type === 'SwapCreditExecuted';
-              }) : undefined) !== null && _ref7 !== void 0 ? _ref7 :
+              }) : undefined) !== null && _ref0 !== void 0 ? _ref0 :
               // Prefer an Issued event
               reversedEvents.find(function (event) {
                 return palletsWithIssued.includes(event.type) && event.value.type === 'Issued';
-              })) !== null && _ref6 !== void 0 ? _ref6 :
+              })) !== null && _ref9 !== void 0 ? _ref9 :
               // Fallback to Minted event
               reversedEvents.find(function (event) {
                 return ['Balances', 'ForeignAssets'].includes(event.type) && event.value.type === 'Minted';
-              })) !== null && _ref5 !== void 0 ? _ref5 : reversedEvents.find(function (event) {
+              })) !== null && _ref8 !== void 0 ? _ref8 : reversedEvents.find(function (event) {
                 return ['Currencies', 'Tokens'].includes(event.type) && event.value.type === 'Deposited';
               });
               if (feeEvent) {
-                _context16.next = 18;
+                _context18.next = 18;
                 break;
               }
-              return _context16.abrupt("return", Promise.resolve({
+              return _context18.abrupt("return", Promise.resolve({
                 success: false,
                 failureReason: 'Cannot determine destination fee. No Issued event found'
               }));
@@ -1310,7 +1560,7 @@ 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;
-              return _context16.abrupt("return", Promise.resolve({
+              return _context18.abrupt("return", Promise.resolve({
                 success: true,
                 fee: fee,
                 weight: weight,
@@ -1319,11 +1569,11 @@ var PapiApi = /*#__PURE__*/function () {
               }));
             case 24:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this);
+        }, _callee18, this);
       }));
-      function getDryRunXcm(_x29) {
+      function getDryRunXcm(_x32) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -1331,21 +1581,21 @@ var PapiApi = /*#__PURE__*/function () {
   }, {
     key: "getBridgeStatus",
     value: function () {
-      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var outboundOperatingMode;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context17.next = 2;
+              _context19.next = 2;
               return this.api.getUnsafeApi().query.EthereumOutboundQueue.OperatingMode.getValue();
             case 2:
-              outboundOperatingMode = _context17.sent;
-              return _context17.abrupt("return", outboundOperatingMode.type);
+              outboundOperatingMode = _context19.sent;
+              return _context19.abrupt("return", outboundOperatingMode.type);
             case 4:
             case "end":
-              return _context17.stop();
+              return _context19.stop();
           }
-        }, _callee17, this);
+        }, _callee19, this);
       }));
       function getBridgeStatus() {
         return _getBridgeStatus.apply(this, arguments);
@@ -1368,10 +1618,19 @@ var PapiApi = /*#__PURE__*/function () {
       var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       if (!this.initialized) return Promise.resolve();
       if (!force && !this.disconnectAllowed) return Promise.resolve();
-      // Disconnect api only if it was created automatically
-      if (force || typeof this._api === 'string' || this._api === undefined) {
+      // Own client provided, destroy only if force true
+      if (force && _typeof(this._api) === 'object') {
         this.api.destroy();
       }
+      // Client created automatically
+      if (typeof this._api === 'string' || Array.isArray(this._api) || this._api === undefined) {
+        if (force) {
+          this.api.destroy();
+        } else {
+          var key = this._api === undefined ? sdkCore.getNodeProviders(this._node) : this._api;
+          releasePolkadotClient(key);
+        }
+      }
       return Promise.resolve();
     }
   }]);