@paraspell/sdk-pjs 10.10.11 → 10.11.0

package/dist/index.cjs

@@ -276,20 +276,16 @@ var snakeToCamel = function snakeToCamel(str) {
   });
 };
 var PolkadotJsApi = /*#__PURE__*/function () {
-  function PolkadotJsApi() {
+  function PolkadotJsApi(config) {
     _classCallCheck(this, PolkadotJsApi);
     this.initialized = false;
     this.disconnectAllowed = true;
+    this._config = config;
   }
   return _createClass(PolkadotJsApi, [{
-    key: "setApi",
-    value: function setApi(api) {
-      this._api = api;
-    }
-  }, {
-    key: "getApiOrUrl",
-    value: function getApiOrUrl() {
-      return this._api;
+    key: "getConfig",
+    value: function getConfig() {
+      return this._config;
     }
   }, {
     key: "getApi",
@@ -299,45 +295,31 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(node, _clientTtlMs) {
-        var _this$_api, _t;
+      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(chain, _clientTtlMs) {
+        var apiConfig;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              if (!(this.initialized || node === 'Ethereum')) {
+              if (!(this.initialized || chain === 'Ethereum')) {
                 _context.n = 1;
                 break;
               }
               return _context.a(2);
             case 1:
-              if (!(typeof this._api === 'string' || this._api instanceof Array)) {
-                _context.n = 3;
+              this._node = chain;
+              apiConfig = this.getApiConfigForChain(chain);
+              if (!(sdkCore.isConfig(this._config) && this._config.development && !apiConfig)) {
+                _context.n = 2;
                 break;
               }
-              _context.n = 2;
-              return this.createApiInstance(this._api);
+              throw new sdkCore.MissingChainApiError(chain);
             case 2:
-              this.api = _context.v;
-              _context.n = 7;
-              break;
+              _context.n = 3;
+              return this.resolveApi(apiConfig, chain);
             case 3:
-              if (!((_this$_api = this._api) !== null && _this$_api !== void 0)) {
-                _context.n = 4;
-                break;
-              }
-              _t = _this$_api;
-              _context.n = 6;
-              break;
-            case 4:
-              _context.n = 5;
-              return sdkCore.createApiInstanceForNode(this, node);
-            case 5:
-              _t = _context.v;
-            case 6:
-              this.api = _t;
-            case 7:
+              this.api = _context.v;
               this.initialized = true;
-            case 8:
+            case 4:
               return _context.a(2);
           }
         }, _callee, this);
@@ -348,21 +330,58 @@ var PolkadotJsApi = /*#__PURE__*/function () {
       return init;
     }()
   }, {
-    key: "createApiInstance",
+    key: "getApiConfigForChain",
+    value: function getApiConfigForChain(chain) {
+      if (sdkCore.isConfig(this._config)) {
+        var _this$_config$apiOver;
+        return (_this$_config$apiOver = this._config.apiOverrides) === null || _this$_config$apiOver === void 0 ? void 0 : _this$_config$apiOver[chain];
+      }
+      return this._config;
+    }
+  }, {
+    key: "resolveApi",
     value: function () {
-      var _createApiInstance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(wsUrl) {
-        var wsProvider;
+      var _resolveApi = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(apiConfig, chain) {
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
+            case 0:
+              if (apiConfig) {
+                _context2.n = 1;
+                break;
+              }
+              return _context2.a(2, sdkCore.createApiInstanceForNode(this, chain));
+            case 1:
+              if (!(typeof apiConfig === 'string' || apiConfig instanceof Array)) {
+                _context2.n = 2;
+                break;
+              }
+              return _context2.a(2, this.createApiInstance(apiConfig));
+            case 2:
+              return _context2.a(2, apiConfig);
+          }
+        }, _callee2, this);
+      }));
+      function resolveApi(_x3, _x4) {
+        return _resolveApi.apply(this, arguments);
+      }
+      return resolveApi;
+    }()
+  }, {
+    key: "createApiInstance",
+    value: function () {
+      var _createApiInstance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(wsUrl) {
+        var wsProvider;
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
               wsProvider = new api.WsProvider(wsUrl);
-              return _context2.a(2, api.ApiPromise.create({
+              return _context3.a(2, api.ApiPromise.create({
                 provider: wsProvider
               }));
           }
-        }, _callee2);
+        }, _callee3);
       }));
