@subwallet/extension-base 1.2.31-0 → 1.2.33-0

package/koni/background/handlers/Tabs.js

@@ -15,24 +15,33 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
 import { canDerive, getEVMChainInfo, stripUrl } from '@subwallet/extension-base/utils';
+import { EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { isArray, isNumber } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthType) {
+function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTypes) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
-  let authTypeFilter = ({
+  const authTypeFilter = ({
     type
-  }) => true;
-  if (accountAuthType === 'substrate') {
-    authTypeFilter = ({
-      type
-    }) => type !== 'ethereum';
-  } else if (accountAuthType === 'evm') {
-    authTypeFilter = ({
-      type
-    }) => type === 'ethereum';
-  }
+  }) => {
+    if (accountAuthTypes) {
+      if (!type) {
+        return false;
+      }
+      const validTypes = {
+        evm: EthereumKeypairTypes,
+        substrate: SubstrateKeypairTypes,
+        ton: TonKeypairTypes
+      };
+      return accountAuthTypes.some(authType => {
+        var _validTypes$authType;
+        return (_validTypes$authType = validTypes[authType]) === null || _validTypes$authType === void 0 ? void 0 : _validTypes$authType.includes(type);
+      });
+    } else {
+      return true;
+    }
+  };
   return Object.values(accounts).filter(({
     json: {
       meta: {
@@ -111,12 +120,13 @@ export default class KoniTabs {
       payloadAfterValidated: request
     };
     const {
-      pair
+      errors
     } = await generateValidationProcess(this.#koniState, url, payloadValidate, [validationAuthMiddleware]);
-    return this.#koniState.sign(url, new RequestBytesSign(request), {
-      address,
-      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
-    });
+    if (errors.length === 0) {
+      return this.#koniState.sign(url, new RequestBytesSign(request));
+    } else {
+      throw errors[0];
+    }
   }
   async extrinsicSign(url, request) {
     const address = request.address;
@@ -127,12 +137,14 @@ export default class KoniTabs {
       payloadAfterValidated: request
     };
     const {
+      errors,
       pair
     } = await generateValidationProcess(this.#koniState, url, payloadValidate, [validationAuthMiddleware]);
-    return this.#koniState.sign(url, new RequestExtrinsicSign(request), {
-      address,
-      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
-    });
+    if (pair && errors.length === 0) {
+      return this.#koniState.sign(url, new RequestExtrinsicSign(request));
+    } else {
+      throw errors[0];
+    }
   }
   metadataProvide(url, request) {
     return this.#koniState.injectMetadata(url, request);
@@ -240,9 +252,22 @@ export default class KoniTabs {
     anyType
   }) {
     const authInfo = await this.getAuthInfo(url);
-    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, (authInfo === null || authInfo === void 0 ? void 0 : authInfo.accountAuthType) || accountAuthType);
+    const accountAuthTypes = [];
+    if (accountAuthType) {
+      accountAuthTypes.push(accountAuthType);
+    } else if (authInfo) {
+      if (authInfo.accountAuthTypes.includes('substrate')) {
+        accountAuthTypes.push('substrate');
+      }
+      if (authInfo.accountAuthTypes.includes('evm')) {
+        accountAuthTypes.push('evm');
+      }
+    }
+    return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes);
   }
-  accountsSubscribeV2(url, {
+
+  // TODO: Update logic
+  accountsSubstrateSubscribeV2(url, {
     accountAuthType
   }, id, port) {
     const cb = createSubscription(id, port);
@@ -250,9 +275,19 @@ export default class KoniTabs {
     this.#accountSubs[id] = {
       subscription: authInfoSubject.subscribe(infos => {
         this.getAuthInfo(url, infos).then(authInfo => {
-          const accountAuthType_ = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.accountAuthType) || accountAuthType;
-          const accounts = this.#koniState.keyringService.accounts;
-          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType_));
+          const accountAuthTypes = [];
+          if (accountAuthType) {
+            accountAuthTypes.push(accountAuthType);
+          } else if (authInfo) {
+            if (authInfo.accountAuthTypes.includes('substrate')) {
+              accountAuthTypes.push('substrate');
+            }
+            if (authInfo.accountAuthTypes.includes('evm')) {
+              accountAuthTypes.push('evm');
+            }
+          }
+          const accounts = this.#koniState.keyringService.context.pairs;
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthTypes));
         }).catch(console.error);
       }),
       url
