@subwallet/extension-base 1.0.6-1 → 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/api/nft/wasm_nft/index.js

@@ -32,7 +32,7 @@ async function isArtZeroFeaturedCollection(networkKey, contractAddress) {
   const urlencoded = new URLSearchParams();
   urlencoded.append('collection_address', contractAddress);
   const collectionInfoPromise = new Promise(function (resolve) {
-    (0, _crossFetch.default)(`${networkKey === 'alephTest' ? _utils.ART_ZERO_TESTNET_COLLECTION_API : _utils.ART_ZERO_COLLECTION_API}`, {
+    (0, _crossFetch.default)((0, _utils.collectionApiFromArtZero)(networkKey), {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded'
@@ -55,6 +55,20 @@ class WasmNftApi extends _nft.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: (0, _utils2.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;
@@ -78,7 +92,7 @@ class WasmNftApi extends _nft.BaseNftApi {
     if (!parsedTokenUri) {
       return undefined;
     }
-    const nftItemImageSrc = `${this.chain === 'alephTest' ? _utils.ART_ZERO_TESTNET_IMAGE_API : _utils.ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
+    const nftItemImageSrc = `${(0, _utils.itemImageApiFromArtZero)(this.chain)}?input=${parsedTokenUri}&size=500`;
     const collectionImageUrl = await (0, _axios.default)(nftItemImageSrc, {
       method: 'GET'
     });
@@ -87,7 +101,7 @@ class WasmNftApi extends _nft.BaseNftApi {
   async parseFeaturedCollectionImage(smartContract) {
     const urlencoded = new URLSearchParams();
     urlencoded.append('collection_address', smartContract);
-    const resp = await (0, _crossFetch.default)(this.chain === 'alephTest' ? _utils.ART_ZERO_TESTNET_COLLECTION_API : _utils.ART_ZERO_COLLECTION_API, {
+    const resp = await (0, _crossFetch.default)((0, _utils.collectionDetailApiFromArtZero)(this.chain), {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded'
@@ -106,7 +120,7 @@ class WasmNftApi extends _nft.BaseNftApi {
     if (!parsedCollectionImage) {
       return;
     }
-    const collectionImageSrc = `${this.chain === 'alephTest' ? _utils.ART_ZERO_TESTNET_IMAGE_API : _utils.ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}&size=500`;
+    const collectionImageSrc = `${(0, _utils.itemImageApiFromArtZero)(this.chain)}?input=${parsedCollectionImage}&size=500`;
     const collectionImageUrl = await (0, _axios.default)(collectionImageSrc, {
       method: 'GET'
     });
@@ -189,8 +203,55 @@ class WasmNftApi extends _nft.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 (0, _crossFetch.default)(`${(0, _utils.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 (0, _crossFetch.default)(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 = (0, _utils.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: '',
@@ -199,7 +260,7 @@ class WasmNftApi extends _nft.BaseNftApi {
       name: tokenId
     };
     const _tokenUri = await contractPromise.query['psp34Traits::tokenUri'](address, {
-      gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api)
+      gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
     }, tokenId);
     if (_tokenUri.output) {
       let itemDetail = false;
@@ -210,7 +271,7 @@ class WasmNftApi extends _nft.BaseNftApi {
       if (isFeatured) {
         const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         if (parsedTokenUri) {
-          const resp = await (0, _crossFetch.default)(`${this.chain === 'alephTest' ? _utils.ART_ZERO_TESTNET_IPFS_API : _utils.ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
+          const resp = await (0, _crossFetch.default)(`${(0, _utils.ipfsApiFromArtZero)(this.chain)}?input=${parsedTokenUri}`);
           itemDetail = resp && resp.ok && (await resp.json());
         }
       } else {
@@ -230,7 +291,7 @@ class WasmNftApi extends _nft.BaseNftApi {
       const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
       if (isFeatured) {
         nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
-        nftItem.externalUrl = _utils.ART_ZERO_EXTERNAL_URL;
+        nftItem.externalUrl = (0, _utils.externalUrlOnArtZero)(this.chain);
       } else {
         nftItem.image = this.parseUrl(rawImageSrc);
       }
@@ -247,19 +308,19 @@ class WasmNftApi extends _nft.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 = (0, _utils3._getContractAddressOfToken)(tokenInfo);
     const nftOwnerMap = {};
     await Promise.all(this.addresses.map(async address => {
-      var _this$substrateApi2, _balance$output;
+      var _this$substrateApi3, _balance$output;
       if ((0, _utilCrypto.isEthereumAddress)(address)) {
         return;
       }
       const nftIds = [];
       const _balance = await contractPromise.query['psp34::balanceOf'](address, {
-        gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
+        gasLimit: (0, _utils2.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();
@@ -275,9 +336,9 @@ class WasmNftApi extends _nft.BaseNftApi {
       }
       try {
         await Promise.all(itemIndexes.map(async i => {
-          var _this$substrateApi3;
+          var _this$substrateApi4;
           const _tokenByIndexResp = await contractPromise.query['psp34Enumerable::ownersTokenByIndex'](address, {
-            gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi3 = this.substrateApi) === null || _this$substrateApi3 === void 0 ? void 0 : _this$substrateApi3.api)
+            gasLimit: (0, _utils2.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();
@@ -285,18 +346,47 @@ class WasmNftApi extends _nft.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 = _types._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: (0, _utils2.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 = _types._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 = _types._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
+              }
             }
           }
         }));
@@ -336,17 +426,17 @@ class WasmNftApi extends _nft.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 = (0, _wasm.getPSP34ContractPromise)(apiPromise, (0, _utils3._getContractAddressOfToken)(tokenInfo));
-      const isCollectionFeatured = await isArtZeroFeaturedCollection(this.chain, (0, _utils3._getContractAddressOfToken)(tokenInfo));
-      return await this.getItemsByCollection(contractPromise, tokenInfo, tokenInfo.name, params, isCollectionFeatured);
+      const [isAttributeOnChain, isCollectionFeatured] = await Promise.all([this.isAttributeStoredOnChain(contractPromise), isArtZeroFeaturedCollection(this.chain, (0, _utils3._getContractAddressOfToken)(tokenInfo))]);
+      return await this.getItemsByCollection(contractPromise, tokenInfo, tokenInfo.name, params, isCollectionFeatured, isAttributeOnChain);
     }));
   }
 }

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

@@ -3,21 +3,82 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ART_ZERO_TESTNET_IPFS_API = exports.ART_ZERO_TESTNET_IMAGE_API = exports.ART_ZERO_TESTNET_COLLECTION_API = exports.ART_ZERO_IPFS_API = exports.ART_ZERO_IMAGE_API = exports.ART_ZERO_EXTERNAL_URL = exports.ART_ZERO_COLLECTION_API = void 0;
+exports.ASTAR_ART_ZERO_TESTNET_IPFS_API = exports.ASTAR_ART_ZERO_TESTNET_IMAGE_API = exports.ASTAR_ART_ZERO_TESTNET_COLLECTION_API = exports.ASTAR_ART_ZERO_IPFS_API = exports.ASTAR_ART_ZERO_IMAGE_API = exports.ASTAR_ART_ZERO_EXTERNAL_URL = exports.ASTAR_ART_ZERO_COLLECTION_API = exports.ART_ZERO_TESTNET_IPFS_API = exports.A0_ART_ZERO_TESTNET_IMAGE_API = exports.A0_ART_ZERO_TESTNET_COLLECTION_API = exports.A0_ART_ZERO_IPFS_API = exports.A0_ART_ZERO_IMAGE_API = exports.A0_ART_ZERO_EXTERNAL_URL = exports.A0_ART_ZERO_COLLECTION_API = void 0;
+exports.collectionApiFromArtZero = collectionApiFromArtZero;
+exports.collectionDetailApiFromArtZero = collectionDetailApiFromArtZero;
+exports.externalUrlOnArtZero = externalUrlOnArtZero;
+exports.ipfsApiFromArtZero = ipfsApiFromArtZero;
+exports.itemImageApiFromArtZero = itemImageApiFromArtZero;
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const ART_ZERO_TESTNET_IMAGE_API = 'https://a0-test-api.artzero.io/getImage';
-exports.ART_ZERO_TESTNET_IMAGE_API = ART_ZERO_TESTNET_IMAGE_API;
+const A0_ART_ZERO_TESTNET_IMAGE_API = 'https://a0-test-api.artzero.io/getImage';
+exports.A0_ART_ZERO_TESTNET_IMAGE_API = A0_ART_ZERO_TESTNET_IMAGE_API;
+const ASTAR_ART_ZERO_TESTNET_IMAGE_API = 'https://astar-test-api.artzero.io/getImage';
+exports.ASTAR_ART_ZERO_TESTNET_IMAGE_API = ASTAR_ART_ZERO_TESTNET_IMAGE_API;
 const ART_ZERO_TESTNET_IPFS_API = 'https://a0-test-api.artzero.io/getJSON';
 exports.ART_ZERO_TESTNET_IPFS_API = ART_ZERO_TESTNET_IPFS_API;
-const ART_ZERO_TESTNET_COLLECTION_API = 'https://a0-test-api.artzero.io/getCollectionByAddress';
-exports.ART_ZERO_TESTNET_COLLECTION_API = ART_ZERO_TESTNET_COLLECTION_API;
-const ART_ZERO_IMAGE_API = 'https://a0-api.artzero.io/getImage';
-exports.ART_ZERO_IMAGE_API = ART_ZERO_IMAGE_API;
-const ART_ZERO_IPFS_API = 'https://a0-api.artzero.io/getJSON';
-exports.ART_ZERO_IPFS_API = ART_ZERO_IPFS_API;
-const ART_ZERO_COLLECTION_API = 'https://a0-api.artzero.io/getCollectionByAddress';
-exports.ART_ZERO_COLLECTION_API = ART_ZERO_COLLECTION_API;
-const ART_ZERO_EXTERNAL_URL = 'https://a0.artzero.io/#/marketplace';
-exports.ART_ZERO_EXTERNAL_URL = ART_ZERO_EXTERNAL_URL;
+const ASTAR_ART_ZERO_TESTNET_IPFS_API = 'https://astar-test-api.artzero.io/getJSON';
+exports.ASTAR_ART_ZERO_TESTNET_IPFS_API = ASTAR_ART_ZERO_TESTNET_IPFS_API;
+const A0_ART_ZERO_TESTNET_COLLECTION_API = 'https://a0-test-api.artzero.io/getCollectionByAddress';
+exports.A0_ART_ZERO_TESTNET_COLLECTION_API = A0_ART_ZERO_TESTNET_COLLECTION_API;
+const ASTAR_ART_ZERO_TESTNET_COLLECTION_API = 'https://astar-test-api.artzero.io/getCollectionByAddress';
+exports.ASTAR_ART_ZERO_TESTNET_COLLECTION_API = ASTAR_ART_ZERO_TESTNET_COLLECTION_API;
+const A0_ART_ZERO_IMAGE_API = 'https://a0-api.artzero.io/getImage';
+exports.A0_ART_ZERO_IMAGE_API = A0_ART_ZERO_IMAGE_API;
+const ASTAR_ART_ZERO_IMAGE_API = 'https://astar-api.artzero.io/getImage';
+exports.ASTAR_ART_ZERO_IMAGE_API = ASTAR_ART_ZERO_IMAGE_API;
+const A0_ART_ZERO_IPFS_API = 'https://a0-api.artzero.io/getJSON';
+exports.A0_ART_ZERO_IPFS_API = A0_ART_ZERO_IPFS_API;
+const ASTAR_ART_ZERO_IPFS_API = 'https://astar-api.artzero.io/getJSON';
+exports.ASTAR_ART_ZERO_IPFS_API = ASTAR_ART_ZERO_IPFS_API;
+const A0_ART_ZERO_COLLECTION_API = 'https://a0-api.artzero.io/getCollectionByAddress';
+exports.A0_ART_ZERO_COLLECTION_API = A0_ART_ZERO_COLLECTION_API;
+const ASTAR_ART_ZERO_COLLECTION_API = 'https://astar-api.artzero.io/getCollectionByAddress';
+exports.ASTAR_ART_ZERO_COLLECTION_API = ASTAR_ART_ZERO_COLLECTION_API;
+const A0_ART_ZERO_EXTERNAL_URL = 'https://a0.artzero.io/#/marketplace';
+exports.A0_ART_ZERO_EXTERNAL_URL = A0_ART_ZERO_EXTERNAL_URL;
+const ASTAR_ART_ZERO_EXTERNAL_URL = 'https://astar.artzero.io/#/marketplace';
+exports.ASTAR_ART_ZERO_EXTERNAL_URL = ASTAR_ART_ZERO_EXTERNAL_URL;
+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;
+}
+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;
+}
+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;
+}
+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;
+}
+function externalUrlOnArtZero(chain) {
+  if (chain === 'astar') {
+    return ASTAR_ART_ZERO_EXTERNAL_URL;
+  }
+  return A0_ART_ZERO_EXTERNAL_URL;
+}

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-1'
+  version: '1.0.7-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -665,17 +665,19 @@ 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 ((0, _utils._isEqualSmartContractAsset)(assetInfo, defaultChainAsset)) {
+          if ((0, _utils._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/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/api/nft/wasm_nft/index.d.ts

@@ -5,9 +5,11 @@ export declare class WasmNftApi extends BaseNftApi {
     private wasmContracts;
     constructor(api: _SubstrateApi | null, addresses: string[], chain: string);
     setSmartContractNfts(wasmContracts: _ChainAsset[]): void;
+    private isAttributeStoredOnChain;
     private parseFeaturedTokenUri;
     private parseFeaturedNftImage;
     private parseFeaturedCollectionImage;
+    private processOnChainMetadata;
     private processOffChainMetadata;
     private getItemsByCollection;
     fetchNfts(params: HandleNftParams): Promise<number>;