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

package/dist/browser/Plugin.d.cts

@@ -41,7 +41,6 @@ export declare const CryptoWalletNftWitnessPlugin: () => import("@xyo-network/pa
         }) | undefined;
     } & {
         address?: string | undefined;
-        chainId?: number | undefined;
         schema: "network.xyo.crypto.nft.witness.config";
         timeout?: number | undefined;
     }, "schema"> & {
@@ -53,5 +52,7 @@ export declare const CryptoWalletNftWitnessPlugin: () => import("@xyo-network/pa
     };
     ephemeralQueryAccountEnabled?: boolean | undefined;
     wallet?: import("@xyo-network/wallet-model").WalletInstance | undefined;
+} & {
+    provider: import("@ethersproject/providers").JsonRpcProvider | import("@ethersproject/providers").WebSocketProvider;
 }>>;
 //# sourceMappingURL=Plugin.d.ts.map

package/dist/browser/Plugin.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAStC,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAStC,CAAA"}

package/dist/browser/Plugin.d.mts

@@ -41,7 +41,6 @@ export declare const CryptoWalletNftWitnessPlugin: () => import("@xyo-network/pa
         }) | undefined;
     } & {
         address?: string | undefined;
-        chainId?: number | undefined;
         schema: "network.xyo.crypto.nft.witness.config";
         timeout?: number | undefined;
     }, "schema"> & {
@@ -53,5 +52,7 @@ export declare const CryptoWalletNftWitnessPlugin: () => import("@xyo-network/pa
     };
     ephemeralQueryAccountEnabled?: boolean | undefined;
     wallet?: import("@xyo-network/wallet-model").WalletInstance | undefined;
+} & {
+    provider: import("@ethersproject/providers").JsonRpcProvider | import("@ethersproject/providers").WebSocketProvider;
 }>>;
 //# sourceMappingURL=Plugin.d.ts.map

package/dist/browser/Plugin.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAStC,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAStC,CAAA"}

package/dist/browser/Plugin.d.ts

@@ -41,7 +41,6 @@ export declare const CryptoWalletNftWitnessPlugin: () => import("@xyo-network/pa
         }) | undefined;
     } & {
         address?: string | undefined;
-        chainId?: number | undefined;
         schema: "network.xyo.crypto.nft.witness.config";
         timeout?: number | undefined;
     }, "schema"> & {
@@ -53,5 +52,7 @@ export declare const CryptoWalletNftWitnessPlugin: () => import("@xyo-network/pa
     };
     ephemeralQueryAccountEnabled?: boolean | undefined;
     wallet?: import("@xyo-network/wallet-model").WalletInstance | undefined;
+} & {
+    provider: import("@ethersproject/providers").JsonRpcProvider | import("@ethersproject/providers").WebSocketProvider;
 }>>;
 //# sourceMappingURL=Plugin.d.ts.map

package/dist/browser/Plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAStC,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAStC,CAAA"}

package/dist/browser/Witness.d.cts

