@subwallet/extension-base 1.0.2-2 → 1.0.3-0

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

@@ -82,6 +82,7 @@ class EvmNftApi extends _nft.BaseNftApi {
     const contract = new this.evmApi.api.eth.Contract(_helper._ERC721_ABI, smartContract);
     let ownItem = false;
     let collectionImage;
+    const nftOwnerMap = {};
     await Promise.all(this.addresses.map(async address => {
       if (!(0, _utilCrypto.isEthereumAddress)(address)) {
         return;
@@ -91,6 +92,7 @@ class EvmNftApi extends _nft.BaseNftApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       const balance = await contract.methods.balanceOf(address).call();
       if (Number(balance) === 0) {
+        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -132,8 +134,9 @@ class EvmNftApi extends _nft.BaseNftApi {
             }
           }
         }));
+        nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error('evm nft error', e);
+        console.error('EVM NFT error', e);
       }
     }));
     if (ownItem) {
@@ -145,10 +148,12 @@ class EvmNftApi extends _nft.BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      // nftParams.updateReady(true);
+      Object.entries(nftOwnerMap).forEach(_ref => {
+        let [owner, nftIds] = _ref;
+        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
+      });
     }
   }
-
   async handleNfts(params) {
     if (!this.evmContracts || this.evmContracts.length === 0) {
       return;

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

@@ -132,19 +132,16 @@ class NftHandler {
       console.error('error setting up nft handlers', e);
     }
   }
-  async handleNfts(nftContracts, updateItem, updateCollection) {
+  async handleNfts(nftContracts, updateItem, updateCollection, cleanUpNfts) {
     this.setupApi();
     this.setupNftContracts(nftContracts);
     await Promise.all(this.handlers.map(async handler => {
       await handler.fetchNfts({
         updateItem,
-        updateCollection
+        updateCollection,
+        cleanUpNfts
       });
     }));
   }
-  parseAssetId(id) {
-    const numberId = parseInt(id);
-    return numberId.toString();
-  }
 }
 exports.NftHandler = NftHandler;

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

@@ -90,17 +90,18 @@ class KaruraNftApi extends _nft.BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetails(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -122,8 +123,8 @@ class KaruraNftApi extends _nft.BaseNftApi {
         };
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch karura nft', e);
     }

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

@@ -139,6 +139,7 @@ class RmrkNftApi extends _nft.BaseNftApi {
       const kusamaAddress = (0, _utils.reformatAddress)(address, 2);
       allNfts = await this.getAllByAccount(kusamaAddress);
       if (allNfts.length <= 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionInfoUrl = [];
@@ -238,9 +239,18 @@ class RmrkNftApi extends _nft.BaseNftApi {
           image: allCollectionMeta[item.collectionId] ? this.parseUrl(allCollectionMeta[item.collectionId].image) : null,
           chain: this.chain
         };
+        const nftIds = [];
+        allNfts.forEach(nft => {
+          const nftCollectionId = nft === null || nft === void 0 ? void 0 : nft.collectionId;
+          if (nftCollectionId === item.collectionId) {
+            nftIds.push(nft === null || nft === void 0 ? void 0 : nft.id);
+          }
+        });
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       });
+      const allCollectionIds = allCollections.map(item => item.collectionId);
+      const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
+      params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
       console.error('Failed to fetch rmrk nft', e);
     }

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

@@ -93,17 +93,18 @@ class StatemineNftApi extends _nft.BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
+        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
-      const collectionNftIds = {};
+      const collectionIds = [];
+      const nftIds = [];
       await Promise.all(assetIds.map(async assetId => {
         const parsedClassId = this.parseTokenId(assetId.classId);
         const parsedTokenId = this.parseTokenId(assetId.tokenId);
-        if (collectionNftIds[parsedClassId]) {
-          collectionNftIds[parsedClassId].push(parsedTokenId);
-        } else {
-          collectionNftIds[parsedClassId] = [parsedTokenId];
+        if (!collectionIds.includes(parsedClassId)) {
+          collectionIds.push(parsedClassId);
         }
+        nftIds.push(parsedTokenId);
         const [tokenInfo, collectionMeta] = await Promise.all([this.getTokenDetails(assetId), this.getCollectionDetail(parseInt(parsedClassId))]);
         const parsedNft = {
           id: parsedTokenId,
@@ -122,8 +123,8 @@ class StatemineNftApi extends _nft.BaseNftApi {
           image: collectionMeta && collectionMeta.image ? this.parseUrl(collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.image) : undefined
         };
         params.updateCollection(this.chain, parsedCollection);
-        // params.updateReady(true);
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error('Failed to fetch statemine nft', e);
     }

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

@@ -141,6 +141,8 @@ class UniqueNftApi extends _nft.BaseNftApi {
           }
         }
       }));
