@subwallet/extension-base 1.0.2-1b → 1.0.2-2

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

@@ -122,11 +122,8 @@ class KaruraNftApi extends _nft.BaseNftApi {
         };
         params.updateItem(this.chain, parsedNft, address);
         params.updateCollection(this.chain, parsedCollection);
+        // params.updateReady(true);
       }));
-      Object.entries(collectionNftIds).forEach(_ref2 => {
-        let [collectionId, nftIds] = _ref2;
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
     } catch (e) {
       console.error('Failed to fetch karura nft', e);
     }

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

@@ -238,15 +238,8 @@ 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.cleanUpNfts(this.chain, address, item.collectionId, nftIds);
+        // params.updateReady(true);
       });
     } catch (e) {
       console.error('Failed to fetch rmrk nft', e);

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

@@ -122,11 +122,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);
       }));
-      Object.entries(collectionNftIds).forEach(_ref => {
-        let [collectionId, nftIds] = _ref;
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
     } catch (e) {
       console.error('Failed to fetch statemine nft', e);
     }

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

@@ -141,7 +141,6 @@ class UniqueNftApi extends _nft.BaseNftApi {
           }
         }
       }));
-      const nftCollectionMap = {};
       await Promise.all(allCollectionId.map(async collectionId => {
         const collectionIdStr = collectionId.toString();
 
@@ -149,7 +148,6 @@ 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]);
-        nftCollectionMap[collectionIdStr] = nftIds;
         const parsedCollection = {
           collectionId: collectionIdStr,
           chain: this.chain
@@ -176,13 +174,10 @@ class UniqueNftApi extends _nft.BaseNftApi {
             }
             params.updateItem(this.chain, parsedItem, address);
             params.updateCollection(this.chain, parsedCollection);
+            // params.updateReady(true);
           }
         }));
       }));
-      Object.entries(nftCollectionMap).forEach(_ref => {
-        let [collectionId, nftIds] = _ref;
-        params.cleanUpNfts(this.chain, address, collectionId, nftIds);
-      });
     } catch (e) {
       console.error('Failed to fetch unique nft', e);
     }

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

@@ -9,44 +9,12 @@ 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/koni/api/tokens/wasm/utils");
-var _utils3 = require("@subwallet/extension-base/services/chain-service/utils");
-var _axios = _interopRequireDefault(require("axios"));
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 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) {
@@ -59,40 +27,31 @@ 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.split('ipfs://ipfs/')[1]}`;
+      return `ipfs://${tokenUri}`;
     }
     return tokenUri;
   }
