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

package/koni/api/nft/wasm_nft/index.js

@@ -3,7 +3,7 @@
 
 import { _AssetType } from '@subwallet/chain-list/types';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
-import { ART_ZERO_COLLECTION_API, ART_ZERO_EXTERNAL_URL, ART_ZERO_IMAGE_API, ART_ZERO_IPFS_API, ART_ZERO_TESTNET_COLLECTION_API, ART_ZERO_TESTNET_IMAGE_API, ART_ZERO_TESTNET_IPFS_API } from '@subwallet/extension-base/koni/api/nft/wasm_nft/utils';
+import { collectionApiFromArtZero, collectionDetailApiFromArtZero, externalUrlOnArtZero, ipfsApiFromArtZero, itemImageApiFromArtZero } from '@subwallet/extension-base/koni/api/nft/wasm_nft/utils';
 import { getPSP34ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
@@ -26,7 +26,7 @@ async function isArtZeroFeaturedCollection(networkKey, contractAddress) {
   const urlencoded = new URLSearchParams();
   urlencoded.append('collection_address', contractAddress);
   const collectionInfoPromise = new Promise(function (resolve) {
-    fetch(`${networkKey === 'alephTest' ? ART_ZERO_TESTNET_COLLECTION_API : ART_ZERO_COLLECTION_API}`, {
+    fetch(collectionApiFromArtZero(networkKey), {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded'
@@ -49,6 +49,20 @@ export class WasmNftApi extends BaseNftApi {
   setSmartContractNfts(wasmContracts) {
     this.wasmContracts = wasmContracts;
   }
+  async isAttributeStoredOnChain(contractPromise) {
+    var _this$substrateApi, _onChainAttributeCoun;
+    if (!contractPromise.query['psp34Traits::getAttributeCount']) {
+      return false;
+    }
+
+    // @ts-ignore
+    const _onChainAttributeCount = await contractPromise.query['psp34Traits::getAttributeCount'](this.addresses[0], {
+      gasLimit: getDefaultWeightV2((_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api)
+    });
+    const _attributeCount = _onChainAttributeCount === null || _onChainAttributeCount === void 0 ? void 0 : (_onChainAttributeCoun = _onChainAttributeCount.output) === null || _onChainAttributeCoun === void 0 ? void 0 : _onChainAttributeCoun.toJSON();
+    const onChainAttributeCount = _onChainAttributeCount.output ? (_attributeCount === null || _attributeCount === void 0 ? void 0 : _attributeCount.ok) || (_attributeCount === null || _attributeCount === void 0 ? void 0 : _attributeCount.Ok) : '0';
+    return parseInt(onChainAttributeCount) !== 0;
+  }
   parseFeaturedTokenUri(tokenUri) {
     if (!tokenUri || tokenUri.length === 0) {
       return undefined;
@@ -72,7 +86,7 @@ export class WasmNftApi extends BaseNftApi {
     if (!parsedTokenUri) {
       return undefined;
     }
-    const nftItemImageSrc = `${this.chain === 'alephTest' ? ART_ZERO_TESTNET_IMAGE_API : ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
+    const nftItemImageSrc = `${itemImageApiFromArtZero(this.chain)}?input=${parsedTokenUri}&size=500`;
     const collectionImageUrl = await axios(nftItemImageSrc, {
       method: 'GET'
     });
@@ -81,7 +95,7 @@ export class WasmNftApi extends BaseNftApi {
   async parseFeaturedCollectionImage(smartContract) {
     const urlencoded = new URLSearchParams();
     urlencoded.append('collection_address', smartContract);
-    const resp = await fetch(this.chain === 'alephTest' ? ART_ZERO_TESTNET_COLLECTION_API : ART_ZERO_COLLECTION_API, {
+    const resp = await fetch(collectionDetailApiFromArtZero(this.chain), {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded'
@@ -100,7 +114,7 @@ export class WasmNftApi extends BaseNftApi {
     if (!parsedCollectionImage) {
       return;
     }
-    const collectionImageSrc = `${this.chain === 'alephTest' ? ART_ZERO_TESTNET_IMAGE_API : ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}&size=500`;
+    const collectionImageSrc = `${itemImageApiFromArtZero(this.chain)}?input=${parsedCollectionImage}&size=500`;
     const collectionImageUrl = await axios(collectionImageSrc, {
       method: 'GET'
     });
@@ -183,8 +197,55 @@ export class WasmNftApi extends BaseNftApi {
   //   return nftItem;
   // }
 
+  async processOnChainMetadata(tokenId, isFeatured, tokenUri) {
+    const nftItem = {
+      chain: '',
+      collectionId: '',
+      id: '',
+      owner: '',
+      name: tokenId
+    };
+    let itemDetail = false;
+    if (isFeatured) {
+      const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
+      if (parsedTokenUri) {
+        const resp = await fetch(`${ipfsApiFromArtZero(this.chain)}?input=${parsedTokenUri}`);
+        itemDetail = resp && resp.ok && (await resp.json());
+      }
+    } else {
+      const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
+      const detailUrl = this.parseUrl(parsedTokenUri);
+      if (detailUrl) {
+        const resp = await fetch(detailUrl);
+        itemDetail = resp && resp.ok && (await resp.json());
+      }
+    }
+    if (!itemDetail) {
+      return nftItem;
+    }
+    nftItem.name = itemDetail.name;
+    nftItem.description = itemDetail.description;
+    const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
+    if (isFeatured) {
+      nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
+      nftItem.externalUrl = externalUrlOnArtZero(this.chain);
+    } else {
+      nftItem.image = this.parseUrl(rawImageSrc);
+    }
+    const propertiesMap = {};
+    const traitList = itemDetail.attributes ? itemDetail.attributes : itemDetail.traits;
+    if (traitList) {
+      traitList.forEach(traitMap => {
+        propertiesMap[traitMap.trait_type] = {
+          value: traitMap.value
+        };
+      });
+      nftItem.properties = propertiesMap;
+    }
+    return nftItem;
+  }
   async processOffChainMetadata(contractPromise, address, tokenId, isFeatured) {
-    var _this$substrateApi;
+    var _this$substrateApi2;
     const nftItem = {
       chain: '',
       collectionId: '',
@@ -193,7 +254,7 @@ export class WasmNftApi extends BaseNftApi {
       name: tokenId
     };
     const _tokenUri = await contractPromise.query['psp34Traits::tokenUri'](address, {
-      gasLimit: getDefaultWeightV2((_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api)
+      gasLimit: getDefaultWeightV2((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
     }, tokenId);
     if (_tokenUri.output) {
       let itemDetail = false;
@@ -204,7 +265,7 @@ export class WasmNftApi extends BaseNftApi {
       if (isFeatured) {
         const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         if (parsedTokenUri) {
-          const resp = await fetch(`${this.chain === 'alephTest' ? ART_ZERO_TESTNET_IPFS_API : ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
+          const resp = await fetch(`${ipfsApiFromArtZero(this.chain)}?input=${parsedTokenUri}`);
           itemDetail = resp && resp.ok && (await resp.json());
         }
       } else {
@@ -224,7 +285,7 @@ export class WasmNftApi extends BaseNftApi {
       const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
       if (isFeatured) {
         nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
-        nftItem.externalUrl = ART_ZERO_EXTERNAL_URL;
+        nftItem.externalUrl = externalUrlOnArtZero(this.chain);
       } else {
         nftItem.image = this.parseUrl(rawImageSrc);
       }
@@ -241,19 +302,19 @@ export class WasmNftApi extends BaseNftApi {
     }
     return nftItem;
   }
-  async getItemsByCollection(contractPromise, tokenInfo, collectionName, nftParams, isFeatured) {
+  async getItemsByCollection(contractPromise, tokenInfo, collectionName, nftParams, isFeatured, isAttributeOnChain) {
     let ownItem = false;
     let collectionImage;
     const smartContract = _getContractAddressOfToken(tokenInfo);
     const nftOwnerMap = {};
     await Promise.all(this.addresses.map(async address => {
-      var _this$substrateApi2, _balance$output;
+      var _this$substrateApi3, _balance$output;
       if (isEthereumAddress(address)) {
         return;
       }
       const nftIds = [];
       const _balance = await contractPromise.query['psp34::balanceOf'](address, {
-        gasLimit: getDefaultWeightV2((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
+        gasLimit: getDefaultWeightV2((_this$substrateApi3 = this.substrateApi) === null || _this$substrateApi3 === void 0 ? void 0 : _this$substrateApi3.api)
       }, address);
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const balanceJson = _balance === null || _balance === void 0 ? void 0 : (_balance$output = _balance.output) === null || _balance$output === void 0 ? void 0 : _balance$output.toJSON();
@@ -269,9 +330,9 @@ export class WasmNftApi extends BaseNftApi {
       }
       try {
         await Promise.all(itemIndexes.map(async i => {
-          var _this$substrateApi3;
+          var _this$substrateApi4;
           const _tokenByIndexResp = await contractPromise.query['psp34Enumerable::ownersTokenByIndex'](address, {
-            gasLimit: getDefaultWeightV2((_this$substrateApi3 = this.substrateApi) === null || _this$substrateApi3 === void 0 ? void 0 : _this$substrateApi3.api)
+            gasLimit: getDefaultWeightV2((_this$substrateApi4 = this.substrateApi) === null || _this$substrateApi4 === void 0 ? void 0 : _this$substrateApi4.api)
           }, address, i);
           if (_tokenByIndexResp.output) {
             const rawTokenId = _tokenByIndexResp.output.toHuman();
@@ -279,18 +340,47 @@ export class WasmNftApi extends BaseNftApi {
             const tokenIdObj = rawTokenId.Ok.Ok || rawTokenId.ok.ok; // capital O, not normal o
             const tokenId = Object.values(tokenIdObj)[0].replaceAll(',', '');
             nftIds.push(tokenId);
-            const nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
-            nftItem.collectionId = smartContract;
-            nftItem.chain = this.chain;
-            nftItem.type = _AssetType.PSP34;
-            nftItem.id = tokenId;
-            nftItem.owner = address;
-            nftItem.onChainOption = tokenIdObj;
-            nftItem.originAsset = tokenInfo.slug;
-            nftParams.updateItem(this.chain, nftItem, address);
-            ownItem = true;
-            if (!isFeatured && !collectionImage && nftItem.image) {
-              collectionImage = nftItem.image; // No default collection image
+            let tokenUri;
+            try {
+              if (isAttributeOnChain) {
+                var _this$substrateApi5, _tokenUri$output;
+                const _tokenUri = await contractPromise.query['psp34Traits::getAttributes'](address, {
+                  gasLimit: getDefaultWeightV2((_this$substrateApi5 = this.substrateApi) === null || _this$substrateApi5 === void 0 ? void 0 : _this$substrateApi5.api)
+                }, tokenIdObj, ['metadata']);
+                const tokenUriObj = (_tokenUri$output = _tokenUri.output) === null || _tokenUri$output === void 0 ? void 0 : _tokenUri$output.toJSON();
+                tokenUri = (tokenUriObj.ok || tokenUriObj.Ok)[0];
+              }
+            } catch (e) {
+              console.debug(e);
+            }
+            if (!tokenUri) {
+              const nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
+              nftItem.collectionId = smartContract;
+              nftItem.chain = this.chain;
+              nftItem.type = _AssetType.PSP34;
+              nftItem.id = tokenId;
+              nftItem.owner = address;
+              nftItem.onChainOption = tokenIdObj;
+              nftItem.originAsset = tokenInfo.slug;
+              nftParams.updateItem(this.chain, nftItem, address);
+              ownItem = true;
+              if (!isFeatured && !collectionImage && nftItem.image) {
+                collectionImage = nftItem.image; // No default collection image
+              }
+            } else {
+              const nftItem = await this.processOnChainMetadata(tokenId, false, tokenUri);
+              nftItem.collectionId = smartContract;
+              nftItem.chain = this.chain;
+              nftItem.type = _AssetType.PSP34;
+              nftItem.id = tokenId;
+              nftItem.owner = address;
+              nftItem.onChainOption = tokenIdObj;
+              nftItem.originAsset = tokenInfo.slug;
+              nftParams.updateItem(this.chain, nftItem, address);
+              ownItem = true;
+              if (!isFeatured && !collectionImage && nftItem.image) {
+                collectionImage = nftItem.image; // No default collection image
+              }
             }
           }
         }));
@@ -329,17 +419,17 @@ export class WasmNftApi extends BaseNftApi {
     return 1;
   }
   async handleNfts(params) {
-    var _this$substrateApi4;
+    var _this$substrateApi6;
     if (!this.wasmContracts || this.wasmContracts.length === 0) {
       return;
     }
     await this.connect(); // might not be necessary
 
-    const apiPromise = (_this$substrateApi4 = this.substrateApi) === null || _this$substrateApi4 === void 0 ? void 0 : _this$substrateApi4.api;
+    const apiPromise = (_this$substrateApi6 = this.substrateApi) === null || _this$substrateApi6 === void 0 ? void 0 : _this$substrateApi6.api;
     await Promise.all(this.wasmContracts.map(async tokenInfo => {
       const contractPromise = getPSP34ContractPromise(apiPromise, _getContractAddressOfToken(tokenInfo));
-      const isCollectionFeatured = await isArtZeroFeaturedCollection(this.chain, _getContractAddressOfToken(tokenInfo));
-      return await this.getItemsByCollection(contractPromise, tokenInfo, tokenInfo.name, params, isCollectionFeatured);
+      const [isAttributeOnChain, isCollectionFeatured] = await Promise.all([this.isAttributeStoredOnChain(contractPromise), isArtZeroFeaturedCollection(this.chain, _getContractAddressOfToken(tokenInfo))]);
+      return await this.getItemsByCollection(contractPromise, tokenInfo, tokenInfo.name, params, isCollectionFeatured, isAttributeOnChain);
     }));
   }
 }

package/koni/api/nft/wasm_nft/utils.d.ts

@@ -1,7 +1,19 @@
-export declare const ART_ZERO_TESTNET_IMAGE_API = "https://a0-test-api.artzero.io/getImage";
+export declare const A0_ART_ZERO_TESTNET_IMAGE_API = "https://a0-test-api.artzero.io/getImage";
+export declare const ASTAR_ART_ZERO_TESTNET_IMAGE_API = "https://astar-test-api.artzero.io/getImage";
 export declare const ART_ZERO_TESTNET_IPFS_API = "https://a0-test-api.artzero.io/getJSON";
-export declare const ART_ZERO_TESTNET_COLLECTION_API = "https://a0-test-api.artzero.io/getCollectionByAddress";
-export declare const ART_ZERO_IMAGE_API = "https://a0-api.artzero.io/getImage";
-export declare const ART_ZERO_IPFS_API = "https://a0-api.artzero.io/getJSON";
-export declare const ART_ZERO_COLLECTION_API = "https://a0-api.artzero.io/getCollectionByAddress";
-export declare const ART_ZERO_EXTERNAL_URL = "https://a0.artzero.io/#/marketplace";
+export declare const ASTAR_ART_ZERO_TESTNET_IPFS_API = "https://astar-test-api.artzero.io/getJSON";
+export declare const A0_ART_ZERO_TESTNET_COLLECTION_API = "https://a0-test-api.artzero.io/getCollectionByAddress";
+export declare const ASTAR_ART_ZERO_TESTNET_COLLECTION_API = "https://astar-test-api.artzero.io/getCollectionByAddress";
+export declare const A0_ART_ZERO_IMAGE_API = "https://a0-api.artzero.io/getImage";
+export declare const ASTAR_ART_ZERO_IMAGE_API = "https://astar-api.artzero.io/getImage";
+export declare const A0_ART_ZERO_IPFS_API = "https://a0-api.artzero.io/getJSON";
+export declare const ASTAR_ART_ZERO_IPFS_API = "https://astar-api.artzero.io/getJSON";
+export declare const A0_ART_ZERO_COLLECTION_API = "https://a0-api.artzero.io/getCollectionByAddress";
+export declare const ASTAR_ART_ZERO_COLLECTION_API = "https://astar-api.artzero.io/getCollectionByAddress";
+export declare const A0_ART_ZERO_EXTERNAL_URL = "https://a0.artzero.io/#/marketplace";
+export declare const ASTAR_ART_ZERO_EXTERNAL_URL = "https://astar.artzero.io/#/marketplace";
+export declare function collectionApiFromArtZero(chain: string): "https://a0-test-api.artzero.io/getCollectionByAddress" | "https://a0-api.artzero.io/getCollectionByAddress" | "https://astar-api.artzero.io/getCollectionByAddress";
+export declare function itemImageApiFromArtZero(chain: string): "https://a0-test-api.artzero.io/getImage" | "https://a0-api.artzero.io/getImage" | "https://astar-api.artzero.io/getImage";
+export declare function collectionDetailApiFromArtZero(chain: string): "https://a0-test-api.artzero.io/getCollectionByAddress" | "https://a0-api.artzero.io/getCollectionByAddress" | "https://astar-api.artzero.io/getCollectionByAddress";
+export declare function ipfsApiFromArtZero(chain: string): "https://a0-test-api.artzero.io/getJSON" | "https://a0-api.artzero.io/getJSON" | "https://astar-api.artzero.io/getJSON";
+export declare function externalUrlOnArtZero(chain: string): "https://a0.artzero.io/#/marketplace" | "https://astar.artzero.io/#/marketplace";

package/koni/api/nft/wasm_nft/utils.js

@@ -1,10 +1,59 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export const ART_ZERO_TESTNET_IMAGE_API = 'https://a0-test-api.artzero.io/getImage';
+export const A0_ART_ZERO_TESTNET_IMAGE_API = 'https://a0-test-api.artzero.io/getImage';
+export const ASTAR_ART_ZERO_TESTNET_IMAGE_API = 'https://astar-test-api.artzero.io/getImage';
 export const ART_ZERO_TESTNET_IPFS_API = 'https://a0-test-api.artzero.io/getJSON';
-export const ART_ZERO_TESTNET_COLLECTION_API = 'https://a0-test-api.artzero.io/getCollectionByAddress';
-export const ART_ZERO_IMAGE_API = 'https://a0-api.artzero.io/getImage';
-export const ART_ZERO_IPFS_API = 'https://a0-api.artzero.io/getJSON';
-export const ART_ZERO_COLLECTION_API = 'https://a0-api.artzero.io/getCollectionByAddress';
-export const ART_ZERO_EXTERNAL_URL = 'https://a0.artzero.io/#/marketplace';
+export const ASTAR_ART_ZERO_TESTNET_IPFS_API = 'https://astar-test-api.artzero.io/getJSON';
+export const A0_ART_ZERO_TESTNET_COLLECTION_API = 'https://a0-test-api.artzero.io/getCollectionByAddress';
+export const ASTAR_ART_ZERO_TESTNET_COLLECTION_API = 'https://astar-test-api.artzero.io/getCollectionByAddress';
+export const A0_ART_ZERO_IMAGE_API = 'https://a0-api.artzero.io/getImage';
+export const ASTAR_ART_ZERO_IMAGE_API = 'https://astar-api.artzero.io/getImage';
+export const A0_ART_ZERO_IPFS_API = 'https://a0-api.artzero.io/getJSON';
+export const ASTAR_ART_ZERO_IPFS_API = 'https://astar-api.artzero.io/getJSON';
+export const A0_ART_ZERO_COLLECTION_API = 'https://a0-api.artzero.io/getCollectionByAddress';
+export const ASTAR_ART_ZERO_COLLECTION_API = 'https://astar-api.artzero.io/getCollectionByAddress';
+export const A0_ART_ZERO_EXTERNAL_URL = 'https://a0.artzero.io/#/marketplace';
+export const ASTAR_ART_ZERO_EXTERNAL_URL = 'https://astar.artzero.io/#/marketplace';
+export function collectionApiFromArtZero(chain) {
+  if (chain === 'alephTest') {
+    return A0_ART_ZERO_TESTNET_COLLECTION_API;
+  }
+  if (chain === 'astar') {
+    return ASTAR_ART_ZERO_COLLECTION_API;
+  }
+  return A0_ART_ZERO_COLLECTION_API;
+}
+export function itemImageApiFromArtZero(chain) {
+  if (chain === 'alephTest') {
+    return A0_ART_ZERO_TESTNET_IMAGE_API;
+  }
+  if (chain === 'astar') {
+    return ASTAR_ART_ZERO_IMAGE_API;
+  }
+  return A0_ART_ZERO_IMAGE_API;
+}
+export function collectionDetailApiFromArtZero(chain) {
+  if (chain === 'alephTest') {
+    return A0_ART_ZERO_TESTNET_COLLECTION_API;
+  }
+  if (chain === 'astar') {
+    return ASTAR_ART_ZERO_COLLECTION_API;
+  }
+  return A0_ART_ZERO_COLLECTION_API;
+}
+export function ipfsApiFromArtZero(chain) {
+  if (chain === 'alephTest') {
+    return ART_ZERO_TESTNET_IPFS_API;
+  }
+  if (chain === 'astar') {
+    return ASTAR_ART_ZERO_IPFS_API;
+  }
+  return A0_ART_ZERO_IPFS_API;
+}
+export function externalUrlOnArtZero(chain) {
+  if (chain === 'astar') {
+    return ASTAR_ART_ZERO_EXTERNAL_URL;
+  }
+  return A0_ART_ZERO_EXTERNAL_URL;
+}

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-1",
+  "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.7",
-    "@subwallet/extension-base": "^1.0.6-1",
-    "@subwallet/extension-chains": "^1.0.6-1",
-    "@subwallet/extension-dapp": "^1.0.6-1",
-    "@subwallet/extension-inject": "^1.0.6-1",
+    "@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-1'
+  version: '1.0.7-0'
 };

package/services/chain-service/index.js

@@ -652,17 +652,19 @@ export class ChainService {
           parsedStoredAssetRegistry[storedAsset.slug] = storedAsset;
         }
       });
-      for (const assetInfo of Object.values(parsedStoredAssetRegistry)) {
+      for (const storedAssetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
         for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
-          if (_isEqualSmartContractAsset(assetInfo, defaultChainAsset)) {
+          if (_isEqualSmartContractAsset(storedAssetInfo, defaultChainAsset)) {
             duplicated = true;
             break;
           }
         }
         if (!duplicated) {
-          mergedAssetRegistry[assetInfo.slug] = assetInfo;
+          mergedAssetRegistry[storedAssetInfo.slug] = storedAssetInfo;
+        } else {
+          deprecatedAssets.push(storedAssetInfo.slug);
         }
       }
       this.dataMap.assetRegistry = mergedAssetRegistry;

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;
 }