@xyo-network/crypto-nft-collection-witness-plugin 2.79.2 → 2.79.4

package/src/lib/getNftCollectionNfts.ts

@@ -1,34 +1,17 @@
 import { BaseProvider } from '@ethersproject/providers'
+import { exists } from '@xylabs/exists'
 import { AxiosJson } from '@xyo-network/axios'
 import { NftInfo, NftMetadata, NftSchema, TokenType, toTokenType } from '@xyo-network/crypto-nft-payload-plugin'
 import { ERC721Enumerable__factory, ERC721URIStorage__factory, ERC1155Supply__factory } from '@xyo-network/open-zeppelin-typechain'
+import { checkIpfsUrl, getErc1967Status } from '@xyo-network/witness-blockchain-abstract'
 
 import { tokenTypes } from './tokenTypes'
 import { tryCall } from './tryCall'
 
 const ipfsGateway = '5d7b6582.beta.decentralnetworkservices.com'
 
-/**
- * Returns the equivalent IPFS gateway URL for the supplied URL.
- * @param urlToCheck The URL to check
- * @returns If the supplied URL is an IPFS URL, it converts the URL to the
- * equivalent IPFS gateway URL. Otherwise, returns the original URL.
- */
-export const checkIpfsUrl = (urlToCheck: string, ipfsGateway: string) => {
-  const url = new URL(urlToCheck)
-  let protocol = url.protocol
-  let host = url.host
-  let path = url.pathname
-  const query = url.search
-  if (protocol === 'ipfs:') {
-    protocol = 'https:'
-    host = ipfsGateway
-    path = url.host === 'ipfs' ? `ipfs${path}` : `ipfs/${url.host}${path}`
-    const root = `${protocol}//${host}/${path}`
-    return query?.length > 0 ? `${root}?${query}` : root
-  } else {
-    return urlToCheck
-  }
+function range(size: number, startAt: number = 0): ReadonlyArray<number> {
+  return [...Array(size).keys()].map((i) => i + startAt)
 }
 
 export const getNftCollectionNfts = async (
@@ -49,45 +32,56 @@ export const getNftCollectionNfts = async (
   maxNfts = 100,
 ): Promise<NftInfo[]> => {
   try {
+    //Check if ERC-1967 Upgradeable
+    const { implementation } = await getErc1967Status(provider, contractAddress)
+
     const axios = new AxiosJson({ timeout: 2000 })
-    const enumerable = ERC721Enumerable__factory.connect(contractAddress, provider)
-    const storage = ERC721URIStorage__factory.connect(contractAddress, provider)
-    const supply1155 = ERC1155Supply__factory.connect(contractAddress, provider)
-    const finalTypes = types ?? (await tokenTypes(provider, contractAddress))
-    const result: NftInfo[] = []
+    const enumerable = ERC721Enumerable__factory.connect(implementation, provider)
+    const storage = ERC721URIStorage__factory.connect(implementation, provider)
+    const supply1155 = ERC1155Supply__factory.connect(implementation, provider)
+    const finalTypes = types ?? (await tokenTypes(provider, implementation))
 
-    for (let i = 0; i < maxNfts; i++) {
-      const tokenId = await tryCall(async () => (await enumerable.tokenByIndex(i)).toHexString())
-      if (tokenId !== undefined) {
-        const supply = finalTypes.includes(toTokenType('ERC1155'))
-          ? (await tryCall(async () => (await supply1155.totalSupply(tokenId)).toHexString())) ?? '0x01'
-          : '0x01'
-        const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId))
-        const checkedMetaDataUri = metadataUri ? checkIpfsUrl(metadataUri, ipfsGateway) : undefined
-        let metadata: NftMetadata | undefined = undefined
-        if (checkedMetaDataUri !== undefined) {
-          try {
-            metadata = (await axios.get(checkedMetaDataUri)).data
-          } catch (ex) {
-            const error = ex as Error
-            console.error(`Get Metadata failed: ${error.message}`)
-          }
-        }
+    const maxNftsArray = range(maxNfts)
 
-        const info: NftInfo = {
-          address: contractAddress,
-          chainId: provider.network.chainId,
-          metadata,
-          metadataUri,
-          schema: NftSchema,
-          supply,
-          tokenId,
-          type: finalTypes.at(0),
-          types: finalTypes,
-        }
-        result.push(info)
-      }
-    }
+    const result: NftInfo[] = (
+      await Promise.all(
+        maxNftsArray.map(async (_value, i) => {
+          const tokenId = (await tryCall(async () => (await enumerable.tokenByIndex(i)).toHexString())) ?? `${i}`
+          if (tokenId !== undefined) {
+            const supply = finalTypes.includes(toTokenType('ERC1155'))
+              ? (await tryCall(async () => (await supply1155.totalSupply(tokenId)).toHexString())) ?? '0x01'
+              : '0x01'
+            const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId))
+            const checkedMetaDataUri = metadataUri ? checkIpfsUrl(metadataUri, ipfsGateway) : undefined
+            let metadata: NftMetadata | undefined = undefined
+            if (checkedMetaDataUri !== undefined) {
+              try {
+                metadata = (await axios.get(checkedMetaDataUri)).data
+              } catch (ex) {
+                const error = ex as Error
+                console.error(`Get Metadata failed: ${error.message}`)
+              }
+            }
+
+            const info: NftInfo = {
+              address: contractAddress,
+              chainId: provider.network.chainId,
+              metadata,
+              metadataUri,
+              schema: NftSchema,
+              supply,
+              tokenId,
+              type: finalTypes.at(0),
+              types: finalTypes,
+            }
+            if (implementation !== contractAddress) {
+              info.implementation = implementation
+            }
+            return info
+          }
+        }),
+      )
+    ).filter(exists)
     return result
   } catch (ex) {
     const error = ex as Error