-  async parseFeaturedNftImage(tokenUri) {
+  parseFeaturedNftImage(tokenUri) {
     const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
     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 collectionImageUrl = await (0, _axios.default)(nftItemImageSrc, {
-      method: 'GET'
-    });
-    return collectionImageUrl.data;
+    return `${_utils.ART_ZERO_IMAGE_API}?input=${parsedTokenUri}&size=500`;
   }
   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)(_utils.ART_ZERO_COLLECTION_API, {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded'
+        Accept: 'application/json',
+        'Content-Type': 'application/json'
       },
-      body: urlencoded
+      body: JSON.stringify({
+        collection_address: smartContract
+      })
     });
     const result = resp && resp.ok && (await resp.json());
     if (!result) {
@@ -106,91 +65,82 @@ 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 collectionImageUrl = await (0, _axios.default)(collectionImageSrc, {
-      method: 'GET'
+    return `${_utils.ART_ZERO_IMAGE_API}?input=${parsedCollectionImage}`;
+  }
+  async getCollectionAttributes(contractPromise) {
+    const _onChainAttributeCount = await contractPromise.query['psp34Traits::getAttributeCount'](this.addresses[0], {
+      gasLimit: -1
     });
-    return collectionImageUrl.data;
+    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;
   }
-
-  // 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: '',
@@ -199,23 +149,19 @@ 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: -1
     }, tokenId);
     if (_tokenUri.output) {
       let itemDetail = false;
-      // 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;
+      const tokenUri = _tokenUri.output.toString();
       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)(`${_utils.ART_ZERO_IPFS_API}?input=${parsedTokenUri}`);
           itemDetail = resp && resp.ok && (await resp.json());
         }
       } else {
-        const parsedTokenUri = this.parseFeaturedTokenUri(tokenUri);
-        const detailUrl = this.parseUrl(parsedTokenUri);
+        const detailUrl = this.parseUrl(tokenUri);
         if (detailUrl) {
           const resp = await (0, _crossFetch.default)(detailUrl);
           itemDetail = resp && resp.ok && (await resp.json());
@@ -230,7 +176,7 @@ class WasmNftApi extends _nft.BaseNftApi {
       nftItem.externalUrl = itemDetail.external_url;
       const rawImageSrc = itemDetail.image ? itemDetail.image : itemDetail.image_url;
       if (isFeatured) {
-        nftItem.image = await this.parseFeaturedNftImage(rawImageSrc);
+        nftItem.image = this.parseFeaturedNftImage(rawImageSrc);
         nftItem.externalUrl = _utils.ART_ZERO_EXTERNAL_URL;
       } else {
         nftItem.image = this.parseUrl(rawImageSrc);
@@ -248,24 +194,20 @@ class WasmNftApi extends _nft.BaseNftApi {
     }
     return nftItem;
   }
-  async getItemsByCollection(contractPromise, tokenInfo, collectionName, nftParams, isFeatured) {
+  async getItemsByCollection(contractPromise, collectionAttributes, isMetadataOnchain, tokenInfo, collectionName, nftParams) {
     let ownItem = false;
     let collectionImage;
-    const smartContract = (0, _utils3._getContractAddressOfToken)(tokenInfo);
-    const nftOwnerMap = {};
+    const smartContract = (0, _utils2._getContractAddressOfToken)(tokenInfo);
+    const isFeatured = _utils.ART_ZERO_CONTRACTS.includes(smartContract);
     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: (0, _utils2.getDefaultWeightV2)((_this$substrateApi2 = this.substrateApi) === null || _this$substrateApi2 === void 0 ? void 0 : _this$substrateApi2.api)
+        gasLimit: -1
       }, 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();
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      const balance = _balance.output ? balanceJson.ok || balanceJson.Ok : '0';
+      const balance = _balance.output ? _balance.output.toString() : '0';
       if (parseInt(balance) === 0) {
         return;
       }
@@ -275,17 +217,20 @@ 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: (0, _utils2.getDefaultWeightV2)((_this$substrateApi3 = this.substrateApi) === null || _this$substrateApi3 === void 0 ? void 0 : _this$substrateApi3.api)
+            gasLimit: -1
           }, address, i);
           if (_tokenByIndexResp.output) {
             const rawTokenId = _tokenByIndexResp.output.toHuman();
-            // 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(',', '');
+            const tokenIdObj = rawTokenId.Ok;
+            const tokenId = Object.values(tokenIdObj)[0];
             nftIds.push(tokenId);
-            const nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
+            let nftItem;
+            if (isMetadataOnchain) {
+              nftItem = await this.processOnChainMetadata(contractPromise, address, tokenIdObj, collectionAttributes, isFeatured);
+            } else {
+              nftItem = await this.processOffChainMetadata(contractPromise, address, tokenId, isFeatured);
+            }
             nftItem.collectionId = smartContract;
             nftItem.chain = this.chain;
             nftItem.type = _types._AssetType.PSP34;
@@ -300,8 +245,6 @@ class WasmNftApi extends _nft.BaseNftApi {
             }
           }
         }));
-
-        nftOwnerMap[address] = nftIds;
       } catch (e) {
         console.error(`error parsing item for ${this.chain} nft`, e);
       }
@@ -321,10 +264,6 @@ 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) {
@@ -336,17 +275,20 @@ class WasmNftApi extends _nft.BaseNftApi {
     return 1;
   }
   async handleNfts(params) {
-    var _this$substrateApi4;
+    var _this$substrateApi;
     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$substrateApi = this.substrateApi) === null || _this$substrateApi === void 0 ? void 0 : _this$substrateApi.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 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);
     }));
   }
 }

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

@@ -3,21 +3,17 @@
 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.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;
 // 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 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';
+const ART_ZERO_CONTRACTS = ['5Hg1xe6JAGZj92wxtj1ykAfQpwwRNqzAnvhZ3TuXZEmLU1Vw'];
+exports.ART_ZERO_CONTRACTS = ART_ZERO_CONTRACTS;
+const ART_ZERO_IMAGE_API = 'https://api.artzero.io/getImage';
 exports.ART_ZERO_IMAGE_API = ART_ZERO_IMAGE_API;