-      function createApiInstance(_x3) {
+      function createApiInstance(_x5) {
         return _createApiInstance.apply(this, arguments);
       }
       return createApiInstance;
@@ -416,21 +435,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "calculateTransactionFee",
     value: function () {
-      var _calculateTransactionFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(tx, address) {
+      var _calculateTransactionFee = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(tx, address) {
         var _yield$tx$paymentInfo, partialFee;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
             case 0:
-              _context3.n = 1;
+              _context4.n = 1;
               return tx.paymentInfo(address);
             case 1:
-              _yield$tx$paymentInfo = _context3.v;
+              _yield$tx$paymentInfo = _context4.v;
               partialFee = _yield$tx$paymentInfo.partialFee;
-              return _context3.a(2, partialFee.toBigInt());
+              return _context4.a(2, partialFee.toBigInt());
           }
-        }, _callee3);
+        }, _callee4);
       }));
-      function calculateTransactionFee(_x4, _x5) {
+      function calculateTransactionFee(_x6, _x7) {
         return _calculateTransactionFee.apply(this, arguments);
       }
       return calculateTransactionFee;
@@ -438,23 +457,23 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "quoteAhPrice",
     value: function () {
-      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(fromMl, toMl, amountIn) {
+      var _quoteAhPrice = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(fromMl, toMl, amountIn) {
         var includeFee,
           quoted,
-          _args4 = arguments;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+          _args5 = arguments;
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
-              includeFee = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : true;
-              _context4.n = 1;
+              includeFee = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : true;
+              _context5.n = 1;
               return this.api.call.assetConversionApi.quotePriceExactTokensForTokens(fromMl, toMl, amountIn.toString(), includeFee);
             case 1:
-              quoted = _context4.v;
-              return _context4.a(2, quoted.toJSON() !== null ? BigInt(quoted.toString()) : undefined);
+              quoted = _context5.v;
+              return _context5.a(2, quoted.toJSON() !== null ? BigInt(quoted.toString()) : undefined);
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function quoteAhPrice(_x6, _x7, _x8) {
+      function quoteAhPrice(_x8, _x9, _x0) {
         return _quoteAhPrice.apply(this, arguments);
       }
       return quoteAhPrice;
@@ -462,20 +481,20 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceNative",
     value: function () {
-      var _getBalanceNative = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(address) {
+      var _getBalanceNative = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(address) {
         var response;
-        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 this.api.query.system.account(address);
             case 1:
-              response = _context5.v;
-              return _context5.a(2, response.data.free.toBigInt());
+              response = _context6.v;
+              return _context6.a(2, response.data.free.toBigInt());
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function getBalanceNative(_x9) {
+      function getBalanceNative(_x1) {
         return _getBalanceNative.apply(this, arguments);
       }
       return getBalanceNative;
@@ -483,22 +502,22 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignPolkadotXcm",
     value: function () {
-      var _getBalanceForeignPolkadotXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(address, id) {
+      var _getBalanceForeignPolkadotXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(address, id) {
         var parsedId, response, obj;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
             case 0:
               parsedId = new types.u32(this.api.registry, id);
-              _context6.n = 1;
+              _context7.n = 1;
               return this.api.query.assets.account(parsedId, address);
             case 1:
-              response = _context6.v;
+              response = _context7.v;
               obj = response.toJSON();
-              return _context6.a(2, obj.balance ? BigInt(obj.balance) : 0n);
+              return _context7.a(2, obj.balance ? BigInt(obj.balance) : 0n);
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function getBalanceForeignPolkadotXcm(_x0, _x1) {
+      function getBalanceForeignPolkadotXcm(_x10, _x11) {
         return _getBalanceForeignPolkadotXcm.apply(this, arguments);
       }
       return getBalanceForeignPolkadotXcm;
@@ -506,21 +525,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getMythosForeignBalance",
     value: function () {
-      var _getMythosForeignBalance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(address) {
+      var _getMythosForeignBalance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(address) {
         var response, obj;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.n) {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
             case 0:
-              _context7.n = 1;
+              _context8.n = 1;
               return this.api.query.balances.account(address);
             case 1:
-              response = _context7.v;
+              response = _context8.v;
               obj = response.toJSON();
-              return _context7.a(2, obj.free ? BigInt(obj.free) : 0n);
+              return _context8.a(2, obj.free ? BigInt(obj.free) : 0n);
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
-      function getMythosForeignBalance(_x10) {
+      function getMythosForeignBalance(_x12) {
         return _getMythosForeignBalance.apply(this, arguments);
       }
       return getMythosForeignBalance;
@@ -528,21 +547,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignAssetsPallet",
     value: function () {
-      var _getBalanceForeignAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(address, multiLocation) {
+      var _getBalanceForeignAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(address, multiLocation) {
         var response, obj;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.n) {
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
             case 0:
-              _context8.n = 1;
+              _context9.n = 1;
               return this.api.query.foreignAssets.account(multiLocation, address);
             case 1:
-              response = _context8.v;
+              response = _context9.v;
               obj = response.toJSON();
-              return _context8.a(2, BigInt(obj === null || !obj.balance ? 0 : obj.balance));
+              return _context9.a(2, BigInt(obj === null || !obj.balance ? 0 : obj.balance));
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function getBalanceForeignAssetsPallet(_x11, _x12) {
+      function getBalanceForeignAssetsPallet(_x13, _x14) {
         return _getBalanceForeignAssetsPallet.apply(this, arguments);
       }
       return getBalanceForeignAssetsPallet;
@@ -550,21 +569,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getForeignAssetsByIdBalance",
     value: function () {
-      var _getForeignAssetsByIdBalance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(address, assetId) {
+      var _getForeignAssetsByIdBalance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(address, assetId) {
         var response, obj;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.n) {
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.n) {
             case 0:
-              _context9.n = 1;
+              _context0.n = 1;
               return this.api.query.foreignAssets.account(assetId, address);
             case 1:
-              response = _context9.v;
+              response = _context0.v;
               obj = response.toJSON();
-              return _context9.a(2, BigInt(obj === null || !obj.balance ? 0 : obj.balance));
+              return _context0.a(2, BigInt(obj === null || !obj.balance ? 0 : obj.balance));
           }
-        }, _callee9, this);
+        }, _callee0, this);
       }));
-      function getForeignAssetsByIdBalance(_x13, _x14) {
+      function getForeignAssetsByIdBalance(_x15, _x16) {
         return _getForeignAssetsByIdBalance.apply(this, arguments);
       }
       return getForeignAssetsByIdBalance;
@@ -572,22 +591,22 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignBifrost",
     value: function () {
-      var _getBalanceForeignBifrost = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(address, asset) {
+      var _getBalanceForeignBifrost = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(address, asset) {
         var currencySelection, response, accountData;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.n) {
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
             case 0:
               currencySelection = sdkCore.getNode('BifrostPolkadot').getCurrencySelection(asset);
-              _context0.n = 1;
+              _context1.n = 1;
               return this.api.query.tokens.accounts(address, currencySelection);
             case 1:
-              response = _context0.v;
+              response = _context1.v;
               accountData = response ? response : null;
-              return _context0.a(2, accountData ? BigInt(accountData.free.toString()) : 0n);
+              return _context1.a(2, accountData ? BigInt(accountData.free.toString()) : 0n);
           }
-        }, _callee0, this);
+        }, _callee1, this);
       }));
-      function getBalanceForeignBifrost(_x15, _x16) {
+      function getBalanceForeignBifrost(_x17, _x18) {
         return _getBalanceForeignBifrost.apply(this, arguments);
       }
       return getBalanceForeignBifrost;
@@ -595,23 +614,23 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceNativeAcala",
     value: function () {
-      var _getBalanceNativeAcala = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(address, symbol) {
+      var _getBalanceNativeAcala = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(address, symbol) {
         var response, accountData;
-        return _regenerator().w(function (_context1) {
-          while (1) switch (_context1.n) {
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.n) {
             case 0:
-              _context1.n = 1;
+              _context10.n = 1;
               return this.api.query.tokens.accounts(address, {
                 Token: symbol
               });
             case 1:
-              response = _context1.v;
+              response = _context10.v;
               accountData = response ? response : null;
-              return _context1.a(2, accountData ? BigInt(accountData.free.toString()) : 0n);
+              return _context10.a(2, accountData ? BigInt(accountData.free.toString()) : 0n);
           }
-        }, _callee1, this);
+        }, _callee10, this);
       }));
-      function getBalanceNativeAcala(_x17, _x18) {
+      function getBalanceNativeAcala(_x19, _x20) {
         return _getBalanceNativeAcala.apply(this, arguments);
       }
       return getBalanceNativeAcala;
@@ -619,19 +638,19 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceForeignXTokens",
     value: function () {
-      var _getBalanceForeignXTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(node, address, asset) {
+      var _getBalanceForeignXTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(node, address, asset) {
         var pallet, response, entry, accountData;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.n) {
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             case 0:
               pallet = 'tokens';
               if (node === 'Centrifuge' || node === 'Altair') {
                 pallet = 'ormlTokens';
               }
-              _context10.n = 1;
+              _context11.n = 1;
               return this.api.query[pallet].accounts.entries(address);
             case 1:
-              response = _context10.v;
+              response = _context11.v;
               entry = response.find(function (_ref2) {
                 var _asset$symbol, _asset$assetId, _assetItem$toHuman, _asset$symbol2, _assetItem$toHuman2, _asset$assetId2;
                 var _ref3 = _slicedToArray(_ref2, 2),
@@ -643,11 +662,11 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 return assetSymbol === ((_asset$symbol = asset.symbol) === null || _asset$symbol === void 0 ? void 0 : _asset$symbol.toLowerCase()) || sdkCore.isForeignAsset(asset) && assetSymbol === ((_asset$assetId = asset.assetId) === null || _asset$assetId === void 0 ? void 0 : _asset$assetId.toLowerCase()) || Object.values((_assetItem$toHuman = assetItem.toHuman()) !== null && _assetItem$toHuman !== void 0 ? _assetItem$toHuman : {}).toString().toLowerCase() === ((_asset$symbol2 = asset.symbol) === null || _asset$symbol2 === void 0 ? void 0 : _asset$symbol2.toLowerCase()) || sdkCore.isForeignAsset(asset) && Object.values((_assetItem$toHuman2 = assetItem.toHuman()) !== null && _assetItem$toHuman2 !== void 0 ? _assetItem$toHuman2 : {}).toString().toLowerCase() === ((_asset$assetId2 = asset.assetId) === null || _asset$assetId2 === void 0 ? void 0 : _asset$assetId2.toLowerCase());
               });
               accountData = entry ? entry[1] : null;
-              return _context10.a(2, accountData ? BigInt(accountData.free.toString()) : 0n);
+              return _context11.a(2, accountData ? BigInt(accountData.free.toString()) : 0n);
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function getBalanceForeignXTokens(_x19, _x20, _x21) {
+      function getBalanceForeignXTokens(_x21, _x22, _x23) {
         return _getBalanceForeignXTokens.apply(this, arguments);
       }
       return getBalanceForeignXTokens;
@@ -655,21 +674,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBalanceAssetsPallet",
     value: function () {
-      var _getBalanceAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(address, assetId) {
+      var _getBalanceAssetsPallet = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(address, assetId) {
         var response, obj;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _context11.n = 1;
+              _context12.n = 1;
               return this.api.query.assets.account(assetId, address);
             case 1:
-              response = _context11.v;
+              response = _context12.v;
               obj = response.toJSON();
-              return _context11.a(2, BigInt(obj === null || !obj.balance ? 0 : obj.balance));
+              return _context12.a(2, BigInt(obj === null || !obj.balance ? 0 : obj.balance));
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
-      function getBalanceAssetsPallet(_x22, _x23) {
+      function getBalanceAssetsPallet(_x24, _x25) {
         return _getBalanceAssetsPallet.apply(this, arguments);
       }
       return getBalanceAssetsPallet;
@@ -682,27 +701,27 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getFromRpc",
     value: function () {
-      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(module, method, key) {
+      var _getFromRpc = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(module, method, key) {
         var rpcModule, response;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.n) {
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
               rpcModule = this.api.rpc[module];
               if (!(!rpcModule || !rpcModule[method])) {
-                _context12.n = 1;
+                _context13.n = 1;
                 break;
               }
               throw new sdkCore.InvalidParameterError("RPC method ".concat(module, ".").concat(method, " not available"));
             case 1:
-              _context12.n = 2;
+              _context13.n = 2;
               return rpcModule[method](key);
             case 2:
-              response = _context12.v;
-              return _context12.a(2, response.toHex());
+              response = _context13.v;
+              return _context13.a(2, response.toHex());
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
-      function getFromRpc(_x24, _x25, _x26) {
+      function getFromRpc(_x26, _x27, _x28) {
         return _getFromRpc.apply(this, arguments);
       }
       return getFromRpc;
@@ -715,25 +734,25 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "clone",
     value: function clone() {
-      return new PolkadotJsApi();
+      return new PolkadotJsApi(sdkCore.isConfig(this._config) ? this._config : undefined);
     }
   }, {
     key: "createApiForNode",
     value: function () {
-      var _createApiForNode = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(node) {
+      var _createApiForNode = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(node) {
         var api;
-        return _regenerator().w(function (_context13) {
-          while (1) switch (_context13.n) {
+        return _regenerator().w(function (_context14) {
+          while (1) switch (_context14.n) {
             case 0:
               api = new PolkadotJsApi();
-              _context13.n = 1;
+              _context14.n = 1;
               return api.init(node);
             case 1:
-              return _context13.a(2, api);
+              return _context14.a(2, api);
           }
-        }, _callee13);
+        }, _callee14);
       }));
-      function createApiForNode(_x27) {
+      function createApiForNode(_x29) {
         return _createApiForNode.apply(this, arguments);
       }
       return createApiForNode;
@@ -741,16 +760,16 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunCall",
     value: function () {
-      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(_ref4) {
+      var _getDryRunCall = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(_ref4) {
         var _this$api$call$dryRun;
         var tx, address, node, supportsDryRunApi, nodesRequiringVersionParam, needsVersionParam, DEFAULT_XCM_VERSION, response, result, resultJson, isSuccess, moduleError, failureReason, executionFee, fee, actualWeight, weight, forwardedXcms, destParaId;
-        return _regenerator().w(function (_context14) {
-          while (1) switch (_context14.n) {
+        return _regenerator().w(function (_context15) {
+          while (1) switch (_context15.n) {
             case 0:
               tx = _ref4.tx, address = _ref4.address, node = _ref4.node;
               supportsDryRunApi = sdkCore.getAssetsObject(node).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context14.n = 1;
+                _context15.n = 1;
                 break;
               }
               throw new sdkCore.NodeNotSupportedError("DryRunApi is not available on node ".concat(node));
@@ -758,32 +777,32 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               nodesRequiringVersionParam = ['BifrostPolkadot', 'BifrostKusama', 'AssetHubKusama', 'AssetHubPolkadot', 'Kusama', 'Polkadot', 'Polimec', 'Astar'];
               needsVersionParam = nodesRequiringVersionParam.includes(node);
               DEFAULT_XCM_VERSION = 3;
-              _context14.n = 2;
+              _context15.n = 2;
               return (_this$api$call$dryRun = this.api.call.dryRunApi).dryRunCall.apply(_this$api$call$dryRun, [{
                 system: {
                   Signed: address
                 }
               }, tx].concat(_toConsumableArray(needsVersionParam ? [DEFAULT_XCM_VERSION] : [])));
             case 2:
-              response = _context14.v;
+              response = _context15.v;
               result = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = result.Ok && result.Ok.executionResult.Ok;
               if (isSuccess) {
-                _context14.n = 3;
+                _context15.n = 3;
                 break;
               }
               moduleError = result.Ok.executionResult.Err.error.Module;
               failureReason = sdkCore.resolveModuleError(node, moduleError);
-              return _context14.a(2, {
+              return _context15.a(2, {
                 success: false,
                 failureReason: failureReason
               });
             case 3:
-              _context14.n = 4;
+              _context15.n = 4;
               return this.calculateTransactionFee(tx, address);
             case 4:
-              executionFee = _context14.v;
+              executionFee = _context15.v;
               fee = sdkCore.computeFeeFromDryRunPjs(result, node, executionFee);
               actualWeight = resultJson.ok.executionResult.ok.actualWeight;
               weight = actualWeight ? {
@@ -794,7 +813,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               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;
               }(Object.values(forwardedXcms[0])[0].interior);
-              return _context14.a(2, {
+              return _context15.a(2, {
                 success: true,
                 fee: fee,
                 weight: weight,
@@ -802,9 +821,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 destParaId: destParaId
               });
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function getDryRunCall(_x28) {
+      function getDryRunCall(_x30) {
         return _getDryRunCall.apply(this, arguments);
       }
       return getDryRunCall;
@@ -812,21 +831,21 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getXcmWeight",
     value: function () {
-      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(xcm) {
+      var _getXcmWeight = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(xcm) {
         var result, resultJson;
-        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.call.xcmPaymentApi.queryXcmWeight(xcm);
             case 1:
-              result = _context15.v;
+              result = _context16.v;
               resultJson = result.toJSON();
-              return _context15.a(2, resultJson.ok);
+              return _context16.a(2, resultJson.ok);
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
-      function getXcmWeight(_x29) {
+      function getXcmWeight(_x31) {
         return _getXcmWeight.apply(this, arguments);
       }
       return getXcmWeight;
@@ -834,33 +853,33 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getDryRunXcm",
     value: function () {
-      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(_ref6) {
+      var _getDryRunXcm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(_ref6) {
         var _ref7, _ref8, _ref9;
         var originLocation, xcm, node, origin, supportsDryRunApi, response, result, resultJson, isSuccess, failureReason, emitted, reversedEvents, palletsWithIssued, feeEvent, feeAmount, fee, actualWeight, weight, forwardedXcms, destParaId;
-        return _regenerator().w(function (_context16) {
-          while (1) switch (_context16.n) {
+        return _regenerator().w(function (_context17) {
+          while (1) switch (_context17.n) {
             case 0:
               originLocation = _ref6.originLocation, xcm = _ref6.xcm, node = _ref6.node, origin = _ref6.origin;
               supportsDryRunApi = sdkCore.getAssetsObject(node).supportsDryRunApi;
               if (supportsDryRunApi) {
-                _context16.n = 1;
+                _context17.n = 1;
                 break;
               }
               throw new sdkCore.NodeNotSupportedError("DryRunApi is not available on node ".concat(node));
             case 1:
-              _context16.n = 2;
+              _context17.n = 2;
               return this.api.call.dryRunApi.dryRunXcm(originLocation, xcm);
             case 2:
-              response = _context16.v;
+              response = _context17.v;
               result = response.toHuman();
               resultJson = response.toJSON();
               isSuccess = result.Ok && result.Ok.executionResult.Complete;
               if (isSuccess) {
-                _context16.n = 3;
+                _context17.n = 3;
                 break;
               }
               failureReason = result.Ok.executionResult.Incomplete.error;
-              return _context16.a(2, {
+              return _context17.a(2, {
                 success: false,
                 failureReason: failureReason
               });
@@ -882,10 +901,10 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 return ['currencies', 'tokens'].includes(event.section) && event.method === 'Deposited';
               });
               if (feeEvent) {
-                _context16.n = 4;
+                _context17.n = 4;
                 break;
               }
-              return _context16.a(2, Promise.resolve({
+              return _context17.a(2, Promise.resolve({
                 success: false,
                 failureReason: 'Cannot determine destination fee. No Issued event found'
               }));
@@ -901,7 +920,7 @@ var PolkadotJsApi = /*#__PURE__*/function () {
               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;
               }(Object.values(forwardedXcms[0])[0].interior);
-              return _context16.a(2, {
+              return _context17.a(2, {
                 success: true,
                 fee: fee,
                 weight: weight,
@@ -909,9 +928,9 @@ var PolkadotJsApi = /*#__PURE__*/function () {
                 destParaId: destParaId
               });
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
-      function getDryRunXcm(_x30) {
+      function getDryRunXcm(_x32) {
         return _getDryRunXcm.apply(this, arguments);
       }
       return getDryRunXcm;
@@ -919,18 +938,18 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "getBridgeStatus",
     value: function () {
-      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17() {
+      var _getBridgeStatus = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18() {
         var outboundOperatingMode;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.n) {
+        return _regenerator().w(function (_context18) {
+          while (1) switch (_context18.n) {
             case 0:
-              _context17.n = 1;
+              _context18.n = 1;
               return this.api.query.ethereumOutboundQueue.operatingMode();
             case 1:
-              outboundOperatingMode = _context17.v;
-              return _context17.a(2, outboundOperatingMode.toPrimitive());
+              outboundOperatingMode = _context18.v;
+              return _context18.a(2, outboundOperatingMode.toPrimitive());
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
       function getBridgeStatus() {
         return _getBridgeStatus.apply(this, arguments);
@@ -950,35 +969,38 @@ var PolkadotJsApi = /*#__PURE__*/function () {
   }, {
     key: "disconnect",
     value: function () {
-      var _disconnect = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18() {
+      var _disconnect = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19() {
+        var _this$_config$apiOver2;
         var force,
-          _args18 = arguments;
-        return _regenerator().w(function (_context18) {
-          while (1) switch (_context18.n) {
+          api,
+          _args19 = arguments;
+        return _regenerator().w(function (_context19) {
+          while (1) switch (_context19.n) {
             case 0:
-              force = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : false;
+              force = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : false;
               if (this.initialized) {
-                _context18.n = 1;
+                _context19.n = 1;
                 break;
               }
-              return _context18.a(2, Promise.resolve());
+              return _context19.a(2, Promise.resolve());
             case 1:
               if (!(!force && !this.disconnectAllowed)) {
-                _context18.n = 2;
+                _context19.n = 2;
                 break;
               }
-              return _context18.a(2);
+              return _context19.a(2);
             case 2:
-              if (!(force || typeof this._api === 'string' || this._api === undefined)) {
-                _context18.n = 3;
+              api = sdkCore.isConfig(this._config) ? (_this$_config$apiOver2 = this._config.apiOverrides) === null || _this$_config$apiOver2 === void 0 ? void 0 : _this$_config$apiOver2[this._node] : this._config; // Disconnect api only if it was created automatically
+              if (!(force || typeof api === 'string' || api === undefined)) {
+                _context19.n = 3;
                 break;
               }
-              _context18.n = 3;
+              _context19.n = 3;
               return this.api.disconnect();
             case 3:
-              return _context18.a(2);
+              return _context19.a(2);
           }
-        }, _callee18, this);
+        }, _callee19, this);
       }));
       function disconnect() {
         return _disconnect.apply(this, arguments);
@@ -999,8 +1021,7 @@ var createPolkadotJsApiCall = function createPolkadotJsApiCall(apiCall) {
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
-            pjsApi = new PolkadotJsApi();
-            pjsApi.setApi(options.api);
+            pjsApi = new PolkadotJsApi(options.api);
             optionsWithApi = _objectSpread2(_objectSpread2({}, options), {}, {
               api: pjsApi
             });
@@ -1543,6 +1564,8 @@ var EvmBuilderCore = /*#__PURE__*/function () {
               _yield$transferEthToP = _context.v;
               response = _yield$transferEthToP.response;
               return _context.a(2, response.hash);
+            case 6:
+              return _context.a(2);
           }
         }, _callee, this);
       }));
@@ -1573,8 +1596,7 @@ var EvmBuilder$1 = function EvmBuilder(api, provider) {
  * @returns A new Builder instance.
  */
 var Builder = function Builder(api) {
-  var pjsApi = new PolkadotJsApi();
-  pjsApi.setApi(api);
+  var pjsApi = new PolkadotJsApi(api);
   return sdkCore.Builder(pjsApi);
 };
 var EvmBuilder = function EvmBuilder(provider) {
@@ -1601,8 +1623,7 @@ var getParaEthTransferFees = /*#__PURE__*/function () {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          pjsApi = new PolkadotJsApi();
-          pjsApi.setApi(api);
+          pjsApi = new PolkadotJsApi(api);
           _context.n = 1;
           return pjsApi.init('AssetHubPolkadot', sdkCore.DRY_RUN_CLIENT_TIMEOUT_MS);
         case 1:
@@ -1623,8 +1644,7 @@ var getBridgeStatus = /*#__PURE__*/function () {
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          pjsApi = new PolkadotJsApi();
-          pjsApi.setApi(api);
+          pjsApi = new PolkadotJsApi(api);
           return _context2.a(2, sdkCore.getBridgeStatus(pjsApi));
       }
     }, _callee2);