@xyo-network/crypto-nft-collection-witness-plugin 2.80.5 → 2.81.0

package/src/Witness.ts

@@ -58,7 +58,7 @@ export class CryptoNftCollectionWitness<
         const [name, symbol, total, typesSettled, archivistSettled] = await Promise.allSettled([
           await erc721Enumerable.name(),
           await erc721Enumerable.symbol(),
-          (await erc721Enumerable.totalSupply()).toNumber(),
+          await erc721Enumerable.totalSupply(),
           await tokenTypes(provider, address),
           await this.writeArchivist(),
         ])
@@ -80,7 +80,7 @@ export class CryptoNftCollectionWitness<
           schema: NftCollectionSchema,
           sources,
           symbol: resolvedValue(symbol, true),
-          total: resolvedValue(total, true),
+          total: Number(resolvedValue(total, true)),
           type: types.at(0),
           types,
         }

package/src/lib/contractHasFunctions.ts

@@ -1,12 +1,12 @@
-import { Interface } from '@ethersproject/abi'
-import { Provider } from '@ethersproject/providers'
+import { assertEx } from '@xylabs/assert'
+import { Interface, Provider } from 'ethers'
 
 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)) {
+      const selector = assertEx(contractInterface.getFunction(functionNames[i])?.selector, 'Function not found on interface')
+      if (!bytecode.includes(selector.substring(2))) {
         return false
       }
       return true

package/src/lib/getNftCollectionNfts.ts

@@ -1,4 +1,3 @@
-import { BaseProvider } from '@ethersproject/providers'
 import { AxiosJson } from '@xylabs/axios'
 import { BigNumber as XyBigNumber } from '@xylabs/bignumber'
 import { exists } from '@xylabs/exists'
@@ -7,6 +6,7 @@ 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 } from '@xyo-network/witness-blockchain-abstract'
+import { Provider } from 'ethers'
 
 import { tokenTypes } from './tokenTypes'
 import { tryCall } from './tryCall'
@@ -33,7 +33,7 @@ export const getNftCollectionNfts = async (
   /**
    * The chain ID (1 = Ethereum Mainnet, 4 = Rinkeby, etc.) of the chain to search for NFTs on
    */
-  provider: BaseProvider,
+  provider: Provider,
   types?: TokenType[],
   /**
    * The maximum number of NFTs to return. Configurable to prevent
@@ -64,10 +64,10 @@ export const getNftCollectionNfts = async (
     const result: NftInfo[] = (
       await Promise.all(
         maxNftsArray.map(async (_value, i) => {
-          const tokenId = (await tryCall(async () => (await enumerable.tokenByIndex(i, { blockTag: block })).toHexString())) ?? `${i}`
+          const tokenId = (await tryCall(async () => await enumerable.tokenByIndex(i, { blockTag: block }))) ?? BigInt(i)
           if (tokenId !== undefined) {
             const supply = finalTypes.includes(toTokenType('ERC1155'))
-              ? (await tryCall(async () => (await supply1155.totalSupply(tokenId, { blockTag: block })).toHexString())) ?? '0x01'
+              ? (await tryCall(async () => await supply1155['totalSupply(uint256)'](tokenId))) ?? '0x01'
               : '0x01'
             const metadataUri = await tryCall(async () => await storage.tokenURI(tokenId, { blockTag: block }))
             const checkedMetaDataUri = metadataUri ? checkIpfsUrl(metadataUri, ipfsGateway) : undefined
@@ -83,12 +83,12 @@ export const getNftCollectionNfts = async (
 
             const info: NftInfo = {
               address: contractAddress,
-              chainId: provider.network.chainId,
+              chainId: Number((await provider.getNetwork()).chainId),
               metadata,
               metadataUri,
               schema: NftSchema,
-              supply,
-              tokenId,
+              supply: `0x${supply.toString(16)}`,
+              tokenId: `0x${tokenId.toString(16)}`,
               type: finalTypes.at(0),
               types: finalTypes,
             }

package/src/lib/tokenTypes.ts

@@ -1,6 +1,6 @@
-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 { ERC721__factory, ERC1155URIStorage__factory } from '@xyo-network/open-zeppelin-typechain'
+import { Provider } from 'ethers'
 
 import { contractHasFunctions } from './contractHasFunctions'
 
@@ -9,7 +9,7 @@ export const isErc1155 = async (provider: Provider, address: string) => {
 }
 
 export const isErc721 = async (provider: Provider, address: string) => {
-  return await contractHasFunctions(provider, address, IERC721Metadata__factory.createInterface(), ['name', 'symbol', 'tokenURI'])
+  return await contractHasFunctions(provider, address, ERC721__factory.createInterface(), ['name', 'symbol', 'tokenURI'])
 }
 
 export const tokenTypes = async (provider: Provider, address: string) => {