@@ -279,7 +314,9 @@ export default class KoniTabs {
     return true;
   }
   authorizeV2(url, request) {
-    if (request.accountAuthType === 'evm') {
+    var _request$accountAuthT, _request$accountAuthT2;
+    const isConnectOnlyEvmAccountType = ((_request$accountAuthT = request.accountAuthTypes) === null || _request$accountAuthT === void 0 ? void 0 : _request$accountAuthT.length) === 1 && ((_request$accountAuthT2 = request.accountAuthTypes) === null || _request$accountAuthT2 === void 0 ? void 0 : _request$accountAuthT2.includes('evm'));
+    if (isConnectOnlyEvmAccountType) {
       return new Promise((resolve, reject) => {
         this.#koniState.authorizeUrlV2(url, request).then(resolve).catch(e => {
           reject(new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST));
@@ -289,23 +326,30 @@ export default class KoniTabs {
       return this.#koniState.authorizeUrlV2(url, request);
     }
   }
+
+  // TODO: Update logic
   async getEvmCurrentAccount(url) {
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
-        const allAccounts = this.#koniState.keyringService.accounts;
-        const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
+        const allAccounts = this.#koniState.keyringService.context.pairs;
+        const accountList = transformAccountsV2(allAccounts, false, authInfo, ['evm']).map(a => a.address);
         let accounts = [];
-        const address = this.#koniState.keyringService.currentAccount.address;
-        if (address === ALL_ACCOUNT_KEY || !address) {
+        const proxyId = this.#koniState.keyringService.context.currentAccount.proxyId;
+        if (proxyId === ALL_ACCOUNT_KEY || !proxyId) {
           accounts = accountList;
         } else {
-          if (accountList.includes(address)) {
-            const result = accountList.filter(adr => adr !== address);
-            result.unshift(address);
-            accounts = result;
-          } else {
-            accounts = accountList;
+          const addresses = this.#koniState.keyringService.context.addressesByProxyId(proxyId);
+          const result = [];
+          const inList = [];
+          for (const account of accountList) {
+            if (!addresses.includes(account)) {
+              result.push(account);
+            } else {
+              inList.push(account);
+            }
           }
+          result.unshift(...inList);
+          accounts = result;
         }
         resolve(accounts);
       }).catch(console.error);
@@ -407,34 +451,30 @@ export default class KoniTabs {
             const urlStripped = stripUrl(url);
             if (value && value[urlStripped]) {
               const {
-                accountAuthType,
+                accountAuthTypes,
                 isAllowedMap
               } = {
                 ...value[urlStripped]
               };
-              if (!accountAuthType) {
+              if (!accountAuthTypes) {
                 resolve();
               }
-              switch (accountAuthType) {
-                case 'substrate':
-                  resolve();
-                  break;
-                case 'evm':
+              if (accountAuthTypes !== null && accountAuthTypes !== void 0 && accountAuthTypes.includes('evm')) {
+                if (accountAuthTypes.length === 1) {
                   delete value[urlStripped];
-                  break;
-                case 'both':
-                  {
-                    value[urlStripped].isAllowedMap = Object.entries(isAllowedMap).reduce((allowedMap, [address, value]) => {
-                      if (isEthereumAddress(address)) {
-                        allowedMap[address] = false;
-                      } else {
-                        allowedMap[address] = value;
-                      }
-                      return allowedMap;
-                    }, {});
-                    value[urlStripped].accountAuthType = 'substrate';
-                    break;
-                  }
+                } else {
+                  value[urlStripped].isAllowedMap = Object.entries(isAllowedMap).reduce((allowedMap, [address, value]) => {
+                    if (isEthereumAddress(address)) {
+                      allowedMap[address] = false;
+                    } else {
+                      allowedMap[address] = value;
+                    }
+                    return allowedMap;
+                  }, {});
+                  value[urlStripped].accountAuthTypes = accountAuthTypes === null || accountAuthTypes === void 0 ? void 0 : accountAuthTypes.filter(type => type !== 'evm');
+                }
+              } else {
+                resolve();
               }
               this.#koniState.setAuthorize(value, () => {
                 resolve();
@@ -670,6 +710,8 @@ export default class KoniTabs {
     const evmState = await this.getEvmState(url);
     return evmState.chainId || '0x0';
   }
+
+  // TODO: Update logic
   async evmSubscribeEvents(url, id, port) {
     // This method will be called after DApp request connect to extension
     const cb = createSubscription(id, port);
@@ -694,7 +736,7 @@ export default class KoniTabs {
         currentAccountList = newAccountList;
       }
     };
-    const accountListSubscription = this.#koniState.keyringService.currentAccountSubject.subscribe(() => {
+    const accountListSubscription = this.#koniState.keyringService.context.observable.currentAccount.subscribe(() => {
       onCurrentAccountChanged().catch(console.error);
     });
 
@@ -855,6 +897,8 @@ export default class KoniTabs {
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Failed to sign message');
     }
   }
+
+  // TODO: Update logic
   async evmSendTransaction(id, url, {
     params
   }) {
@@ -894,7 +938,7 @@ export default class KoniTabs {
         case 'wallet_requestPermissions':
           await this.authorizeV2(url, {
             origin: '',
-            accountAuthType: 'evm',
+            accountAuthTypes: ['evm'],
             reConfirm: true
           });
           return await this.getEvmPermission(url, id);
@@ -1047,7 +1091,7 @@ export default class KoniTabs {
       case 'pub(accounts.listV2)':
         return this.accountsListV2(url, request);
       case 'pub(accounts.subscribeV2)':
-        return this.accountsSubscribeV2(url, request, id, port);
+        return this.accountsSubstrateSubscribeV2(url, request, id, port);
       case 'pub(accounts.unsubscribe)':
         return this.accountsUnsubscribe(url, request);
       case 'evm(events.subscribe)':

package/koni/background/subscription.js

@@ -43,7 +43,7 @@ export class KoniSubscription {
   async start() {
     var _this$state$keyringSe;
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
-    const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
+    const currentAddress = (_this$state$keyringSe = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.proxyId;
     if (currentAddress) {
       this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     }
@@ -54,7 +54,7 @@ export class KoniSubscription {
       if (!needReload) {
         return;
       }
-      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
+      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.proxyId;
       if (!address) {
         return;
       }
@@ -71,7 +71,7 @@ export class KoniSubscription {
     return Promise.resolve();
   }
   subscribeCrowdloans(address, substrateApiMap, onlyRunOnFirstTime) {
-    const addresses = this.state.getDecodedAddresses(address);
+    const addresses = this.state.keyringService.context.getDecodedAddresses(address);
     if (!addresses.length) {
       return;
     }
@@ -92,7 +92,7 @@ export class KoniSubscription {
     };
   }
   subscribeNft(address, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap) {
-    const addresses = this.state.getDecodedAddresses(address);
+    const addresses = this.state.keyringService.context.getDecodedAddresses(address);
     if (!addresses.length) {
       return;
     }
@@ -107,7 +107,7 @@ export class KoniSubscription {
   }
   async reloadCrowdloan() {
     var _this$state$keyringSe2;
-    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
+    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.context.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.proxyId;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     await waitTimeout(1800);
   }