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

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

@@ -1,4 +1,5 @@
-import { NftInfo } from '@xyo-network/crypto-nft-payload-plugin';
+import { JsonRpcProvider } from '@ethersproject/providers';
+import { NftInfo, TokenType } from '@xyo-network/crypto-nft-payload-plugin';
 /**
  * Returns the equivalent IPFS gateway URL for the supplied URL.
  * @param urlToCheck The URL to check
@@ -6,5 +7,5 @@ import { NftInfo } from '@xyo-network/crypto-nft-payload-plugin';
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
 export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway: string) => string;
-export declare const getNftCollectionNfts: (contractAddress: string, chainId: number, maxNfts?: number) => Promise<NftInfo[]>;
+export declare const getNftCollectionNfts: (contractAddress: string, provider: JsonRpcProvider, types?: TokenType[], maxNfts?: number) => Promise<NftInfo[]>;
 //# sourceMappingURL=getNftCollectionNfts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAuC,MAAM,wCAAwC,CAAA;AASrG;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,eAAe,MAAM,WAenE,CAAA;AAED,eAAO,MAAM,oBAAoB,oBAId,MAAM,WAId,MAAM,uBAOd,QAAQ,OAAO,EAAE,CAsCnB,CAAA"}
+{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE1D,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAQhH;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,eAAe,MAAM,WAenE,CAAA;AAED,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,eAAe,UACjB,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CAgDnB,CAAA"}

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

@@ -1,4 +1,5 @@
-import { NftInfo } from '@xyo-network/crypto-nft-payload-plugin';
+import { JsonRpcProvider } from '@ethersproject/providers';
+import { NftInfo, TokenType } from '@xyo-network/crypto-nft-payload-plugin';
 /**
  * Returns the equivalent IPFS gateway URL for the supplied URL.
  * @param urlToCheck The URL to check
@@ -6,5 +7,5 @@ import { NftInfo } from '@xyo-network/crypto-nft-payload-plugin';
  * equivalent IPFS gateway URL. Otherwise, returns the original URL.
  */
 export declare const checkIpfsUrl: (urlToCheck: string, ipfsGateway: string) => string;
-export declare const getNftCollectionNfts: (contractAddress: string, chainId: number, maxNfts?: number) => Promise<NftInfo[]>;
+export declare const getNftCollectionNfts: (contractAddress: string, provider: JsonRpcProvider, types?: TokenType[], maxNfts?: number) => Promise<NftInfo[]>;
 //# sourceMappingURL=getNftCollectionNfts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAuC,MAAM,wCAAwC,CAAA;AASrG;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,eAAe,MAAM,WAenE,CAAA;AAED,eAAO,MAAM,oBAAoB,oBAId,MAAM,WAId,MAAM,uBAOd,QAAQ,OAAO,EAAE,CAsCnB,CAAA"}