-const ART_ZERO_IPFS_API = 'https://a0-api.artzero.io/getJSON';
+const ART_ZERO_IPFS_API = 'https://api.artzero.io/getJSON';
 exports.ART_ZERO_IPFS_API = ART_ZERO_IPFS_API;
-const ART_ZERO_COLLECTION_API = 'https://a0-api.artzero.io/getCollectionByAddress';
+const ART_ZERO_COLLECTION_API = 'https://api.artzero.io/getCollectionByAddress';
 exports.ART_ZERO_COLLECTION_API = ART_ZERO_COLLECTION_API;
-const ART_ZERO_EXTERNAL_URL = 'https://a0.artzero.io/#/marketplace';
+const ART_ZERO_EXTERNAL_URL = 'https://artzero.io/demotestnet/#/marketplace';
 exports.ART_ZERO_EXTERNAL_URL = ART_ZERO_EXTERNAL_URL;

package/cjs/koni/api/staking/bonding/amplitude.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getAmplitudeBondingExtrinsic = getAmplitudeBondingExtrinsic;
+exports.getAmplitudeCancelWithdrawalExtrinsic = getAmplitudeCancelWithdrawalExtrinsic;
 exports.getAmplitudeClaimRewardExtrinsic = getAmplitudeClaimRewardExtrinsic;
 exports.getAmplitudeCollatorsInfo = getAmplitudeCollatorsInfo;
 exports.getAmplitudeNominatorMetadata = getAmplitudeNominatorMetadata;
@@ -51,31 +52,24 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   const nominationList = [];
   const unstakingList = [];
   const [_delegatorState, _unstakingInfo] = await Promise.all([chainApi.api.query.parachainStaking.delegatorState(address), chainApi.api.query.parachainStaking.unstaking(address)]);
-  const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
   const delegatorState = _delegatorState.toPrimitive();
   const unstakingInfo = _unstakingInfo.toPrimitive();
-  console.log('unstakingInfo ampe', unstakingInfo, !!unstakingInfo);
   if (!delegatorState && !unstakingInfo) {
     return;
   }
   let activeStake = '0';
   if (delegatorState) {
     // delegatorState can be null while unstaking all
-    const identityInfo = chainApi.api.query.identity ? (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive() : undefined;
-    const identity = identityInfo ? (0, _utils.parseIdentity)(identityInfo) : undefined;
+    const identityInfo = (await chainApi.api.query.identity.identityOf(delegatorState.owner)).toPrimitive();
+    const identity = (0, _utils.parseIdentity)(identityInfo);
     activeStake = delegatorState.amount.toString();
-    const bnActiveStake = new _util.BN(activeStake);
-    let delegationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
-    if (bnActiveStake.gt(_util.BN_ZERO) && bnActiveStake.gte(new _util.BN(minDelegatorStake))) {
-      delegationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
-    }
     nominationList.push({
-      status: delegationStatus,
+      status: _KoniTypes.StakingStatus.NOT_EARNING,
       chain,
       validatorAddress: delegatorState.owner,
       activeStake: delegatorState.amount.toString(),
       validatorMinStake: '0',
-      hasUnstaking: !!unstakingInfo && Object.values(unstakingInfo).length > 0,
+      hasUnstaking: !!unstakingInfo,
       validatorIdentity: identity
     });
   }
@@ -103,11 +97,9 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return;
   }
-  const stakingStatus = (0, _utils.getStakingStatusByNominations)(new _util.BN(activeStake), nominationList);
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
-    status: stakingStatus,
     address: address,
     activeStake: activeStake,
     nominations: nominationList,
@@ -188,4 +180,8 @@ async function getAmplitudeWithdrawalExtrinsic(substrateApi, address) {
 async function getAmplitudeClaimRewardExtrinsic(substrateApi) {
   const chainApi = await substrateApi.isReady;
   return chainApi.api.tx.utility.batch([chainApi.api.tx.parachainStaking.incrementDelegatorRewards(), chainApi.api.tx.parachainStaking.claimRewards()]);
+}
+async function getAmplitudeCancelWithdrawalExtrinsic(substrateApi) {
+  const chainApi = await substrateApi.isReady;
+  return chainApi.api.tx.parachainStaking.cancelLeaveCandidates();
 }