@xyo-network/crypto-nft-collection-witness-plugin 2.78.3 → 2.78.4

package/dist/node/lib/tokenTypes.d.mts

@@ -1,8 +1,6 @@
-import { Interface } from '@ethersproject/abi';
-import { Contract } from '@ethersproject/contracts';
+import { Provider } from '@ethersproject/providers';
 import { TokenType } from '@xyo-network/crypto-nft-payload-plugin';
-export declare const isErc1155: (contract: Contract) => Promise<boolean>;
-export declare const isErc721: (contract: Contract) => Promise<boolean>;
-export declare const hasFunctions: (contract: Contract, contractInterface: Interface, functionNames: string[]) => Promise<boolean>;
-export declare const tokenTypes: (contract: Contract) => Promise<TokenType[]>;
+export declare const isErc1155: (provider: Provider, address: string) => Promise<boolean>;
+export declare const isErc721: (provider: Provider, address: string) => Promise<boolean>;
+export declare const tokenTypes: (provider: Provider, address: string) => Promise<TokenType[]>;
 //# sourceMappingURL=tokenTypes.d.ts.map

package/dist/node/lib/tokenTypes.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenTypes.d.ts","sourceRoot":"","sources":["../../../src/lib/tokenTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAGlE,eAAO,MAAM,SAAS,aAAoB,QAAQ,qBAEjD,CAAA;AAED,eAAO,MAAM,QAAQ,aAAoB,QAAQ,qBAEhD,CAAA;AAED,eAAO,MAAM,YAAY,aAAoB,QAAQ,qBAAqB,SAAS,iBAAiB,MAAM,EAAE,qBAU3G,CAAA;AAED,eAAO,MAAM,UAAU,aAAoB,QAAQ,yBAUlD,CAAA"}
+{"version":3,"file":"tokenTypes.d.ts","sourceRoot":"","sources":["../../../src/lib/tokenTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAKlE,eAAO,MAAM,SAAS,aAAoB,QAAQ,WAAW,MAAM,qBAElE,CAAA;AAED,eAAO,MAAM,QAAQ,aAAoB,QAAQ,WAAW,MAAM,qBAEjE,CAAA;AAED,eAAO,MAAM,UAAU,aAAoB,QAAQ,WAAW,MAAM,yBAUnE,CAAA"}

package/dist/node/lib/tokenTypes.d.ts

@@ -1,8 +1,6 @@
-import { Interface } from '@ethersproject/abi';
-import { Contract } from '@ethersproject/contracts';
+import { Provider } from '@ethersproject/providers';
 import { TokenType } from '@xyo-network/crypto-nft-payload-plugin';
-export declare const isErc1155: (contract: Contract) => Promise<boolean>;
-export declare const isErc721: (contract: Contract) => Promise<boolean>;
-export declare const hasFunctions: (contract: Contract, contractInterface: Interface, functionNames: string[]) => Promise<boolean>;
-export declare const tokenTypes: (contract: Contract) => Promise<TokenType[]>;
+export declare const isErc1155: (provider: Provider, address: string) => Promise<boolean>;
+export declare const isErc721: (provider: Provider, address: string) => Promise<boolean>;
+export declare const tokenTypes: (provider: Provider, address: string) => Promise<TokenType[]>;
 //# sourceMappingURL=tokenTypes.d.ts.map

package/dist/node/lib/tokenTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenTypes.d.ts","sourceRoot":"","sources":["../../../src/lib/tokenTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAGlE,eAAO,MAAM,SAAS,aAAoB,QAAQ,qBAEjD,CAAA;AAED,eAAO,MAAM,QAAQ,aAAoB,QAAQ,qBAEhD,CAAA;AAED,eAAO,MAAM,YAAY,aAAoB,QAAQ,qBAAqB,SAAS,iBAAiB,MAAM,EAAE,qBAU3G,CAAA;AAED,eAAO,MAAM,UAAU,aAAoB,QAAQ,yBAUlD,CAAA"}
+{"version":3,"file":"tokenTypes.d.ts","sourceRoot":"","sources":["../../../src/lib/tokenTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAKlE,eAAO,MAAM,SAAS,aAAoB,QAAQ,WAAW,MAAM,qBAElE,CAAA;AAED,eAAO,MAAM,QAAQ,aAAoB,QAAQ,WAAW,MAAM,qBAEjE,CAAA;AAED,eAAO,MAAM,UAAU,aAAoB,QAAQ,WAAW,MAAM,yBAUnE,CAAA"}

package/dist/node/lib/tryCall.d.cts

@@ -0,0 +1,2 @@
+export declare const tryCall: <T>(func: () => Promise<T>, name?: string) => Promise<T | undefined>;
+//# sourceMappingURL=tryCall.d.ts.map

package/dist/node/lib/tryCall.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tryCall.d.ts","sourceRoot":"","sources":["../../../src/lib/tryCall.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,qCAA4C,MAAM,2BAUrE,CAAA"}

package/dist/node/lib/tryCall.d.mts

@@ -0,0 +1,2 @@
+export declare const tryCall: <T>(func: () => Promise<T>, name?: string) => Promise<T | undefined>;
+//# sourceMappingURL=tryCall.d.ts.map

package/dist/node/lib/tryCall.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tryCall.d.ts","sourceRoot":"","sources":["../../../src/lib/tryCall.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,qCAA4C,MAAM,2BAUrE,CAAA"}

package/dist/node/lib/tryCall.d.ts

@@ -0,0 +1,2 @@
+export declare const tryCall: <T>(func: () => Promise<T>, name?: string) => Promise<T | undefined>;
+//# sourceMappingURL=tryCall.d.ts.map

package/dist/node/lib/tryCall.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tryCall.d.ts","sourceRoot":"","sources":["../../../src/lib/tryCall.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,qCAA4C,MAAM,2BAUrE,CAAA"}

package/package.json

@@ -15,23 +15,23 @@
     "@ethersproject/providers": "^5.7.2",
     "@xylabs/assert": "^2.13.3",
     "@xylabs/eth-address": "^2.13.3",
-    "@xyo-network/abstract-witness": "~2.78.3",
-    "@xyo-network/axios": "~2.78.3",
-    "@xyo-network/core": "~2.78.3",
-    "@xyo-network/crypto-nft-collection-payload-plugin": "~2.78.3",
-    "@xyo-network/crypto-nft-payload-plugin": "~2.78.3",
-    "@xyo-network/module-model": "~2.78.3",
+    "@xyo-network/abstract-witness": "~2.78.4",
+    "@xyo-network/axios": "~2.78.4",
+    "@xyo-network/core": "~2.78.4",
+    "@xyo-network/crypto-nft-collection-payload-plugin": "~2.78.4",
+    "@xyo-network/crypto-nft-payload-plugin": "~2.78.4",
+    "@xyo-network/module-model": "~2.78.4",
     "@xyo-network/open-zeppelin-typechain": "^2.2.11",
-    "@xyo-network/payload-model": "~2.78.3",
-    "@xyo-network/payloadset-plugin": "~2.78.3",
-    "@xyo-network/witness-model": "~2.78.3"
+    "@xyo-network/payload-model": "~2.78.4",
+    "@xyo-network/payloadset-plugin": "~2.78.4",
+    "@xyo-network/witness-model": "~2.78.4"
   },
   "devDependencies": {
     "@xylabs/jest-helpers": "^2.13.3",
-    "@xylabs/ts-scripts-yarn3": "^3.1.13",
-    "@xylabs/tsconfig": "^3.1.13",
-    "@xyo-network/account": "~2.78.3",
-    "@xyo-network/account-model": "~2.78.3",
+    "@xylabs/ts-scripts-yarn3": "^3.1.21",
+    "@xylabs/tsconfig": "^3.1.21",
+    "@xyo-network/account": "~2.78.4",
+    "@xyo-network/account-model": "~2.78.4",
     "ethers": "^5.7.2",
     "jest": "^29.7.0",
     "typescript": "^5.2.2"
@@ -76,5 +76,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.78.3"
+  "version": "2.78.4"
 }

package/src/Witness.ts

@@ -75,7 +75,7 @@ export class CryptoNftCollectionWitness<TParams extends CryptoNftCollectionWitne
           await erc721Enumerable.name(),
           await erc721Enumerable.symbol(),
           (await erc721Enumerable.totalSupply()).toNumber(),
-          await tokenTypes(erc721Enumerable),
+          await tokenTypes(provider, address),
           await this.writeArchivist(),
         ])
         const types = resolvedValue(typesSettled, true)