+      const collectionIds = [];
+      let allNftIds = [];
       await Promise.all(allCollectionId.map(async collectionId => {
         const collectionIdStr = collectionId.toString();
 
@@ -148,6 +150,8 @@ class UniqueNftApi extends _nft.BaseNftApi {
         const collection = (await this.substrateApi.api.query.nft.collectionById(collectionId)).toJSON();
         collectionMap[collectionIdStr] = collection;
         const nftIds = Object.entries(nftMap).filter(item => item[1] === collectionId).map(item => item[0]);
+        collectionIds.push(collectionIdStr);
+        allNftIds = allNftIds.concat(nftIds);
         const parsedCollection = {
           collectionId: collectionIdStr,
           chain: this.chain
@@ -174,10 +178,10 @@ class UniqueNftApi extends _nft.BaseNftApi {
             }
             params.updateItem(this.chain, parsedItem, address);
             params.updateCollection(this.chain, parsedCollection);
-            // params.updateReady(true);
           }
         }));
       }));
+      params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
       console.error('Failed to fetch unique nft', e);
     }

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

@@ -9,12 +9,44 @@ var _types = require("@subwallet/chain-list/types");
 var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
 var _utils = require("@subwallet/extension-base/koni/api/nft/wasm_nft/utils");
 var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
-var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
+var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
+var _axios = _interopRequireDefault(require("axios"));
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+// interface CollectionAttributes {
+//   storedOnChain: boolean,
+//   attributeList: string[] // list of attribute names
+// }
+
+async function isArtZeroFeaturedCollection(networkKey, contractAddress) {
+  const timeout = new Promise(resolve => {
+    const id = setTimeout(() => {
+      clearTimeout(id);
+      resolve(null);
+    }, 3000);
+  });
+  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}`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+      },
+      body: urlencoded
+    }).then(resp => {
+      resolve(resp.json());
+    }).catch(console.error);
+  });
+  const collectionInfo = await Promise.race([timeout, collectionInfoPromise]);
+
+  // @ts-ignore
+  return collectionInfo !== null && (collectionInfo === null || collectionInfo === void 0 ? void 0 : collectionInfo.status) !== 'FAILED';
+}
 class WasmNftApi extends _nft.BaseNftApi {
   wasmContracts = [];
   constructor(api, addresses, chain) {
@@ -27,31 +59,40 @@ class WasmNftApi extends _nft.BaseNftApi {
     if (!tokenUri || tokenUri.length === 0) {
       return undefined;
     }
+    if (tokenUri.startsWith('/ipfs/')) {
+      return tokenUri;
+    }
+    if (tokenUri.startsWith('ipfs://')) {
+      return `/ipfs/${tokenUri.split('ipfs://')[1]}`;
+    }
     if (!tokenUri.includes('ipfs://') && !tokenUri.includes('ipfs://ipfs/')) {
-      return `ipfs://${tokenUri}`;
+      return `/ipfs/${tokenUri}`;
     }
     if (tokenUri.includes('ipfs://ipfs/')) {
-      return `ipfs://${tokenUri}`;
+      return `/ipfs/${tokenUri.split('ipfs://ipfs/')[1]}`;
     }
     return tokenUri;
   }