@@ -1,10 +1,14 @@
+import { JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
 import { AbstractWitness } from '@xyo-network/abstract-witness';
 import { CryptoWalletNftWitnessConfig, NftInfo, NftWitnessQuery } from '@xyo-network/crypto-nft-payload-plugin';
 import { AnyConfigSchema } from '@xyo-network/module-model';
 import { WitnessParams } from '@xyo-network/witness-model';
-export type CryptoWalletNftWitnessParams = WitnessParams<AnyConfigSchema<CryptoWalletNftWitnessConfig>>;
+export type CryptoWalletNftWitnessParams = WitnessParams<AnyConfigSchema<CryptoWalletNftWitnessConfig>, {
+    provider: JsonRpcProvider | WebSocketProvider;
+}>;
 export declare class CryptoWalletNftWitness<TParams extends CryptoWalletNftWitnessParams = CryptoWalletNftWitnessParams> extends AbstractWitness<TParams, NftWitnessQuery, NftInfo> {
     static configSchemas: "network.xyo.crypto.nft.witness.config"[];
+    get provider(): JsonRpcProvider | WebSocketProvider;
     get timeout(): number;
     protected observeHandler(payloads?: NftWitnessQuery[]): Promise<NftInfo[]>;
 }

package/dist/browser/Witness.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EACL,4BAA4B,EAE5B,OAAO,EAGP,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAI1D,MAAM,MAAM,4BAA4B,GAAG,aAAa,CAAC,eAAe,CAAC,4BAA4B,CAAC,CAAC,CAAA;AAMvG,qBAAa,sBAAsB,CAAC,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAAE,SAAQ,eAAe,CACtI,OAAO,EACP,eAAe,EACf,OAAO,CACR;IACC,OAAgB,aAAa,4CAA2B;IAExD,IAAI,OAAO,WAEV;cAEwB,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAwB1F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAY,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAGvF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EACL,4BAA4B,EAE5B,OAAO,EAGP,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAI1D,MAAM,MAAM,4BAA4B,GAAG,aAAa,CACtD,eAAe,CAAC,4BAA4B,CAAC,EAC7C;IACE,QAAQ,EAAE,eAAe,GAAG,iBAAiB,CAAA;CAC9C,CACF,CAAA;AAMD,qBAAa,sBAAsB,CAAC,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAAE,SAAQ,eAAe,CACtI,OAAO,EACP,eAAe,EACf,OAAO,CACR;IACC,OAAgB,aAAa,4CAA2B;IAExD,IAAI,QAAQ,wCAEX;IAED,IAAI,OAAO,WAEV;cAEwB,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA+B1F"}

package/dist/browser/Witness.d.mts

@@ -1,10 +1,14 @@
+import { JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
 import { AbstractWitness } from '@xyo-network/abstract-witness';
 import { CryptoWalletNftWitnessConfig, NftInfo, NftWitnessQuery } from '@xyo-network/crypto-nft-payload-plugin';
 import { AnyConfigSchema } from '@xyo-network/module-model';
 import { WitnessParams } from '@xyo-network/witness-model';
-export type CryptoWalletNftWitnessParams = WitnessParams<AnyConfigSchema<CryptoWalletNftWitnessConfig>>;
+export type CryptoWalletNftWitnessParams = WitnessParams<AnyConfigSchema<CryptoWalletNftWitnessConfig>, {
+    provider: JsonRpcProvider | WebSocketProvider;
+}>;
 export declare class CryptoWalletNftWitness<TParams extends CryptoWalletNftWitnessParams = CryptoWalletNftWitnessParams> extends AbstractWitness<TParams, NftWitnessQuery, NftInfo> {
     static configSchemas: "network.xyo.crypto.nft.witness.config"[];
+    get provider(): JsonRpcProvider | WebSocketProvider;
     get timeout(): number;
     protected observeHandler(payloads?: NftWitnessQuery[]): Promise<NftInfo[]>;
 }

package/dist/browser/Witness.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EACL,4BAA4B,EAE5B,OAAO,EAGP,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAI1D,MAAM,MAAM,4BAA4B,GAAG,aAAa,CAAC,eAAe,CAAC,4BAA4B,CAAC,CAAC,CAAA;AAMvG,qBAAa,sBAAsB,CAAC,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAAE,SAAQ,eAAe,CACtI,OAAO,EACP,eAAe,EACf,OAAO,CACR;IACC,OAAgB,aAAa,4CAA2B;IAExD,IAAI,OAAO,WAEV;cAEwB,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAwB1F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAY,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAGvF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EACL,4BAA4B,EAE5B,OAAO,EAGP,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAI1D,MAAM,MAAM,4BAA4B,GAAG,aAAa,CACtD,eAAe,CAAC,4BAA4B,CAAC,EAC7C;IACE,QAAQ,EAAE,eAAe,GAAG,iBAAiB,CAAA;CAC9C,CACF,CAAA;AAMD,qBAAa,sBAAsB,CAAC,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAAE,SAAQ,eAAe,CACtI,OAAO,EACP,eAAe,EACf,OAAO,CACR;IACC,OAAgB,aAAa,4CAA2B;IAExD,IAAI,QAAQ,wCAEX;IAED,IAAI,OAAO,WAEV;cAEwB,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA+B1F"}

package/dist/browser/Witness.d.ts

@@ -1,10 +1,14 @@
+import { JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';
 import { AbstractWitness } from '@xyo-network/abstract-witness';
 import { CryptoWalletNftWitnessConfig, NftInfo, NftWitnessQuery } from '@xyo-network/crypto-nft-payload-plugin';
 import { AnyConfigSchema } from '@xyo-network/module-model';
 import { WitnessParams } from '@xyo-network/witness-model';
-export type CryptoWalletNftWitnessParams = WitnessParams<AnyConfigSchema<CryptoWalletNftWitnessConfig>>;
+export type CryptoWalletNftWitnessParams = WitnessParams<AnyConfigSchema<CryptoWalletNftWitnessConfig>, {
+    provider: JsonRpcProvider | WebSocketProvider;
+}>;
 export declare class CryptoWalletNftWitness<TParams extends CryptoWalletNftWitnessParams = CryptoWalletNftWitnessParams> extends AbstractWitness<TParams, NftWitnessQuery, NftInfo> {
     static configSchemas: "network.xyo.crypto.nft.witness.config"[];
+    get provider(): JsonRpcProvider | WebSocketProvider;
     get timeout(): number;
     protected observeHandler(payloads?: NftWitnessQuery[]): Promise<NftInfo[]>;
 }

package/dist/browser/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EACL,4BAA4B,EAE5B,OAAO,EAGP,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAI1D,MAAM,MAAM,4BAA4B,GAAG,aAAa,CAAC,eAAe,CAAC,4BAA4B,CAAC,CAAC,CAAA;AAMvG,qBAAa,sBAAsB,CAAC,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAAE,SAAQ,eAAe,CACtI,OAAO,EACP,eAAe,EACf,OAAO,CACR;IACC,OAAgB,aAAa,4CAA2B;IAExD,IAAI,OAAO,WAEV;cAEwB,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAwB1F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAY,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAGvF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EACL,4BAA4B,EAE5B,OAAO,EAGP,eAAe,EAChB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAI1D,MAAM,MAAM,4BAA4B,GAAG,aAAa,CACtD,eAAe,CAAC,4BAA4B,CAAC,EAC7C;IACE,QAAQ,EAAE,eAAe,GAAG,iBAAiB,CAAA;CAC9C,CACF,CAAA;AAMD,qBAAa,sBAAsB,CAAC,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAAE,SAAQ,eAAe,CACtI,OAAO,EACP,eAAe,EACf,OAAO,CACR;IACC,OAAgB,aAAa,4CAA2B;IAExD,IAAI,QAAQ,wCAEX;IAED,IAAI,OAAO,WAEV;cAEwB,cAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA+B1F"}

package/dist/browser/index.cjs

@@ -23,28 +23,53 @@ __export(src_exports, {
   CryptoWalletNftWitness: () => CryptoWalletNftWitness,
   CryptoWalletNftWitnessPlugin: () => CryptoWalletNftWitnessPlugin,
   checkIpfsUrl: () => checkIpfsUrl2,
+  contractHasFunctions: () => contractHasFunctions,
   default: () => src_default,
   getErc1155MetadataUri: () => getErc1155MetadataUri,
   getErc721MetadataUri: () => getErc721MetadataUri,
   getNftMetadataUri: () => getNftMetadataUri,
-  getNftsOwnedByAddress: () => getNftsOwnedByAddress
+  getNftsOwnedByAddress: () => getNftsOwnedByAddress,
+  getProviderFromEnv: () => getProviderFromEnv,
+  getProviderFromEnvInternal: () => getProviderFromEnvInternal,
+  isErc1155: () => isErc1155,
+  isErc721: () => isErc721,
+  tokenTypes: () => tokenTypes
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/Plugin.ts
-var import_crypto_nft_payload_plugin3 = require("@xyo-network/crypto-nft-payload-plugin");
+var import_crypto_nft_payload_plugin2 = require("@xyo-network/crypto-nft-payload-plugin");
 var import_payload_model = require("@xyo-network/payload-model");
 var import_payloadset_plugin = require("@xyo-network/payloadset-plugin");
 
 // src/Witness.ts
-var import_assert2 = require("@xylabs/assert");
+var import_assert3 = require("@xylabs/assert");
 var import_eth_address = require("@xylabs/eth-address");
 var import_abstract_witness = require("@xyo-network/abstract-witness");
-var import_crypto_nft_payload_plugin2 = require("@xyo-network/crypto-nft-payload-plugin");
+var import_crypto_nft_payload_plugin = require("@xyo-network/crypto-nft-payload-plugin");
+
+// src/lib/contractHasFunctions.ts
+var contractHasFunctions = async (provider, address, contractInterface, functionNames) => {
+  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;
+    console.log(error);
+    return false;
+  }
+};
 
 // src/lib/getNftsOwnedByAddress.ts
+var import_assert2 = require("@xylabs/assert");
 var import_axios2 = require("@xyo-network/axios");
-var import_crypto_nft_payload_plugin = require("@xyo-network/crypto-nft-payload-plugin");
 var import_open_zeppelin_typechain3 = require("@xyo-network/open-zeppelin-typechain");
 
 // src/lib/getInfuraProvider.ts
@@ -64,54 +89,31 @@ var getInfuraProviderConfig = () => {
   return { projectId, projectSecret };
 };
 
-// src/lib/getNftCollectionMetadata.ts
+// src/lib/getNftMetadata.ts
+var import_axios = require("@xyo-network/axios");
+var import_open_zeppelin_typechain2 = require("@xyo-network/open-zeppelin-typechain");
+
+// src/lib/tokenTypes.ts
 var import_open_zeppelin_typechain = require("@xyo-network/open-zeppelin-typechain");
-var import_ethers = require("ethers");
-function getInterfaceID(contractInterface) {
-  let interfaceID = import_ethers.constants.Zero;
-  const functions = Object.keys(contractInterface.functions);
-  for (let i = 0; i < functions.length; i++) {
-    interfaceID = interfaceID.xor(contractInterface.getSighash(functions[i]));
+var isErc1155 = async (provider, address) => {
+  return await contractHasFunctions(provider, address, import_open_zeppelin_typechain.ERC1155URIStorage__factory.createInterface(), ["uri"]);
+};
+var isErc721 = async (provider, address) => {
+  return await contractHasFunctions(provider, address, import_open_zeppelin_typechain.IERC721Metadata__factory.createInterface(), ["name", "symbol", "tokenURI"]);
+};
+var tokenTypes = async (provider, address) => {
+  const [erc721, erc1155] = await Promise.all([isErc721(provider, address), isErc1155(provider, address)]);
+  const result = [];
+  if (erc721) {
+    result.push("ERC721");
   }
-  return interfaceID.toHexString();
-}
-var getNftCollectionMetadata = async (contractAddress, provider) => {
-  try {
-    const contract721 = import_open_zeppelin_typechain.ERC721Enumerable__factory.connect(contractAddress, provider);
-    const contract1155 = import_open_zeppelin_typechain.ERC1155__factory.connect(contractAddress, provider);
-    let name = "";
-    try {
-      name = await contract721.name();
-    } catch (ex) {
-      const error = ex;
-      console.log(`name: ${error.message}`);
-    }
-    let symbol = "";
-    try {
-      symbol = await contract721.symbol();
-    } catch (ex) {
-      const error = ex;
-      console.log(`symbol: ${error.message}`);
-    }
-    let is1155 = false;
-    try {
-      is1155 = await contract1155.supportsInterface(getInterfaceID(import_open_zeppelin_typechain.ERC1155__factory.getInterface(import_open_zeppelin_typechain.ERC1155__factory.abi)));
-    } catch (ex) {
-      const error = ex;
-      console.log(`is1155: ${error.message}`);
-      is1155 = false;
-    }
-    return { address: contractAddress, chainId: provider.network.chainId, name, symbol, type: is1155 ? "ERC1155" : "ERC721" };
-  } catch (ex) {
-    const error = ex;
-    console.error(`getNftCollectionMetadata: ${error.message}`);
-    throw ex;
+  if (erc1155) {
+    result.push("ERC1155");
   }
+  return result;
 };
 
 // src/lib/getNftMetadata.ts
-var import_axios = require("@xyo-network/axios");
-var import_open_zeppelin_typechain2 = require("@xyo-network/open-zeppelin-typechain");
 var ipfsGateway = "5d7b6582.beta.decentralnetworkservices.com";
 var checkIpfsUrl = (urlToCheck, ipfsGateway2) => {
   const url = new URL(urlToCheck);
@@ -131,21 +133,28 @@ var checkIpfsUrl = (urlToCheck, ipfsGateway2) => {
 };
 var getNftMetadata = async (contractAddress, provider, tokenId) => {
   const axios = new import_axios.AxiosJson({ timeout: 2e3 });
-  const storage = import_open_zeppelin_typechain2.ERC721URIStorage__factory.connect(contractAddress, provider);
+  const enumerable721 = import_open_zeppelin_typechain2.ERC721Enumerable__factory.connect(contractAddress, provider);
+  const storage721 = import_open_zeppelin_typechain2.ERC721URIStorage__factory.connect(contractAddress, provider);
   const storage1155 = import_open_zeppelin_typechain2.ERC1155URIStorage__factory.connect(contractAddress, provider);
+  const is1155 = await isErc1155(provider, contractAddress);
   let uri1155;
-  try {
-    uri1155 = await storage1155.uri(tokenId);
-  } catch (ex) {
-    const error = ex;
-    console.error(`metaDataUri: ${error.message}`);
+  if (is1155) {
+    try {
+      uri1155 = await storage1155.uri(tokenId);
+    } catch (ex) {
+    }
   }
+  const is721 = await isErc721(provider, contractAddress);
   let metadataUri;
-  try {
-    metadataUri = await storage.tokenURI(tokenId);
-  } catch (ex) {
-    const error = ex;
-    console.error(`metadataUri: ${error.message}`);
+  if (is721) {
+    try {
+      metadataUri = await enumerable721.tokenURI(tokenId);
+    } catch (ex) {
+      try {
+        metadataUri = await storage721.tokenURI(tokenId);
+      } catch (ex2) {
+      }
+    }
   }
   const tokenMetadataUri = metadataUri ?? uri1155;
   const checkedMetaDataUri = tokenMetadataUri ? checkIpfsUrl(tokenMetadataUri, ipfsGateway) : tokenMetadataUri;
@@ -153,25 +162,21 @@ var getNftMetadata = async (contractAddress, provider, tokenId) => {
   try {
     metadata = checkedMetaDataUri ? (await axios.get(checkedMetaDataUri)).data : void 0;
   } catch (ex) {
-    const error = ex;
-    console.error(`metadata: ${error.message}`);
   }
   return [tokenMetadataUri, metadata];
 };
 
-// src/lib/getProvider.ts
-var import_providers2 = require("@ethersproject/providers");
-var getProviderFromEnv = (chainId = "homestead") => {
-  const infuraWssUri = process.env.INFURA_WSS_URI;
-  const infuraProvider = new import_providers2.InfuraProvider("homestead", {
-    projectId: process.env.INFURA_PROJECT_ID,
-    projectSecret: process.env.INFURA_PROJECT_SECRET
-  });
-  const infuraWebsocketProvider = infuraWssUri ? new import_providers2.WebSocketProvider(infuraWssUri, chainId) : void 0;
-  const quickNodeUri = process.env.QUICKNODE_WSS_URI;
-  const quickNodeProvider = quickNodeUri ? new import_providers2.WebSocketProvider(quickNodeUri, chainId) : void 0;
-  const provider = infuraWebsocketProvider ?? infuraProvider ?? infuraWebsocketProvider ?? quickNodeProvider ?? infuraProvider;
-  return provider;
+// src/lib/tryCall.ts
+var tryCall = async (func, name) => {
+  try {
+    return await func();
+  } catch (ex) {
+    if (name) {
+      const error = ex;
+      console.log(`tryCall failed [${name}]: ${error.message}`);
+    }
+    return void 0;
+  }
 };
 
 // src/lib/getNftsOwnedByAddress.ts
@@ -211,60 +216,54 @@ var getNftMetadataUri = async (address, tokenId) => {
   const results = await Promise.all([getErc721MetadataUri(address, tokenId), getErc1155MetadataUri(address, tokenId)]);
   return results[0][0] ?? results[1][0];
 };
-var getNftsOwnedByAddress = async (publicAddress, chainId, privateKey, maxNfts = 1e3, timeout = 2e3) => {
+var getNftsOwnedByAddress = async (publicAddress, provider, maxNfts = 1e3, timeout = 5e3) => {
+  const endpoint = (0, import_assert2.assertEx)(process.env.QUICKNODE_API_URI, "No endpoint found");
   const axios = new import_axios2.AxiosJson({ timeout });
-  const provider = getProviderFromEnv();
-  const qnUri = "https://api.quicknode.com/graphql";
-  const result = await axios.post(qnUri, {
-    query: `query Query {
-    ethereum {
-      walletByAddress(address: "${publicAddress}") {
-        walletNFTs (first: ${maxNfts}) {
-          edges {
-            node {
-              nft {
-                contractAddress
-                metadata
-                tokenId
-                externalUrl
-                name
-              }
-            }
-          }
+  const assets = [];
+  let done = false;
+  let currentPage = 0;
+  const id = Date.now();
+  while (!done && assets.length < maxNfts) {
+    const query = {
+      id,
+      jsonrpc: "2.0",
+      method: "qn_fetchNFTs",
+      params: [
+        {
+          omitFields: ["traits"],
+          page: currentPage + 1,
+          perPage: 10,
+          wallet: publicAddress
         }
-      }
-    }
-  }`,
-    variables: {}
-  });
+      ]
+    };
+    const results = (await axios.post(endpoint, query)).data.result;
+    assets.push(...results.assets ?? []);
+    currentPage = results.pageNumber;
+    done = results.pageNumber === results.totalPages;
+  }
   const nftResult = await Promise.all(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    Object.values(result.data.data.ethereum.walletByAddress.walletNFTs.edges).map(async (nft) => {
+    assets.map(async (nft) => {
       try {
-        const { contractAddress, tokenId, metadata, externalUrl } = nft.node.nft;
+        const { collectionAddress, collectionTokenId } = nft;
         let supply = "0x01";
-        let type = (0, import_crypto_nft_payload_plugin.toTokenType)("ERC721");
-        try {
-          const supply1155 = import_open_zeppelin_typechain3.ERC1155Supply__factory.connect(contractAddress, provider);
-          const { type: nftType } = await getNftCollectionMetadata(contractAddress, provider);
-          type = nftType;
-          supply = nftType === (0, import_crypto_nft_payload_plugin.toTokenType)("ERC1155") ? (await supply1155.totalSupply(tokenId)).toHexString() : "0x01";
-        } catch (ex) {
-          const error = ex;
-          console.error(`supply: ${error.message}`);
+        const types = await tokenTypes(provider, collectionAddress);
+        if (types.includes("ERC1155")) {
+          const supply1155 = import_open_zeppelin_typechain3.ERC1155Supply__factory.connect(collectionAddress, provider);
+          supply = await tryCall(async () => (await supply1155.totalSupply(collectionTokenId)).toHexString()) ?? "0x01";
         }
         const fields = {
-          address: contractAddress,
-          chainId,
-          metadata,
-          metadataUri: externalUrl,
+          address: collectionAddress,
+          chainId: provider.network.chainId,
           supply,
-          tokenId,
-          type
+          tokenId: collectionTokenId,
+          type: types.at(0),
+          types
         };
         if (!fields.metadataUri || !fields.metadata) {
-          const [metadataUri, metadata2] = await getNftMetadata(contractAddress, provider, fields.tokenId);
-          fields.metadata = metadata2;
+          const [metadataUri, metadata] = await getNftMetadata(collectionAddress, provider, fields.tokenId);
+          fields.metadata = metadata;
           fields.metadataUri = metadataUri;
         }
         return fields;
@@ -279,43 +278,77 @@ var getNftsOwnedByAddress = async (publicAddress, chainId, privateKey, maxNfts =
   return nftResult;
 };
 
+// src/lib/getProvider.ts
+var import_providers2 = require("@ethersproject/providers");
+var getProviderFromEnvInternal = (chainId = 1) => {
+  console.log(`getProviderFromEnvInternal: ${chainId}`);
+  const infuraWssUri = process.env.INFURA_WSS_URI;
+  const infuraProvider = new import_providers2.InfuraProvider(chainId, {
+    projectId: process.env.INFURA_PROJECT_ID,
+    projectSecret: process.env.INFURA_PROJECT_SECRET
+  });
+  const infuraGenericWebsocketProvider = infuraWssUri ? new import_providers2.WebSocketProvider(infuraWssUri, chainId) : void 0;
+  const quickNodeWSSUri = process.env.QUICKNODE_WSS_URI;
+  const quickNodeWebSocketProvider = quickNodeWSSUri ? new import_providers2.WebSocketProvider(quickNodeWSSUri, chainId) : void 0;
+  const quickNodeHttpsUri = process.env.QUICKNODE_WSS_URI;
+  const quickRpcProvider = quickNodeHttpsUri ? new import_providers2.JsonRpcProvider(quickNodeHttpsUri, chainId) : void 0;
+  const provider = infuraProvider ?? quickNodeWebSocketProvider ?? infuraProvider ?? infuraGenericWebsocketProvider ?? quickRpcProvider;
+  return provider;
+};
+var providers = {};
+var getProviderFromEnv = (chainId = 1) => {
+  console.log(`getProviderFromEnv: ${chainId}`);
+  providers[chainId] = providers[chainId] ?? getProviderFromEnvInternal(chainId);
+  return providers[chainId];
+};
+
 // src/Witness.ts
-var schema = import_crypto_nft_payload_plugin2.NftSchema;
+var schema = import_crypto_nft_payload_plugin.NftSchema;
 var defaultMaxNfts = 100;
 var CryptoWalletNftWitness = class extends import_abstract_witness.AbstractWitness {
-  static configSchemas = [import_crypto_nft_payload_plugin2.NftWitnessConfigSchema];
+  static configSchemas = [import_crypto_nft_payload_plugin.NftWitnessConfigSchema];
+  get provider() {
+    return this.params.provider;
+  }
   get timeout() {
-    return this.config.timeout ?? 2e3;
+    return this.config.timeout ?? 1e4;
   }
   async observeHandler(payloads) {
     await this.started("throw");
-    const queries = payloads?.filter(import_crypto_nft_payload_plugin2.isNftWitnessQuery) ?? [];
-    const observations = await Promise.all(
-      queries.map(async (query) => {
-        const address = (0, import_assert2.assertEx)(
-          import_eth_address.EthAddress.parse((0, import_assert2.assertEx)(query?.address || this.config.address, "params.address is required")),
-          "Failed to parse params.address"
-        ).toString();
-        const chainId = (0, import_assert2.assertEx)(query?.chainId || this.config.chainId, "params.chainId is required");
-        const maxNfts = query?.maxNfts || defaultMaxNfts;
-        try {
-          const nfts = await getNftsOwnedByAddress(address, chainId, this.account.private.hex, maxNfts, this.timeout);
-          const observation = nfts.map((nft) => {
-            return { ...nft, schema };
-          });
-          return observation;
-        } catch (error) {
-          throw new Error(`Failed to get nfts for address ${address} on chainId ${chainId}`);
-        }
-      })
-    );
-    return observations.flat();
+    const queries = payloads?.filter(import_crypto_nft_payload_plugin.isNftWitnessQuery) ?? [];
+    try {
+      const observations = await Promise.all(
+        queries.map(async (query) => {
+          const addressValue = (0, import_assert3.assertEx)(query?.address ?? this.config.address, "params.address is required");
+          const parsedAddressValue = import_eth_address.EthAddress.parse(addressValue);
+          const address = (0, import_assert3.assertEx)(parsedAddressValue?.toString(), "Failed to parse params.address");
+          const network = this.provider.network;
+          const chainId = (0, import_assert3.assertEx)(network.chainId, "params.chainId is required");
+          const maxNfts = query?.maxNfts || defaultMaxNfts;
+          try {
+            const nfts = await getNftsOwnedByAddress(address, this.provider, maxNfts, this.timeout);
+            const observation = nfts.map((nft) => {
+              return { ...nft, schema };
+            });
+            return observation;
+          } catch (ex) {
+            const error = ex;
+            throw Error(`Failed to get nfts for address ${address} on chainId ${chainId}: ${error.message}`);
+          }
+        })
+      );
+      return observations.flat();
+    } catch (ex) {
+      const error = ex;
+      console.error(error);
+      return [];
+    }
   }
 };
 
 // src/Plugin.ts
 var CryptoWalletNftWitnessPlugin = () => (0, import_payloadset_plugin.createPayloadSetWitnessPlugin)(
-  { required: { [import_crypto_nft_payload_plugin3.NftSchema]: 1 }, schema: import_payload_model.PayloadSetSchema },
+  { required: { [import_crypto_nft_payload_plugin2.NftSchema]: 1 }, schema: import_payload_model.PayloadSetSchema },
   {
     witness: async (params) => {
       const result = await CryptoWalletNftWitness.create(params);