package/src/lib/contractHasFunctions.ts

@@ -0,0 +1,20 @@
+import { Interface } from '@ethersproject/abi'
+import { Provider } from '@ethersproject/providers'
+
+export const contractHasFunctions = async (provider: Provider, address: string, contractInterface: Interface, functionNames: string[]) => {
+  try {
+    const bytecode = await provider.getCode(address, 'latest')
+    for (let i = 0; i < functionNames.length; i++) {
+      const nameSig = contractInterface.getSighash(functionNames[i]).substring(2)
+      if (!bytecode.includes(nameSig)) {
+        return false
+      }
+      return true
+    }
+    return false
+  } catch (ex) {
+    const error = ex as Error
+    console.log(error)
+    return false
+  }
+}

package/src/lib/getNftCollectionNfts.ts

@@ -3,8 +3,8 @@ 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 { nonEvaluableContractAddresses } from './nonEvaluableContractAddresses'
 import { tokenTypes } from './tokenTypes'
+import { tryCall } from './tryCall'
 
 const ipfsGateway = '5d7b6582.beta.decentralnetworkservices.com'
 
@@ -48,42 +48,51 @@ export const getNftCollectionNfts = async (
    */
   maxNfts = 100,
 ): Promise<NftInfo[]> => {
-  if (nonEvaluableContractAddresses.includes(contractAddress.toUpperCase())) {
-    throw new Error(`Unable to evaluate collection with contractAddress: ${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(enumerable))
-  const result: NftInfo[] = []
+  try {
+    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[] = []
 
-  for (let i = 0; i < maxNfts; i++) {
-    console.log(`Getting Token [${i}]`)
-    const tokenId = (await enumerable.tokenByIndex(i)).toHexString()
-    const supply = finalTypes.includes(toTokenType('ERC1155')) ? (await supply1155.totalSupply(tokenId)).toHexString() : '0x01'
-    const metadataUri = await storage.tokenURI(tokenId)
-    const checkedMetaDataUri = checkIpfsUrl(metadataUri, ipfsGateway)
-    let metadata: NftMetadata | undefined = undefined
-    try {
-      metadata = (await axios.get(checkedMetaDataUri)).data
-    } catch (ex) {
-      const error = ex as Error
-      console.error(error.message)
-    }
+    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 info: NftInfo = {
-      address: contractAddress,
-      chainId: provider.network.chainId,
-      metadata,
-      metadataUri,
-      schema: NftSchema,
-      supply,
-      tokenId,
-      type: finalTypes.at(0),
-      types,
+        const info: NftInfo = {
+          address: contractAddress,
+          chainId: provider.network.chainId,
+          metadata,
+          metadataUri,
+          schema: NftSchema,
+          supply,
+          tokenId,
+          type: finalTypes.at(0),
+          types: finalTypes,
+        }
+        result.push(info)
+      }
     }
-    result.push(info)
+    return result
+  } catch (ex) {
+    const error = ex as Error
+    console.error(`getNftCollectionNfts failed: [${error.name}] ${error.message}`)
+    console.log(error.stack)
+    return []
   }
-  return result
 }

package/src/lib/getProviderFromEnv.ts

@@ -1,17 +1,29 @@
-import { InfuraProvider, WebSocketProvider } from '@ethersproject/providers'
+import { InfuraProvider, JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers'
 
-export const getProviderFromEnv = (chainId: string | number = 'homestead') => {
+export const getProviderFromEnvInternal = (chainId: number = 0x01) => {
+  console.log(`getProviderFromEnvInternal: ${chainId}`)
   const infuraWssUri = process.env.INFURA_WSS_URI
-  const infuraProvider = new InfuraProvider('homestead', {
+  const infuraProvider = new InfuraProvider(chainId, {
     projectId: process.env.INFURA_PROJECT_ID,
     projectSecret: process.env.INFURA_PROJECT_SECRET,
   })
 
-  const infuraWebsocketProvider = infuraWssUri ? new WebSocketProvider(infuraWssUri, chainId) : undefined
+  const infuraGenericWebsocketProvider = infuraWssUri ? new WebSocketProvider(infuraWssUri, chainId) : undefined
 
-  const quickNodeUri = process.env.QUICKNODE_WSS_URI
-  const quickNodeProvider = quickNodeUri ? new WebSocketProvider(quickNodeUri, chainId) : undefined
+  const quickNodeWSSUri = process.env.QUICKNODE_WSS_URI
+  const quickNodeWebSocketProvider = quickNodeWSSUri ? new WebSocketProvider(quickNodeWSSUri, chainId) : undefined
 
-  const provider = infuraWebsocketProvider ?? infuraProvider ?? infuraWebsocketProvider ?? quickNodeProvider ?? infuraProvider
+  const quickNodeHttpsUri = process.env.QUICKNODE_WSS_URI
+  const quickRpcProvider = quickNodeHttpsUri ? new JsonRpcProvider(quickNodeHttpsUri, chainId) : undefined
+
+  const provider = infuraProvider ?? quickNodeWebSocketProvider ?? infuraProvider ?? infuraGenericWebsocketProvider ?? quickRpcProvider
   return provider
 }
+
+const providers: Record<number, JsonRpcProvider | WebSocketProvider> = {}
+
+export const getProviderFromEnv = (chainId: number = 0x01) => {
+  console.log(`getProviderFromEnv: ${chainId}`)
+  providers[chainId] = providers[chainId] ?? getProviderFromEnvInternal(chainId)
+  return providers[chainId]
+}

package/src/lib/index.ts

@@ -1,4 +1,5 @@
 export * from './collectionMetrics'
+export * from './contractHasFunctions'
 export * from './getNftCollectionNfts'
 export * from './getProviderFromEnv'
 export * from './tokenTypes'

package/src/lib/tokenTypes.ts

@@ -1,30 +1,19 @@
-import { Interface } from '@ethersproject/abi'
-import { Contract } from '@ethersproject/contracts'
+import { Provider } from '@ethersproject/providers'
 import { TokenType } from '@xyo-network/crypto-nft-payload-plugin'
 import { ERC1155URIStorage__factory, IERC721Metadata__factory } from '@xyo-network/open-zeppelin-typechain'
 
-export const isErc1155 = async (contract: Contract) => {
-  return await hasFunctions(contract, ERC1155URIStorage__factory.createInterface(), ['uri'])
-}
+import { contractHasFunctions } from './contractHasFunctions'
 
-export const isErc721 = async (contract: Contract) => {
-  return await hasFunctions(contract, IERC721Metadata__factory.createInterface(), ['name', 'symbol', 'tokenURI'])
+export const isErc1155 = async (provider: Provider, address: string) => {
+  return await contractHasFunctions(provider, address, ERC1155URIStorage__factory.createInterface(), ['uri'])
 }
 
-export const hasFunctions = async (contract: Contract, contractInterface: Interface, functionNames: string[]) => {
-  const bytecode = await contract.provider.getCode(contract.address)
-  for (let i = 0; i < functionNames.length; i++) {
-    const nameSig = contractInterface.getSighash(functionNames[i]).substring(2)
-    if (!bytecode.includes(nameSig)) {
-      return false
-    }
-    return true
-  }
-  return false
+export const isErc721 = async (provider: Provider, address: string) => {
+  return await contractHasFunctions(provider, address, IERC721Metadata__factory.createInterface(), ['name', 'symbol', 'tokenURI'])
 }
 
-export const tokenTypes = async (contract: Contract) => {
-  const [erc721, erc1155] = await Promise.all([isErc721(contract), isErc1155(contract)])
+export const tokenTypes = async (provider: Provider, address: string) => {
+  const [erc721, erc1155] = await Promise.all([isErc721(provider, address), isErc1155(provider, address)])
   const result: TokenType[] = []
   if (erc721) {
     result.push('ERC721')

package/src/lib/tryCall.ts

@@ -0,0 +1,11 @@
+export const tryCall = async <T>(func: () => Promise<T>, name?: string): Promise<T | undefined> => {
+  try {
+    return await func()
+  } catch (ex) {
+    if (name) {
+      const error = ex as Error
+      console.log(`tryCall failed [${name}]: ${error.message}`)
+    }
+    return undefined
+  }
+}