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

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

@@ -19,6 +19,7 @@ var _types2 = require("@subwallet/extension-base/services/chain-service/handler/
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/setting-service/constants");
 var _utils2 = require("@subwallet/extension-base/utils");
+var _types3 = require("@subwallet/keyring/types");
 var _web = _interopRequireDefault(require("web3"));
 var _phishing = require("@polkadot/phishing");
 var _util = require("@polkadot/util");
@@ -29,51 +30,51 @@ var _utilCrypto = require("@polkadot/util-crypto");
 function transformAccountsV2(accounts) {
   let anyType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   let authInfo = arguments.length > 2 ? arguments[2] : undefined;
-  let accountAuthType = arguments.length > 3 ? arguments[3] : undefined;
+  let accountAuthTypes = arguments.length > 3 ? arguments[3] : undefined;
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
-  let authTypeFilter = _ref => {
+  const authTypeFilter = _ref => {
     let {
       type
     } = _ref;
-    return true;
+    if (accountAuthTypes) {
+      if (!type) {
+        return false;
+      }
+      const validTypes = {
+        evm: _types3.EthereumKeypairTypes,
+        substrate: _types3.SubstrateKeypairTypes,
+        ton: _types3.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;
+    }
   };
-  if (accountAuthType === 'substrate') {
-    authTypeFilter = _ref2 => {
-      let {
-        type
-      } = _ref2;
-      return type !== 'ethereum';
-    };
-  } else if (accountAuthType === 'evm') {
-    authTypeFilter = _ref3 => {
-      let {
-        type
-      } = _ref3;
-      return type === 'ethereum';
-    };
-  }
-  return Object.values(accounts).filter(_ref4 => {
+  return Object.values(accounts).filter(_ref2 => {
     let {
       json: {
         meta: {
           isHidden
         }
       }
-    } = _ref4;
+    } = _ref2;
     return !isHidden;
-  }).filter(_ref5 => {
+  }).filter(_ref3 => {
     let {
       type
-    } = _ref5;
+    } = _ref3;
     return anyType ? true : (0, _utils2.canDerive)(type);
-  }).filter(authTypeFilter).filter(_ref6 => {
+  }).filter(authTypeFilter).filter(_ref4 => {
     let {
       json: {
         address
       }
-    } = _ref6;
+    } = _ref4;
     return accountSelected.includes(address);
-  }).sort((a, b) => (a.json.meta.whenCreated || 0) - (b.json.meta.whenCreated || 0)).map(_ref7 => {
+  }).sort((a, b) => (a.json.meta.whenCreated || 0) - (b.json.meta.whenCreated || 0)).map(_ref5 => {
     let {
       json: {
         address,
@@ -83,7 +84,7 @@ function transformAccountsV2(accounts) {
         }
       },
       type
-    } = _ref7;
+    } = _ref5;
     return {
       address,
       genesisHash,
@@ -143,12 +144,13 @@ class KoniTabs {
       payloadAfterValidated: request
     };
     const {
-      pair
+      errors
     } = await (0, _logicValidation.generateValidationProcess)(this.#koniState, url, payloadValidate, [_logicValidation.validationAuthMiddleware]);
-    return this.#koniState.sign(url, new _RequestBytesSign.default(request), {
-      address,
-      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
-    });
+    if (errors.length === 0) {
+      return this.#koniState.sign(url, new _RequestBytesSign.default(request));
+    } else {
+      throw errors[0];
+    }
   }
   async extrinsicSign(url, request) {
     const address = request.address;
@@ -159,12 +161,14 @@ class KoniTabs {
       payloadAfterValidated: request
     };
     const {
+      errors,
       pair
     } = await (0, _logicValidation.generateValidationProcess)(this.#koniState, url, payloadValidate, [_logicValidation.validationAuthMiddleware]);
-    return this.#koniState.sign(url, new _RequestExtrinsicSign.default(request), {
-      address,
-      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
-    });
+    if (pair && errors.length === 0) {
+      return this.#koniState.sign(url, new _RequestExtrinsicSign.default(request));
+    } else {
+      throw errors[0];
+    }
   }
   metadataProvide(url, request) {
     return this.#koniState.injectMetadata(url, request);
@@ -172,11 +176,11 @@ class KoniTabs {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   metadataList(url) {
-    return this.#koniState.knownMetadata.map(_ref8 => {
+    return this.#koniState.knownMetadata.map(_ref6 => {
       let {
         genesisHash,
         specVersion
-      } = _ref8;
+      } = _ref6;
       return {
         genesisHash,
         specVersion
@@ -224,10 +228,10 @@ class KoniTabs {
     chrome.tabs.query({
       url: nonFragment
     }, tabs => {
-      tabs.map(_ref9 => {
+      tabs.map(_ref7 => {
         let {
           id
-        } = _ref9;
+        } = _ref7;
         return id;
       }).filter(id => (0, _util.isNumber)(id)).forEach(id => (0, _helpers.withErrorLog)(() => chrome.tabs.update(id, {
         url
@@ -273,26 +277,49 @@ class KoniTabs {
     const shortenUrl = (0, _utils2.stripUrl)(url);
     return authList[shortenUrl];
   }
-  async accountsListV2(url, _ref10) {
+  async accountsListV2(url, _ref8) {
     let {
       accountAuthType,
       anyType
-    } = _ref10;
+    } = _ref8;
     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, _ref11, id, port) {
+
+  // TODO: Update logic
+  accountsSubstrateSubscribeV2(url, _ref9, id, port) {
     let {
       accountAuthType
-    } = _ref11;
+    } = _ref9;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const authInfoSubject = this.#koniState.requestService.subscribeAuthorizeUrlSubject;
     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
@@ -306,10 +333,10 @@ class KoniTabs {
     });
     return id;
   }
-  accountsUnsubscribe(url, _ref12) {
+  accountsUnsubscribe(url, _ref10) {
     let {
       id
-    } = _ref12;
+    } = _ref10;
     const sub = this.#accountSubs[id];
     if (!sub || sub.url !== url) {
       return false;
@@ -320,7 +347,9 @@ 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.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST));
@@ -330,23 +359,30 @@ 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 === _constants.ALL_ACCOUNT_KEY || !address) {
+        const proxyId = this.#koniState.keyringService.context.currentAccount.proxyId;
+        if (proxyId === _constants.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);
@@ -422,10 +458,10 @@ class KoniTabs {
       date: new Date().getTime()
     }];
   }
-  async revokePermissions(url, id, _ref13) {
+  async revokePermissions(url, id, _ref11) {
     let {
       params
-    } = _ref13;
+    } = _ref11;
     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.');
     }
@@ -449,35 +485,31 @@ class KoniTabs {
             const urlStripped = (0, _utils2.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, _ref14) => {
-                      let [address, value] = _ref14;
-                      if ((0, _utilCrypto.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, _ref12) => {
+                    let [address, value] = _ref12;
+                    if ((0, _utilCrypto.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();
@@ -492,10 +524,10 @@ class KoniTabs {
     await Promise.all(Array.from(permissions).map(permissionPromise));
     return null;
   }
-  async switchEvmChain(id, url, _ref15) {
+  async switchEvmChain(id, url, _ref13) {
     let {
       params
-    } = _ref15;
+    } = _ref13;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
     const chainIdDec = parseInt(chainId, 16);
@@ -527,11 +559,11 @@ class KoniTabs {
     }
     return null;
   }
-  async addEvmToken(id, url, _ref16) {
+  async addEvmToken(id, url, _ref14) {
     var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     let {
       params
-    } = _ref16;
+    } = _ref14;
     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') {
@@ -584,10 +616,10 @@ class KoniTabs {
 
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
-  async addEvmChain(id, url, _ref17) {
+  async addEvmChain(id, url, _ref15) {
     let {
       params
-    } = _ref17;
+    } = _ref15;
     const input = params;
     if (input && input.length > 0) {
       const {
@@ -716,6 +748,8 @@ 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 = (0, _subscriptions.createSubscription)(id, port);
@@ -740,7 +774,7 @@ class KoniTabs {
         currentAccountList = newAccountList;
       }
     };
-    const accountListSubscription = this.#koniState.keyringService.currentAccountSubject.subscribe(() => {
+    const accountListSubscription = this.#koniState.keyringService.context.observable.currentAccount.subscribe(() => {
       onCurrentAccountChanged().catch(console.error);
     });
 
@@ -790,11 +824,11 @@ class KoniTabs {
     const networkCheckInterval = setInterval(networkCheck, _constants.CRON_GET_API_MAP_STATUS);
     const provider = await this.getEvmProvider(url);
     const eventMap = {};
-    eventMap.data = _ref18 => {
+    eventMap.data = _ref16 => {
       let {
         method,
         params
-      } = _ref18;
+      } = _ref16;
       emitEvent('message', {
         type: method,
         data: params
@@ -803,8 +837,8 @@ class KoniTabs {
     eventMap.error = rs => {
       emitEvent('error', rs);
     };
-    Object.entries(eventMap).forEach(_ref19 => {
-      let [event, callback] = _ref19;
+    Object.entries(eventMap).forEach(_ref17 => {
+      let [event, callback] = _ref17;
       // 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));
     });
@@ -818,8 +852,8 @@ class KoniTabs {
       if (this.evmEventEmitterMap[url][id]) {
         delete this.evmEventEmitterMap[url][id];
       }
-      Object.entries(eventMap).forEach(_ref20 => {
-        let [event, callback] = _ref20;
+      Object.entries(eventMap).forEach(_ref18 => {
+        let [event, callback] = _ref18;
         // 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));
       });
@@ -854,11 +888,11 @@ class KoniTabs {
     }
     return provider;
   }
-  async performWeb3Method(id, url, _ref21, callback) {
+  async performWeb3Method(id, url, _ref19, callback) {
     let {
       method,
       params
-    } = _ref21;
+    } = _ref19;
     const provider = await this.getEvmProvider(url);
     this.checkAndHandleProviderStatus(provider);
     return new Promise((resolve, reject) => {
@@ -894,11 +928,11 @@ class KoniTabs {
     const allowedAccounts = await this.getEvmCurrentAccount(url);
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
-  async evmSign(id, url, _ref22) {
+  async evmSign(id, url, _ref20) {
     let {
       method,
       params
-    } = _ref22;
+    } = _ref20;
     const signResult = await this.#koniState.evmSign(id, url, method, params);
     if (signResult) {
       return signResult;
@@ -906,10 +940,12 @@ class KoniTabs {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Failed to sign message');
     }
   }
-  async evmSendTransaction(id, url, _ref23) {
+
+  // TODO: Update logic
+  async evmSendTransaction(id, url, _ref21) {
     let {
       params
-    } = _ref23;
+    } = _ref21;
     const transactionParams = params[0];
     const transactionHash = await this.#koniState.evmSendTransaction(id, url, transactionParams);
     if (!transactionHash) {
@@ -946,7 +982,7 @@ class KoniTabs {
         case 'wallet_requestPermissions':
           await this.authorizeV2(url, {
             origin: '',
-            accountAuthType: 'evm',
+            accountAuthTypes: ['evm'],
             reConfirm: true
           });
           return await this.getEvmPermission(url, id);
@@ -995,11 +1031,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, _ref24) {
+  async addPspToken(id, url, _ref22) {
     let {
       genesisHash,
       tokenInfo: input
-    } = _ref24;
+    } = _ref22;
     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));
@@ -1100,7 +1136,7 @@ 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/cjs/koni/background/subscription.js

@@ -49,7 +49,7 @@ 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());
     }
@@ -60,7 +60,7 @@ 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;
       }
@@ -77,7 +77,7 @@ 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;
     }
@@ -98,7 +98,7 @@ 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;
     }
@@ -118,7 +118,7 @@ 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 (0, _utils.waitTimeout)(1800);
   }

package/cjs/packageInfo.js

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

package/cjs/page/Accounts.js

@@ -15,15 +15,12 @@ class Accounts {
   }
   get(anyType) {
     return sendRequest('pub(accounts.listV2)', {
-      anyType,
-      accountAuthType: 'substrate'
+      anyType
     });
   }
   subscribe(cb) {
     let id = null;
-    sendRequest('pub(accounts.subscribeV2)', {
-      accountAuthType: 'substrate'
-    }, cb).then(subId => {
+    sendRequest('pub(accounts.subscribeV2)', {}, cb).then(subId => {
       id = subId;
     }).catch(console.error);
     return () => {

package/cjs/page/SubWalleEvmProvider.js

@@ -88,7 +88,7 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
           const origin = document.title !== '' ? document.title : window.location.hostname;
           this.sendMessage('pub(authorize.tabV2)', {
             origin,
-            accountAuthType: 'evm'
+            accountAuthTypes: ['evm']
           }).then(() => {
             // Return account list
             this.request({

package/cjs/page/index.js

@@ -43,9 +43,10 @@ function sendMessage(message, request, subscriber) {
 // the enable function, called by the dapp to allow access
 
 async function enable(origin, opt) {
+  const accountAuthTypes = (opt === null || opt === void 0 ? void 0 : opt.accountAuthType) === 'both' ? ['substrate', 'evm'] : [(opt === null || opt === void 0 ? void 0 : opt.accountAuthType) || 'substrate'];
   await sendMessage('pub(authorize.tabV2)', {
     origin,
-    accountAuthType: (opt === null || opt === void 0 ? void 0 : opt.accountAuthType) || 'substrate'
+    accountAuthTypes
   });
   return new _Injected.default(sendMessage);
 }