-  parseFeaturedNftImage(tokenUri) {
+  async parseFeaturedNftImage(tokenUri) {
     const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
     if (!parsedTokenUri) {
       return undefined;
     }
-    return `${_utils.ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
+    const nftItemImageSrc = `${this.chain === 'alephTest' ? _utils.ART_ZERO_TESTNET_IMAGE_API : _utils.ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
+    const collectionImageUrl = await (0, _axios.default)(nftItemImageSrc, {
+      method: 'GET'
+    });
+    return collectionImageUrl.data;
   }
   async parseFeaturedCollectionImage(smartContract) {
-    const resp = await (0, _crossFetch.default)(_utils.ART_ZERO_COLLECTION_API, {
+    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, {
       method: 'POST',
       headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/x-www-form-urlencoded'
       },
-      body: JSON.stringify({
-        collection_address: smartContract
-      })
+      body: urlencoded
     });
     const result = resp && resp.ok && (await resp.json());
     if (!result) {
@@ -65,82 +106,91 @@ class WasmNftApi extends _nft.BaseNftApi {
     if (!parsedCollectionImage) {
       return;
     }
-    return `${_utils.ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}`;
-  }
-  async getCollectionAttributes(contractPromise) {
-    const _onChainAttributeCount = await contractPromise.query['psp34Traits::getAttributeCount'](this.addresses[0], {
-      gasLimit: -1
+    const collectionImageSrc = `${this.chain === 'alephTest' ? _utils.ART_ZERO_TESTNET_IMAGE_API : _utils.ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}&size=500`;
+    const collectionImageUrl = await (0, _axios.default)(collectionImageSrc, {
+      method: 'GET'
     });
-    const onChainAttributeCount = _onChainAttributeCount.output ? _onChainAttributeCount.output.toString() : '0';
-    if (parseInt(onChainAttributeCount) === 0) {
-      return {
-        storedOnChain: false,
-        attributeList: []
-      };
-    }
-    const attributeList = [];
-    const attributeIndexes = [];
-    for (let i = 0; i < parseInt(onChainAttributeCount); i++) {
-      attributeIndexes.push(i);
-    }
-    await Promise.all(attributeIndexes.map(async i => {
-      const _attributeByIndex = await contractPromise.query['psp34Traits::getAttributeName'](this.addresses[0], {
-        gasLimit: -1
-      }, i);
-      if (_attributeByIndex.output) {
-        const attributeName = _attributeByIndex.output.toString();
-        if (attributeName !== '') {
-          attributeList.push(attributeName);
-        }
-      }
-    }));
-    return {
-      storedOnChain: true,
-      attributeList
-    };
-  }
-  async processOnChainMetadata(contractPromise, address, tokenIdObj, collectionAttributes, isFeatured) {
-    const nftItem = {
-      chain: '',
-      collectionId: '',
-      id: '',
-      owner: ''
-    };
-    const _attributeValues = await contractPromise.query['psp34Traits::getAttributes'](address, {
-      gasLimit: -1
-    }, tokenIdObj, collectionAttributes);
-    if (_attributeValues.output) {
-      const attributeValues = _attributeValues.output.toHuman();
-      const attributeDict = {};
-      for (let i = 0; i < collectionAttributes.length; i++) {
-        const attributeName = collectionAttributes[i];
-        const attributeValue = attributeValues[i] ? attributeValues[i] : '';
-        if (attributeName.toLowerCase() === 'nft_name') {
-          nftItem.name = attributeValue;
-        } else if (attributeName.toLowerCase() === 'description') {
-          nftItem.description = attributeValue;
-        } else if (attributeName.toLowerCase() === 'avatar') {
-          if (isFeatured) {
-            nftItem.image = this.parseFeaturedNftImage(attributeValue);
-          } else {
-            nftItem.image = this.parseUrl(attributeValue);
-          }
-        } else {
-          if (attributeValue !== '') {
-            attributeDict[attributeName] = {
-              value: attributeValue
-            };
-          }
-        }
-      }
-      nftItem.properties = attributeDict;
-    }
-    if (isFeatured) {
-      nftItem.externalUrl = _utils.ART_ZERO_EXTERNAL_URL;
-    }
-    return nftItem;
+    return collectionImageUrl.data;
   }
+
+  // private async getCollectionAttributes (contractPromise: ContractPromise): Promise<CollectionAttributes> {
+  //   const _onChainAttributeCount = await contractPromise.query['psp34Traits::getAttributeCount'](this.addresses[0], { gasLimit: getDefaultWeightV2(this.substrateApi?.api as ApiPromise) });
+  //   const onChainAttributeCount = _onChainAttributeCount.output ? _onChainAttributeCount.output.toString() : '0';
+  //
+  //   if (parseInt(onChainAttributeCount) === 0) {
+  //     return {
+  //       storedOnChain: false,
+  //       attributeList: []
+  //     };
+  //   }
+  //
+  //   const attributeList: string[] = [];
+  //   const attributeIndexes: number[] = [];
+  //
+  //   for (let i = 0; i < parseInt(onChainAttributeCount); i++) {
+  //     attributeIndexes.push(i);
+  //   }
+  //
+  //   await Promise.all(attributeIndexes.map(async (i) => {
+  //     const _attributeByIndex = await contractPromise.query['psp34Traits::getAttributeName'](this.addresses[0], { gasLimit: getDefaultWeightV2(this.substrateApi?.api as ApiPromise) }, i);
+  //
+  //     if (_attributeByIndex.output) {
+  //       const attributeName = _attributeByIndex.output.toString();
+  //
+  //       if (attributeName !== '') {
+  //         attributeList.push(attributeName);
+  //       }
+  //     }
+  //   }));
+  //
+  //   return {
+  //     storedOnChain: true,
+  //     attributeList
+  //   };
+  // }
+
+  // private async processOnChainMetadata (contractPromise: ContractPromise, address: string, tokenIdObj: Record<string, string>, collectionAttributes: string[], isFeatured: boolean): Promise<NftItem> {
+  //   const nftItem: NftItem = { chain: '', collectionId: '', id: '', owner: '' };
+  //   const _attributeValues = await contractPromise.query['psp34Traits::getAttributes'](address, { gasLimit: getDefaultWeightV2(this.substrateApi?.api as ApiPromise) }, tokenIdObj, collectionAttributes);
+  //
+  //   if (_attributeValues.output) {
+  //     const attributeValues = _attributeValues.output.toHuman() as string[];
+  //
+  //     const attributeDict: Record<string, any> = {};
+  //
+  //     for (let i = 0; i < collectionAttributes.length; i++) {
+  //       const attributeName = collectionAttributes[i];
+  //       const attributeValue = attributeValues[i] ? attributeValues[i] : '';
+  //
+  //       if (attributeName.toLowerCase() === 'nft_name') {
+  //         nftItem.name = attributeValue;
+  //       } else if (attributeName.toLowerCase() === 'description') {
+  //         nftItem.description = attributeValue;
+  //       } else if (attributeName.toLowerCase() === 'avatar') {
+  //         if (isFeatured) {
+  //           nftItem.image = await this.parseFeaturedNftImage(attributeValue);
+  //         } else {
+  //           nftItem.image = this.parseUrl(attributeValue);
+  //         }
+  //       } else {
+  //         if (attributeValue !== '') {
+  //           attributeDict[attributeName] = { value: attributeValue };
+  //         }
+  //       }
+  //     }
+  //
+  //     nftItem.properties = attributeDict;
+  //   }
+  //
+  //   if (isFeatured) {
+  //     nftItem.externalUrl = ART_ZERO_EXTERNAL_URL;
+  //   }
+  //
+  //   return nftItem;
+  // }
+
   async processOffChainMetadata(contractPromise, address, tokenId, isFeatured) {
+    var _this$substrateApi;
     const nftItem = {
       chain: '',
       collectionId: '',
@@ -149,19 +199,23 @@ class WasmNftApi extends _nft.BaseNftApi {
       name: tokenId
     };
     const _tokenUri = await contractPromise.query['psp34Traits::tokenUri'](address, {
-      gasLimit: -1
+      gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api)
     }, tokenId);
     if (_tokenUri.output) {
       let itemDetail = false;
-      const tokenUri = _tokenUri.output.toString();
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      const _tokenUriObj = _tokenUri.output.toJSON();
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      const tokenUri = _tokenUriObj.Ok || _tokenUriObj.ok;
       if (isFeatured) {
         const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
         if (parsedTokenUri) {
-          const resp = await (0, _crossFetch.default)(`${_utils.ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
+          const resp = await (0, _crossFetch.default)(`${this.chain === 'alephTest' ? _utils.ART_ZERO_TESTNET_IPFS_API : _utils.ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
           itemDetail = resp && resp.ok && (await resp.json());
         }
       } else {
-        const detailUrl = this.parseUrl(tokenUri);
+        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());
@@ -176,7 +230,7 @@ class WasmNftApi extends _nft.BaseNftApi {
       nftItem.externalUrl = itemDetail.external_url;
       const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
       if (isFeatured) {
-        nftItem.image = this.parseFeaturedNftImage(rawImageSrc);
+        nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
         nftItem.externalUrl = _utils.ART_ZERO_EXTERNAL_URL;
       } else {
         nftItem.image = this.parseUrl(rawImageSrc);
@@ -194,21 +248,26 @@ class WasmNftApi extends _nft.BaseNftApi {
     }
     return nftItem;
   }
-  async getItemsByCollection(contractPromise, collectionAttributes, isMetadataOnchain, tokenInfo, collectionName, nftParams) {
+  async getItemsByCollection(contractPromise, tokenInfo, collectionName, nftParams, isFeatured) {
     let ownItem = false;
     let collectionImage;
-    const smartContract = (0, _utils2._getContractAddressOfToken)(tokenInfo);
-    const isFeatured = _utils.ART_ZERO_CONTRACTS.includes(smartContract);
+    const smartContract = (0, _utils3._getContractAddressOfToken)(tokenInfo);
+    const nftOwnerMap = {};
     await Promise.all(this.addresses.map(async address => {
+      var _this$substrateApi2, _balance$output;
       if ((0, _utilCrypto.isEthereumAddress)(address)) {
         return;
       }
       const nftIds = [];
       const _balance = await contractPromise.query['psp34::balanceOf'](address, {
-        gasLimit: -1
+        gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
       }, address);
-      const balance = _balance.output ? _balance.output.toString() : '0';
+      // 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();
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      const balance = _balance.output ? balanceJson.ok || balanceJson.Ok : '0';
       if (parseInt(balance) === 0) {
+        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -217,20 +276,17 @@ class WasmNftApi extends _nft.BaseNftApi {
       }
       try {
         await Promise.all(itemIndexes.map(async i => {
+          var _this$substrateApi3;
           const _tokenByIndexResp = await contractPromise.query['psp34Enumerable::ownersTokenByIndex'](address, {
-            gasLimit: -1
+            gasLimit: (0, _utils2.getDefaultWeightV2)((_this$substrateApi3 = this.substrateApi) === null || _this$substrateApi3 === void 0 ? void 0 : _this$substrateApi3.api)
           }, address, i);
           if (_tokenByIndexResp.output) {
             const rawTokenId = _tokenByIndexResp.output.toHuman();
-            const tokenIdObj = rawTokenId.Ok;
-            const tokenId = Object.values(tokenIdObj)[0];
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            const tokenIdObj = rawTokenId.Ok.Ok || rawTokenId.ok.ok; // capital O, not normal o
+            const tokenId = Object.values(tokenIdObj)[0].replaceAll(',', '');
             nftIds.push(tokenId);
-            let nftItem;
-            if (isMetadataOnchain) {
-              nftItem = await this.processOnChainMetadata(contractPromise, address, tokenIdObj, collectionAttributes, isFeatured);
-            } else {
-              nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
-            }
+            const nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
             nftItem.collectionId = smartContract;
             nftItem.chain = this.chain;
             nftItem.type = _types._AssetType.PSP34;
@@ -245,6 +301,8 @@ class WasmNftApi extends _nft.BaseNftApi {
             }
           }
         }));
+
+        nftOwnerMap[address] = nftIds;
       } catch (e) {
         console.error(`error parsing item for ${this.chain} nft`, e);
       }
@@ -264,6 +322,10 @@ class WasmNftApi extends _nft.BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
+      Object.entries(nftOwnerMap).forEach(_ref => {
+        let [owner, nftIds] = _ref;
+        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
+      });
     }
   }
   async fetchNfts(params) {
@@ -275,20 +337,17 @@ class WasmNftApi extends _nft.BaseNftApi {
     return 1;
   }
   async handleNfts(params) {
-    var _this$substrateApi;
+    var _this$substrateApi4;
     if (!this.wasmContracts || this.wasmContracts.length === 0) {
       return;
     }
     await this.connect(); // might not be necessary
 
-    const apiPromise = (_this$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.api;
+    const apiPromise = (_this$substrateApi4 = this.substrateApi) === null || _this$substrateApi4 === void 0 ? void 0 : _this$substrateApi4.api;
     await Promise.all(this.wasmContracts.map(async tokenInfo => {
-      const contractPromise = (0, _wasm.getPSP34ContractPromise)(apiPromise, (0, _utils2._getContractAddressOfToken)(tokenInfo));
-      const {
-        attributeList,
-        storedOnChain
-      } = await this.getCollectionAttributes(contractPromise);
-      return await this.getItemsByCollection(contractPromise, attributeList, storedOnChain, tokenInfo, tokenInfo.name, params);
+      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);
     }));
   }
 }

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

@@ -3,17 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ART_ZERO_IPFS_API = exports.ART_ZERO_IMAGE_API = exports.ART_ZERO_EXTERNAL_URL = exports.ART_ZERO_CONTRACTS = exports.ART_ZERO_COLLECTION_API = void 0;
+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;
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const ART_ZERO_CONTRACTS = ['5Hg1xe6JAGZj92wxtj1ykAfQpwwRNqzAnvhZ3TuXZEmLU1Vw'];
-exports.ART_ZERO_CONTRACTS = ART_ZERO_CONTRACTS;
-const ART_ZERO_IMAGE_API = 'https://api.artzero.io/getImage';
+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 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://api.artzero.io/getJSON';
+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://api.artzero.io/getCollectionByAddress';
+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://artzero.io/demotestnet/#/marketplace';
+const ART_ZERO_EXTERNAL_URL = 'https://a0.artzero.io/#/marketplace';
 exports.ART_ZERO_EXTERNAL_URL = ART_ZERO_EXTERNAL_URL;