@subwallet/extension-base 1.1.3-0 → 1.1.5-0

package/background/KoniTypes.d.ts

@@ -2,11 +2,11 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
-import { AccountAuthType, AccountJson, AddressJson, AuthorizeRequest, ConfirmationRequestBase, RequestAccountList, RequestAccountSubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
+import { AccountAuthType, AccountJson, AddressJson, AuthorizeRequest, ConfirmationRequestBase, RequestAccountList, RequestAccountSubscribe, RequestAccountUnsubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
-import { WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
+import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
 import { InjectedAccount, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
 import { KeyringOptions } from '@subwallet/ui-keyring/options/types';
@@ -1466,6 +1466,12 @@ export interface RequestReconnectConnectWalletSession {
 export interface RequestDisconnectWalletConnectSession {
     topic: string;
 }
+export interface RequestRejectWalletConnectNotSupport {
+    id: string;
+}
+export interface RequestApproveWalletConnectNotSupport {
+    id: string;
+}
 export interface MantaPayConfig {
     address: string;
     zkAddress: string;
@@ -1626,7 +1632,8 @@ export interface KoniRequestSignatures {
     'pri(confirmations.complete)': [RequestConfirmationComplete, boolean];
     'pub(utils.getRandom)': [RandomTestRequest, number];
     'pub(accounts.listV2)': [RequestAccountList, InjectedAccount[]];
-    'pub(accounts.subscribeV2)': [RequestAccountSubscribe, boolean, InjectedAccount[]];
+    'pub(accounts.subscribeV2)': [RequestAccountSubscribe, string, InjectedAccount[]];
+    'pub(accounts.unsubscribe)': [RequestAccountUnsubscribe, boolean];
     'pri(account.isLocked)': [RequestAccountIsLocked, ResponseAccountIsLocked];
     'pri(qr.transaction.parse.substrate)': [RequestParseTransactionSubstrate, ResponseParseTransactionSubstrate];
     'pri(qr.transaction.parse.evm)': [RequestQrParseRLP, ResponseQrParseRLP];
@@ -1669,12 +1676,15 @@ export interface KoniRequestSignatures {
     'mobile(subscription.restart)': [SubscriptionServiceType[], void];
     'pub(token.add)': [RequestAddPspToken, boolean];
     'pri(walletConnect.connect)': [RequestConnectWalletConnect, boolean];
-    'pri(walletConnect.requests.subscribe)': [null, WalletConnectSessionRequest[], WalletConnectSessionRequest[]];
+    'pri(walletConnect.requests.connect.subscribe)': [null, WalletConnectSessionRequest[], WalletConnectSessionRequest[]];
     'pri(walletConnect.session.approve)': [RequestApproveConnectWalletSession, boolean];
     'pri(walletConnect.session.reject)': [RequestRejectConnectWalletSession, boolean];
     'pri(walletConnect.session.reconnect)': [RequestReconnectConnectWalletSession, boolean];
     'pri(walletConnect.session.subscribe)': [null, SessionTypes.Struct[], SessionTypes.Struct[]];
     'pri(walletConnect.session.disconnect)': [RequestDisconnectWalletConnectSession, boolean];
+    'pri(walletConnect.requests.notSupport.subscribe)': [null, WalletConnectNotSupportRequest[], WalletConnectNotSupportRequest[]];
+    'pri(walletConnect.notSupport.approve)': [RequestApproveWalletConnectNotSupport, boolean];
+    'pri(walletConnect.notSupport.reject)': [RequestRejectWalletConnectNotSupport, boolean];
     'pri(metadata.find)': [RequestFindRawMetadata, ResponseFindRawMetadata];
 }
 export interface ApplicationMetadataType {

package/background/types.d.ts

@@ -134,6 +134,7 @@ export interface RequestSignatures extends KoniRequestSignatures {
     'pub(metadata.list)': [null, InjectedMetadataKnown[]];
     'pub(metadata.provide)': [MetadataDef, boolean];
     'pub(phishing.redirectIfDenied)': [null, boolean];
+    'pub(ping)': [null, boolean];
     'pub(rpc.listProviders)': [void, ResponseRpcListProviders];
     'pub(rpc.send)': [RequestRpcSend, JsonRpcResponse<unknown>];
     'pub(rpc.startProvider)': [string, ProviderMeta];
@@ -252,6 +253,9 @@ export interface RequestAccountList {
 export interface RequestAccountSubscribe {
     accountAuthType?: AccountAuthType;
 }
+export interface RequestAccountUnsubscribe {
+    id: string;
+}
 export interface RequestRpcSend {
     method: string;
     params: unknown[];

package/cjs/koni/api/nft/config.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_TELOS_MIAMI = exports.IPFS_IO_GATEWAY = exports.IPFS_GATEWAY_CLOUD = exports.IPFS_FLEEK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
+exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_W3S_LINK = exports.IPFS_HARDBIN = exports.IPFS_GATEWAY_4EVERLAND = exports.IPFS_FLEEK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
 exports.getRandomIpfsGateway = getRandomIpfsGateway;
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -43,18 +43,18 @@ const UNIQUE_IPFS_GATEWAY = 'https://ipfs.unique.network/ipfs/';
 exports.UNIQUE_IPFS_GATEWAY = UNIQUE_IPFS_GATEWAY;
 const NFT_STORAGE_GATEWAY = 'https://nftstorage.link/ipfs/';
 exports.NFT_STORAGE_GATEWAY = NFT_STORAGE_GATEWAY;
-const IPFS_IO_GATEWAY = 'https://ipfs.io/ipfs/';
-exports.IPFS_IO_GATEWAY = IPFS_IO_GATEWAY;
+const IPFS_W3S_LINK = 'https://w3s.link/ipfs/';
+exports.IPFS_W3S_LINK = IPFS_W3S_LINK;
 const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
 exports.GATEWAY_IPFS_IO = GATEWAY_IPFS_IO;
 const DWEB_LINK = 'https://dweb.link/ipfs/';
 exports.DWEB_LINK = DWEB_LINK;
-const IPFS_GATEWAY_CLOUD = 'https://ipfs-gateway.cloud/ipfs/';
-exports.IPFS_GATEWAY_CLOUD = IPFS_GATEWAY_CLOUD;
+const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
+exports.IPFS_GATEWAY_4EVERLAND = IPFS_GATEWAY_4EVERLAND;
 const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
 exports.IPFS_FLEEK = IPFS_FLEEK;
-const IPFS_TELOS_MIAMI = 'https://ipfs.telos.miami/ipfs';
-exports.IPFS_TELOS_MIAMI = IPFS_TELOS_MIAMI;
+const IPFS_HARDBIN = 'https://hardbin.com/ipfs';
+exports.IPFS_HARDBIN = IPFS_HARDBIN;
 let SUPPORTED_NFT_NETWORKS;
 exports.SUPPORTED_NFT_NETWORKS = SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {
@@ -103,9 +103,6 @@ exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = SUPPORTED_TRANSFER_SUBSTRATE_C
   SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME["pioneer"] = "pioneer";
 })(SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME || (exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = {}));
 const RANDOM_IPFS_GATEWAY_SETTING = [{
-  provider: IPFS_IO_GATEWAY,
-  weight: 0 // Not stable
-}, {
   provider: CF_IPFS_GATEWAY,
   weight: 4
 }, {
@@ -120,12 +117,6 @@ const RANDOM_IPFS_GATEWAY_SETTING = [{
 }, {
   provider: DWEB_LINK,
   weight: 5
-}, {
-  provider: IPFS_GATEWAY_CLOUD,
-  weight: 0 // Deceptive site warning
-}, {
-  provider: IPFS_TELOS_MIAMI,
-  weight: 0
 }];
 if (!_utils.RuntimeInfo.protocol || _utils.RuntimeInfo.protocol && !_utils.RuntimeInfo.protocol.startsWith('http')) {
   RANDOM_IPFS_GATEWAY_SETTING.push({
@@ -136,6 +127,18 @@ if (!_utils.RuntimeInfo.protocol || _utils.RuntimeInfo.protocol && !_utils.Runti
     provider: IPFS_FLEEK,
     weight: 4
   });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: IPFS_HARDBIN,
+    weight: 1
+  });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: IPFS_GATEWAY_4EVERLAND,
+    weight: 2
+  });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: IPFS_W3S_LINK,
+    weight: 1
+  });
 }
 const RANDOM_IPFS_GATEWAY_TOTAL_WEIGHT = RANDOM_IPFS_GATEWAY_SETTING.reduce((value, item) => value + item.weight, 0);
 function getRandomIpfsGateway() {

package/cjs/koni/api/nft/nft.js

@@ -74,7 +74,7 @@ class BaseNftApi {
     if (!input || input.length === 0) {
       return undefined;
     }
-    if ((0, _utils.isUrl)(input)) {
+    if ((0, _utils.isUrl)(input) || input.includes('https://') || input.includes('http')) {
       return input;
     }
     if (input.startsWith('/ipfs/')) {

package/cjs/koni/api/nft/rmrk_nft/index.js

@@ -24,18 +24,23 @@ class RmrkNftApi extends _nft.BaseNftApi {
   constructor(addresses, chain) {
     super(chain, null, addresses);
   }
-  parseUrl(input) {
-    if (!input || input.length === 0) {
-      return undefined;
-    }
-    if ((0, _utils.isUrl)(input) || input.includes('https://') || input.includes('http')) {
-      return input;
-    }
-    if (!input.includes('ipfs://ipfs/')) {
-      return (0, _config.getRandomIpfsGateway)() + input;
-    }
-    return (0, _config.getRandomIpfsGateway)() + input.split('ipfs://ipfs/')[1];
-  }
+
+  // override parseUrl (input: string): string | undefined {
+  //   if (!input || input.length === 0) {
+  //     return undefined;
+  //   }
+  //
+  //   if (isUrl(input) || input.includes('https://') || input.includes('http')) {
+  //     return input;
+  //   }
+  //
+  //   if (!input.includes('ipfs://ipfs/')) {
+  //     return getRandomIpfsGateway() + input;
+  //   }
+  //
+  //   return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1];
+  // }
+
   async getMetadata(metadataUrl) {
     let url = metadataUrl;
     if (!(0, _utils.isUrl)(metadataUrl)) {
@@ -76,53 +81,57 @@ class RmrkNftApi extends _nft.BaseNftApi {
     }));
     const nfts = [];
     await Promise.all(data.map(async item => {
-      const primaryResource = item.primaryResource ? item.primaryResource : null;
-      const metadataUri = primaryResource && primaryResource.metadata ? primaryResource.metadata : item.metadata;
-      const nftMetadata = await this.getMetadata(metadataUri);
-      if (item.source === RMRK_SOURCE.BIRD_KANARIA) {
-        nfts.push({
-          ...item,
-          metadata: nftMetadata,
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.KANARIA) {
-        nfts.push({
-          ...item,
-          metadata: {
-            ...nftMetadata,
-            image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
-          },
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.SINGULAR_V1) {
-        nfts.push({
-          ...item,
-          metadata: {
-            description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
-            name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
-            attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
-            animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
-            image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
-          },
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.SINGULAR_V2) {
-        const id = item.id;
-        if (!id.toLowerCase().includes(KANBIRD_KEYWORD)) {
-          // excludes kanaria bird, already handled above
+      try {
+        const primaryResource = item.primaryResource ? item.primaryResource : null;
+        const metadataUri = primaryResource && primaryResource.metadata ? primaryResource.metadata : item.metadata;
+        const nftMetadata = await this.getMetadata(metadataUri);
+        if (item.source === RMRK_SOURCE.BIRD_KANARIA) {
+          nfts.push({
+            ...item,
+            metadata: nftMetadata,
+            owner: account
+          });
+        } else if (item.source === RMRK_SOURCE.KANARIA) {
+          nfts.push({
+            ...item,
+            metadata: {
+              ...nftMetadata,
+              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
+            },
+            owner: account
+          });
+        } else if (item.source === RMRK_SOURCE.SINGULAR_V1) {
           nfts.push({
             ...item,
             metadata: {
               description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
               name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
               attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
-              properties: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.properties,
               animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
-              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.mediaUri)
+              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
             },
             owner: account
           });
+        } else if (item.source === RMRK_SOURCE.SINGULAR_V2) {
+          const id = item.id;
+          if (!id.toLowerCase().includes(KANBIRD_KEYWORD)) {
+            // excludes kanaria bird, already handled above
+            nfts.push({
+              ...item,
+              metadata: {
+                description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
+                name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
+                attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
+                properties: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.properties,
+                animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
+                image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.mediaUri)
+              },
+              owner: account
+            });
+          }
         }
+      } catch (e) {
+        console.log('error fetching RMRK NFT', e);
       }
     }));
     return nfts;

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

@@ -696,10 +696,10 @@ class KoniExtension {
     });
     return true;
   }
-  getNonReadonlyAccounts() {
+  getAccounts() {
     const storedAccounts = this.#koniState.keyringService.accounts;
     const transformedAccounts = transformAccounts(storedAccounts);
-    return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
+    return transformedAccounts.map(a => a.address);
   }
   isAddressValidWithAuthType(address, accountAuthType) {
     if (accountAuthType === 'substrate') {
@@ -721,12 +721,12 @@ class KoniExtension {
   _changeAuthorizationAll(connectValue, callBack) {
     this.#koniState.getAuthorize(value => {
       (0, _util.assert)(value, 'The source is not known');
-      const nonReadonlyAccounts = this.getNonReadonlyAccounts();
+      const accounts = this.getAccounts();
       Object.keys(value).forEach(url => {
         if (!value[url].isAllowed) {
           return;
         }
-        const targetAccounts = this.filterAccountsByAccountAuthType(nonReadonlyAccounts, value[url].accountAuthType);
+        const targetAccounts = this.filterAccountsByAccountAuthType(accounts, value[url].accountAuthType);
         targetAccounts.forEach(address => {
           value[url].isAllowedMap[address] = connectValue;
         });
@@ -749,8 +749,8 @@ class KoniExtension {
   _changeAuthorization(url, connectValue, callBack) {
     this.#koniState.getAuthorize(value => {
       (0, _util.assert)(value[url], 'The source is not known');
-      const nonReadonlyAccounts = this.getNonReadonlyAccounts();
-      const targetAccounts = this.filterAccountsByAccountAuthType(nonReadonlyAccounts, value[url].accountAuthType);
+      const accounts = this.getAccounts();
+      const targetAccounts = this.filterAccountsByAccountAuthType(accounts, value[url].accountAuthType);
       targetAccounts.forEach(address => {
         value[url].isAllowedMap[address] = connectValue;
       });
@@ -3314,11 +3314,39 @@ class KoniExtension {
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
-  async enableMantaPay(_ref86) {
+  WCNotSupportSubscribe(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.requestService.notSupportWCSubject.subscribe(requests => cb(requests));
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+      subscription.unsubscribe();
+    });
+    return this.#koniState.requestService.allNotSupportWCRequests;
+  }
+  approveWalletConnectNotSupport(_ref86) {
+    let {
+      id
+    } = _ref86;
+    const request = this.#koniState.requestService.getNotSupportWCRequest(id);
+    request.resolve();
+    return true;
+  }
+  rejectWalletConnectNotSupport(_ref87) {
+    let {
+      id
+    } = _ref87;
+    const request = this.#koniState.requestService.getNotSupportWCRequest(id);
+    request.reject(new Error('USER_REJECTED'));
+    return true;
+  }
+
+  /// Manta
+
+  async enableMantaPay(_ref88) {
     let {
       address,
       password
-    } = _ref86;
+    } = _ref88;
     // always takes the current account
     function timeout() {
       return new Promise(resolve => setTimeout(resolve, 1500));
@@ -3442,10 +3470,10 @@ class KoniExtension {
 
   /// Metadata
 
-  async findRawMetadata(_ref87) {
+  async findRawMetadata(_ref89) {
     let {
       genesisHash
-    } = _ref87;
+    } = _ref89;
     const {
       metadata,
       specVersion
@@ -3840,7 +3868,7 @@ class KoniExtension {
       /// Wallet Connect
       case 'pri(walletConnect.connect)':
         return this.connectWalletConnect(request);
-      case 'pri(walletConnect.requests.subscribe)':
+      case 'pri(walletConnect.requests.connect.subscribe)':
         return this.connectWCSubscribe(id, port);
       case 'pri(walletConnect.session.approve)':
         return this.approveWalletConnectSession(request);
@@ -3850,6 +3878,16 @@ class KoniExtension {
         return this.subscribeWalletConnectSessions(id, port);
       case 'pri(walletConnect.session.disconnect)':
         return this.disconnectWalletConnectSession(request);
+
+      // Not support
+      case 'pri(walletConnect.requests.notSupport.subscribe)':
+        return this.WCNotSupportSubscribe(id, port);
+      case 'pri(walletConnect.notSupport.approve)':
+        return this.approveWalletConnectNotSupport(request);
+      case 'pri(walletConnect.notSupport.reject)':
+        return this.rejectWalletConnectNotSupport(request);
+
+      // Manta
       case 'pri(mantaPay.enable)':
         return await this.enableMantaPay(request);
       case 'pri(mantaPay.initSyncMantaPay)':

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

@@ -109,6 +109,7 @@ const chainPatrolCheckUrl = async url => {
 };
 exports.chainPatrolCheckUrl = chainPatrolCheckUrl;
 class KoniTabs {
+  #accountSubs = {};
   #koniState;
   evmEventEmitterMap = {};
   #chainPatrolService = _constants2.DEFAULT_CHAIN_PATROL_ENABLE;
@@ -137,17 +138,25 @@ class KoniTabs {
     (0, _util.assert)(pair, 'Unable to find keypair');
     return pair;
   }
-  bytesSign(url, request) {
+  async bytesSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
+    const authInfo = await this.getAuthInfo(url);
+    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
+      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
+    }
     return this.#koniState.sign(url, new _RequestBytesSign.default(request), {
       address,
       ...pair.meta
     });
   }
-  extrinsicSign(url, request) {
+  async extrinsicSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
+    const authInfo = await this.getAuthInfo(url);
+    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
+      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
+    }
     return this.#koniState.sign(url, new _RequestExtrinsicSign.default(request), {
       address,
       ...pair.meta
@@ -255,8 +264,8 @@ class KoniTabs {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.#koniState.createUnsubscriptionHandle(id, unsubscribe);
   }
-  async getAuthInfo(url) {
-    const authList = await this.#koniState.getAuthList();
+  async getAuthInfo(url, fromList) {
+    const authList = fromList || (await this.#koniState.getAuthList());
     const shortenUrl = (0, _utils2.stripUrl)(url);
     return authList[shortenUrl];
   }
@@ -273,15 +282,36 @@ class KoniTabs {
       accountAuthType
     } = _ref11;
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    const subscription = this.#koniState.keyringService.accountSubject.subscribe(accounts => {
-      this.getAuthInfo(url).then(authInfo => {
-        cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
-      }).catch(console.error);
-    });
-    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    const authInfoSubject = this.#koniState.requestService.subscribeAuthorizeUrlSubject;
+
+    // Update unsubscribe from @polkadot/extension-base
+    this.#accountSubs[id] = {
+      subscription: authInfoSubject.subscribe(infos => {
+        this.getAuthInfo(url, infos).then(authInfo => {
+          const accounts = this.#koniState.keyringService.accounts;
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
+        }).catch(console.error);
+      }),
+      url
+    };
     port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
+      this.accountsUnsubscribe(url, {
+        id
+      });
     });
+    return id;
+  }
+  accountsUnsubscribe(url, _ref12) {
+    let {
+      id
+    } = _ref12;
+    const sub = this.#accountSubs[id];
+    if (!sub || sub.url !== url) {
+      return false;
+    }
+    delete this.#accountSubs[id];
+    (0, _subscriptions.unsubscribe)(id);
+    sub.subscription.unsubscribe();
     return true;
   }
   authorizeV2(url, request) {
@@ -382,10 +412,10 @@ class KoniTabs {
       date: new Date().getTime()
     }];
   }
-  async switchEvmChain(id, url, _ref12) {
+  async switchEvmChain(id, url, _ref13) {
     let {
       params
-    } = _ref12;
+    } = _ref13;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const chainId = params[0].chainId;
     const evmState = await this.getEvmState(url);
@@ -400,11 +430,11 @@ class KoniTabs {
     }
     return null;
   }
-  async addEvmToken(id, url, _ref13) {
+  async addEvmToken(id, url, _ref14) {
     var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     let {
       params
-    } = _ref13;
+    } = _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') {
@@ -457,10 +487,10 @@ class KoniTabs {
 
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
-  async addEvmChain(id, url, _ref14) {
+  async addEvmChain(id, url, _ref15) {
     let {
       params
-    } = _ref14;
+    } = _ref15;
     const input = params;
     if (input && input.length > 0) {
       const {
@@ -663,11 +693,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 = _ref16 => {
       let {
         method,
         params
-      } = _ref15;
+      } = _ref16;
       emitEvent('message', {
         type: method,
         data: params
@@ -676,8 +706,8 @@ class KoniTabs {
     eventMap.error = rs => {
       emitEvent('error', rs);
     };
-    Object.entries(eventMap).forEach(_ref16 => {
-      let [event, callback] = _ref16;
+    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));
     });
@@ -691,8 +721,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(_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));
       });
@@ -727,11 +757,11 @@ class KoniTabs {
     }
     return provider;
   }
-  async performWeb3Method(id, url, _ref18, callback) {
+  async performWeb3Method(id, url, _ref19, callback) {
     let {
       method,
       params
-    } = _ref18;
+    } = _ref19;
     const provider = await this.getEvmProvider(url);
     this.checkAndHandleProviderStatus(provider);
     return new Promise((resolve, reject) => {
@@ -756,11 +786,11 @@ class KoniTabs {
     const allowedAccounts = await this.getEvmCurrentAccount(url, true);
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
-  async evmSign(id, url, _ref19) {
+  async evmSign(id, url, _ref20) {
     let {
       method,
       params
-    } = _ref19;
+    } = _ref20;
     const allowedAccounts = await this.getEvmCurrentAccount(url, true);
     const signResult = await this.#koniState.evmSign(id, url, method, params, allowedAccounts);
     if (signResult) {
@@ -769,10 +799,10 @@ class KoniTabs {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Have something wrong to sign message');
     }
   }
-  async evmSendTransaction(id, url, _ref20) {
+  async evmSendTransaction(id, url, _ref21) {
     let {
       params
-    } = _ref20;
+    } = _ref21;
     const transactionParams = params[0];
     const canUseAccount = transactionParams.from && this.canUseAccount(transactionParams.from, url);
     const evmState = await this.getEvmState(url);
@@ -870,11 +900,11 @@ class KoniTabs {
       return false;
     }
   }
-  async addPspToken(id, url, _ref21) {
+  async addPspToken(id, url, _ref22) {
     let {
       genesisHash,
       tokenInfo: input
-    } = _ref21;
+    } = _ref22;
     const _tokenType = input.type;
     if (_tokenType !== 'psp22' && _tokenType !== 'psp34') {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, `Assets type ${_tokenType} is not supported`);
@@ -948,6 +978,8 @@ class KoniTabs {
         return this.metadataList(url);
       case 'pub(metadata.provide)':
         return this.metadataProvide(url, request);
+      case 'pub(ping)':
+        return Promise.resolve(true);
       case 'pub(rpc.listProviders)':
         return this.rpcListProviders();
       case 'pub(rpc.send)':
@@ -970,6 +1002,8 @@ class KoniTabs {
         return this.accountsListV2(url, request);
       case 'pub(accounts.subscribeV2)':
         return this.accountsSubscribeV2(url, request, id, port);
+      case 'pub(accounts.unsubscribe)':
+        return this.accountsUnsubscribe(url, request);
       case 'evm(events.subscribe)':
         return await this.evmSubscribeEvents(url, id, port);
       case 'evm(request)':

package/cjs/packageInfo.js

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