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

package/dist/node/index.mjs

@@ -6,7 +6,6 @@ import { createPayloadSetWitnessPlugin } from "@xyo-network/payloadset-plugin";
 // src/Witness.ts
 import { assertEx } from "@xylabs/assert";
 import { EthAddress } from "@xylabs/eth-address";
-import { AbstractWitness } from "@xyo-network/abstract-witness";
 import { PayloadHasher } from "@xyo-network/core";
 import {
   isNftCollectionWitnessQuery,
@@ -14,7 +13,7 @@ import {
   NftCollectionWitnessConfigSchema
 } from "@xyo-network/crypto-nft-collection-payload-plugin";
 import { ERC721Enumerable__factory as ERC721Enumerable__factory2 } from "@xyo-network/open-zeppelin-typechain";
-import { getProviderFromEnv } from "@xyo-network/witness-blockchain-abstract";
+import { AbstractBlockchainWitness } from "@xyo-network/witness-blockchain-abstract";
 
 // src/lib/collectionMetrics/lib/calculateAllPropertiesDistribution.ts
 var calculateAllPropertiesDistribution = (array) => {
@@ -96,11 +95,14 @@ var contractHasFunctions = async (provider, address, contractInterface, function
 };
 
 // src/lib/getNftCollectionNfts.ts
+import { AxiosJson } from "@xylabs/axios";
+import { BigNumber as XyBigNumber } from "@xylabs/bignumber";
 import { exists } from "@xylabs/exists";
-import { AxiosJson } from "@xyo-network/axios";
+import { getErc1822Status } from "@xyo-network/blockchain-erc1822-witness";
+import { getErc1967Status } from "@xyo-network/blockchain-erc1967-witness";
 import { NftSchema, 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 { checkIpfsUrl } from "@xyo-network/witness-blockchain-abstract";
 
 // src/lib/tokenTypes.ts
 import { ERC1155URIStorage__factory, IERC721Metadata__factory } from "@xyo-network/open-zeppelin-typechain";
@@ -137,12 +139,21 @@ var tryCall = async (func, name) => {
 
 // src/lib/getNftCollectionNfts.ts
 var ipfsGateway = "5d7b6582.beta.decentralnetworkservices.com";
+var hexBytesOnlyOnly = (value) => {
+  return value.startsWith("0x") ? value.substring(2) : value;
+};
+var isHexZero = (value) => {
+  return value === void 0 ? true : new XyBigNumber(hexBytesOnlyOnly(value), "hex").eqn(0);
+};
 function range(size, startAt = 0) {
   return [...Array(size).keys()].map((i) => i + startAt);
 }
 var getNftCollectionNfts = async (contractAddress, provider, types, maxNfts = 100) => {
   try {
-    const { implementation } = await getErc1967Status(provider, contractAddress);
+    const block = await provider.getBlockNumber();
+    const erc1967Status = await getErc1967Status(provider, contractAddress, block);
+    const erc1822Status = await getErc1822Status(provider, contractAddress, block);
+    const implementation = isHexZero(erc1967Status.slots.implementation) ? erc1822Status.implementation : erc1967Status.implementation;
     const axios = new AxiosJson({ timeout: 2e3 });
     const enumerable = ERC721Enumerable__factory.connect(implementation, provider);
     const storage = ERC721URIStorage__factory.connect(implementation, provider);
@@ -151,10 +162,10 @@ var getNftCollectionNfts = async (contractAddress, provider, types, maxNfts = 10
     const maxNftsArray = range(maxNfts);
     const result = (await Promise.all(
       maxNftsArray.map(async (_value, i) => {
-        const tokenId = await tryCall(async () => (await enumerable.tokenByIndex(i)).toHexString()) ?? `${i}`;
+        const tokenId = await tryCall(async () => (await enumerable.tokenByIndex(i, { blockTag: block })).toHexString()) ?? `${i}`;
         if (tokenId !== void 0) {
-          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 supply = finalTypes.includes(toTokenType("ERC1155")) ? await tryCall(async () => (await supply1155.totalSupply(tokenId, { blockTag: block })).toHexString()) ?? "0x01" : "0x01";
+          const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId, { blockTag: block }));
           const checkedMetaDataUri = metadataUri ? checkIpfsUrl(metadataUri, ipfsGateway) : void 0;
           let metadata = void 0;
           if (checkedMetaDataUri !== void 0) {
@@ -201,20 +212,16 @@ function resolvedValue(settled, assert) {
   }
   return settled.status === "fulfilled" ? settled.value : void 0;
 }
-var CryptoNftCollectionWitness = class extends AbstractWitness {
+var CryptoNftCollectionWitness = class extends AbstractBlockchainWitness {
   static configSchemas = [NftCollectionWitnessConfigSchema];
-  providers = {};
-  getProvider(chainId) {
-    this.providers[chainId] = this.providers[chainId] ?? getProviderFromEnv(chainId);
-    return this.providers[chainId];
-  }
   async observeHandler(payloads) {
     await this.started("throw");
+    await this.getProviders();
     const queries = (payloads == null ? void 0 : payloads.filter(isNftCollectionWitnessQuery)) ?? [];
     const observations = await Promise.all(
       queries.map(async (query) => {
         const chainId = assertEx((query == null ? void 0 : query.chainId) || this.config.chainId, "params.chainId is required");
-        const provider = this.getProvider(chainId);
+        const provider = await this.getProvider(true, true);
         const address = assertEx(
           EthAddress.parse(assertEx((query == null ? void 0 : query.address) || this.config.address, "params.address is required")),
           "Failed to parse params.address"

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/collectionMetrics/lib/calculateAllPropertiesDistribution.ts","../../src/lib/collectionMetrics/lib/probabilityDistributions/binomial/calculateBinomialParamsFromProbability.ts","../../src/lib/collectionMetrics/getNftCollectionMetrics.ts","../../src/lib/contractHasFunctions.ts","../../src/lib/getNftCollectionNfts.ts","../../src/lib/tokenTypes.ts","../../src/lib/tryCall.ts","../../src/index.ts"],"sourcesContent":["import { NftSchema } from '@xyo-network/crypto-nft-payload-plugin'\nimport { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\n\nimport { CryptoNftCollectionWitness } from './Witness'\n\nexport const CryptoNftCollectionWitnessPlugin = () =>\n  createPayloadSetWitnessPlugin<CryptoNftCollectionWitness>(\n    { required: { [NftSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await CryptoNftCollectionWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { InfuraProvider, Provider, WebSocketProvider } from '@ethersproject/providers'\nimport { assertEx } from '@xylabs/assert'\nimport { EthAddress } from '@xylabs/eth-address'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { PayloadHasher } from '@xyo-network/core'\nimport {\n  isNftCollectionWitnessQuery,\n  NftCollectionInfo,\n  NftCollectionSchema,\n  NftCollectionWitnessConfig,\n  NftCollectionWitnessConfigSchema,\n  NftCollectionWitnessQuery,\n} from '@xyo-network/crypto-nft-collection-payload-plugin'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { ERC721Enumerable__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { getProviderFromEnv } from '@xyo-network/witness-blockchain-abstract'\nimport { WitnessParams } from '@xyo-network/witness-model'\n\nimport { getNftCollectionMetrics, getNftCollectionNfts, tokenTypes } from './lib'\n\nexport type CryptoNftCollectionWitnessParams = WitnessParams<\n  AnyConfigSchema<NftCollectionWitnessConfig>,\n  {\n    provider: Provider\n  }\n>\n\nconst defaultMaxNfts = 100\n\n/**\n * A \"no operation\" Promise to be used\n * when no action is desired but a Promise\n * is required to be returned\n */\nconst NoOp = Promise.resolve()\n\nfunction resolvedValue<T>(settled: PromiseSettledResult<T>, assert: true): T\nfunction resolvedValue<T>(settled: PromiseSettledResult<T>, assert?: false): T | undefined\nfunction resolvedValue<T>(settled: PromiseSettledResult<T>, assert?: boolean) {\n  if (assert && settled.status === 'rejected') {\n    throw settled.reason\n  }\n  return settled.status === 'fulfilled' ? settled.value : undefined\n}\n\nexport class CryptoNftCollectionWitness<TParams extends CryptoNftCollectionWitnessParams = CryptoNftCollectionWitnessParams> extends AbstractWitness<\n  TParams,\n  NftCollectionWitnessQuery,\n  NftCollectionInfo\n> {\n  static override configSchemas = [NftCollectionWitnessConfigSchema]\n\n  protected providers: Record<number, WebSocketProvider | InfuraProvider> = {}\n\n  protected getProvider(chainId: number) {\n    this.providers[chainId] = this.providers[chainId] ?? getProviderFromEnv(chainId)\n    return this.providers[chainId]\n  }\n\n  protected override async observeHandler(payloads?: NftCollectionWitnessQuery[]): Promise<NftCollectionInfo[]> {\n    await this.started('throw')\n    const queries = payloads?.filter(isNftCollectionWitnessQuery) ?? []\n    const observations = await Promise.all(\n      queries.map<Promise<NftCollectionInfo>>(async (query) => {\n        const chainId = assertEx(query?.chainId || this.config.chainId, 'params.chainId is required')\n        const provider = this.getProvider(chainId)\n        const address = assertEx(\n          EthAddress.parse(assertEx(query?.address || this.config.address, 'params.address is required')),\n          'Failed to parse params.address',\n        ).toString()\n\n        const erc721Enumerable = ERC721Enumerable__factory.connect(address, provider)\n\n        const maxNfts = query?.maxNfts || defaultMaxNfts\n        const [name, symbol, total, typesSettled, archivistSettled] = await Promise.allSettled([\n          await erc721Enumerable.name(),\n          await erc721Enumerable.symbol(),\n          (await erc721Enumerable.totalSupply()).toNumber(),\n          await tokenTypes(provider, address),\n          await this.writeArchivist(),\n        ])\n        const types = resolvedValue(typesSettled, true)\n        const nfts = await getNftCollectionNfts(address, provider, types, maxNfts)\n        const metrics = getNftCollectionMetrics(nfts)\n        const archivist = resolvedValue(archivistSettled)\n        const [sources] = await Promise.all([\n          // Hash all the payloads\n          Promise.all(nfts.map((nft) => PayloadHasher.hashAsync(nft))),\n          // Insert them into the archivist if we have one\n          archivist ? archivist.insert(nfts) : NoOp,\n        ])\n        const payload: NftCollectionInfo = {\n          address,\n          chainId,\n          metrics,\n          name: resolvedValue(name, true),\n          schema: NftCollectionSchema,\n          sources,\n          symbol: resolvedValue(symbol, true),\n          total: resolvedValue(total, true),\n          type: types.at(0),\n          types,\n        }\n        return payload\n      }),\n    )\n    return observations.flat()\n  }\n}\n","import { Distribution } from './distribution'\n\nexport const calculateAllPropertiesDistribution = <T>(array: T[]): Distribution<T> => {\n  const distribution: Distribution<T> = {}\n\n  array.forEach((item) => {\n    for (const property in item) {\n      if (Object.prototype.hasOwnProperty.call(item, property)) {\n        const value = item[property as keyof T]\n        if (value !== undefined && value !== null) {\n          const valueString = value.toString()\n          if (!distribution[property]) {\n            distribution[property] = { [valueString]: 1 }\n          } else if (!distribution[property]![valueString]) {\n            ;(distribution[property] as Record<string, number>)[valueString] = 1\n          } else {\n            ;(distribution[property] as Record<string, number>)[valueString] += 1\n          }\n        }\n      }\n    }\n  })\n\n  return distribution\n}\n","import { BinomialDistributionParameters } from '@xyo-network/crypto-nft-collection-payload-plugin'\n\n/**\n * Calculates the parameters of a binomial distribution given the number of trials and success probability\n * @param n Number of trials\n * @param p Success probability\n * @returns The binomial distribution parameters\n */\nexport const calculateBinomialParamsFromProbability = (n: number, p: number): BinomialDistributionParameters => {\n  // Mean (µ)\n  const mean = n * p\n\n  // Variance (σ^2)\n  const variance = n * p * (1 - p)\n\n  // Standard Deviation (σ)\n  const stdDev = Math.sqrt(variance)\n\n  return { mean, p, stdDev, variance }\n}\n","import { NftCollectionMetrics, NftTraitMetrics } from '@xyo-network/crypto-nft-collection-payload-plugin'\nimport { NftInfoFields, OpenSeaNftAttribute } from '@xyo-network/crypto-nft-payload-plugin'\n\nimport { calculateAllPropertiesDistribution, calculateBinomialParamsFromProbability } from './lib'\n\ntype TraitDistributionEntry = [string, { [key: string]: number }]\n\nexport const getNftCollectionMetrics = (nfts: NftInfoFields[]): NftCollectionMetrics => {\n  const traits = nfts\n    .map((nft) => nft?.metadata?.attributes as OpenSeaNftAttribute[] | undefined)\n    .filter((v): v is OpenSeaNftAttribute[] => v !== undefined)\n    .map((attributes) => {\n      return Object.fromEntries(attributes.map((attribute) => [attribute.trait_type, attribute.value]))\n    })\n  const distribution = calculateAllPropertiesDistribution(traits)\n  const n = nfts.length\n  const attributes = Object.fromEntries(\n    Object.entries(distribution)\n      .filter((v): v is TraitDistributionEntry => v[1] !== undefined)\n      .map(([trait, entries]) => {\n        const traitCount = Object.values(entries).reduce((prev, curr) => prev + curr, 0)\n        const { p } = calculateBinomialParamsFromProbability(nfts.length, traitCount / n)\n        const values = Object.fromEntries(\n          Object.entries(entries).map(([value, traitValueCount]) => {\n            const { p } = calculateBinomialParamsFromProbability(n, traitValueCount / n)\n            const metrics: NftTraitMetrics = { binomial: { p }, count: traitValueCount }\n            return [value, metrics]\n          }),\n        )\n        return [trait, { metrics: { binomial: { p }, count: traitCount }, values }]\n      }),\n  )\n  return { metadata: { attributes } }\n}\n","import { Interface } from '@ethersproject/abi'\nimport { Provider } from '@ethersproject/providers'\n\nexport const contractHasFunctions = async (provider: Provider, address: string, contractInterface: Interface, functionNames: string[]) => {\n  try {\n    const bytecode = await provider.getCode(address, 'latest')\n    for (let i = 0; i < functionNames.length; i++) {\n      const nameSig = contractInterface.getSighash(functionNames[i]).substring(2)\n      if (!bytecode.includes(nameSig)) {\n        return false\n      }\n      return true\n    }\n    return false\n  } catch (ex) {\n    const error = ex as Error\n    console.log(error)\n    return false\n  }\n}\n","import { BaseProvider } from '@ethersproject/providers'\nimport { exists } from '@xylabs/exists'\nimport { AxiosJson } from '@xyo-network/axios'\nimport { NftInfo, NftMetadata, NftSchema, TokenType, toTokenType } from '@xyo-network/crypto-nft-payload-plugin'\nimport { ERC721Enumerable__factory, ERC721URIStorage__factory, ERC1155Supply__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { checkIpfsUrl, getErc1967Status } from '@xyo-network/witness-blockchain-abstract'\n\nimport { tokenTypes } from './tokenTypes'\nimport { tryCall } from './tryCall'\n\nconst ipfsGateway = '5d7b6582.beta.decentralnetworkservices.com'\n\nfunction range(size: number, startAt: number = 0): ReadonlyArray<number> {\n  return [...Array(size).keys()].map((i) => i + startAt)\n}\n\nexport const getNftCollectionNfts = async (\n  /**\n   * The address of the NFT contract to search for\n   */\n  contractAddress: string,\n  /**\n   * The chain ID (1 = Ethereum Mainnet, 4 = Rinkeby, etc.) of the chain to search for NFTs on\n   */\n  provider: BaseProvider,\n  types?: TokenType[],\n  /**\n   * The maximum number of NFTs to return. Configurable to prevent\n   * large wallets from exhausting Infura API credits. Ideally a\n   * multiple of 100 as that appears to be the default page size.\n   */\n  maxNfts = 100,\n): Promise<NftInfo[]> => {\n  try {\n    //Check if ERC-1967 Upgradeable\n    const { implementation } = await getErc1967Status(provider, contractAddress)\n\n    const axios = new AxiosJson({ timeout: 2000 })\n    const enumerable = ERC721Enumerable__factory.connect(implementation, provider)\n    const storage = ERC721URIStorage__factory.connect(implementation, provider)\n    const supply1155 = ERC1155Supply__factory.connect(implementation, provider)\n    const finalTypes = types ?? (await tokenTypes(provider, implementation))\n\n    const maxNftsArray = range(maxNfts)\n\n    const result: NftInfo[] = (\n      await Promise.all(\n        maxNftsArray.map(async (_value, i) => {\n          const tokenId = (await tryCall(async () => (await enumerable.tokenByIndex(i)).toHexString())) ?? `${i}`\n          if (tokenId !== undefined) {\n            const supply = finalTypes.includes(toTokenType('ERC1155'))\n              ? (await tryCall(async () => (await supply1155.totalSupply(tokenId)).toHexString())) ?? '0x01'\n              : '0x01'\n            const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId))\n            const checkedMetaDataUri = metadataUri ? checkIpfsUrl(metadataUri, ipfsGateway) : undefined\n            let metadata: NftMetadata | undefined = undefined\n            if (checkedMetaDataUri !== undefined) {\n              try {\n                metadata = (await axios.get(checkedMetaDataUri)).data\n              } catch (ex) {\n                const error = ex as Error\n                console.error(`Get Metadata failed: ${error.message}`)\n              }\n            }\n\n            const info: NftInfo = {\n              address: contractAddress,\n              chainId: provider.network.chainId,\n              metadata,\n              metadataUri,\n              schema: NftSchema,\n              supply,\n              tokenId,\n              type: finalTypes.at(0),\n              types: finalTypes,\n            }\n            if (implementation !== contractAddress) {\n              info.implementation = implementation\n            }\n            return info\n          }\n        }),\n      )\n    ).filter(exists)\n    return result\n  } catch (ex) {\n    const error = ex as Error\n    console.error(`getNftCollectionNfts failed: [${error.name}] ${error.message}`)\n    console.log(error.stack)\n    return []\n  }\n}\n","import { Provider } from '@ethersproject/providers'\nimport { TokenType } from '@xyo-network/crypto-nft-payload-plugin'\nimport { ERC1155URIStorage__factory, IERC721Metadata__factory } from '@xyo-network/open-zeppelin-typechain'\n\nimport { contractHasFunctions } from './contractHasFunctions'\n\nexport const isErc1155 = async (provider: Provider, address: string) => {\n  return await contractHasFunctions(provider, address, ERC1155URIStorage__factory.createInterface(), ['uri'])\n}\n\nexport const isErc721 = async (provider: Provider, address: string) => {\n  return await contractHasFunctions(provider, address, IERC721Metadata__factory.createInterface(), ['name', 'symbol', 'tokenURI'])\n}\n\nexport const tokenTypes = async (provider: Provider, address: string) => {\n  const [erc721, erc1155] = await Promise.all([isErc721(provider, address), isErc1155(provider, address)])\n  const result: TokenType[] = []\n  if (erc721) {\n    result.push('ERC721')\n  }\n  if (erc1155) {\n    result.push('ERC1155')\n  }\n  return result\n}\n","export const tryCall = async <T>(func: () => Promise<T>, name?: string): Promise<T | undefined> => {\n  try {\n    return await func()\n  } catch (ex) {\n    if (name) {\n      const error = ex as Error\n      console.log(`tryCall failed [${name}]: ${error.message}`)\n    }\n    return undefined\n  }\n}\n","import { CryptoNftCollectionWitnessPlugin } from './Plugin'\n\nexport * from './lib'\nexport * from './Witness'\n\nexport { CryptoNftCollectionWitnessPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default CryptoNftCollectionWitnessPlugin\n"],"mappings":"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","names":["NftSchema","ERC721Enumerable__factory","attributes","p","ERC721Enumerable__factory","NftSchema"]}
+{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/collectionMetrics/lib/calculateAllPropertiesDistribution.ts","../../src/lib/collectionMetrics/lib/probabilityDistributions/binomial/calculateBinomialParamsFromProbability.ts","../../src/lib/collectionMetrics/getNftCollectionMetrics.ts","../../src/lib/contractHasFunctions.ts","../../src/lib/getNftCollectionNfts.ts","../../src/lib/tokenTypes.ts","../../src/lib/tryCall.ts","../../src/index.ts"],"sourcesContent":["import { NftSchema } from '@xyo-network/crypto-nft-payload-plugin'\nimport { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\n\nimport { CryptoNftCollectionWitness } from './Witness'\n\nexport const CryptoNftCollectionWitnessPlugin = () =>\n  createPayloadSetWitnessPlugin<CryptoNftCollectionWitness>(\n    { required: { [NftSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await CryptoNftCollectionWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { EthAddress } from '@xylabs/eth-address'\nimport { PayloadHasher } from '@xyo-network/core'\nimport {\n  isNftCollectionWitnessQuery,\n  NftCollectionInfo,\n  NftCollectionSchema,\n  NftCollectionWitnessConfig,\n  NftCollectionWitnessConfigSchema,\n  NftCollectionWitnessQuery,\n} from '@xyo-network/crypto-nft-collection-payload-plugin'\nimport { ERC721Enumerable__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { AbstractBlockchainWitness, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract'\n\nimport { getNftCollectionMetrics, getNftCollectionNfts, tokenTypes } from './lib'\n\nexport type CryptoNftCollectionWitnessParams = BlockchainWitnessParams<NftCollectionWitnessConfig>\n\nconst defaultMaxNfts = 100\n\n/**\n * A \"no operation\" Promise to be used\n * when no action is desired but a Promise\n * is required to be returned\n */\nconst NoOp = Promise.resolve()\n\nfunction resolvedValue<T>(settled: PromiseSettledResult<T>, assert: true): T\nfunction resolvedValue<T>(settled: PromiseSettledResult<T>, assert?: false): T | undefined\nfunction resolvedValue<T>(settled: PromiseSettledResult<T>, assert?: boolean) {\n  if (assert && settled.status === 'rejected') {\n    throw settled.reason\n  }\n  return settled.status === 'fulfilled' ? settled.value : undefined\n}\n\nexport class CryptoNftCollectionWitness<\n  TParams extends CryptoNftCollectionWitnessParams = CryptoNftCollectionWitnessParams,\n> extends AbstractBlockchainWitness<TParams, NftCollectionWitnessQuery, NftCollectionInfo> {\n  static override configSchemas = [NftCollectionWitnessConfigSchema]\n\n  protected override async observeHandler(payloads?: NftCollectionWitnessQuery[]): Promise<NftCollectionInfo[]> {\n    await this.started('throw')\n    await this.getProviders() //make sure cache clears\n    const queries = payloads?.filter(isNftCollectionWitnessQuery) ?? []\n    const observations = await Promise.all(\n      queries.map<Promise<NftCollectionInfo>>(async (query) => {\n        const chainId = assertEx(query?.chainId || this.config.chainId, 'params.chainId is required')\n        const provider = await this.getProvider(true, true)\n        const address = assertEx(\n          EthAddress.parse(assertEx(query?.address || this.config.address, 'params.address is required')),\n          'Failed to parse params.address',\n        ).toString()\n\n        const erc721Enumerable = ERC721Enumerable__factory.connect(address, provider)\n\n        const maxNfts = query?.maxNfts || defaultMaxNfts\n        const [name, symbol, total, typesSettled, archivistSettled] = await Promise.allSettled([\n          await erc721Enumerable.name(),\n          await erc721Enumerable.symbol(),\n          (await erc721Enumerable.totalSupply()).toNumber(),\n          await tokenTypes(provider, address),\n          await this.writeArchivist(),\n        ])\n        const types = resolvedValue(typesSettled, true)\n        const nfts = await getNftCollectionNfts(address, provider, types, maxNfts)\n        const metrics = getNftCollectionMetrics(nfts)\n        const archivist = resolvedValue(archivistSettled)\n        const [sources] = await Promise.all([\n          // Hash all the payloads\n          Promise.all(nfts.map((nft) => PayloadHasher.hashAsync(nft))),\n          // Insert them into the archivist if we have one\n          archivist ? archivist.insert(nfts) : NoOp,\n        ])\n        const payload: NftCollectionInfo = {\n          address,\n          chainId,\n          metrics,\n          name: resolvedValue(name, true),\n          schema: NftCollectionSchema,\n          sources,\n          symbol: resolvedValue(symbol, true),\n          total: resolvedValue(total, true),\n          type: types.at(0),\n          types,\n        }\n        return payload\n      }),\n    )\n    return observations.flat()\n  }\n}\n","import { Distribution } from './distribution'\n\nexport const calculateAllPropertiesDistribution = <T>(array: T[]): Distribution<T> => {\n  const distribution: Distribution<T> = {}\n\n  array.forEach((item) => {\n    for (const property in item) {\n      if (Object.prototype.hasOwnProperty.call(item, property)) {\n        const value = item[property as keyof T]\n        if (value !== undefined && value !== null) {\n          const valueString = value.toString()\n          if (!distribution[property]) {\n            distribution[property] = { [valueString]: 1 }\n          } else if (!distribution[property]![valueString]) {\n            ;(distribution[property] as Record<string, number>)[valueString] = 1\n          } else {\n            ;(distribution[property] as Record<string, number>)[valueString] += 1\n          }\n        }\n      }\n    }\n  })\n\n  return distribution\n}\n","import { BinomialDistributionParameters } from '@xyo-network/crypto-nft-collection-payload-plugin'\n\n/**\n * Calculates the parameters of a binomial distribution given the number of trials and success probability\n * @param n Number of trials\n * @param p Success probability\n * @returns The binomial distribution parameters\n */\nexport const calculateBinomialParamsFromProbability = (n: number, p: number): BinomialDistributionParameters => {\n  // Mean (µ)\n  const mean = n * p\n\n  // Variance (σ^2)\n  const variance = n * p * (1 - p)\n\n  // Standard Deviation (σ)\n  const stdDev = Math.sqrt(variance)\n\n  return { mean, p, stdDev, variance }\n}\n","import { NftCollectionMetrics, NftTraitMetrics } from '@xyo-network/crypto-nft-collection-payload-plugin'\nimport { NftInfoFields, OpenSeaNftAttribute } from '@xyo-network/crypto-nft-payload-plugin'\n\nimport { calculateAllPropertiesDistribution, calculateBinomialParamsFromProbability } from './lib'\n\ntype TraitDistributionEntry = [string, { [key: string]: number }]\n\nexport const getNftCollectionMetrics = (nfts: NftInfoFields[]): NftCollectionMetrics => {\n  const traits = nfts\n    .map((nft) => nft?.metadata?.attributes as OpenSeaNftAttribute[] | undefined)\n    .filter((v): v is OpenSeaNftAttribute[] => v !== undefined)\n    .map((attributes) => {\n      return Object.fromEntries(attributes.map((attribute) => [attribute.trait_type, attribute.value]))\n    })\n  const distribution = calculateAllPropertiesDistribution(traits)\n  const n = nfts.length\n  const attributes = Object.fromEntries(\n    Object.entries(distribution)\n      .filter((v): v is TraitDistributionEntry => v[1] !== undefined)\n      .map(([trait, entries]) => {\n        const traitCount = Object.values(entries).reduce((prev, curr) => prev + curr, 0)\n        const { p } = calculateBinomialParamsFromProbability(nfts.length, traitCount / n)\n        const values = Object.fromEntries(\n          Object.entries(entries).map(([value, traitValueCount]) => {\n            const { p } = calculateBinomialParamsFromProbability(n, traitValueCount / n)\n            const metrics: NftTraitMetrics = { binomial: { p }, count: traitValueCount }\n            return [value, metrics]\n          }),\n        )\n        return [trait, { metrics: { binomial: { p }, count: traitCount }, values }]\n      }),\n  )\n  return { metadata: { attributes } }\n}\n","import { Interface } from '@ethersproject/abi'\nimport { Provider } from '@ethersproject/providers'\n\nexport const contractHasFunctions = async (provider: Provider, address: string, contractInterface: Interface, functionNames: string[]) => {\n  try {\n    const bytecode = await provider.getCode(address, 'latest')\n    for (let i = 0; i < functionNames.length; i++) {\n      const nameSig = contractInterface.getSighash(functionNames[i]).substring(2)\n      if (!bytecode.includes(nameSig)) {\n        return false\n      }\n      return true\n    }\n    return false\n  } catch (ex) {\n    const error = ex as Error\n    console.log(error)\n    return false\n  }\n}\n","import { BaseProvider } from '@ethersproject/providers'\nimport { AxiosJson } from '@xylabs/axios'\nimport { BigNumber as XyBigNumber } from '@xylabs/bignumber'\nimport { exists } from '@xylabs/exists'\nimport { getErc1822Status } from '@xyo-network/blockchain-erc1822-witness'\nimport { getErc1967Status } from '@xyo-network/blockchain-erc1967-witness'\nimport { NftInfo, NftMetadata, NftSchema, TokenType, toTokenType } from '@xyo-network/crypto-nft-payload-plugin'\nimport { ERC721Enumerable__factory, ERC721URIStorage__factory, ERC1155Supply__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { checkIpfsUrl } from '@xyo-network/witness-blockchain-abstract'\n\nimport { tokenTypes } from './tokenTypes'\nimport { tryCall } from './tryCall'\n\nconst ipfsGateway = '5d7b6582.beta.decentralnetworkservices.com'\n\nconst hexBytesOnlyOnly = (value: string) => {\n  return value.startsWith('0x') ? value.substring(2) : value\n}\n\nconst isHexZero = (value?: string) => {\n  return value === undefined ? true : new XyBigNumber(hexBytesOnlyOnly(value), 'hex').eqn(0)\n}\n\nfunction range(size: number, startAt: number = 0): ReadonlyArray<number> {\n  return [...Array(size).keys()].map((i) => i + startAt)\n}\n\nexport const getNftCollectionNfts = async (\n  /**\n   * The address of the NFT contract to search for\n   */\n  contractAddress: string,\n  /**\n   * The chain ID (1 = Ethereum Mainnet, 4 = Rinkeby, etc.) of the chain to search for NFTs on\n   */\n  provider: BaseProvider,\n  types?: TokenType[],\n  /**\n   * The maximum number of NFTs to return. Configurable to prevent\n   * large wallets from exhausting Infura API credits. Ideally a\n   * multiple of 100 as that appears to be the default page size.\n   */\n  maxNfts = 100,\n): Promise<NftInfo[]> => {\n  try {\n    const block = await provider.getBlockNumber()\n\n    //Check if ERC-1967 Upgradeable\n    const erc1967Status = await getErc1967Status(provider, contractAddress, block)\n\n    //Check if ERC-1822 Upgradeable\n    const erc1822Status = await getErc1822Status(provider, contractAddress, block)\n\n    const implementation = isHexZero(erc1967Status.slots.implementation) ? erc1822Status.implementation : erc1967Status.implementation\n\n    const axios = new AxiosJson({ timeout: 2000 })\n    const enumerable = ERC721Enumerable__factory.connect(implementation, provider)\n    const storage = ERC721URIStorage__factory.connect(implementation, provider)\n    const supply1155 = ERC1155Supply__factory.connect(implementation, provider)\n    const finalTypes = types ?? (await tokenTypes(provider, implementation))\n\n    const maxNftsArray = range(maxNfts)\n\n    const result: NftInfo[] = (\n      await Promise.all(\n        maxNftsArray.map(async (_value, i) => {\n          const tokenId = (await tryCall(async () => (await enumerable.tokenByIndex(i, { blockTag: block })).toHexString())) ?? `${i}`\n          if (tokenId !== undefined) {\n            const supply = finalTypes.includes(toTokenType('ERC1155'))\n              ? (await tryCall(async () => (await supply1155.totalSupply(tokenId, { blockTag: block })).toHexString())) ?? '0x01'\n              : '0x01'\n            const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId, { blockTag: block }))\n            const checkedMetaDataUri = metadataUri ? checkIpfsUrl(metadataUri, ipfsGateway) : undefined\n            let metadata: NftMetadata | undefined = undefined\n            if (checkedMetaDataUri !== undefined) {\n              try {\n                metadata = (await axios.get(checkedMetaDataUri)).data\n              } catch (ex) {\n                const error = ex as Error\n                console.error(`Get Metadata failed: ${error.message}`)\n              }\n            }\n\n            const info: NftInfo = {\n              address: contractAddress,\n              chainId: provider.network.chainId,\n              metadata,\n              metadataUri,\n              schema: NftSchema,\n              supply,\n              tokenId,\n              type: finalTypes.at(0),\n              types: finalTypes,\n            }\n            if (implementation !== contractAddress) {\n              info.implementation = implementation\n            }\n            return info\n          }\n        }),\n      )\n    ).filter(exists)\n    return result\n  } catch (ex) {\n    const error = ex as Error\n    console.error(`getNftCollectionNfts failed: [${error.name}] ${error.message}`)\n    console.log(error.stack)\n    return []\n  }\n}\n","import { Provider } from '@ethersproject/providers'\nimport { TokenType } from '@xyo-network/crypto-nft-payload-plugin'\nimport { ERC1155URIStorage__factory, IERC721Metadata__factory } from '@xyo-network/open-zeppelin-typechain'\n\nimport { contractHasFunctions } from './contractHasFunctions'\n\nexport const isErc1155 = async (provider: Provider, address: string) => {\n  return await contractHasFunctions(provider, address, ERC1155URIStorage__factory.createInterface(), ['uri'])\n}\n\nexport const isErc721 = async (provider: Provider, address: string) => {\n  return await contractHasFunctions(provider, address, IERC721Metadata__factory.createInterface(), ['name', 'symbol', 'tokenURI'])\n}\n\nexport const tokenTypes = async (provider: Provider, address: string) => {\n  const [erc721, erc1155] = await Promise.all([isErc721(provider, address), isErc1155(provider, address)])\n  const result: TokenType[] = []\n  if (erc721) {\n    result.push('ERC721')\n  }\n  if (erc1155) {\n    result.push('ERC1155')\n  }\n  return result\n}\n","export const tryCall = async <T>(func: () => Promise<T>, name?: string): Promise<T | undefined> => {\n  try {\n    return await func()\n  } catch (ex) {\n    if (name) {\n      const error = ex as Error\n      console.log(`tryCall failed [${name}]: ${error.message}`)\n    }\n    return undefined\n  }\n}\n","import { CryptoNftCollectionWitnessPlugin } from './Plugin'\n\nexport * from './lib'\nexport * from './Witness'\n\nexport { CryptoNftCollectionWitnessPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default CryptoNftCollectionWitnessPlugin\n"],"mappings":"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","names":["NftSchema","ERC721Enumerable__factory","attributes","p","ERC721Enumerable__factory","NftSchema"]}

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

@@ -1 +1 @@
-{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGvD,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAahH,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,YAAY,UACd,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CA2DnB,CAAA"}
+{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAMvD,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAqBhH,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,YAAY,UACd,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CAkEnB,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGvD,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAahH,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,YAAY,UACd,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CA2DnB,CAAA"}
+{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAMvD,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAqBhH,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,YAAY,UACd,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CAkEnB,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGvD,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAahH,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,YAAY,UACd,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CA2DnB,CAAA"}
+{"version":3,"file":"getNftCollectionNfts.d.ts","sourceRoot":"","sources":["../../../src/lib/getNftCollectionNfts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAMvD,OAAO,EAAE,OAAO,EAA0B,SAAS,EAAe,MAAM,wCAAwC,CAAA;AAqBhH,eAAO,MAAM,oBAAoB,oBAId,MAAM,YAIb,YAAY,UACd,SAAS,EAAE,uBAOlB,QAAQ,OAAO,EAAE,CAkEnB,CAAA"}

package/package.json

@@ -12,26 +12,27 @@
   "dependencies": {
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@xylabs/assert": "^2.13.3",
-    "@xylabs/eth-address": "^2.13.3",
-    "@xyo-network/abstract-witness": "~2.79.4",
-    "@xyo-network/axios": "~2.79.4",
-    "@xyo-network/core": "~2.79.4",
-    "@xyo-network/crypto-nft-collection-payload-plugin": "~2.79.4",
-    "@xyo-network/crypto-nft-payload-plugin": "~2.79.4",
-    "@xyo-network/module-model": "~2.79.4",
+    "@xylabs/assert": "^2.13.9",
+    "@xylabs/axios": "^2.13.9",
+    "@xylabs/bignumber": "^2.13.9",
+    "@xylabs/eth-address": "^2.13.9",
+    "@xylabs/exists": "^2.13.9",
+    "@xyo-network/blockchain-erc1822-witness": "~2.79.6",
+    "@xyo-network/blockchain-erc1967-witness": "~2.79.6",
+    "@xyo-network/core": "~2.79.6",
+    "@xyo-network/crypto-nft-collection-payload-plugin": "~2.79.6",
+    "@xyo-network/crypto-nft-payload-plugin": "~2.79.6",
     "@xyo-network/open-zeppelin-typechain": "^2.2.11",
-    "@xyo-network/payload-model": "~2.79.4",
-    "@xyo-network/payloadset-plugin": "~2.79.4",
-    "@xyo-network/witness-blockchain-abstract": "~2.79.4",
-    "@xyo-network/witness-model": "~2.79.4"
+    "@xyo-network/payload-model": "~2.79.6",
+    "@xyo-network/payloadset-plugin": "~2.79.6",
+    "@xyo-network/witness-blockchain-abstract": "~2.79.6"
   },
   "devDependencies": {
-    "@xylabs/jest-helpers": "^2.13.3",
+    "@xylabs/jest-helpers": "^2.13.9",
     "@xylabs/ts-scripts-yarn3": "^3.1.21",
     "@xylabs/tsconfig": "^3.1.21",
-    "@xyo-network/account": "~2.79.4",
-    "@xyo-network/account-model": "~2.79.4",
+    "@xyo-network/account": "~2.79.6",
+    "@xyo-network/account-model": "~2.79.6",
     "ethers": "^5.7.2",
     "jest": "^29.7.0",
     "typescript": "^5.2.2"
@@ -76,5 +77,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.79.4"
+  "version": "2.79.6"
 }

package/src/Witness.ts

@@ -1,7 +1,5 @@
-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'
 import { PayloadHasher } from '@xyo-network/core'
 import {
   isNftCollectionWitnessQuery,
@@ -11,19 +9,12 @@ import {
   NftCollectionWitnessConfigSchema,
   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 { getProviderFromEnv } from '@xyo-network/witness-blockchain-abstract'
-import { WitnessParams } from '@xyo-network/witness-model'
+import { AbstractBlockchainWitness, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract'
 
 import { getNftCollectionMetrics, getNftCollectionNfts, tokenTypes } from './lib'
 
-export type CryptoNftCollectionWitnessParams = WitnessParams<
-  AnyConfigSchema<NftCollectionWitnessConfig>,
-  {
-    provider: Provider
-  }
->
+export type CryptoNftCollectionWitnessParams = BlockchainWitnessParams<NftCollectionWitnessConfig>
 
 const defaultMaxNfts = 100
 
@@ -43,27 +34,19 @@ function resolvedValue<T>(settled: PromiseSettledResult<T>, assert?: boolean) {
   return settled.status === 'fulfilled' ? settled.value : undefined
 }
 
-export class CryptoNftCollectionWitness<TParams extends CryptoNftCollectionWitnessParams = CryptoNftCollectionWitnessParams> extends AbstractWitness<
-  TParams,
-  NftCollectionWitnessQuery,
-  NftCollectionInfo
-> {
+export class CryptoNftCollectionWitness<
+  TParams extends CryptoNftCollectionWitnessParams = CryptoNftCollectionWitnessParams,
+> extends AbstractBlockchainWitness<TParams, NftCollectionWitnessQuery, NftCollectionInfo> {
   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')
+    await this.getProviders() //make sure cache clears
     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 provider = await this.getProvider(true, true)
         const address = assertEx(
           EthAddress.parse(assertEx(query?.address || this.config.address, 'params.address is required')),
           'Failed to parse params.address',

package/src/lib/getNftCollectionNfts.ts

@@ -1,15 +1,26 @@
 import { BaseProvider } from '@ethersproject/providers'
+import { AxiosJson } from '@xylabs/axios'
+import { BigNumber as XyBigNumber } from '@xylabs/bignumber'
 import { exists } from '@xylabs/exists'
-import { AxiosJson } from '@xyo-network/axios'
+import { getErc1822Status } from '@xyo-network/blockchain-erc1822-witness'
+import { getErc1967Status } from '@xyo-network/blockchain-erc1967-witness'
 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 { checkIpfsUrl } from '@xyo-network/witness-blockchain-abstract'
 
 import { tokenTypes } from './tokenTypes'
 import { tryCall } from './tryCall'
 
 const ipfsGateway = '5d7b6582.beta.decentralnetworkservices.com'
 
+const hexBytesOnlyOnly = (value: string) => {
+  return value.startsWith('0x') ? value.substring(2) : value
+}
+
+const isHexZero = (value?: string) => {
+  return value === undefined ? true : new XyBigNumber(hexBytesOnlyOnly(value), 'hex').eqn(0)
+}
+
 function range(size: number, startAt: number = 0): ReadonlyArray<number> {
   return [...Array(size).keys()].map((i) => i + startAt)
 }
@@ -32,8 +43,15 @@ export const getNftCollectionNfts = async (
   maxNfts = 100,
 ): Promise<NftInfo[]> => {
   try {
+    const block = await provider.getBlockNumber()
+
     //Check if ERC-1967 Upgradeable
-    const { implementation } = await getErc1967Status(provider, contractAddress)
+    const erc1967Status = await getErc1967Status(provider, contractAddress, block)
+
+    //Check if ERC-1822 Upgradeable
+    const erc1822Status = await getErc1822Status(provider, contractAddress, block)
+
+    const implementation = isHexZero(erc1967Status.slots.implementation) ? erc1822Status.implementation : erc1967Status.implementation
 
     const axios = new AxiosJson({ timeout: 2000 })
     const enumerable = ERC721Enumerable__factory.connect(implementation, provider)
@@ -46,12 +64,12 @@ export const getNftCollectionNfts = async (
     const result: NftInfo[] = (
       await Promise.all(
         maxNftsArray.map(async (_value, i) => {
-          const tokenId = (await tryCall(async () => (await enumerable.tokenByIndex(i)).toHexString())) ?? `${i}`
+          const tokenId = (await tryCall(async () => (await enumerable.tokenByIndex(i, { blockTag: block })).toHexString())) ?? `${i}`
           if (tokenId !== undefined) {
             const supply = finalTypes.includes(toTokenType('ERC1155'))
-              ? (await tryCall(async () => (await supply1155.totalSupply(tokenId)).toHexString())) ?? '0x01'
+              ? (await tryCall(async () => (await supply1155.totalSupply(tokenId, { blockTag: block })).toHexString())) ?? '0x01'
               : '0x01'
-            const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId))
+            const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId, { blockTag: block }))
             const checkedMetaDataUri = metadataUri ? checkIpfsUrl(metadataUri, ipfsGateway) : undefined
             let metadata: NftMetadata | undefined = undefined
             if (checkedMetaDataUri !== undefined) {