@subwallet/extension-base 1.3.70-2 → 1.3.72-0

package/cjs/koni/background/handlers/State.js

@@ -42,6 +42,7 @@ var _helper = require("@subwallet/extension-base/services/request-service/helper
 var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/services/setting-service/SettingService"));
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
+var _substrateProxyService = _interopRequireDefault(require("@subwallet/extension-base/services/substrate-proxy-service"));
 var _swapService = require("@subwallet/extension-base/services/swap-service");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
@@ -60,8 +61,7 @@ var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _cron = require("../cron");
 var _subscription = require("../subscription");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -95,6 +95,9 @@ class KoniState {
     data: {}
   };
   lazyMap = {};
+
+  // TODO: consider making chainService public (or getter) and call function directly
+
   // Handle the general status of the extension
   generalStatus = _types.ServiceStatus.INITIALIZING;
   waitSleeping = null;
@@ -130,6 +133,7 @@ class KoniState {
     this.inappNotificationService = new _inappNotificationService.InappNotificationService(this.dbService, this.keyringService, this.eventService, this.chainService);
     this.chainOnlineService = new _chainOnlineService.ChainOnlineService(this.chainService, this.settingService, this.eventService, this.dbService);
     this.openGovService = new _openGov.default(this);
+    this.substrateProxyAccountService = new _substrateProxyService.default(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
     this.logger = (0, _util.logger)('State');
@@ -761,7 +765,7 @@ class KoniState {
   async enableChainWithPriorityAssets(chainSlug) {
     let enableTokens = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (enableTokens) {
-      await this.chainService.updatePriorityAssetsByChain(chainSlug, true);
+      await this.balanceService.updatePriorityAssetsByChain(chainSlug, true);
     }
     return this.chainService.enableChain(chainSlug);
   }
@@ -1364,10 +1368,10 @@ class KoniState {
     const psbtGenerate = bitcoin.Psbt.fromHex(psbt, {
       network: network_
     });
-    const isExistedInput = (inputs, address) => inputs.findIndex(_ref10 => {
+    const isExistedInput = (inputs, address) => inputs.findIndex(_ref0 => {
       let {
         address: address_
-      } = _ref10;
+      } = _ref0;
       return (0, _utils3.isSameAddress)(address, address_ || '');
     });
     let to = '';
@@ -1375,11 +1379,11 @@ class KoniState {
     let value = new _bignumber.default(0);
     const totalBalance = await this.balanceService.getTotalBalance(address, result.networkKey, tokenInfo.slug);
     let inputAmount = new _bignumber.default(0);
-    const psbtInputData = psbtGenerate.data.inputs.reduce((inputs, _ref11, inputIndex) => {
+    const psbtInputData = psbtGenerate.data.inputs.reduce((inputs, _ref1, inputIndex) => {
       let {
         nonWitnessUtxo,
         witnessUtxo
-      } = _ref11;
+      } = _ref1;
       let inputData = null;
       if (witnessUtxo) {
         inputData = {
@@ -1437,11 +1441,11 @@ class KoniState {
       txInput: psbtInputData,
       txOutput: psbtOutputData
     };
-    return this.requestService.addConfirmationBitcoin(id, url, 'bitcoinSignPsbtRequest', payloadAfterValidated, {}).then(_ref12 => {
+    return this.requestService.addConfirmationBitcoin(id, url, 'bitcoinSignPsbtRequest', payloadAfterValidated, {}).then(_ref10 => {
       let {
         isApproved,
         payload
-      } = _ref12;
+      } = _ref10;
       if (isApproved) {
         if (payload) {
           return payload;
@@ -1473,11 +1477,11 @@ class KoniState {
     };
 
     // Custom handle this instead of general handler transaction
-    return this.requestService.addConfirmationBitcoin(id, url, 'bitcoinSendTransactionRequestAfterConfirmation', requestPayload, {}).then(_ref13 => {
+    return this.requestService.addConfirmationBitcoin(id, url, 'bitcoinSendTransactionRequestAfterConfirmation', requestPayload, {}).then(_ref11 => {
       let {
         isApproved,
         payload
-      } = _ref13;
+      } = _ref11;
       if (isApproved) {
         if (payload) {
           return payload;
@@ -1583,11 +1587,11 @@ class KoniState {
       const subscription = this.keyringService.context.observable.currentAccount.subscribe(handleRemind);
     }
   }
-  async setStorageFromWS(_ref14) {
+  async setStorageFromWS(_ref12) {
     let {
       key,
       value
-    } = _ref14;
+    } = _ref12;
     try {
       const jsonData = JSON.stringify(value);
       await _storage.SWStorage.instance.setItem(key, jsonData);
@@ -1878,7 +1882,7 @@ class KoniState {
     });
   }
   async enableMantaPay(updateStore, address, password, seedPhrase) {
-    var _this$chainService3, _this$chainService3$m, _this$chainService4, _this$chainService4$m, _this$chainService4$m2, _this$chainService11, _this$chainService11$, _this$chainService11$2;
+    var _this$chainService3, _this$chainService3$m, _this$chainService4, _this$chainService4$m, _this$chainService4$m2, _this$chainService1, _this$chainService1$m, _this$chainService1$m2;
     if (!address || (0, _utilCrypto.isEthereumAddress)(address)) {
       return;
     }
@@ -1898,7 +1902,7 @@ class KoniState {
         data: encryptedData
       }));
     } else {
-      var _this$chainService9, _this$chainService9$m, _this$chainService10, _this$chainService10$, _this$chainService10$2;
+      var _this$chainService9, _this$chainService9$m, _this$chainService0, _this$chainService0$m, _this$chainService0$m2;
       const authContext = await ((_this$chainService9 = this.chainService) === null || _this$chainService9 === void 0 ? void 0 : (_this$chainService9$m = _this$chainService9.mantaPay) === null || _this$chainService9$m === void 0 ? void 0 : _this$chainService9$m.getMantaAuthContext(address, _constants2._DEFAULT_MANTA_ZK_CHAIN));
 
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
@@ -1906,18 +1910,18 @@ class KoniState {
 
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
       const proofAuthKey = new Uint8Array(Object.values(decryptedData.proof_authorization_key));
-      await ((_this$chainService10 = this.chainService) === null || _this$chainService10 === void 0 ? void 0 : (_this$chainService10$ = _this$chainService10.mantaPay) === null || _this$chainService10$ === void 0 ? void 0 : (_this$chainService10$2 = _this$chainService10$.privateWallet) === null || _this$chainService10$2 === void 0 ? void 0 : _this$chainService10$2.loadAuthorizationContext({
+      await ((_this$chainService0 = this.chainService) === null || _this$chainService0 === void 0 ? void 0 : (_this$chainService0$m = _this$chainService0.mantaPay) === null || _this$chainService0$m === void 0 ? void 0 : (_this$chainService0$m2 = _this$chainService0$m.privateWallet) === null || _this$chainService0$m2 === void 0 ? void 0 : _this$chainService0$m2.loadAuthorizationContext({
         proof_authorization_key: proofAuthKey
       }));
     }
-    const zkAddress = await ((_this$chainService11 = this.chainService) === null || _this$chainService11 === void 0 ? void 0 : (_this$chainService11$ = _this$chainService11.mantaPay) === null || _this$chainService11$ === void 0 ? void 0 : (_this$chainService11$2 = _this$chainService11$.privateWallet) === null || _this$chainService11$2 === void 0 ? void 0 : _this$chainService11$2.getZkAddress());
+    const zkAddress = await ((_this$chainService1 = this.chainService) === null || _this$chainService1 === void 0 ? void 0 : (_this$chainService1$m = _this$chainService1.mantaPay) === null || _this$chainService1$m === void 0 ? void 0 : (_this$chainService1$m2 = _this$chainService1$m.privateWallet) === null || _this$chainService1$m2 === void 0 ? void 0 : _this$chainService1$m2.getZkAddress());
     if (updateStore) {
-      var _this$chainService12, _this$chainService12$, _this$chainService13, _this$chainService13$, _this$chainService13$2, _this$chainService13$3;
-      await ((_this$chainService12 = this.chainService) === null || _this$chainService12 === void 0 ? void 0 : (_this$chainService12$ = _this$chainService12.mantaPay) === null || _this$chainService12$ === void 0 ? void 0 : _this$chainService12$.saveMantaPayConfig({
+      var _this$chainService10, _this$chainService10$, _this$chainService11, _this$chainService11$, _this$chainService11$2, _this$chainService11$3;
+      await ((_this$chainService10 = this.chainService) === null || _this$chainService10 === void 0 ? void 0 : (_this$chainService10$ = _this$chainService10.mantaPay) === null || _this$chainService10$ === void 0 ? void 0 : _this$chainService10$.saveMantaPayConfig({
         address,
         zkAddress: zkAddress,
         enabled: true,
-        chain: (_this$chainService13 = this.chainService) === null || _this$chainService13 === void 0 ? void 0 : (_this$chainService13$ = _this$chainService13.mantaPay) === null || _this$chainService13$ === void 0 ? void 0 : (_this$chainService13$2 = _this$chainService13$.privateWallet) === null || _this$chainService13$2 === void 0 ? void 0 : (_this$chainService13$3 = _this$chainService13$2.network) === null || _this$chainService13$3 === void 0 ? void 0 : _this$chainService13$3.toLowerCase(),
+        chain: (_this$chainService11 = this.chainService) === null || _this$chainService11 === void 0 ? void 0 : (_this$chainService11$ = _this$chainService11.mantaPay) === null || _this$chainService11$ === void 0 ? void 0 : (_this$chainService11$2 = _this$chainService11$.privateWallet) === null || _this$chainService11$2 === void 0 ? void 0 : (_this$chainService11$3 = _this$chainService11$2.network) === null || _this$chainService11$3 === void 0 ? void 0 : _this$chainService11$3.toLowerCase(),
         isInitialSync: false
       }));
     }
@@ -1925,48 +1929,48 @@ class KoniState {
     return zkAddress;
   }
   async disableMantaPay(address) {
-    var _this$chainService14, _this$chainService14$, _this$chainService15, _this$chainService15$, _this$chainService15$2, _this$chainService16, _this$chainService16$, _this$chainService16$2, _this$chainService17, _this$chainService17$, _this$chainService18, _this$chainService18$;
-    const config = await ((_this$chainService14 = this.chainService) === null || _this$chainService14 === void 0 ? void 0 : (_this$chainService14$ = _this$chainService14.mantaPay) === null || _this$chainService14$ === void 0 ? void 0 : _this$chainService14$.getMantaPayConfig(address, _constants2._DEFAULT_MANTA_ZK_CHAIN));
+    var _this$chainService12, _this$chainService12$, _this$chainService13, _this$chainService13$, _this$chainService13$2, _this$chainService14, _this$chainService14$, _this$chainService14$2, _this$chainService15, _this$chainService15$, _this$chainService16, _this$chainService16$;
+    const config = await ((_this$chainService12 = this.chainService) === null || _this$chainService12 === void 0 ? void 0 : (_this$chainService12$ = _this$chainService12.mantaPay) === null || _this$chainService12$ === void 0 ? void 0 : _this$chainService12$.getMantaPayConfig(address, _constants2._DEFAULT_MANTA_ZK_CHAIN));
     if (!config) {
       return false;
     }
-    await ((_this$chainService15 = this.chainService) === null || _this$chainService15 === void 0 ? void 0 : (_this$chainService15$ = _this$chainService15.mantaPay) === null || _this$chainService15$ === void 0 ? void 0 : (_this$chainService15$2 = _this$chainService15$.privateWallet) === null || _this$chainService15$2 === void 0 ? void 0 : _this$chainService15$2.dropAuthorizationContext());
-    await ((_this$chainService16 = this.chainService) === null || _this$chainService16 === void 0 ? void 0 : (_this$chainService16$ = _this$chainService16.mantaPay) === null || _this$chainService16$ === void 0 ? void 0 : (_this$chainService16$2 = _this$chainService16$.privateWallet) === null || _this$chainService16$2 === void 0 ? void 0 : _this$chainService16$2.dropUserSeedPhrase());
+    await ((_this$chainService13 = this.chainService) === null || _this$chainService13 === void 0 ? void 0 : (_this$chainService13$ = _this$chainService13.mantaPay) === null || _this$chainService13$ === void 0 ? void 0 : (_this$chainService13$2 = _this$chainService13$.privateWallet) === null || _this$chainService13$2 === void 0 ? void 0 : _this$chainService13$2.dropAuthorizationContext());
+    await ((_this$chainService14 = this.chainService) === null || _this$chainService14 === void 0 ? void 0 : (_this$chainService14$ = _this$chainService14.mantaPay) === null || _this$chainService14$ === void 0 ? void 0 : (_this$chainService14$2 = _this$chainService14$.privateWallet) === null || _this$chainService14$2 === void 0 ? void 0 : _this$chainService14$2.dropUserSeedPhrase());
     // await this.chainService?.mantaPay?.privateWallet?.resetState();
-    await ((_this$chainService17 = this.chainService) === null || _this$chainService17 === void 0 ? void 0 : (_this$chainService17$ = _this$chainService17.mantaPay) === null || _this$chainService17$ === void 0 ? void 0 : _this$chainService17$.deleteMantaPayConfig(address, _constants2._DEFAULT_MANTA_ZK_CHAIN));
-    await ((_this$chainService18 = this.chainService) === null || _this$chainService18 === void 0 ? void 0 : (_this$chainService18$ = _this$chainService18.mantaPay) === null || _this$chainService18$ === void 0 ? void 0 : _this$chainService18$.deleteMantaAuthContext(address, _constants2._DEFAULT_MANTA_ZK_CHAIN));
+    await ((_this$chainService15 = this.chainService) === null || _this$chainService15 === void 0 ? void 0 : (_this$chainService15$ = _this$chainService15.mantaPay) === null || _this$chainService15$ === void 0 ? void 0 : _this$chainService15$.deleteMantaPayConfig(address, _constants2._DEFAULT_MANTA_ZK_CHAIN));
+    await ((_this$chainService16 = this.chainService) === null || _this$chainService16 === void 0 ? void 0 : (_this$chainService16$ = _this$chainService16.mantaPay) === null || _this$chainService16$ === void 0 ? void 0 : _this$chainService16$.deleteMantaAuthContext(address, _constants2._DEFAULT_MANTA_ZK_CHAIN));
     this.chainService.setMantaZkAssetSettings(false);
     this.isMantaPayEnabled = false;
     return true;
   }
   async initialSyncMantaPay(address) {
-    var _this$chainService19, _this$chainService19$, _this$chainService20, _this$chainService20$, _this$chainService20$2, _this$chainService20$3, _this$chainService21, _this$chainService21$, _this$chainService21$2, _this$chainService22, _this$chainService22$;
+    var _this$chainService17, _this$chainService17$, _this$chainService18, _this$chainService18$, _this$chainService18$2, _this$chainService18$3, _this$chainService19, _this$chainService19$, _this$chainService19$2, _this$chainService20, _this$chainService20$;
     if (!address || (0, _utilCrypto.isEthereumAddress)(address)) {
       return;
     }
-    (_this$chainService19 = this.chainService) === null || _this$chainService19 === void 0 ? void 0 : (_this$chainService19$ = _this$chainService19.mantaPay) === null || _this$chainService19$ === void 0 ? void 0 : _this$chainService19$.setCurrentAddress(address);
-    await ((_this$chainService20 = this.chainService) === null || _this$chainService20 === void 0 ? void 0 : (_this$chainService20$ = _this$chainService20.mantaPay) === null || _this$chainService20$ === void 0 ? void 0 : (_this$chainService20$2 = _this$chainService20$.privateWallet) === null || _this$chainService20$2 === void 0 ? void 0 : (_this$chainService20$3 = _this$chainService20$2.baseWallet) === null || _this$chainService20$3 === void 0 ? void 0 : _this$chainService20$3.isApiReady());
-    const syncResult = await ((_this$chainService21 = this.chainService) === null || _this$chainService21 === void 0 ? void 0 : (_this$chainService21$ = _this$chainService21.mantaPay) === null || _this$chainService21$ === void 0 ? void 0 : (_this$chainService21$2 = _this$chainService21$.privateWallet) === null || _this$chainService21$2 === void 0 ? void 0 : _this$chainService21$2.initialWalletSync());
-    await ((_this$chainService22 = this.chainService) === null || _this$chainService22 === void 0 ? void 0 : (_this$chainService22$ = _this$chainService22.mantaPay) === null || _this$chainService22$ === void 0 ? void 0 : _this$chainService22$.updateMantaPayConfig(address, _constants2._DEFAULT_MANTA_ZK_CHAIN, {
+    (_this$chainService17 = this.chainService) === null || _this$chainService17 === void 0 ? void 0 : (_this$chainService17$ = _this$chainService17.mantaPay) === null || _this$chainService17$ === void 0 ? void 0 : _this$chainService17$.setCurrentAddress(address);
+    await ((_this$chainService18 = this.chainService) === null || _this$chainService18 === void 0 ? void 0 : (_this$chainService18$ = _this$chainService18.mantaPay) === null || _this$chainService18$ === void 0 ? void 0 : (_this$chainService18$2 = _this$chainService18$.privateWallet) === null || _this$chainService18$2 === void 0 ? void 0 : (_this$chainService18$3 = _this$chainService18$2.baseWallet) === null || _this$chainService18$3 === void 0 ? void 0 : _this$chainService18$3.isApiReady());
+    const syncResult = await ((_this$chainService19 = this.chainService) === null || _this$chainService19 === void 0 ? void 0 : (_this$chainService19$ = _this$chainService19.mantaPay) === null || _this$chainService19$ === void 0 ? void 0 : (_this$chainService19$2 = _this$chainService19$.privateWallet) === null || _this$chainService19$2 === void 0 ? void 0 : _this$chainService19$2.initialWalletSync());
+    await ((_this$chainService20 = this.chainService) === null || _this$chainService20 === void 0 ? void 0 : (_this$chainService20$ = _this$chainService20.mantaPay) === null || _this$chainService20$ === void 0 ? void 0 : _this$chainService20$.updateMantaPayConfig(address, _constants2._DEFAULT_MANTA_ZK_CHAIN, {
       isInitialSync: true
     }));
     this.eventService.emit('mantaPay.initSync', undefined);
     return syncResult;
   }
   getMantaZkBalance() {
-    var _this$chainService23, _this$chainService24, _this$chainService24$, _this$chainService24$2, _this$chainService25, _this$chainService25$, _this$chainService26, _this$chainService26$, _this$chainService26$2;
-    if (!this.chainService || !((_this$chainService23 = this.chainService) !== null && _this$chainService23 !== void 0 && _this$chainService23.mantaPay)) {
+    var _this$chainService21, _this$chainService22, _this$chainService22$, _this$chainService22$2, _this$chainService23, _this$chainService23$, _this$chainService24, _this$chainService24$, _this$chainService24$2;
+    if (!this.chainService || !((_this$chainService21 = this.chainService) !== null && _this$chainService21 !== void 0 && _this$chainService21.mantaPay)) {
       return;
     }
-    if (!((_this$chainService24 = this.chainService) !== null && _this$chainService24 !== void 0 && (_this$chainService24$ = _this$chainService24.mantaPay) !== null && _this$chainService24$ !== void 0 && (_this$chainService24$2 = _this$chainService24$.privateWallet) !== null && _this$chainService24$2 !== void 0 && _this$chainService24$2.initialSyncIsFinished)) {
+    if (!((_this$chainService22 = this.chainService) !== null && _this$chainService22 !== void 0 && (_this$chainService22$ = _this$chainService22.mantaPay) !== null && _this$chainService22$ !== void 0 && (_this$chainService22$2 = _this$chainService22$.privateWallet) !== null && _this$chainService22$2 !== void 0 && _this$chainService22$2.initialSyncIsFinished)) {
       return;
     }
-    const chain = (_this$chainService25 = this.chainService) === null || _this$chainService25 === void 0 ? void 0 : (_this$chainService25$ = _this$chainService25.mantaPay.privateWallet) === null || _this$chainService25$ === void 0 ? void 0 : _this$chainService25$.network;
+    const chain = (_this$chainService23 = this.chainService) === null || _this$chainService23 === void 0 ? void 0 : (_this$chainService23$ = _this$chainService23.mantaPay.privateWallet) === null || _this$chainService23$ === void 0 ? void 0 : _this$chainService23$.network;
     if (!chain) {
       return;
     }
     const assetMap = this.chainService.getMantaZkAssets(chain === null || chain === void 0 ? void 0 : chain.toLowerCase());
-    (_this$chainService26 = this.chainService) === null || _this$chainService26 === void 0 ? void 0 : (_this$chainService26$ = _this$chainService26.mantaPay) === null || _this$chainService26$ === void 0 ? void 0 : (_this$chainService26$2 = _this$chainService26$.privateWallet) === null || _this$chainService26$2 === void 0 ? void 0 : _this$chainService26$2.getMultiZkBalance(Object.values(assetMap).map(tokenInfo => new _bn.default((0, _utils._getTokenOnChainAssetId)(tokenInfo)))).then(zkBalances => {
+    (_this$chainService24 = this.chainService) === null || _this$chainService24 === void 0 ? void 0 : (_this$chainService24$ = _this$chainService24.mantaPay) === null || _this$chainService24$ === void 0 ? void 0 : (_this$chainService24$2 = _this$chainService24$.privateWallet) === null || _this$chainService24$2 === void 0 ? void 0 : _this$chainService24$2.getMultiZkBalance(Object.values(assetMap).map(tokenInfo => new _bn.default((0, _utils._getTokenOnChainAssetId)(tokenInfo)))).then(zkBalances => {
       const assetList = Object.values(assetMap);
       for (let i = 0; i < assetList.length; i++) {
         var _zkBalances$i;
@@ -1983,9 +1987,9 @@ class KoniState {
     }).catch(console.warn);
   }
   subscribeMantaPayBalance() {
-    var _this$chainService27, _this$chainService27$;
+    var _this$chainService25, _this$chainService25$;
     let interval;
-    (_this$chainService27 = this.chainService) === null || _this$chainService27 === void 0 ? void 0 : (_this$chainService27$ = _this$chainService27.mantaPay) === null || _this$chainService27$ === void 0 ? void 0 : _this$chainService27$.getMantaPayConfig(this.keyringService.context.currentAccount.proxyId, _constants2._DEFAULT_MANTA_ZK_CHAIN).then(config => {
+    (_this$chainService25 = this.chainService) === null || _this$chainService25 === void 0 ? void 0 : (_this$chainService25$ = _this$chainService25.mantaPay) === null || _this$chainService25$ === void 0 ? void 0 : _this$chainService25$.getMantaPayConfig(this.keyringService.context.currentAccount.proxyId, _constants2._DEFAULT_MANTA_ZK_CHAIN).then(config => {
       if (config && config.enabled && config.isInitialSync) {
         this.getMantaZkBalance();
         interval = setInterval(this.getMantaZkBalance, _constants.MANTA_PAY_BALANCE_INTERVAL);
@@ -1996,23 +2000,23 @@ class KoniState {
     };
   }
   async syncMantaPay() {
-    var _this$chainService28, _this$chainService28$, _this$chainService29, _this$chainService29$, _this$chainService29$2;
-    const config = await ((_this$chainService28 = this.chainService) === null || _this$chainService28 === void 0 ? void 0 : (_this$chainService28$ = _this$chainService28.mantaPay) === null || _this$chainService28$ === void 0 ? void 0 : _this$chainService28$.getMantaPayFirstConfig(_constants2._DEFAULT_MANTA_ZK_CHAIN));
+    var _this$chainService26, _this$chainService26$, _this$chainService27, _this$chainService27$, _this$chainService27$2;
+    const config = await ((_this$chainService26 = this.chainService) === null || _this$chainService26 === void 0 ? void 0 : (_this$chainService26$ = _this$chainService26.mantaPay) === null || _this$chainService26$ === void 0 ? void 0 : _this$chainService26$.getMantaPayFirstConfig(_constants2._DEFAULT_MANTA_ZK_CHAIN));
     if (!config.isInitialSync) {
       return;
     }
-    if ((_this$chainService29 = this.chainService) !== null && _this$chainService29 !== void 0 && (_this$chainService29$ = _this$chainService29.mantaPay) !== null && _this$chainService29$ !== void 0 && (_this$chainService29$2 = _this$chainService29$.privateWallet) !== null && _this$chainService29$2 !== void 0 && _this$chainService29$2.initialSyncIsFinished) {
-      var _this$chainService30, _this$chainService30$, _this$chainService30$2;
-      await ((_this$chainService30 = this.chainService) === null || _this$chainService30 === void 0 ? void 0 : (_this$chainService30$ = _this$chainService30.mantaPay) === null || _this$chainService30$ === void 0 ? void 0 : (_this$chainService30$2 = _this$chainService30$.privateWallet) === null || _this$chainService30$2 === void 0 ? void 0 : _this$chainService30$2.walletSync());
+    if ((_this$chainService27 = this.chainService) !== null && _this$chainService27 !== void 0 && (_this$chainService27$ = _this$chainService27.mantaPay) !== null && _this$chainService27$ !== void 0 && (_this$chainService27$2 = _this$chainService27$.privateWallet) !== null && _this$chainService27$2 !== void 0 && _this$chainService27$2.initialSyncIsFinished) {
+      var _this$chainService28, _this$chainService28$, _this$chainService28$2;
+      await ((_this$chainService28 = this.chainService) === null || _this$chainService28 === void 0 ? void 0 : (_this$chainService28$ = _this$chainService28.mantaPay) === null || _this$chainService28$ === void 0 ? void 0 : (_this$chainService28$2 = _this$chainService28$.privateWallet) === null || _this$chainService28$2 === void 0 ? void 0 : _this$chainService28$2.walletSync());
     } else {
-      var _this$chainService31, _this$chainService31$, _this$chainService31$2;
-      await ((_this$chainService31 = this.chainService) === null || _this$chainService31 === void 0 ? void 0 : (_this$chainService31$ = _this$chainService31.mantaPay) === null || _this$chainService31$ === void 0 ? void 0 : (_this$chainService31$2 = _this$chainService31$.privateWallet) === null || _this$chainService31$2 === void 0 ? void 0 : _this$chainService31$2.initialWalletSync());
+      var _this$chainService29, _this$chainService29$, _this$chainService29$2;
+      await ((_this$chainService29 = this.chainService) === null || _this$chainService29 === void 0 ? void 0 : (_this$chainService29$ = _this$chainService29.mantaPay) === null || _this$chainService29$ === void 0 ? void 0 : (_this$chainService29$2 = _this$chainService29$.privateWallet) === null || _this$chainService29$2 === void 0 ? void 0 : _this$chainService29$2.initialWalletSync());
     }
   }
   async getMantaPayZkBalance(address, tokenInfo) {
-    var _this$chainService32, _this$chainService32$, _this$chainService32$2;
+    var _this$chainService30, _this$chainService30$, _this$chainService30$2;
     const bnAssetId = new _bn.default((0, _utils._getTokenOnChainAssetId)(tokenInfo));
-    const balance = await ((_this$chainService32 = this.chainService) === null || _this$chainService32 === void 0 ? void 0 : (_this$chainService32$ = _this$chainService32.mantaPay) === null || _this$chainService32$ === void 0 ? void 0 : (_this$chainService32$2 = _this$chainService32$.privateWallet) === null || _this$chainService32$2 === void 0 ? void 0 : _this$chainService32$2.getZkBalance(bnAssetId));
+    const balance = await ((_this$chainService30 = this.chainService) === null || _this$chainService30 === void 0 ? void 0 : (_this$chainService30$ = _this$chainService30.mantaPay) === null || _this$chainService30$ === void 0 ? void 0 : (_this$chainService30$2 = _this$chainService30$.privateWallet) === null || _this$chainService30$2 === void 0 ? void 0 : _this$chainService30$2.getZkBalance(bnAssetId));
     return {
       decimals: tokenInfo.decimals || 0,
       symbol: tokenInfo.symbol,
@@ -2020,11 +2024,11 @@ class KoniState {
     };
   }
   subscribeMantaPaySyncState() {
-    var _this$chainService33, _this$chainService34, _this$chainService34$;
-    if (!((_this$chainService33 = this.chainService) !== null && _this$chainService33 !== void 0 && _this$chainService33.mantaPay)) {
+    var _this$chainService31, _this$chainService32, _this$chainService32$;
+    if (!((_this$chainService31 = this.chainService) !== null && _this$chainService31 !== void 0 && _this$chainService31.mantaPay)) {
       return new _rxjs.Subject();
     }
-    return (_this$chainService34 = this.chainService) === null || _this$chainService34 === void 0 ? void 0 : (_this$chainService34$ = _this$chainService34.mantaPay) === null || _this$chainService34$ === void 0 ? void 0 : _this$chainService34$.subscribeSyncState();
+    return (_this$chainService32 = this.chainService) === null || _this$chainService32 === void 0 ? void 0 : (_this$chainService32$ = _this$chainService32.mantaPay) === null || _this$chainService32$ === void 0 ? void 0 : _this$chainService32$.subscribeSyncState();
   }
 
   /* Metadata */
@@ -2047,12 +2051,12 @@ class KoniState {
 
   /* Metadata */
 
-  getCrowdloanContributions(_ref15) {
+  getCrowdloanContributions(_ref13) {
     let {
       address,
       page,
       relayChain
-    } = _ref15;
+    } = _ref13;
     return this.subscanService.getCrowdloanContributions(relayChain, address, page);
   }
 }

package/cjs/koni/background/handlers/Tabs.js

@@ -30,8 +30,7 @@ var _web = _interopRequireDefault(require("web3"));
 var _phishing = require("@polkadot/phishing");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -52,7 +51,7 @@ function transformAccountsV2(accounts) {
       }
       const validTypes = {
         evm: _types3.EthereumKeypairTypes,
-        substrate: _types3.SubstrateKeypairTypes,
+        substrate: _types3.AllSubstrateKeypairTypes,
         ton: _types3.TonKeypairTypes,
         cardano: _types3.CardanoKeypairTypes,
         bitcoin: _types3.BitcoinKeypairTypes
@@ -80,7 +79,7 @@ function transformAccountsV2(accounts) {
       return true;
     }
   };
-  return Object.values(accounts).filter(_ref2 => {
+  const injectedAccounts = Object.values(accounts).filter(_ref2 => {
     let {
       json: {
         meta: {
@@ -114,6 +113,12 @@ function transformAccountsV2(accounts) {
       type
     };
   });
+  return injectedAccounts.map(acc => {
+    if (acc.type === 'ed25519-tw') {
+      acc.type = 'ed25519';
+    }
+    return acc;
+  });
 }
 // check if a URL is blocked
 const chainPatrolCheckUrl = async url => {
@@ -503,10 +508,10 @@ class KoniTabs {
       date: new Date().getTime()
     }];
   }
-  async revokePermissions(url, id, _ref10) {
+  async revokePermissions(url, id, _ref0) {
     let {
       params
-    } = _ref10;
+    } = _ref0;
     if (!params || !(0, _util.isArray)(params) || params.length === 0) {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'No list of permissions found to revoke in the parameters.');
     }
@@ -542,8 +547,8 @@ class KoniTabs {
                 if (accountAuthTypes.length === 1) {
                   delete value[urlStripped];
                 } else {
-                  value[urlStripped].isAllowedMap = Object.entries(isAllowedMap).reduce((allowedMap, _ref11) => {
-                    let [address, value] = _ref11;
+                  value[urlStripped].isAllowedMap = Object.entries(isAllowedMap).reduce((allowedMap, _ref1) => {
+                    let [address, value] = _ref1;
                     if ((0, _utilCrypto.isEthereumAddress)(address)) {
                       allowedMap[address] = false;
                     } else {
@@ -569,10 +574,10 @@ class KoniTabs {
     await Promise.all(Array.from(permissions).map(permissionPromise));
     return null;
   }
-  async switchEvmChain(id, url, _ref12) {
+  async switchEvmChain(id, url, _ref10) {
     let {
       params
-    } = _ref12;
+    } = _ref10;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
     const chainIdDec = parseInt(chainId, 16);
@@ -627,11 +632,11 @@ class KoniTabs {
     }
     return null;
   }
-  async addEvmToken(id, url, _ref13) {
+  async addEvmToken(id, url, _ref11) {
     var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     let {
       params
-    } = _ref13;
+    } = _ref11;
     const input = params;
     const _tokenType = (input === null || input === void 0 ? void 0 : (_input$type = input.type) === null || _input$type === void 0 ? void 0 : _input$type.toLowerCase()) || '';
     if (_tokenType !== 'erc20' && _tokenType !== 'erc721') {
@@ -684,10 +689,10 @@ class KoniTabs {
 
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
-  async addEvmChain(id, url, _ref14) {
+  async addEvmChain(id, url, _ref12) {
     let {
       params
-    } = _ref14;
+    } = _ref12;
     const input = params;
     if (input && input.length > 0) {
       const {
@@ -892,11 +897,11 @@ class KoniTabs {
     const networkCheckInterval = setInterval(networkCheck, _constants.CRON_GET_API_MAP_STATUS);
     const provider = await this.getEvmProvider(url);
     const eventMap = {};
-    eventMap.data = _ref15 => {
+    eventMap.data = _ref13 => {
       let {
         method,
         params
-      } = _ref15;
+      } = _ref13;
       emitEvent('message', {
         type: method,
         data: params
@@ -905,8 +910,8 @@ class KoniTabs {
     eventMap.error = rs => {
       emitEvent('error', rs);
     };
-    Object.entries(eventMap).forEach(_ref16 => {
-      let [event, callback] = _ref16;
+    Object.entries(eventMap).forEach(_ref14 => {
+      let [event, callback] = _ref14;
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       (provider === null || provider === void 0 ? void 0 : provider.on) && (provider === null || provider === void 0 ? void 0 : provider.on(event, callback));
     });
@@ -920,8 +925,8 @@ class KoniTabs {
       if (this.evmEventEmitterMap[url][id]) {
         delete this.evmEventEmitterMap[url][id];
       }
-      Object.entries(eventMap).forEach(_ref17 => {
-        let [event, callback] = _ref17;
+      Object.entries(eventMap).forEach(_ref15 => {
+        let [event, callback] = _ref15;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         (provider === null || provider === void 0 ? void 0 : provider.removeListener) && (provider === null || provider === void 0 ? void 0 : provider.removeListener(event, callback));
       });
@@ -956,11 +961,11 @@ class KoniTabs {
     }
     return provider;
   }
-  async performWeb3Method(id, url, _ref18, callback) {
+  async performWeb3Method(id, url, _ref16, callback) {
     let {
       method,
       params
-    } = _ref18;
+    } = _ref16;
     const provider = await this.getEvmProvider(url);
     this.checkAndHandleProviderStatus(provider);
     return new Promise((resolve, reject) => {
@@ -992,11 +997,11 @@ class KoniTabs {
       });
     });
   }
-  async evmSign(id, url, _ref19) {
+  async evmSign(id, url, _ref17) {
     let {
       method,
       params
-    } = _ref19;
+    } = _ref17;
     const signResult = await this.#koniState.evmSign(id, url, method, params);
     if (signResult) {
       return signResult;
@@ -1006,10 +1011,10 @@ class KoniTabs {
   }
 
   // TODO: Update logic
-  async evmSendTransaction(id, url, _ref20) {
+  async evmSendTransaction(id, url, _ref18) {
     let {
       params
-    } = _ref20;
+    } = _ref18;
     const transactionParams = params[0];
     const transactionHash = await this.#koniState.evmSendTransaction(id, url, transactionParams);
     if (!transactionHash) {
@@ -1095,11 +1100,11 @@ class KoniTabs {
   isEvmPublicRequest(type, request) {
     return type === 'evm(request)' && ['eth_chainId', 'net_version', 'wallet_requestPermissions', 'wallet_getPermissions'].includes(request === null || request === void 0 ? void 0 : request.method) || type === 'evm(events.subscribe)';
   }
-  async addPspToken(id, url, _ref21) {
+  async addPspToken(id, url, _ref19) {
     let {
       genesisHash,
       tokenInfo: input
-    } = _ref21;
+    } = _ref19;
     const _tokenType = input.type;
     if (_tokenType !== 'psp22' && _tokenType !== 'psp34') {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Assets type {{tokenType}} is not supported'.replace('{{tokenType}}', _tokenType));
@@ -1401,11 +1406,11 @@ class KoniTabs {
       throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.USER_REJECTED_REQUEST);
     }
   }
-  async bitcoinSign(id, url, _ref22) {
+  async bitcoinSign(id, url, _ref20) {
     let {
       method,
       params
-    } = _ref22;
+    } = _ref20;
     const signResult = await this.#koniState.bitcoinSign(id, url, method, params);
     if (signResult) {
       return signResult;
@@ -1413,11 +1418,11 @@ class KoniTabs {
       throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, 'Failed to sign message');
     }
   }
-  async bitcoinSignPspt(id, url, _ref23) {
+  async bitcoinSignPspt(id, url, _ref21) {
     let {
       method,
       params
-    } = _ref23;
+    } = _ref21;
     const psbtParams = params;
     const signResult = await this.#koniState.bitcoinSignPspt(id, url, psbtParams);
     if (signResult) {
@@ -1426,10 +1431,10 @@ class KoniTabs {
       throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, 'Failed to sign message');
     }
   }
-  async bitcoinSendTransfer(id, url, _ref24) {
+  async bitcoinSendTransfer(id, url, _ref22) {
     let {
       params
-    } = _ref24;
+    } = _ref22;
     const transactionParams = params;
     const transactionHash = await this.#koniState.bitcoinSendTransaction(id, url, transactionParams);
     if (!transactionHash) {

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.70-2'
+  version: '1.3.72-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/page/index.js

@@ -21,6 +21,13 @@ var _getId = require("../utils/getId");
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+// when sending a message from the injector to the extension, we
+//  - create an event - this we send to the loader
+//  - the loader takes this event and uses port.postMessage to background
+//  - on response, the loader creates a reponse event
+//  - this injector, listens on the events, maps it to the original
+//  - resolves/rejects the promise with the result (or sub data)
+
 const handlers = {};
 
 // a generic message sender that creates an event, returning a promise that will

package/cjs/page/substrate/PostMessageProvider.js

@@ -11,6 +11,9 @@ var _util = require("@polkadot/util");
 // SPDX-License-Identifier: Apache-2.0
 
 const l = (0, _util.logger)('PostMessageProvider');
+
+// Same as https://github.com/polkadot-js/api/blob/57ca9a9c3204339e1e1f693fcacc33039868dc27/packages/rpc-provider/src/ws/Provider.ts#L17
+
 // External to class, this.# is not private enough (yet)
 let sendRequest;
 

package/cjs/services/balance-service/helpers/subscribe/cardano/utils.js

@@ -49,7 +49,6 @@ async function retryCardanoTxStatus(fn, options) {
       await new Promise(resolve => setTimeout(resolve, options.delay)); // wait for delay period, then recall the fn()
     }
   }
-
   console.error('Cardano transaction timeout', lastError); // throw only last error, in case no successful result from fn()
 
   return false;

package/cjs/services/balance-service/helpers/subscribe/substrate/gear.js

@@ -67,7 +67,6 @@ const subscribeGRC20Balance = _ref => {
       }
     });
   };
-
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
@@ -127,7 +126,6 @@ const subscribeVftBalance = _ref3 => {
       }
     });
   };
-
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {