@subwallet/extension-base 1.0.6-2 → 1.0.7-0

package/background/KoniTypes.d.ts

@@ -902,6 +902,11 @@ export interface AddNetworkRequestExternal {
     chainName: string;
     blockExplorerUrls?: string[];
     requestId?: string;
+    nativeCurrency: {
+        name: string;
+        symbol: string;
+        decimals: number;
+    };
 }
 export interface AddNetworkExternalRequest {
     chainId: string;
@@ -918,6 +923,8 @@ export interface AddTokenRequestExternal {
     name: string;
     symbol: string;
     decimals: number;
+    validated: boolean;
+    contractError: boolean;
 }
 export interface ConfirmationDefinitions {
     addNetworkRequest: [ConfirmationsQueueItem<_NetworkUpsertParams>, ConfirmationResult<null>];

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

@@ -1370,6 +1370,7 @@ class KoniState {
     await this.priceService.stop();
   }
   async wakeup() {
+    await this.eventService.waitChainReady;
     await this.resumeAllNetworks();
     this.cron.start();
     this.subscription.start();

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

@@ -14,6 +14,7 @@ var _RequestBytesSign = _interopRequireDefault(require("@subwallet/extension-bas
 var _RequestExtrinsicSign = _interopRequireDefault(require("@subwallet/extension-base/background/RequestExtrinsicSign"));
 var _constants = require("@subwallet/extension-base/constants");
 var _defaults = require("@subwallet/extension-base/defaults");
+var _types2 = require("@subwallet/extension-base/services/chain-service/handler/types");
 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");
@@ -405,7 +406,7 @@ class KoniTabs {
     return null;
   }
   async addEvmToken(id, url, _ref13) {
-    var _input$type, _input$options, _input$options2;
+    var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     let {
       params
     } = _ref13;
@@ -423,28 +424,42 @@ class KoniTabs {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, 'Current chain is not available');
     }
     const tokenType = _tokenType === 'erc20' ? _types._AssetType.ERC20 : _types._AssetType.ERC721;
-    const validate = await this.#koniState.validateCustomAsset({
+    const tokenInfo = {
+      slug: '',
+      type: tokenType,
+      name: (input === null || input === void 0 ? void 0 : (_input$options3 = input.options) === null || _input$options3 === void 0 ? void 0 : _input$options3.symbol) || '',
+      contractAddress: input.options.address,
+      symbol: (input === null || input === void 0 ? void 0 : (_input$options4 = input.options) === null || _input$options4 === void 0 ? void 0 : _input$options4.symbol) || '',
+      decimals: (input === null || input === void 0 ? void 0 : (_input$options5 = input.options) === null || _input$options5 === void 0 ? void 0 : _input$options5.decimals) || 0,
+      originChain: chain,
+      contractError: false,
+      validated: false
+    };
+    this.#koniState.validateCustomAsset({
       type: tokenType,
       contractAddress: input.options.address,
       originChain: chain
+    }).then(validate => {
+      if (validate.contractError) {
+        tokenInfo.contractError = true;
+      } else {
+        tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
+        tokenInfo.name = validate.name;
+        tokenInfo.symbol = validate.symbol;
+        tokenInfo.decimals = validate.decimals;
+      }
+    }).catch(() => {
+      tokenInfo.contractError = true;
+    }).finally(() => {
+      tokenInfo.validated = true;
+      this.#koniState.requestService.updateConfirmation(id, 'addTokenRequest', tokenInfo);
     });
 
     // Below code is comment because we will handle exited token in the ui-view
     // if (validate.isExist) {
     //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
     // } else
-    if (validate.contractError) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
-    }
-    const tokenInfo = {
-      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
-      type: tokenType,
-      name: validate.name,
-      contractAddress: input.options.address,
-      symbol: validate.symbol,
-      decimals: validate.decimals,
-      originChain: chain
-    };
+
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
   async addEvmChain(id, url, _ref14) {
@@ -457,6 +472,10 @@ class KoniTabs {
         blockExplorerUrls,
         chainId,
         chainName,
+        nativeCurrency: {
+          decimals,
+          symbol
+        },
         rpcUrls
       } = input[0];
       if (chainId) {
@@ -507,12 +526,19 @@ class KoniTabs {
             throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, 'Currently HTTP provider for EVM network');
           }
           const provider = filteredUrls[0];
-          const chainInfo = await this.#koniState.validateCustomChain(provider);
-          if (!chainInfo.success) {
-            throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
-          }
+          const chainInfo = {
+            existentialDeposit: '0',
+            genesisHash: '',
+            success: true,
+            addressPrefix: '',
+            evmChainId: chainIdNum,
+            decimals: decimals,
+            symbol: symbol,
+            paraId: null,
+            name: chainName
+          };
           const newProviderKey = (0, _utils._generateCustomProviderKey)(0);
-          return await this.#koniState.addNetworkConfirm(id, url, {
+          const networkData = {
             mode: 'insert',
             chainSpec: {
               evmChainId: chainInfo.evmChainId,
@@ -532,8 +558,31 @@ class KoniTabs {
               symbol: chainInfo.symbol,
               chainType: 'EVM',
               name: chainInfo.name
+            },
+            unconfirmed: true
+          };
+          this.#koniState.validateCustomChain(provider).then(res => {
+            if (!res.success) {
+              networkData.providerError = res.error;
+            } else {
+              networkData.chainSpec = {
+                evmChainId: res.evmChainId,
+                decimals: res.decimals,
+                existentialDeposit: res.existentialDeposit,
+                genesisHash: res.genesisHash,
+                paraId: res.paraId,
+                addressPrefix: res.addressPrefix ? parseInt(res.addressPrefix) : 0
+              };
+              networkData.chainEditInfo.symbol = res.symbol;
+              networkData.chainEditInfo.name = res.name;
             }
+          }).catch(() => {
+            networkData.providerError = _types2._CHAIN_VALIDATION_ERROR.NONE;
+          }).finally(() => {
+            networkData.unconfirmed = false;
+            this.#koniState.requestService.updateConfirmation(id, 'addNetworkRequest', networkData);
           });
+          return await this.#koniState.addNetworkConfirm(id, url, networkData);
         } else {
           throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }

package/cjs/packageInfo.js

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

package/cjs/services/migration-service/index.js

@@ -19,8 +19,8 @@ class MigrationService {
   async run() {
     const keys = Object.keys(_scripts.default).sort((a, b) => a.localeCompare(b));
 
-    // Await timeout 2s
-    await new Promise(resolve => setTimeout(resolve, 2000));
+    // Await timeout 1s
+    await new Promise(resolve => setTimeout(resolve, 1000));
     for (let i = 0; i < keys.length; i++) {
       try {
         const JobClass = _scripts.default[keys[i]];

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -81,6 +81,29 @@ class EvmRequestHandler {
     this.#requestService.updateIconV2();
     return promise;
   }
+  updateConfirmation(id, type, payload) {
+    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    let validator = arguments.length > 4 ? arguments[4] : undefined;
+    const confirmations = this.confirmationsQueueSubject.getValue();
+    const confirmationType = confirmations[type];
+
+    // Check duplicate request
+    const exists = confirmationType[id];
+    if (!exists) {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Request does not exist');
+    }
+    const payloadJson = JSON.stringify(payload);
+    confirmationType[id] = {
+      ...exists,
+      payload,
+      payloadJson,
+      ...options
+    };
+    if (validator) {
+      this.confirmationsPromiseMap[id].validator = validator;
+    }
+    this.confirmationsQueueSubject.next(confirmations);
+  }
   async signMessage(confirmation) {
     const {
       account,

package/cjs/services/request-service/index.js

@@ -164,6 +164,11 @@ class RequestService {
   async completeConfirmation(request) {
     return await this.#evmRequestHandler.completeConfirmation(request);
   }
+  updateConfirmation(id, type, payload) {
+    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    let validator = arguments.length > 4 ? arguments[4] : undefined;
+    return this.#evmRequestHandler.updateConfirmation(id, type, payload, options, validator);
+  }
 
   // General methods
   get numRequests() {

package/koni/background/handlers/State.js

@@ -1343,6 +1343,7 @@ export default class KoniState {
     await this.priceService.stop();
   }
   async wakeup() {
+    await this.eventService.waitChainReady;
     await this.resumeAllNetworks();
     this.cron.start();
     this.subscription.start();

package/koni/background/handlers/Tabs.js

@@ -10,6 +10,7 @@ import RequestBytesSign from '@subwallet/extension-base/background/RequestBytesS
 import RequestExtrinsicSign from '@subwallet/extension-base/background/RequestExtrinsicSign';
 import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS } from '@subwallet/extension-base/constants';
 import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
+import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 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 } from '@subwallet/extension-base/utils';
@@ -365,7 +366,7 @@ export default class KoniTabs {
   async addEvmToken(id, url, {
     params
   }) {
-    var _input$type, _input$options, _input$options2;
+    var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     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') {
@@ -380,28 +381,42 @@ export default class KoniTabs {
       throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current chain is not available');
     }
     const tokenType = _tokenType === 'erc20' ? _AssetType.ERC20 : _AssetType.ERC721;
-    const validate = await this.#koniState.validateCustomAsset({
+    const tokenInfo = {
+      slug: '',
+      type: tokenType,
+      name: (input === null || input === void 0 ? void 0 : (_input$options3 = input.options) === null || _input$options3 === void 0 ? void 0 : _input$options3.symbol) || '',
+      contractAddress: input.options.address,
+      symbol: (input === null || input === void 0 ? void 0 : (_input$options4 = input.options) === null || _input$options4 === void 0 ? void 0 : _input$options4.symbol) || '',
+      decimals: (input === null || input === void 0 ? void 0 : (_input$options5 = input.options) === null || _input$options5 === void 0 ? void 0 : _input$options5.decimals) || 0,
+      originChain: chain,
+      contractError: false,
+      validated: false
+    };
+    this.#koniState.validateCustomAsset({
       type: tokenType,
       contractAddress: input.options.address,
       originChain: chain
+    }).then(validate => {
+      if (validate.contractError) {
+        tokenInfo.contractError = true;
+      } else {
+        tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
+        tokenInfo.name = validate.name;
+        tokenInfo.symbol = validate.symbol;
+        tokenInfo.decimals = validate.decimals;
+      }
+    }).catch(() => {
+      tokenInfo.contractError = true;
+    }).finally(() => {
+      tokenInfo.validated = true;
+      this.#koniState.requestService.updateConfirmation(id, 'addTokenRequest', tokenInfo);
     });
 
     // Below code is comment because we will handle exited token in the ui-view
     // if (validate.isExist) {
     //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
     // } else
-    if (validate.contractError) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
-    }
-    const tokenInfo = {
-      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
-      type: tokenType,
-      name: validate.name,
-      contractAddress: input.options.address,
-      symbol: validate.symbol,
-      decimals: validate.decimals,
-      originChain: chain
-    };
+
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
   async addEvmChain(id, url, {
@@ -413,6 +428,10 @@ export default class KoniTabs {
         blockExplorerUrls,
         chainId,
         chainName,
+        nativeCurrency: {
+          decimals,
+          symbol
+        },
         rpcUrls
       } = input[0];
       if (chainId) {
@@ -463,12 +482,19 @@ export default class KoniTabs {
             throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Currently HTTP provider for EVM network');
           }
           const provider = filteredUrls[0];
-          const chainInfo = await this.#koniState.validateCustomChain(provider);
-          if (!chainInfo.success) {
-            throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
-          }
+          const chainInfo = {
+            existentialDeposit: '0',
+            genesisHash: '',
+            success: true,
+            addressPrefix: '',
+            evmChainId: chainIdNum,
+            decimals: decimals,
+            symbol: symbol,
+            paraId: null,
+            name: chainName
+          };
           const newProviderKey = _generateCustomProviderKey(0);
-          return await this.#koniState.addNetworkConfirm(id, url, {
+          const networkData = {
             mode: 'insert',
             chainSpec: {
               evmChainId: chainInfo.evmChainId,
@@ -488,8 +514,31 @@ export default class KoniTabs {
               symbol: chainInfo.symbol,
               chainType: 'EVM',
               name: chainInfo.name
+            },
+            unconfirmed: true
+          };
+          this.#koniState.validateCustomChain(provider).then(res => {
+            if (!res.success) {
+              networkData.providerError = res.error;
+            } else {
+              networkData.chainSpec = {
+                evmChainId: res.evmChainId,
+                decimals: res.decimals,
+                existentialDeposit: res.existentialDeposit,
+                genesisHash: res.genesisHash,
+                paraId: res.paraId,
+                addressPrefix: res.addressPrefix ? parseInt(res.addressPrefix) : 0
+              };
+              networkData.chainEditInfo.symbol = res.symbol;
+              networkData.chainEditInfo.name = res.name;
             }
+          }).catch(() => {
+            networkData.providerError = _CHAIN_VALIDATION_ERROR.NONE;
+          }).finally(() => {
+            networkData.unconfirmed = false;
+            this.#koniState.requestService.updateConfirmation(id, 'addNetworkRequest', networkData);
           });
+          return await this.#koniState.addNetworkConfirm(id, url, networkData);
         } else {
           throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.6-2",
+  "version": "1.0.7-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1697,11 +1697,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.1.8",
-    "@subwallet/extension-base": "^1.0.6-2",
-    "@subwallet/extension-chains": "^1.0.6-2",
-    "@subwallet/extension-dapp": "^1.0.6-2",
-    "@subwallet/extension-inject": "^1.0.6-2",
+    "@subwallet/chain-list": "^0.1.9",
+    "@subwallet/extension-base": "^1.0.7-0",
+    "@subwallet/extension-chains": "^1.0.7-0",
+    "@subwallet/extension-dapp": "^1.0.7-0",
+    "@subwallet/extension-inject": "^1.0.7-0",
     "@subwallet/keyring": "^0.0.9",
     "@subwallet/ui-keyring": "^0.0.9",
     "@unique-nft/types": "^0.6.0-4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.0.6-2'
+  version: '1.0.7-0'
 };

package/services/chain-service/types.d.ts

@@ -1,4 +1,5 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import Web3 from 'web3';
 import { ApiPromise } from '@polkadot/api';
 import { SubmittableExtrinsicFunction } from '@polkadot/api/promise/types';
@@ -88,6 +89,8 @@ export declare type _NetworkUpsertParams = {
         existentialDeposit: string;
         decimals: number;
     };
+    unconfirmed?: boolean;
+    providerError?: _CHAIN_VALIDATION_ERROR;
 };
 export declare const _CUSTOM_PREFIX = "custom-";
 export interface _ValidateCustomAssetRequest {

package/services/migration-service/index.js

@@ -11,8 +11,8 @@ export default class MigrationService {
   async run() {
     const keys = Object.keys(MigrationScripts).sort((a, b) => a.localeCompare(b));
 
-    // Await timeout 2s
-    await new Promise(resolve => setTimeout(resolve, 2000));
+    // Await timeout 1s
+    await new Promise(resolve => setTimeout(resolve, 1000));
     for (let i = 0; i < keys.length; i++) {
       try {
         const JobClass = MigrationScripts[keys[i]];

package/services/request-service/handler/EvmRequestHandler.d.ts

@@ -11,6 +11,7 @@ export default class EvmRequestHandler {
     get numEvmRequests(): number;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
+    updateConfirmation<CT extends ConfirmationType>(id: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): void;
     private signMessage;
     configToTransaction(config: TransactionConfig): Transaction;
     private signTransaction;

package/services/request-service/handler/EvmRequestHandler.js

@@ -72,6 +72,27 @@ export default class EvmRequestHandler {
     this.#requestService.updateIconV2();
     return promise;
   }
+  updateConfirmation(id, type, payload, options = {}, validator) {
+    const confirmations = this.confirmationsQueueSubject.getValue();
+    const confirmationType = confirmations[type];
+
+    // Check duplicate request
+    const exists = confirmationType[id];
+    if (!exists) {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Request does not exist');
+    }
+    const payloadJson = JSON.stringify(payload);
+    confirmationType[id] = {
+      ...exists,
+      payload,
+      payloadJson,
+      ...options
+    };
+    if (validator) {
+      this.confirmationsPromiseMap[id].validator = validator;
+    }
+    this.confirmationsQueueSubject.next(confirmations);
+  }
   async signMessage(confirmation) {
     const {
       account,

package/services/request-service/index.d.ts

@@ -51,6 +51,7 @@ export default class RequestService {
     signInternalTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON): Promise<ResponseSigning>;
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
+    updateConfirmation<CT extends ConfirmationType>(id: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): void;
     get numRequests(): number;
     resetWallet(): void;
 }

package/services/request-service/index.js

@@ -154,6 +154,9 @@ export default class RequestService {
   async completeConfirmation(request) {
     return await this.#evmRequestHandler.completeConfirmation(request);
   }
+  updateConfirmation(id, type, payload, options = {}, validator) {
+    return this.#evmRequestHandler.updateConfirmation(id, type, payload, options, validator);
+  }
 
   // General methods
   get numRequests() {