+{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE1D,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAQhH;;;;;GAKG;AACH,eAAO,MAAM,YAAY,eAAgB,MAAM,eAAe,MAAM,WAenE,CAAA;AAED,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,eAAe,UACjB,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CAgDnB,CAAA"}

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

@@ -0,0 +1,4 @@
+import { InfuraProvider, JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
+export declare const getProviderFromEnvInternal: (chainId?: number) => InfuraProvider;
+export declare const getProviderFromEnv: (chainId?: number) => JsonRpcProvider | WebSocketProvider;
+//# sourceMappingURL=getProviderFromEnv.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getProviderFromEnv.d.ts","sourceRoot":"","sources":["../../../src/lib/getProviderFromEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE7F,eAAO,MAAM,0BAA0B,aAAa,MAAM,mBAkBzD,CAAA;AAID,eAAO,MAAM,kBAAkB,aAAa,MAAM,wCAIjD,CAAA"}

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

@@ -0,0 +1,4 @@
+import { InfuraProvider, JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
+export declare const getProviderFromEnvInternal: (chainId?: number) => InfuraProvider;
+export declare const getProviderFromEnv: (chainId?: number) => JsonRpcProvider | WebSocketProvider;
+//# sourceMappingURL=getProviderFromEnv.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getProviderFromEnv.d.ts","sourceRoot":"","sources":["../../../src/lib/getProviderFromEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE7F,eAAO,MAAM,0BAA0B,aAAa,MAAM,mBAkBzD,CAAA;AAID,eAAO,MAAM,kBAAkB,aAAa,MAAM,wCAIjD,CAAA"}

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

@@ -0,0 +1,4 @@
+import { InfuraProvider, JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
+export declare const getProviderFromEnvInternal: (chainId?: number) => InfuraProvider;
+export declare const getProviderFromEnv: (chainId?: number) => JsonRpcProvider | WebSocketProvider;
+//# sourceMappingURL=getProviderFromEnv.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getProviderFromEnv.d.ts","sourceRoot":"","sources":["../../../src/lib/getProviderFromEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE7F,eAAO,MAAM,0BAA0B,aAAa,MAAM,mBAkBzD,CAAA;AAID,eAAO,MAAM,kBAAkB,aAAa,MAAM,wCAIjD,CAAA"}

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

@@ -1,5 +1,6 @@
 export * from './collectionMetrics';
-export * from './getNftCollectionCount';
-export * from './getNftCollectionMetadata';
+export * from './contractHasFunctions';
 export * from './getNftCollectionNfts';
+export * from './getProviderFromEnv';
+export * from './tokenTypes';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA"}

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

@@ -1,5 +1,6 @@
 export * from './collectionMetrics';
-export * from './getNftCollectionCount';
-export * from './getNftCollectionMetadata';
+export * from './contractHasFunctions';
 export * from './getNftCollectionNfts';
+export * from './getProviderFromEnv';
+export * from './tokenTypes';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA"}

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

@@ -1,5 +1,6 @@
 export * from './collectionMetrics';
-export * from './getNftCollectionCount';
-export * from './getNftCollectionMetadata';
+export * from './contractHasFunctions';
 export * from './getNftCollectionNfts';
+export * from './getProviderFromEnv';
+export * from './tokenTypes';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,yBAAyB,CAAA;AACvC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA"}

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

@@ -0,0 +1,6 @@
+import { Provider } from '@ethersproject/providers';
+import { TokenType } from '@xyo-network/crypto-nft-payload-plugin';
+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.cts.map

@@ -0,0 +1 @@
+{"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.mts

@@ -0,0 +1,6 @@
+import { Provider } from '@ethersproject/providers';
+import { TokenType } from '@xyo-network/crypto-nft-payload-plugin';
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,6 @@
+import { Provider } from '@ethersproject/providers';
+import { TokenType } from '@xyo-network/crypto-nft-payload-plugin';
+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

@@ -0,0 +1 @@
+{"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

@@ -11,23 +11,27 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.7.0",
+    "@ethersproject/contracts": "^5.7.0",
+    "@ethersproject/providers": "^5.7.2",
     "@xylabs/assert": "^2.13.3",
     "@xylabs/eth-address": "^2.13.3",
-    "@xyo-network/abstract-witness": "~2.78.2",
-    "@xyo-network/core": "~2.78.2",
-    "@xyo-network/crypto-nft-collection-payload-plugin": "~2.78.2",
-    "@xyo-network/crypto-nft-payload-plugin": "~2.78.2",
-    "@xyo-network/module-model": "~2.78.2",
-    "@xyo-network/payload-model": "~2.78.2",
-    "@xyo-network/payloadset-plugin": "~2.78.2",
-    "@xyo-network/witness-model": "~2.78.2"
+    "@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.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.2",
-    "@xyo-network/account-model": "~2.78.2",
+    "@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"
@@ -72,5 +76,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.78.2"
+  "version": "2.78.4"
 }

package/src/Witness.ts

@@ -1,3 +1,4 @@
+import { InfuraProvider, Provider, WebSocketProvider } from '@ethersproject/providers'
 import { assertEx } from '@xylabs/assert'
 import { EthAddress } from '@xylabs/eth-address'
 import { AbstractWitness } from '@xyo-network/abstract-witness'
@@ -11,11 +12,17 @@ import {
   NftCollectionWitnessQuery,
 } from '@xyo-network/crypto-nft-collection-payload-plugin'
 import { AnyConfigSchema } from '@xyo-network/module-model'
+import { ERC721Enumerable__factory } from '@xyo-network/open-zeppelin-typechain'
 import { WitnessParams } from '@xyo-network/witness-model'
 
-import { getNftCollectionCount, getNftCollectionMetadata, getNftCollectionMetrics, getNftCollectionNfts } from './lib'
+import { getNftCollectionMetrics, getNftCollectionNfts, getProviderFromEnv, tokenTypes } from './lib'
 
-export type CryptoNftCollectionWitnessParams = WitnessParams<AnyConfigSchema<NftCollectionWitnessConfig>>
+export type CryptoNftCollectionWitnessParams = WitnessParams<
+  AnyConfigSchema<NftCollectionWitnessConfig>,
+  {
+    provider: Provider
+  }
+>
 
 const defaultMaxNfts = 100
 
@@ -26,6 +33,15 @@ const defaultMaxNfts = 100
  */
 const NoOp = Promise.resolve()
 
+function resolvedValue<T>(settled: PromiseSettledResult<T>, assert: true): T
+function resolvedValue<T>(settled: PromiseSettledResult<T>, assert?: false): T | undefined
+function resolvedValue<T>(settled: PromiseSettledResult<T>, assert?: boolean) {
+  if (assert && settled.status === 'rejected') {
+    throw settled.reason
+  }
+  return settled.status === 'fulfilled' ? settled.value : undefined
+}
+
 export class CryptoNftCollectionWitness<TParams extends CryptoNftCollectionWitnessParams = CryptoNftCollectionWitnessParams> extends AbstractWitness<
   TParams,
   NftCollectionWitnessQuery,
@@ -33,31 +49,57 @@ export class CryptoNftCollectionWitness<TParams extends CryptoNftCollectionWitne
 > {
   static override configSchemas = [NftCollectionWitnessConfigSchema]
 
+  protected providers: Record<number, WebSocketProvider | InfuraProvider> = {}
+
+  protected getProvider(chainId: number) {
+    this.providers[chainId] = this.providers[chainId] ?? getProviderFromEnv(chainId)
+    return this.providers[chainId]
+  }
+
   protected override async observeHandler(payloads?: NftCollectionWitnessQuery[]): Promise<NftCollectionInfo[]> {
     await this.started('throw')
     const queries = payloads?.filter(isNftCollectionWitnessQuery) ?? []
     const observations = await Promise.all(
       queries.map<Promise<NftCollectionInfo>>(async (query) => {
+        const chainId = assertEx(query?.chainId || this.config.chainId, 'params.chainId is required')
+        const provider = this.getProvider(chainId)
         const address = assertEx(
           EthAddress.parse(assertEx(query?.address || this.config.address, 'params.address is required')),
           'Failed to parse params.address',
         ).toString()
-        const chainId = assertEx(query?.chainId || this.config.chainId, 'params.chainId is required')
+
+        const erc721Enumerable = ERC721Enumerable__factory.connect(address, provider)
+
         const maxNfts = query?.maxNfts || defaultMaxNfts
-        const [info, total, nfts, archivist] = await Promise.all([
-          getNftCollectionMetadata(address, chainId),
-          getNftCollectionCount(address, chainId),
-          getNftCollectionNfts(address, chainId, maxNfts),
-          this.writeArchivist(),
+        const [name, symbol, total, typesSettled, archivistSettled] = await Promise.allSettled([
+          await erc721Enumerable.name(),
+          await erc721Enumerable.symbol(),
+          (await erc721Enumerable.totalSupply()).toNumber(),
+          await tokenTypes(provider, address),
+          await this.writeArchivist(),
         ])
+        const types = resolvedValue(typesSettled, true)
+        const nfts = await getNftCollectionNfts(address, provider, types, maxNfts)
         const metrics = getNftCollectionMetrics(nfts)
+        const archivist = resolvedValue(archivistSettled)
         const [sources] = await Promise.all([
           // Hash all the payloads
           Promise.all(nfts.map((nft) => PayloadHasher.hashAsync(nft))),
           // Insert them into the archivist if we have one
           archivist ? archivist.insert(nfts) : NoOp,
         ])
-        const payload: NftCollectionInfo = { ...info, metrics, schema: NftCollectionSchema, sources, total }
+        const payload: NftCollectionInfo = {
+          address,
+          chainId,
+          metrics,
+          name: resolvedValue(name, true),
+          schema: NftCollectionSchema,
+          sources,
+          symbol: resolvedValue(symbol, true),
+          total: resolvedValue(total, true),
+          type: types.at(0),
+          types,
+        }
         return payload
       }),
     )

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

@@ -1,10 +1,10 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
 import { AxiosJson } from '@xyo-network/axios'
-import { NftInfo, NftMetadata, NftSchema, toTokenType } from '@xyo-network/crypto-nft-payload-plugin'
+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 { getNftCollectionMetadata } from './getNftCollectionMetadata'
-import { getProviderFromEnv } from './getProvider'
-import { nonEvaluableContractAddresses } from './nonEvaluableContractAddresses'
+import { tokenTypes } from './tokenTypes'
+import { tryCall } from './tryCall'
 
 const ipfsGateway = '5d7b6582.beta.decentralnetworkservices.com'
 
@@ -39,7 +39,8 @@ export const getNftCollectionNfts = async (
   /**
    * The chain ID (1 = Ethereum Mainnet, 4 = Rinkeby, etc.) of the chain to search for NFTs on
    */
-  chainId: number,
+  provider: JsonRpcProvider,
+  types?: TokenType[],
   /**
    * The maximum number of NFTs to return. Configurable to prevent
    * large wallets from exhausting Infura API credits. Ideally a
@@ -47,41 +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 provider = getProviderFromEnv(chainId)
-  const enumerable = ERC721Enumerable__factory.connect(contractAddress, provider)
-  const storage = ERC721URIStorage__factory.connect(contractAddress, provider)
-  const supply1155 = ERC1155Supply__factory.connect(contractAddress, provider)
-  const result: NftInfo[] = []
-  const { type: nftType } = await getNftCollectionMetadata(contractAddress, chainId)
+  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++) {
-    const tokenId = (await enumerable.tokenByIndex(i)).toHexString()
-    const supply = nftType === toTokenType('ERC11155') ? (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,
-      metadata,
-      metadataUri,
-      schema: NftSchema,
-      supply,
-      tokenId,
-      type: nftType,
+        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

@@ -0,0 +1,29 @@
+import { InfuraProvider, JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers'
+
+export const getProviderFromEnvInternal = (chainId: number = 0x01) => {
+  console.log(`getProviderFromEnvInternal: ${chainId}`)
+  const infuraWssUri = process.env.INFURA_WSS_URI
+  const infuraProvider = new InfuraProvider(chainId, {
+    projectId: process.env.INFURA_PROJECT_ID,
+    projectSecret: process.env.INFURA_PROJECT_SECRET,
+  })
+
+  const infuraGenericWebsocketProvider = infuraWssUri ? new WebSocketProvider(infuraWssUri, chainId) : undefined
+
+  const quickNodeWSSUri = process.env.QUICKNODE_WSS_URI
+  const quickNodeWebSocketProvider = quickNodeWSSUri ? new WebSocketProvider(quickNodeWSSUri, chainId) : undefined
+
+  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 './getNftCollectionCount'
-export * from './getNftCollectionMetadata'
+export * from './contractHasFunctions'
 export * from './getNftCollectionNfts'
+export * from './getProviderFromEnv'
+export * from './tokenTypes'

package/src/lib/tokenTypes.ts

@@ -0,0 +1,25 @@
+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'
+
+import { contractHasFunctions } from './contractHasFunctions'
+
+export const isErc1155 = async (provider: Provider, address: string) => {
+  return await contractHasFunctions(provider, address, ERC1155URIStorage__factory.createInterface(), ['uri'])
+}
+
+export const isErc721 = async (provider: Provider, address: string) => {
+  return await contractHasFunctions(provider, address, IERC721Metadata__factory.createInterface(), ['name', 'symbol', 'tokenURI'])
+}
+
+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')
+  }
+  if (erc1155) {
+    result.push('ERC1155')
+  }
+  return result
+}

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
+  }
+}

package/dist/browser/lib/getNftCollectionCount.d.cts

@@ -1,2 +0,0 @@
-export declare const getNftCollectionCount: (contractAddress: string, chainId: number) => Promise<number>;
-//# sourceMappingURL=getNftCollectionCount.d.ts.map

package/dist/browser/lib/getNftCollectionCount.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNftCollectionCount.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionCount.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,qBAAqB,oBAIf,MAAM,WAId,MAAM,KACd,QAAQ,MAAM,CAOhB,CAAA"}

package/dist/browser/lib/getNftCollectionCount.d.mts

@@ -1,2 +0,0 @@
-export declare const getNftCollectionCount: (contractAddress: string, chainId: number) => Promise<number>;
-//# sourceMappingURL=getNftCollectionCount.d.ts.map

package/dist/browser/lib/getNftCollectionCount.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNftCollectionCount.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionCount.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,qBAAqB,oBAIf,MAAM,WAId,MAAM,KACd,QAAQ,MAAM,CAOhB,CAAA"}

package/dist/browser/lib/getNftCollectionCount.d.ts

@@ -1,2 +0,0 @@
-export declare const getNftCollectionCount: (contractAddress: string, chainId: number) => Promise<number>;
-//# sourceMappingURL=getNftCollectionCount.d.ts.map

package/dist/browser/lib/getNftCollectionCount.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNftCollectionCount.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionCount.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,qBAAqB,oBAIf,MAAM,WAId,MAAM,KACd,QAAQ,MAAM,CAOhB,CAAA"}

package/dist/browser/lib/getNftCollectionMetadata.d.cts

@@ -1,5 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { NftCollectionMetadata } from '@xyo-network/crypto-nft-collection-payload-plugin';
-export declare function getInterfaceID(contractInterface: Interface): string;
-export declare const getNftCollectionMetadata: (contractAddress: string, chainId: number) => Promise<Omit<NftCollectionMetadata, 'total'>>;
-//# sourceMappingURL=getNftCollectionMetadata.d.ts.map

package/dist/browser/lib/getNftCollectionMetadata.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNftCollectionMetadata.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AAOzF,wBAAgB,cAAc,CAAC,iBAAiB,EAAE,SAAS,UAQ1D;AAED,eAAO,MAAM,wBAAwB,oBAIlB,MAAM,WAId,MAAM,KACd,QAAQ,KAAK,qBAAqB,EAAE,OAAO,CAAC,CA8B9C,CAAA"}

package/dist/browser/lib/getNftCollectionMetadata.d.mts

@@ -1,5 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { NftCollectionMetadata } from '@xyo-network/crypto-nft-collection-payload-plugin';
-export declare function getInterfaceID(contractInterface: Interface): string;
-export declare const getNftCollectionMetadata: (contractAddress: string, chainId: number) => Promise<Omit<NftCollectionMetadata, 'total'>>;
-//# sourceMappingURL=getNftCollectionMetadata.d.ts.map

package/dist/browser/lib/getNftCollectionMetadata.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNftCollectionMetadata.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AAOzF,wBAAgB,cAAc,CAAC,iBAAiB,EAAE,SAAS,UAQ1D;AAED,eAAO,MAAM,wBAAwB,oBAIlB,MAAM,WAId,MAAM,KACd,QAAQ,KAAK,qBAAqB,EAAE,OAAO,CAAC,CA8B9C,CAAA"}

package/dist/browser/lib/getNftCollectionMetadata.d.ts

@@ -1,5 +0,0 @@
-import { Interface } from '@ethersproject/abi';
-import { NftCollectionMetadata } from '@xyo-network/crypto-nft-collection-payload-plugin';
-export declare function getInterfaceID(contractInterface: Interface): string;
-export declare const getNftCollectionMetadata: (contractAddress: string, chainId: number) => Promise<Omit<NftCollectionMetadata, 'total'>>;
-//# sourceMappingURL=getNftCollectionMetadata.d.ts.map

package/dist/browser/lib/getNftCollectionMetadata.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNftCollectionMetadata.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AAOzF,wBAAgB,cAAc,CAAC,iBAAiB,EAAE,SAAS,UAQ1D;AAED,eAAO,MAAM,wBAAwB,oBAIlB,MAAM,WAId,MAAM,KACd,QAAQ,KAAK,qBAAqB,EAAE,OAAO,CAAC,CA8B9C,CAAA"}

package/dist/browser/lib/getProvider.d.cts

@@ -1,3 +0,0 @@
-import { InfuraProvider, WebSocketProvider } from '@ethersproject/providers';
-export declare const getProviderFromEnv: (chainId?: string | number) => WebSocketProvider | InfuraProvider;
-//# sourceMappingURL=getProvider.d.ts.map

package/dist/browser/lib/getProvider.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getProvider.d.ts","sourceRoot":"","sources":["../../../src/lib/getProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE5E,eAAO,MAAM,kBAAkB,aAAa,MAAM,GAAG,MAAM,uCAc1D,CAAA"}

package/dist/browser/lib/getProvider.d.mts

@@ -1,3 +0,0 @@
-import { InfuraProvider, WebSocketProvider } from '@ethersproject/providers';
-export declare const getProviderFromEnv: (chainId?: string | number) => WebSocketProvider | InfuraProvider;
-//# sourceMappingURL=getProvider.d.ts.map