@subwallet/extension-base 1.2.32-0 → 1.3.1

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

@@ -38,13 +38,11 @@ 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"));
 var _storage = require("@subwallet/extension-base/storage");
-var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
+var _types2 = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _promise = require("@subwallet/extension-base/utils/promise");
-var _decode = require("@subwallet/keyring/pair/decode");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _bn = _interopRequireDefault(require("bn.js"));
-var _ethSimpleKeyring = _interopRequireDefault(require("eth-simple-keyring"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
@@ -56,15 +54,11 @@ var _subscription = require("../subscription");
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 const passworder = require('browser-passworder');
-const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 const ERROR_CONFIRMATION_TYPE = ['errorConnectNetwork'];
 
 // List of providers passed into constructor. This is the list of providers
 // exposed by the extension.
 
-const getSuri = (seed, type) => {
-  return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
-};
 const generateDefaultCrowdloanMap = () => {
   const crowdloanMap = {};
   return crowdloanMap;
@@ -73,7 +67,6 @@ const DEFAULT_CURRENCY = 'USD';
 class KoniState {
   injectedProviders = new Map();
   unsubscriptionMap = {};
-  accountRefStore = new _AccountRef.default();
   externalRequest = {};
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new _rxjs.Subject();
@@ -98,7 +91,7 @@ class KoniState {
     this.providers = providers;
     this.eventService = new _eventService.EventService();
     this.dbService = new _DatabaseService.default(this.eventService);
-    this.keyringService = new _keyringService.KeyringService(this.eventService);
+    this.keyringService = new _keyringService.KeyringService(this);
     this.notificationService = new _NotificationService.default();
     this.chainService = new _chainService.ChainService(this.dbService, this.eventService);
     this.subscanService = _subscanService.SubscanService.getInstance();
@@ -199,35 +192,12 @@ class KoniState {
   saveMetadata(meta) {
     this.requestService.saveMetadata(meta);
   }
-  sign(url, request, account) {
-    return this.requestService.sign(url, request, account);
+  sign(url, request) {
+    return this.requestService.sign(url, request);
   }
   get authSubjectV2() {
     return this.requestService.authSubjectV2;
   }
-  generateDefaultBalanceMap(_addresses) {
-    const balanceMap = {};
-    const activeChains = this.chainService.getActiveChainInfoMap();
-    const isAllAccount = (0, _utils3.isAccountAll)(this.keyringService.currentAccount.address);
-    const addresses = _addresses || (isAllAccount ? Object.keys(this.keyringService.accounts) : [this.keyringService.currentAccount.address]);
-    addresses.forEach(address => {
-      const temp = {};
-      Object.values(activeChains).forEach(chainInfo => {
-        const chainAssetMap = this.chainService.getFungibleTokensByChain(chainInfo.slug);
-        Object.keys(chainAssetMap).forEach(assetSlug => {
-          temp[assetSlug] = {
-            address,
-            tokenSlug: assetSlug,
-            free: '',
-            locked: '',
-            state: _KoniTypes.APIItemState.PENDING
-          };
-        });
-      });
-      balanceMap[address] = temp;
-    });
-    return balanceMap;
-  }
   afterChainServiceInit() {
     this.subscanService.setSubscanChainMap(this.chainService.getSubscanChainMap());
   }
@@ -313,14 +283,6 @@ class KoniState {
   getAuthList() {
     return this.requestService.getAuthList();
   }
-  getAddressList() {
-    let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(this.keyringService.accounts);
-    return addressList.reduce((addressList, v) => ({
-      ...addressList,
-      [v]: value
-    }), {});
-  }
   async authorizeUrlV2(url, request) {
     return this.requestService.authorizeUrlV2(url, request);
   }
@@ -344,7 +306,7 @@ class KoniState {
     return this.dbService.getMantaPayConfig(chain);
   }
   async getStaking() {
-    const addresses = this.getDecodedAddresses();
+    const addresses = this.keyringService.context.getDecodedAddresses();
     const stakings = await this.dbService.getStakings(addresses, this.activeChainSlugs);
     return {
       ready: true,
@@ -404,7 +366,7 @@ class KoniState {
       nftList: [],
       total: 0
     })).catch(e => this.logger.warn(e));
-    const addresses = this.getDecodedAddresses(newAddress);
+    const addresses = this.keyringService.context.getDecodedAddresses(newAddress);
     this.dbService.subscribeNft(addresses, this.activeChainSlugs, nfts => {
       this.nftSubject.next({
         nftList: nfts,
@@ -423,7 +385,7 @@ class KoniState {
     this.dbService.cleanUpNft(chain, owner, collectionId, nftIds, ownNothing).catch(e => this.logger.warn(e));
   }
   async getNft() {
-    const addresses = this.getDecodedAddresses();
+    const addresses = this.keyringService.context.getDecodedAddresses();
     if (!addresses.length) {
       return;
     }
@@ -453,94 +415,12 @@ class KoniState {
     this.stakingRewardState.ready = ready;
     this.stakingRewardSubject.next(this.stakingRewardState);
   }
-  getAccountRefMap(callback) {
-    const refMap = {};
-    this.accountRefStore.get('refList', refList => {
-      if (refList) {
-        refList.forEach(accRef => {
-          accRef.forEach(acc => {
-            refMap[acc] = [...accRef].filter(r => !(r === acc));
-          });
-        });
-      }
-      callback(refMap);
-    });
-  }
-  addAccountRef(addresses, callback) {
-    this.accountRefStore.get('refList', refList => {
-      const newList = refList ? [...refList] : [];
-      newList.push(addresses);
-      this.accountRefStore.set('refList', newList, callback);
-    });
-  }
-  removeAccountRef(address, callback) {
-    this.accountRefStore.get('refList', refList => {
-      if (refList) {
-        refList.forEach(accRef => {
-          if (accRef.indexOf(address) > -1) {
-            accRef.splice(accRef.indexOf(address), 1);
-          }
-          if (accRef.length < 2) {
-            refList.splice(refList.indexOf(accRef), 1);
-          }
-        });
-        this.accountRefStore.set('refList', refList, () => {
-          callback();
-        });
-      } else {
-        callback();
-      }
-    });
-  }
   getStakingReward(update) {
     update(this.stakingRewardState);
   }
   subscribeStakingReward() {
     return this.stakingRewardSubject;
   }
-  setCurrentAccount(data, callback, preventOneAccount) {
-    const {
-      address,
-      currentGenesisHash
-    } = data;
-    const result = {
-      ...data
-    };
-    if (address === _constants.ALL_ACCOUNT_KEY) {
-      const pairs = _uiKeyring.keyring.getAccounts();
-      const pair = pairs[0];
-      const pairGenesisHash = (pair === null || pair === void 0 ? void 0 : pair.meta.genesisHash) || '';
-      if (pairs.length > 1 || !pair) {
-        result.allGenesisHash = currentGenesisHash || undefined;
-      } else {
-        if (!preventOneAccount) {
-          result.address = pair.address;
-          result.currentGenesisHash = pairGenesisHash || '';
-          result.allGenesisHash = pairGenesisHash || undefined;
-        } else {
-          result.allGenesisHash = currentGenesisHash || undefined;
-        }
-      }
-    }
-    this.keyringService.setCurrentAccount(result);
-    callback && callback();
-  }
-  setAccountTie(address, genesisHash) {
-    if (address !== _constants.ALL_ACCOUNT_KEY) {
-      const pair = _uiKeyring.keyring.getPair(address);
-      (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
-      _uiKeyring.keyring.saveAccountMeta(pair, {
-        ...pair.meta,
-        genesisHash
-      });
-    }
-    const accountInfo = this.keyringService.currentAccount;
-    if (address === accountInfo.address) {
-      accountInfo.currentGenesisHash = genesisHash || _constants.ALL_GENESIS_HASH;
-      this.setCurrentAccount(accountInfo);
-    }
-    return true;
-  }
   async switchEvmNetworkByUrl(shortenUrl, networkKey) {
     const authUrls = await this.getAuthList();
     const chainInfo = this.chainService.getChainInfoByKey(networkKey);
@@ -635,29 +515,6 @@ class KoniState {
   subscribeSettingsSubject() {
     return this.settingService.getSubject();
   }
-  getAccountAddress() {
-    const address = this.keyringService.currentAccount.address;
-    if (address === '') {
-      return null;
-    }
-    return address;
-  }
-  getDecodedAddresses(address) {
-    let checkingAddress = address;
-    if (!address) {
-      checkingAddress = this.getAccountAddress();
-    }
-    if (!checkingAddress) {
-      return [];
-    }
-    if (checkingAddress === _constants.ALL_ACCOUNT_KEY) {
-      return this.getAllAddresses();
-    }
-    return [checkingAddress];
-  }
-  getAllAddresses() {
-    return _uiKeyring.keyring.getAccounts().map(account => account.address);
-  }
   async resetCrowdloanMap(newAddress) {
     const defaultData = generateDefaultCrowdloanMap();
     const storedData = await this.getStoredCrowdloan(newAddress);
@@ -671,7 +528,7 @@ class KoniState {
     this.getStaking().then(data => {
       this.stakingSubject.next(data);
     }).catch(e => this.logger.warn(e));
-    const addresses = this.getDecodedAddresses(newAddress);
+    const addresses = this.keyringService.context.getDecodedAddresses(newAddress);
     this.dbService.subscribeStaking(addresses, this.activeChainSlugs, stakings => {
       this.stakingSubject.next({
         ready: true,
@@ -703,8 +560,8 @@ class KoniState {
     });
   }
   updateCrowdloanStore(networkKey, item) {
-    const currentAccountInfo = this.keyringService.currentAccount;
-    this.dbService.updateCrowdloanStore(networkKey, currentAccountInfo.address, item).catch(e => this.logger.warn(e));
+    const currentAccountInfo = this.keyringService.context.currentAccount;
+    this.dbService.updateCrowdloanStore(networkKey, currentAccountInfo.proxyId, item).catch(e => this.logger.warn(e));
   }
   subscribeCrowdloan() {
     return this.crowdloanSubject;
@@ -860,6 +717,12 @@ class KoniState {
   getEvmApi(networkKey) {
     return this.chainService.getEvmApi(networkKey);
   }
+  getTonApiMap() {
+    return this.chainService.getTonApiMap();
+  }
+  getTonApi(networkKey) {
+    return this.chainService.getTonApi(networkKey);
+  }
   getApiMap() {
     return {
       substrate: this.chainService.getSubstrateApiMap(),
@@ -877,7 +740,7 @@ class KoniState {
     return {
       chainInfoMap: this.chainService.getChainInfoMap(),
       chainApiMap: this.getApiMap(),
-      currentAccountInfo: this.keyringService.currentAccount,
+      currentAccountInfo: this.keyringService.context.currentAccount,
       assetRegistry: this.chainService.getAssetRegistry(),
       chainStateMap: this.chainService.getChainStateMap()
     };
@@ -988,77 +851,11 @@ class KoniState {
     }
     return Object.values(_constants2._PREDEFINED_SINGLE_MODES).find(item => item.networkKeys.includes(networkKey));
   }
-  accountExportPrivateKey(_ref6) {
-    let {
-      address,
-      password
-    } = _ref6;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const exportedJson = _uiKeyring.keyring.backupAccount(_uiKeyring.keyring.getPair(address), password);
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const decoded = (0, _decode.decodePair)(password, (0, _utilCrypto.base64Decode)(exportedJson.encoded), exportedJson.encoding.type);
-    return {
-      privateKey: (0, _util.u8aToHex)(decoded.secretKey),
-      publicKey: (0, _util.u8aToHex)(decoded.publicKey)
-    };
-  }
-  checkPublicAndSecretKey(_ref7) {
-    let {
-      publicKey,
-      secretKey
-    } = _ref7;
-    try {
-      const _secret = (0, _util.hexStripPrefix)(secretKey);
-      if (_secret.length === 64) {
-        const suri = `0x${_secret}`;
-        const {
-          phrase
-        } = (0, _utilCrypto.keyExtractSuri)(suri);
-        if ((0, _util.isHex)(phrase) && (0, _util.isHex)(phrase, 256)) {
-          const type = 'ethereum';
-          const address = _uiKeyring.keyring.createFromUri(getSuri(suri, type), {}, type).address;
-          return {
-            address: address,
-            isValid: true,
-            isEthereum: true
-          };
-        } else {
-          return {
-            address: '',
-            isValid: false,
-            isEthereum: true
-          };
-        }
-      }
-      const keyPair = _uiKeyring.keyring.keyring.addFromPair({
-        publicKey: (0, _util.hexToU8a)(publicKey),
-        secretKey: (0, _util.hexToU8a)(secretKey)
-      });
-      return {
-        address: keyPair.address,
-        isValid: true,
-        isEthereum: false
-      };
-    } catch (e) {
-      console.error(e);
-      return {
-        address: '',
-        isValid: false,
-        isEthereum: false
-      };
-    }
+  accountExportPrivateKey(request) {
+    return this.keyringService.context.accountExportPrivateKey(request);
   }
-  getEthKeyring(address, password) {
-    return new Promise(resolve => {
-      const {
-        privateKey
-      } = this.accountExportPrivateKey({
-        address,
-        password: password
-      });
-      const ethKeyring = new _ethSimpleKeyring.default([privateKey]);
-      resolve(ethKeyring);
-    });
+  checkPublicAndSecretKey(request) {
+    return this.keyringService.context.checkPublicAndSecretKey(request);
   }
   async evmSign(id, url, method, params, topic) {
     let address = '';
@@ -1086,11 +883,11 @@ class KoniState {
       errors: errorsFormated,
       id
     };
-    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(_ref8 => {
+    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(_ref6 => {
       let {
         isApproved,
         payload
-      } = _ref8;
+      } = _ref6;
       if (isApproved) {
         if (payload) {
           return payload;
@@ -1201,10 +998,10 @@ class KoniState {
       transactionEmitter.on('error', rs => {
         var _rs$errors$;
         let evmProviderError = new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR);
-        const errorType = ((_rs$errors$ = rs.errors[0]) === null || _rs$errors$ === void 0 ? void 0 : _rs$errors$.errorType) || _KoniTypes.BasicTxErrorType.INTERNAL_ERROR;
-        if (errorType === _KoniTypes.BasicTxErrorType.USER_REJECT_REQUEST || errorType === _KoniTypes.BasicTxErrorType.UNABLE_TO_SIGN) {
+        const errorType = ((_rs$errors$ = rs.errors[0]) === null || _rs$errors$ === void 0 ? void 0 : _rs$errors$.errorType) || _types2.BasicTxErrorType.INTERNAL_ERROR;
+        if (errorType === _types2.BasicTxErrorType.USER_REJECT_REQUEST || errorType === _types2.BasicTxErrorType.UNABLE_TO_SIGN) {
           evmProviderError = new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);
-        } else if (errorType === _KoniTypes.BasicTxErrorType.UNABLE_TO_SEND) {
+        } else if (errorType === _types2.BasicTxErrorType.UNABLE_TO_SEND) {
           var _rs$errors$2;
           evmProviderError = new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, (_rs$errors$2 = rs.errors[0]) === null || _rs$errors$2 === void 0 ? void 0 : _rs$errors$2.message);
         }
@@ -1215,9 +1012,15 @@ class KoniState {
   getConfirmationsQueueSubject() {
     return this.requestService.confirmationsQueueSubject;
   }
+  getConfirmationsQueueSubjectTon() {
+    return this.requestService.confirmationsQueueSubjectTon;
+  }
   async completeConfirmation(request) {
     return await this.requestService.completeConfirmation(request);
   }
+  async completeConfirmationTon(request) {
+    return await this.requestService.completeConfirmationTon(request);
+  }
   async onMV3Update() {
     const migrationStatus = await _storage.SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
@@ -1232,6 +1035,18 @@ class KoniState {
       }
     }
   }
+  async storePreviousVersionData(details) {
+    if (details.reason === 'update') {
+      const previousVersion = details.previousVersion;
+      if (!previousVersion) {
+        return;
+      }
+      const storedData = await _storage.SWStorage.instance.getItem('previous_version');
+      if (!storedData || !storedData.includes(previousVersion)) {
+        await _storage.SWStorage.instance.setItem('previous_version', previousVersion);
+      }
+    }
+  }
   async migrateMV3LocalStorage(data) {
     try {
       const parsedData = JSON.parse(data);
@@ -1262,13 +1077,14 @@ class KoniState {
       this.onMV3Install().catch(console.error);
     } else if (details.reason === 'update') {
       this.onMV3Update().catch(console.error);
+      this.storePreviousVersionData(details).catch(console.error);
     }
   }
   async onHandleRemindExportAccount() {
     const remindStatus = await _storage.SWStorage.instance.getItem(_constants.REMIND_EXPORT_ACCOUNT);
     if (!remindStatus || !remindStatus.includes('done')) {
       const handleRemind = account => {
-        if (account.address !== '') {
+        if (account.proxyId !== '') {
           // Open remind tab
           const url = `${chrome.runtime.getURL('index.html')}#/remind-export-account`;
           (0, _PopupHandler.openPopup)(url).then(_util.noop).catch(console.error).finally(() => subscription.unsubscribe());
@@ -1278,14 +1094,14 @@ class KoniState {
           }, 3000);
         }
       };
-      const subscription = this.keyringService.currentAccountSubject.subscribe(handleRemind);
+      const subscription = this.keyringService.context.observable.currentAccount.subscribe(handleRemind);
     }
   }
-  async setStorageFromWS(_ref9) {
+  async setStorageFromWS(_ref7) {
     let {
       key,
       value
-    } = _ref9;
+    } = _ref7;
     try {
       const jsonData = JSON.stringify(value);
       await _storage.SWStorage.instance.setItem(key, jsonData);
@@ -1295,6 +1111,14 @@ class KoniState {
       return false;
     }
   }
+  async getStorageFromWS(key) {
+    try {
+      return await _storage.SWStorage.instance.getItem(key);
+    } catch (e) {
+      console.error(e);
+      return null;
+    }
+  }
   onCheckToRemindUser() {
     this.onHandleRemindExportAccount().catch(console.error);
   }
@@ -1463,7 +1287,7 @@ class KoniState {
     });
   }
   async reloadNft() {
-    const currentAddress = this.keyringService.currentAccount.address;
+    const currentAddress = this.keyringService.context.currentAccount.proxyId;
     await this.dbService.removeNftsByAddress(currentAddress);
     return await this.cron.reloadNft();
   }
@@ -1504,7 +1328,6 @@ class KoniState {
     // await this.handleResetBalance(ALL_ACCOUNT_KEY, true);
     await this.earningService.resetWallet();
     await this.dbService.resetWallet(resetAll);
-    this.accountRefStore.set('refList', []);
     if (resetAll) {
       await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
       this.settingService.resetWallet();
@@ -1624,7 +1447,7 @@ class KoniState {
   subscribeMantaPayBalance() {
     var _this$chainService27, _this$chainService27$;
     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.currentAccount.address, _constants2._DEFAULT_MANTA_ZK_CHAIN).then(config => {
+    (_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 => {
       if (config && config.enabled && config.isInitialSync) {
         this.getMantaZkBalance();
         interval = setInterval(this.getMantaZkBalance, _constants.MANTA_PAY_BALANCE_INTERVAL);
@@ -1686,12 +1509,12 @@ class KoniState {
 
   /* Metadata */
 
-  getCrowdloanContributions(_ref10) {
+  getCrowdloanContributions(_ref8) {
     let {
       address,
       page,
       relayChain
-    } = _ref10;
+    } = _ref8;
     return this.subscanService.getCrowdloanContributions(relayChain, address, page);
   }
 }