@xyo-network/crypto-contract-function-read-plugin 2.77.17 → 2.77.19

package/dist/node/index.mjs

@@ -18,26 +18,35 @@ var CryptoContractFunctionReadWitness = class extends AbstractWitness {
   static configSchemas = [CryptoContractFunctionReadWitnessConfigSchema];
   async observeHandler(inPayloads = []) {
     await this.started("throw");
-    const observations = await Promise.all(
-      inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async (callPayload) => {
-        const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload };
-        const { address, functionName, params } = fullCallPayload;
-        const validatedAddress = assertEx(address, "Missing address");
-        const contract = this.params.factory(validatedAddress);
-        const func = assertEx(contract.callStatic[assertEx(functionName, "missing functionName")], `functionName [${functionName}] not found`);
-        const rawResult = await func(...params ?? []);
-        const result = BigNumber.isBigNumber(rawResult) ? { type: "BigNumber", value: rawResult.toHexString() } : { value: rawResult };
-        const observation = {
-          address: validatedAddress,
-          call: await PayloadHasher.hashAsync(fullCallPayload),
-          chainId: (await contract.provider.getNetwork()).chainId,
-          result,
-          schema: CryptoContractFunctionCallResultSchema
-        };
-        return observation;
-      })
-    );
-    return observations.flat();
+    try {
+      const observations = await Promise.all(
+        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async (callPayload) => {
+          const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload };
+          const { address, functionName, params } = fullCallPayload;
+          const validatedAddress = assertEx(address, "Missing address");
+          const validatedFunctionName = assertEx(functionName, "Missing functionName");
+          const contract = this.params.factory(validatedAddress);
+          const func = assertEx(contract.callStatic[validatedFunctionName], `functionName [${validatedFunctionName}] not found`);
+          const rawResult = await func(...params ?? []);
+          const result = BigNumber.isBigNumber(rawResult) ? { type: "BigNumber", value: rawResult.toHexString() } : { value: rawResult };
+          const observation = {
+            address: validatedAddress,
+            call: await PayloadHasher.hashAsync(fullCallPayload),
+            chainId: (await contract.provider.getNetwork()).chainId,
+            functionName: validatedFunctionName,
+            params,
+            result,
+            schema: CryptoContractFunctionCallResultSchema
+          };
+          return observation;
+        })
+      );
+      return observations.flat();
+    } catch (ex) {
+      const error = ex;
+      console.log(`Error [${this.config.name}]: ${error.message}`);
+    }
+    return [];
   }
 };
 
@@ -90,7 +99,8 @@ var CryptoContractDiviner = class _CryptoContractDiviner extends AbstractDiviner
   contractInfoRequiredFields(callResults) {
     return {
       address: assertEx2(_CryptoContractDiviner.matchingExistingField(callResults, "address"), "Mismatched address"),
-      chainId: assertEx2(_CryptoContractDiviner.matchingExistingField(callResults, "chainId"), "Mismatched chainId")
+      chainId: assertEx2(_CryptoContractDiviner.matchingExistingField(callResults, "chainId"), "Mismatched chainId"),
+      schema: ContractInfoSchema
     };
   }
   async divineHandler(inPayloads = []) {
@@ -106,43 +116,20 @@ var CryptoContractDiviner = class _CryptoContractDiviner extends AbstractDiviner
     const result = await Promise.all(
       addresses.map(async (address) => {
         const foundCallResults = callResults.filter((callResult) => callResult.address === address);
-        return {
-          ...await this.reduceResults(address, foundCallResults),
+        const info = {
+          ...{ results: await this.reduceResults(foundCallResults) },
           ...this.contractInfoRequiredFields(foundCallResults)
         };
+        return info;
       })
     );
     return result;
   }
-};
-
-// src/Erc721Diviner.ts
-var CryptoContractErc721DivinerConfigSchema = "network.xyo.crypto.contract.erc721.info.diviner.config";
-var Erc721ContractInfoSchema = "network.xyo.crypto.contract.erc721.info";
-var CryptoContractErc721Diviner = class _CryptoContractErc721Diviner extends CryptoContractDiviner {
-  static configSchemas = [CryptoContractErc721DivinerConfigSchema];
-  async reduceResults(address, callResults) {
-    const name = await _CryptoContractErc721Diviner.findCallResult(address, "name", [], callResults);
-    const symbol = await _CryptoContractErc721Diviner.findCallResult(address, "symbol", [], callResults);
-    return {
-      name,
-      schema: Erc721ContractInfoSchema,
-      symbol
-    };
-  }
-};
-
-// src/Erc1155Diviner.ts
-var CryptoContractErc1155DivinerConfigSchema = "network.xyo.crypto.contract.erc1155.info.diviner.config";
-var Erc1155ContractInfoSchema = "network.xyo.crypto.contract.erc1155.info";
-var CryptoContractErc1155Diviner = class _CryptoContractErc1155Diviner extends CryptoContractDiviner {
-  static configSchemas = [CryptoContractErc1155DivinerConfigSchema];
-  async reduceResults(address, callResults) {
-    const uri = await _CryptoContractErc1155Diviner.findCallResult(address, "uri", [], callResults);
-    return {
-      schema: Erc1155ContractInfoSchema,
-      uri
-    };
+  reduceResults(callResults) {
+    return callResults.reduce((prev, callResult) => {
+      prev[callResult.functionName] = callResult.result;
+      return prev;
+    }, {});
   }
 };
 
@@ -152,14 +139,8 @@ export {
   ContractInfoSchema,
   CryptoContractDiviner,
   CryptoContractDivinerConfigSchema,
-  CryptoContractErc1155Diviner,
-  CryptoContractErc1155DivinerConfigSchema,
-  CryptoContractErc721Diviner,
-  CryptoContractErc721DivinerConfigSchema,
   CryptoContractFunctionReadWitness,
   CryptoContractFunctionReadWitnessPlugin,
-  Erc1155ContractInfoSchema,
-  Erc721ContractInfoSchema,
   src_default as default
 };
 //# sourceMappingURL=index.mjs.map

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/CryptoContractDiviner.ts","../../src/Erc721Diviner.ts","../../src/Erc1155Diviner.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 { CryptoContractFunctionReadWitness } from './Witness'\n\nexport const CryptoContractFunctionReadWitnessPlugin = () =>\n  createPayloadSetWitnessPlugin<CryptoContractFunctionReadWitness>(\n    { required: { [NftSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await CryptoContractFunctionReadWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport {\n  CryptoContractFunctionCall,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n  CryptoContractFunctionCallSchema,\n  CryptoContractFunctionReadWitnessConfig,\n  CryptoContractFunctionReadWitnessConfigSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { BigNumber, Contract } from 'ethers'\n\nexport type CryptoContractFunctionReadWitnessParams<TContract extends Contract> = WitnessParams<\n  AnyConfigSchema<CryptoContractFunctionReadWitnessConfig>,\n  {\n    factory: (address: string) => TContract\n  }\n>\n\nexport class CryptoContractFunctionReadWitness<\n  TContract extends Contract = Contract,\n  TParams extends CryptoContractFunctionReadWitnessParams<TContract> = CryptoContractFunctionReadWitnessParams<TContract>,\n> extends AbstractWitness<TParams, CryptoContractFunctionCall<keyof TContract['callStatic']>, CryptoContractFunctionCallResult> {\n  static override configSchemas = [CryptoContractFunctionReadWitnessConfigSchema]\n\n  protected override async observeHandler(\n    inPayloads: CryptoContractFunctionCall<keyof TContract['callStatic']>[] = [],\n  ): Promise<CryptoContractFunctionCallResult[]> {\n    await this.started('throw')\n    const observations = await Promise.all(\n      inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async (callPayload) => {\n        const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload }\n        const { address, functionName, params } = fullCallPayload\n        const validatedAddress = assertEx(address, 'Missing address')\n        const contract = this.params.factory(validatedAddress)\n        const func = assertEx(contract.callStatic[assertEx(functionName, 'missing functionName')], `functionName [${functionName}] not found`)\n        const rawResult = await func(...(params ?? []))\n        const result: CryptoContractFunctionCallResult['result'] = BigNumber.isBigNumber(rawResult)\n          ? { type: 'BigNumber', value: rawResult.toHexString() }\n          : { value: rawResult }\n        const observation: CryptoContractFunctionCallResult = {\n          address: validatedAddress,\n          call: await PayloadHasher.hashAsync(fullCallPayload),\n          chainId: (await contract.provider.getNetwork()).chainId,\n          result,\n          schema: CryptoContractFunctionCallResultSchema,\n        }\n        return observation\n      }),\n    )\n\n    return observations.flat()\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport {\n  CryptoContractFunctionCall,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n  CryptoContractFunctionCallSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const CryptoContractDivinerConfigSchema = 'network.xyo.crypto.contract.diviner.config'\nexport type CryptoContractDivinerConfigSchema = typeof CryptoContractDivinerConfigSchema\n\nexport type CryptoContractDivinerConfig = DivinerConfig\nexport type CryptoContractDivinerParams = DivinerParams<CryptoContractDivinerConfig>\n\nexport const ContractInfoSchema = 'network.xyo.crypto.contract.info'\nexport type ContractInfoSchema = typeof ContractInfoSchema\n\nexport type OmittedContractInfo<TFields extends object | Payload | null = null, TSchema extends string | null = null> = Omit<\n  ContractInfo<TFields, TSchema extends null ? (TFields extends Payload ? TFields['schema'] : never) : TSchema>,\n  'address' | 'chainId'\n>\n\nexport type ContractInfo<TFields extends object | null = null, TSchema extends string = ContractInfoSchema> = Payload<\n  TFields extends null\n    ? object\n    : TFields & {\n        address: string\n        chainId: string\n      },\n  TSchema\n>\n\nexport abstract class CryptoContractDiviner<\n  TContractInfo extends Payload<Omit<ContractInfo, 'schema'>> = ContractInfo,\n  TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams,\n> extends AbstractDiviner<TParams> {\n  static override configSchemas = [CryptoContractDivinerConfigSchema]\n\n  protected static async findCallResult<TResult = string>(\n    address: string,\n    functionName: string,\n    params: unknown[],\n    payloads: CryptoContractFunctionCallResult[],\n  ): Promise<TResult | undefined> {\n    const callHash = await this.generateCallHash(address, functionName, params)\n    const foundPayload = payloads.find((payload) => payload.call === callHash)\n    return foundPayload?.result.value as TResult | undefined\n  }\n\n  protected static async generateCallHash(address: string, functionName: string, params: unknown[]) {\n    const callPayload: CryptoContractFunctionCall = {\n      address,\n      functionName,\n      params,\n      schema: CryptoContractFunctionCallSchema,\n    }\n    return await PayloadHasher.hashAsync(callPayload)\n  }\n\n  protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T) {\n    const expectedValue = objs.at(0)?.[field] as R\n    const didNotMatch = objs.reduce((prev, obj) => {\n      return prev || obj[field] !== expectedValue\n    }, false)\n    return didNotMatch ? undefined : expectedValue\n  }\n\n  protected contractInfoRequiredFields(callResults: CryptoContractFunctionCallResult[]): Promisable<Omit<ContractInfo, 'schema'>> {\n    return {\n      address: assertEx(CryptoContractDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(CryptoContractDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n    }\n  }\n\n  protected override async divineHandler(inPayloads: CryptoContractFunctionCallResult[] = []): Promise<TContractInfo[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<CryptoContractFunctionCallResult>(CryptoContractFunctionCallResultSchema))\n    const addresses = Object.keys(\n      callResults.reduce<Record<string, boolean>>((prev, result) => {\n        if (result.address) {\n          prev[result.address] = true\n        }\n        return prev\n      }, {}),\n    )\n    const result = await Promise.all(\n      addresses.map(async (address) => {\n        const foundCallResults = callResults.filter((callResult) => callResult.address === address)\n        return {\n          ...(await this.reduceResults(address, foundCallResults)),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        } as TContractInfo\n      }),\n    )\n\n    return result\n  }\n\n  protected abstract reduceResults(\n    address: string,\n    callResults: CryptoContractFunctionCallResult[],\n  ): Promisable<Omit<TContractInfo, 'address' | 'chainId'>>\n}\n","import { CryptoContractFunctionCallResult } from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\n\nimport { ContractInfo, CryptoContractDiviner, OmittedContractInfo } from './CryptoContractDiviner'\n\nexport const CryptoContractErc721DivinerConfigSchema = 'network.xyo.crypto.contract.erc721.info.diviner.config'\nexport type CryptoContractErc721DivinerConfigSchema = typeof CryptoContractErc721DivinerConfigSchema\n\nexport type CryptoContractErc721DivinerConfig = DivinerConfig\nexport type CryptoContractErc721DivinerParams = DivinerParams<CryptoContractErc721DivinerConfig>\n\nexport const Erc721ContractInfoSchema = 'network.xyo.crypto.contract.erc721.info'\nexport type Erc721ContractInfoSchema = typeof Erc721ContractInfoSchema\n\nexport type Erc721ContractInfo = ContractInfo<\n  {\n    name?: string\n    symbol?: string\n    totalSupply?: string\n  },\n  Erc721ContractInfoSchema\n>\n\nexport class CryptoContractErc721Diviner<\n  TParams extends CryptoContractErc721DivinerParams = CryptoContractErc721DivinerParams,\n> extends CryptoContractDiviner<Erc721ContractInfo, TParams> {\n  static override configSchemas = [CryptoContractErc721DivinerConfigSchema]\n\n  protected override async reduceResults(\n    address: string,\n    callResults: CryptoContractFunctionCallResult[],\n  ): Promise<OmittedContractInfo<Erc721ContractInfo>> {\n    const name = await CryptoContractErc721Diviner.findCallResult(address, 'name', [], callResults)\n    const symbol = await CryptoContractErc721Diviner.findCallResult(address, 'symbol', [], callResults)\n    return {\n      name,\n      schema: Erc721ContractInfoSchema,\n      symbol,\n    }\n  }\n}\n","import { CryptoContractFunctionCallResult } from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\n\nimport { ContractInfo, CryptoContractDiviner, OmittedContractInfo } from './CryptoContractDiviner'\n\nexport const CryptoContractErc1155DivinerConfigSchema = 'network.xyo.crypto.contract.erc1155.info.diviner.config'\nexport type CryptoContractErc1155DivinerConfigSchema = typeof CryptoContractErc1155DivinerConfigSchema\n\nexport type CryptoContractErc1155DivinerConfig = DivinerConfig\nexport type CryptoContractErc1155DivinerParams = DivinerParams<CryptoContractErc1155DivinerConfig>\n\nexport const Erc1155ContractInfoSchema = 'network.xyo.crypto.contract.erc1155.info'\nexport type Erc1155ContractInfoSchema = typeof Erc1155ContractInfoSchema\n\nexport type Erc1155ContractInfo = ContractInfo<\n  {\n    uri?: string\n  },\n  Erc1155ContractInfoSchema\n>\n\nexport class CryptoContractErc1155Diviner<\n  TParams extends CryptoContractErc1155DivinerParams = CryptoContractErc1155DivinerParams,\n> extends CryptoContractDiviner<Erc1155ContractInfo, TParams> {\n  static override configSchemas = [CryptoContractErc1155DivinerConfigSchema]\n\n  protected override async reduceResults(\n    address: string,\n    callResults: CryptoContractFunctionCallResult[],\n  ): Promise<OmittedContractInfo<Erc1155ContractInfo>> {\n    const uri = await CryptoContractErc1155Diviner.findCallResult(address, 'uri', [], callResults)\n    return {\n      schema: Erc1155ContractInfoSchema,\n      uri,\n    }\n  }\n}\n","import { CryptoContractFunctionReadWitnessPlugin } from './Plugin'\n\nexport * from './CryptoContractDiviner'\nexport * from './Erc721Diviner'\nexport * from './Erc1155Diviner'\nexport * from './Witness'\n\nexport { CryptoContractFunctionReadWitnessPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default CryptoContractFunctionReadWitnessPlugin\n"],"mappings":"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","names":["assertEx","CryptoContractFunctionCallResultSchema","CryptoContractFunctionCallSchema","PayloadHasher","isPayloadOfSchemaType","result"]}
+{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/CryptoContractDiviner.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 { CryptoContractFunctionReadWitness } from './Witness'\n\nexport const CryptoContractFunctionReadWitnessPlugin = () =>\n  createPayloadSetWitnessPlugin<CryptoContractFunctionReadWitness>(\n    { required: { [NftSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await CryptoContractFunctionReadWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport {\n  CryptoContractFunctionCall,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n  CryptoContractFunctionCallSchema,\n  CryptoContractFunctionReadWitnessConfig,\n  CryptoContractFunctionReadWitnessConfigSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { BigNumber, Contract } from 'ethers'\n\nexport type CryptoContractFunctionReadWitnessParams<TContract extends Contract> = WitnessParams<\n  AnyConfigSchema<CryptoContractFunctionReadWitnessConfig>,\n  {\n    factory: (address: string) => TContract\n  }\n>\n\nexport class CryptoContractFunctionReadWitness<\n  TContract extends Contract = Contract,\n  TParams extends CryptoContractFunctionReadWitnessParams<TContract> = CryptoContractFunctionReadWitnessParams<TContract>,\n> extends AbstractWitness<TParams, CryptoContractFunctionCall<keyof TContract['callStatic']>, CryptoContractFunctionCallResult> {\n  static override configSchemas = [CryptoContractFunctionReadWitnessConfigSchema]\n\n  protected override async observeHandler(\n    inPayloads: CryptoContractFunctionCall<keyof TContract['callStatic']>[] = [],\n  ): Promise<CryptoContractFunctionCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async (callPayload) => {\n          const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload }\n          const { address, functionName, params } = fullCallPayload\n          const validatedAddress = assertEx(address, 'Missing address')\n          const validatedFunctionName = assertEx(functionName, 'Missing functionName')\n          const contract = this.params.factory(validatedAddress)\n          const func = assertEx(contract.callStatic[validatedFunctionName], `functionName [${validatedFunctionName}] not found`)\n          const rawResult = await func(...(params ?? []))\n          const result: CryptoContractFunctionCallResult['result'] = BigNumber.isBigNumber(rawResult)\n            ? { type: 'BigNumber', value: rawResult.toHexString() }\n            : { value: rawResult }\n          const observation: CryptoContractFunctionCallResult = {\n            address: validatedAddress,\n            call: await PayloadHasher.hashAsync(fullCallPayload),\n            chainId: (await contract.provider.getNetwork()).chainId,\n            functionName: validatedFunctionName,\n            params,\n            result,\n            schema: CryptoContractFunctionCallResultSchema,\n          }\n          return observation\n        }),\n      )\n      return observations.flat()\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n    }\n\n    return []\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport {\n  ContractFunctionResult,\n  CryptoContractFunctionCall,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n  CryptoContractFunctionCallSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const CryptoContractDivinerConfigSchema = 'network.xyo.crypto.contract.diviner.config'\nexport type CryptoContractDivinerConfigSchema = typeof CryptoContractDivinerConfigSchema\n\nexport type CryptoContractDivinerConfig = DivinerConfig<{\n  schema: CryptoContractDivinerConfigSchema\n}>\nexport type CryptoContractDivinerParams = DivinerParams<CryptoContractDivinerConfig>\n\nexport const ContractInfoSchema = 'network.xyo.crypto.contract.info'\nexport type ContractInfoSchema = typeof ContractInfoSchema\n\nexport type ContractInfo = Payload<\n  {\n    address: string\n    chainId: string\n    results?: Record<string, ContractFunctionResult>\n  },\n  ContractInfoSchema\n>\n\nexport class CryptoContractDiviner<TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [CryptoContractDivinerConfigSchema]\n\n  protected static async findCallResult<TResult = string>(\n    address: string,\n    functionName: string,\n    params: unknown[],\n    payloads: CryptoContractFunctionCallResult[],\n  ): Promise<TResult | undefined> {\n    const callHash = await this.generateCallHash(address, functionName, params)\n    const foundPayload = payloads.find((payload) => payload.call === callHash)\n    return foundPayload?.result.value as TResult | undefined\n  }\n\n  protected static async generateCallHash(address: string, functionName: string, params: unknown[]) {\n    const callPayload: CryptoContractFunctionCall = {\n      address,\n      functionName,\n      params,\n      schema: CryptoContractFunctionCallSchema,\n    }\n    return await PayloadHasher.hashAsync(callPayload)\n  }\n\n  protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T): R | undefined {\n    const expectedValue = objs.at(0)?.[field] as R\n    const didNotMatch = objs.reduce((prev, obj) => {\n      return prev || obj[field] !== expectedValue\n    }, false)\n    return didNotMatch ? undefined : expectedValue\n  }\n\n  protected contractInfoRequiredFields(callResults: CryptoContractFunctionCallResult[]): ContractInfo {\n    return {\n      address: assertEx(CryptoContractDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(CryptoContractDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: ContractInfoSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: CryptoContractFunctionCallResult[] = []): Promise<ContractInfo[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<CryptoContractFunctionCallResult>(CryptoContractFunctionCallResultSchema))\n    const addresses = Object.keys(\n      callResults.reduce<Record<string, boolean>>((prev, result) => {\n        if (result.address) {\n          prev[result.address] = true\n        }\n        return prev\n      }, {}),\n    )\n    const result = await Promise.all(\n      addresses.map(async (address) => {\n        const foundCallResults = callResults.filter((callResult) => callResult.address === address)\n        const info: ContractInfo = {\n          ...{ results: await this.reduceResults(foundCallResults) },\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return info\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: CryptoContractFunctionCallResult[]): Promisable<ContractInfo['results']> {\n    return callResults.reduce<Record<string, ContractFunctionResult>>((prev, callResult) => {\n      prev[callResult.functionName] = callResult.result\n      return prev\n    }, {})\n  }\n}\n","import { CryptoContractFunctionReadWitnessPlugin } from './Plugin'\n\nexport * from './CryptoContractDiviner'\nexport * from './Witness'\n\nexport { CryptoContractFunctionReadWitnessPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default CryptoContractFunctionReadWitnessPlugin\n"],"mappings":"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","names":["assertEx","CryptoContractFunctionCallResultSchema","CryptoContractFunctionCallSchema","PayloadHasher","isPayloadOfSchemaType","result"]}

package/package.json

@@ -12,26 +12,26 @@
   "dependencies": {
     "@xylabs/assert": "^2.13.3",
     "@xylabs/promise": "^2.13.3",
-    "@xyo-network/abstract-diviner": "~2.77.17",
-    "@xyo-network/abstract-witness": "~2.77.17",
-    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.77.17",
-    "@xyo-network/crypto-nft-payload-plugin": "~2.77.17",
-    "@xyo-network/diviner-model": "~2.77.17",
-    "@xyo-network/hash": "~2.77.17",
-    "@xyo-network/module-model": "~2.77.17",
-    "@xyo-network/payload-model": "~2.77.17",
-    "@xyo-network/payloadset-plugin": "~2.77.17",
-    "@xyo-network/witness-model": "~2.77.17"
+    "@xyo-network/abstract-diviner": "~2.77.19",
+    "@xyo-network/abstract-witness": "~2.77.19",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.77.19",
+    "@xyo-network/crypto-nft-payload-plugin": "~2.77.19",
+    "@xyo-network/diviner-model": "~2.77.19",
+    "@xyo-network/hash": "~2.77.19",
+    "@xyo-network/module-model": "~2.77.19",
+    "@xyo-network/payload-model": "~2.77.19",
+    "@xyo-network/payloadset-plugin": "~2.77.19",
+    "@xyo-network/witness-model": "~2.77.19"
   },
   "devDependencies": {
     "@ethersproject/providers": "^5.7.2",
     "@xylabs/jest-helpers": "^2.13.3",
     "@xylabs/ts-scripts-yarn3": "^3.1.13",
     "@xylabs/tsconfig": "^3.1.13",
-    "@xyo-network/account": "~2.77.17",
-    "@xyo-network/manifest": "~2.77.17",
+    "@xyo-network/account": "~2.77.19",
+    "@xyo-network/manifest": "~2.77.19",
     "@xyo-network/open-zeppelin-typechain": "^2.2.11",
-    "@xyo-network/sentinel-model": "~2.77.17",
+    "@xyo-network/sentinel-model": "~2.77.19",
     "ethers": "^5.7.2",
     "jest": "^29.7.0",
     "typescript": "^5.2.2"
@@ -76,5 +76,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.77.17"
+  "version": "2.77.19"
 }

package/src/CryptoContractDiviner.ts

@@ -2,6 +2,7 @@ import { assertEx } from '@xylabs/assert'
 import { Promisable } from '@xylabs/promise'
 import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import {
+  ContractFunctionResult,
   CryptoContractFunctionCall,
   CryptoContractFunctionCallResult,
   CryptoContractFunctionCallResultSchema,
@@ -16,31 +17,24 @@ export type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPa
 export const CryptoContractDivinerConfigSchema = 'network.xyo.crypto.contract.diviner.config'
 export type CryptoContractDivinerConfigSchema = typeof CryptoContractDivinerConfigSchema
 
-export type CryptoContractDivinerConfig = DivinerConfig
+export type CryptoContractDivinerConfig = DivinerConfig<{
+  schema: CryptoContractDivinerConfigSchema
+}>
 export type CryptoContractDivinerParams = DivinerParams<CryptoContractDivinerConfig>
 
 export const ContractInfoSchema = 'network.xyo.crypto.contract.info'
 export type ContractInfoSchema = typeof ContractInfoSchema
 
-export type OmittedContractInfo<TFields extends object | Payload | null = null, TSchema extends string | null = null> = Omit<
-  ContractInfo<TFields, TSchema extends null ? (TFields extends Payload ? TFields['schema'] : never) : TSchema>,
-  'address' | 'chainId'
+export type ContractInfo = Payload<
+  {
+    address: string
+    chainId: string
+    results?: Record<string, ContractFunctionResult>
+  },
+  ContractInfoSchema
 >
 
-export type ContractInfo<TFields extends object | null = null, TSchema extends string = ContractInfoSchema> = Payload<
-  TFields extends null
-    ? object
-    : TFields & {
-        address: string
-        chainId: string
-      },
-  TSchema
->
-
-export abstract class CryptoContractDiviner<
-  TContractInfo extends Payload<Omit<ContractInfo, 'schema'>> = ContractInfo,
-  TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams,
-> extends AbstractDiviner<TParams> {
+export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams> extends AbstractDiviner<TParams> {
   static override configSchemas = [CryptoContractDivinerConfigSchema]
 
   protected static async findCallResult<TResult = string>(
@@ -64,7 +58,7 @@ export abstract class CryptoContractDiviner<
     return await PayloadHasher.hashAsync(callPayload)
   }
 
-  protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T) {
+  protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T): R | undefined {
     const expectedValue = objs.at(0)?.[field] as R
     const didNotMatch = objs.reduce((prev, obj) => {
       return prev || obj[field] !== expectedValue
@@ -72,14 +66,15 @@ export abstract class CryptoContractDiviner<
     return didNotMatch ? undefined : expectedValue
   }
 
-  protected contractInfoRequiredFields(callResults: CryptoContractFunctionCallResult[]): Promisable<Omit<ContractInfo, 'schema'>> {
+  protected contractInfoRequiredFields(callResults: CryptoContractFunctionCallResult[]): ContractInfo {
     return {
       address: assertEx(CryptoContractDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),
       chainId: assertEx(CryptoContractDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),
+      schema: ContractInfoSchema,
     }
   }
 
-  protected override async divineHandler(inPayloads: CryptoContractFunctionCallResult[] = []): Promise<TContractInfo[]> {
+  protected override async divineHandler(inPayloads: CryptoContractFunctionCallResult[] = []): Promise<ContractInfo[]> {
     const callResults = inPayloads.filter(isPayloadOfSchemaType<CryptoContractFunctionCallResult>(CryptoContractFunctionCallResultSchema))
     const addresses = Object.keys(
       callResults.reduce<Record<string, boolean>>((prev, result) => {
@@ -92,18 +87,21 @@ export abstract class CryptoContractDiviner<
     const result = await Promise.all(
       addresses.map(async (address) => {
         const foundCallResults = callResults.filter((callResult) => callResult.address === address)
-        return {
-          ...(await this.reduceResults(address, foundCallResults)),
+        const info: ContractInfo = {
+          ...{ results: await this.reduceResults(foundCallResults) },
           ...this.contractInfoRequiredFields(foundCallResults),
-        } as TContractInfo
+        }
+        return info
       }),
     )
 
     return result
   }
 
-  protected abstract reduceResults(
-    address: string,
-    callResults: CryptoContractFunctionCallResult[],
-  ): Promisable<Omit<TContractInfo, 'address' | 'chainId'>>
+  protected reduceResults(callResults: CryptoContractFunctionCallResult[]): Promisable<ContractInfo['results']> {
+    return callResults.reduce<Record<string, ContractFunctionResult>>((prev, callResult) => {
+      prev[callResult.functionName] = callResult.result
+      return prev
+    }, {})
+  }
 }

package/src/Erc721Sentinel.json

@@ -4,7 +4,7 @@
     {
       "config": {
         "accountPath": "m/44'/60'/1'/0'/0'",
-        "name": "Erc721Info",
+        "name": "NftInfo",
         "schema": "network.xyo.node.config"
       },
       "modules": {
@@ -42,12 +42,40 @@
           {
             "config": {
               "accountPath": "m/44'/60'/1'/1'/2'",
+              "call": {
+                "functionName": "tokenURI"
+              },
+              "labels": {
+                "network.xyo.crypto.contract.interface": "Erc721"
+              },
+              "language": "javascript",
+              "name": "Erc721TokenURIWitness",
+              "schema": "network.xyo.crypto.contract.function.read.config"
+            }
+          },
+          {
+            "config": {
+              "accountPath": "m/44'/60'/1'/1'/3'",
+              "call": {
+                "functionName": "ownerOf"
+              },
+              "labels": {
+                "network.xyo.crypto.contract.interface": "Erc721"
+              },
+              "language": "javascript",
+              "name": "Erc721OwnerOfWitness",
+              "schema": "network.xyo.crypto.contract.function.read.config"
+            }
+          },
+          {
+            "config": {
+              "accountPath": "m/44'/60'/1'/1'/4'",
               "call": {
                 "functionName": "totalSupply",
                 "params": []
               },
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TotalSupplyWitness",
@@ -56,7 +84,21 @@
           },
           {
             "config": {
-              "accountPath": "m/44'/60'/1'/1'/3'",
+              "accountPath": "m/44'/60'/1'/1'/5'",
+              "call": {
+                "functionName": "tokenByIndex"
+              },
+              "labels": {
+                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+              },
+              "language": "javascript",
+              "name": "Erc721TokenByIndexWitness",
+              "schema": "network.xyo.crypto.contract.function.read.config"
+            }
+          },
+          {
+            "config": {
+              "accountPath": "m/44'/60'/1'/1'/8'",
               "call": {
                 "functionName": "uri",
                 "params": []
@@ -74,7 +116,7 @@
               "accountPath": "m/44'/60'/1'/2'/0'",
               "language": "javascript",
               "name": "Erc721ContractInfoDiviner",
-              "schema": "network.xyo.crypto.contract.erc721.info.diviner.config"
+              "schema": "network.xyo.crypto.contract.diviner.config"
             }
           },
           {
@@ -82,14 +124,14 @@
               "accountPath": "m/44'/60'/1'/2'/1'",
               "language": "javascript",
               "name": "Erc1155ContractInfoDiviner",
-              "schema": "network.xyo.crypto.contract.erc1155.info.diviner.config"
+              "schema": "network.xyo.crypto.contract.diviner.config"
             }
           },
           {
             "config": {
               "accountPath": "m/44'/60'/1'/3'/0'",
               "language": "javascript",
-              "name": "Erc721InfoSentinel",
+              "name": "NftInfoSentinel",
               "schema": "network.xyo.sentinel.config",
               "synchronous": "true",
               "tasks": [
@@ -125,6 +167,46 @@
                 }
               ]
             }
+          },
+          {
+            "config": {
+              "accountPath": "m/44'/60'/1'/3'/1'",
+              "language": "javascript",
+              "name": "NftTokenInfoSentinel",
+              "schema": "network.xyo.sentinel.config",
+              "synchronous": "true",
+              "tasks": [
+                {
+                  "input": true,
+                  "module": "Erc721NameWitness"
+                },
+                {
+                  "input": true,
+                  "module": "Erc721SymbolWitness"
+                },
+                {
+                  "input": true,
+                  "module": "Erc721TotalSupplyWitness"
+                },
+                {
+                  "input": true,
+                  "module": "Erc1155UriWitness"
+                },
+                {
+                  "input": [
+                    "Erc721TokenURIWitness",
+                    "Erc721OwnerOfWitness"
+                  ],
+                  "module": "Erc721TokenContractInfoDiviner"
+                },
+                {
+                  "input": [
+                    "Erc1155UriWitness"
+                  ],
+                  "module": "Erc1155TokenContractInfoDiviner"
+                }
+              ]
+            }
           }
         ]
       }

package/src/Witness.ts

@@ -31,28 +31,37 @@ export class CryptoContractFunctionReadWitness<
     inPayloads: CryptoContractFunctionCall<keyof TContract['callStatic']>[] = [],
   ): Promise<CryptoContractFunctionCallResult[]> {
     await this.started('throw')
-    const observations = await Promise.all(
-      inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async (callPayload) => {
-        const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload }
-        const { address, functionName, params } = fullCallPayload
-        const validatedAddress = assertEx(address, 'Missing address')
-        const contract = this.params.factory(validatedAddress)
-        const func = assertEx(contract.callStatic[assertEx(functionName, 'missing functionName')], `functionName [${functionName}] not found`)
-        const rawResult = await func(...(params ?? []))
-        const result: CryptoContractFunctionCallResult['result'] = BigNumber.isBigNumber(rawResult)
-          ? { type: 'BigNumber', value: rawResult.toHexString() }
-          : { value: rawResult }
-        const observation: CryptoContractFunctionCallResult = {
-          address: validatedAddress,
-          call: await PayloadHasher.hashAsync(fullCallPayload),
-          chainId: (await contract.provider.getNetwork()).chainId,
-          result,
-          schema: CryptoContractFunctionCallResultSchema,
-        }
-        return observation
-      }),
-    )
+    try {
+      const observations = await Promise.all(
+        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async (callPayload) => {
+          const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload }
+          const { address, functionName, params } = fullCallPayload
+          const validatedAddress = assertEx(address, 'Missing address')
+          const validatedFunctionName = assertEx(functionName, 'Missing functionName')
+          const contract = this.params.factory(validatedAddress)
+          const func = assertEx(contract.callStatic[validatedFunctionName], `functionName [${validatedFunctionName}] not found`)
+          const rawResult = await func(...(params ?? []))
+          const result: CryptoContractFunctionCallResult['result'] = BigNumber.isBigNumber(rawResult)
+            ? { type: 'BigNumber', value: rawResult.toHexString() }
+            : { value: rawResult }
+          const observation: CryptoContractFunctionCallResult = {
+            address: validatedAddress,
+            call: await PayloadHasher.hashAsync(fullCallPayload),
+            chainId: (await contract.provider.getNetwork()).chainId,
+            functionName: validatedFunctionName,
+            params,
+            result,
+            schema: CryptoContractFunctionCallResultSchema,
+          }
+          return observation
+        }),
+      )
+      return observations.flat()
+    } catch (ex) {
+      const error = ex as Error
+      console.log(`Error [${this.config.name}]: ${error.message}`)
+    }
 
-    return observations.flat()
+    return []
   }
 }

package/src/index.ts

@@ -1,8 +1,6 @@
 import { CryptoContractFunctionReadWitnessPlugin } from './Plugin'
 
 export * from './CryptoContractDiviner'
-export * from './Erc721Diviner'
-export * from './Erc1155Diviner'
 export * from './Witness'
 
 export { CryptoContractFunctionReadWitnessPlugin }

package/dist/browser/Erc1155Diviner.d.cts

@@ -1,17 +0,0 @@
-import { CryptoContractFunctionCallResult } from '@xyo-network/crypto-contract-function-read-payload-plugin';
-import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
-import { ContractInfo, CryptoContractDiviner, OmittedContractInfo } from './CryptoContractDiviner';
-export declare const CryptoContractErc1155DivinerConfigSchema = "network.xyo.crypto.contract.erc1155.info.diviner.config";
-export type CryptoContractErc1155DivinerConfigSchema = typeof CryptoContractErc1155DivinerConfigSchema;
-export type CryptoContractErc1155DivinerConfig = DivinerConfig;
-export type CryptoContractErc1155DivinerParams = DivinerParams<CryptoContractErc1155DivinerConfig>;
-export declare const Erc1155ContractInfoSchema = "network.xyo.crypto.contract.erc1155.info";
-export type Erc1155ContractInfoSchema = typeof Erc1155ContractInfoSchema;
-export type Erc1155ContractInfo = ContractInfo<{
-    uri?: string;
-}, Erc1155ContractInfoSchema>;
-export declare class CryptoContractErc1155Diviner<TParams extends CryptoContractErc1155DivinerParams = CryptoContractErc1155DivinerParams> extends CryptoContractDiviner<Erc1155ContractInfo, TParams> {
-    static configSchemas: string[];
-    protected reduceResults(address: string, callResults: CryptoContractFunctionCallResult[]): Promise<OmittedContractInfo<Erc1155ContractInfo>>;
-}
-//# sourceMappingURL=Erc1155Diviner.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"Erc1155Diviner.d.ts","sourceRoot":"","sources":["../../src/Erc1155Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,2DAA2D,CAAA;AAC5G,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAEzE,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAElG,eAAO,MAAM,wCAAwC,4DAA4D,CAAA;AACjH,MAAM,MAAM,wCAAwC,GAAG,OAAO,wCAAwC,CAAA;AAEtG,MAAM,MAAM,kCAAkC,GAAG,aAAa,CAAA;AAC9D,MAAM,MAAM,kCAAkC,GAAG,aAAa,CAAC,kCAAkC,CAAC,CAAA;AAElG,eAAO,MAAM,yBAAyB,6CAA6C,CAAA;AACnF,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAA;AAExE,MAAM,MAAM,mBAAmB,GAAG,YAAY,CAC5C;IACE,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,EACD,yBAAyB,CAC1B,CAAA;AAED,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,CAAC;IAC3D,OAAgB,aAAa,WAA6C;cAEjD,aAAa,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,gCAAgC,EAAE,GAC9C,OAAO,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;CAOrD"}

package/dist/browser/Erc1155Diviner.d.mts

@@ -1,17 +0,0 @@
-import { CryptoContractFunctionCallResult } from '@xyo-network/crypto-contract-function-read-payload-plugin';
-import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
-import { ContractInfo, CryptoContractDiviner, OmittedContractInfo } from './CryptoContractDiviner';
-export declare const CryptoContractErc1155DivinerConfigSchema = "network.xyo.crypto.contract.erc1155.info.diviner.config";
-export type CryptoContractErc1155DivinerConfigSchema = typeof CryptoContractErc1155DivinerConfigSchema;
-export type CryptoContractErc1155DivinerConfig = DivinerConfig;
-export type CryptoContractErc1155DivinerParams = DivinerParams<CryptoContractErc1155DivinerConfig>;
-export declare const Erc1155ContractInfoSchema = "network.xyo.crypto.contract.erc1155.info";
-export type Erc1155ContractInfoSchema = typeof Erc1155ContractInfoSchema;
-export type Erc1155ContractInfo = ContractInfo<{
-    uri?: string;
-}, Erc1155ContractInfoSchema>;
-export declare class CryptoContractErc1155Diviner<TParams extends CryptoContractErc1155DivinerParams = CryptoContractErc1155DivinerParams> extends CryptoContractDiviner<Erc1155ContractInfo, TParams> {
-    static configSchemas: string[];
-    protected reduceResults(address: string, callResults: CryptoContractFunctionCallResult[]): Promise<OmittedContractInfo<Erc1155ContractInfo>>;
-}
-//# sourceMappingURL=Erc1155Diviner.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"Erc1155Diviner.d.ts","sourceRoot":"","sources":["../../src/Erc1155Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,2DAA2D,CAAA;AAC5G,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAEzE,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAElG,eAAO,MAAM,wCAAwC,4DAA4D,CAAA;AACjH,MAAM,MAAM,wCAAwC,GAAG,OAAO,wCAAwC,CAAA;AAEtG,MAAM,MAAM,kCAAkC,GAAG,aAAa,CAAA;AAC9D,MAAM,MAAM,kCAAkC,GAAG,aAAa,CAAC,kCAAkC,CAAC,CAAA;AAElG,eAAO,MAAM,yBAAyB,6CAA6C,CAAA;AACnF,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAA;AAExE,MAAM,MAAM,mBAAmB,GAAG,YAAY,CAC5C;IACE,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,EACD,yBAAyB,CAC1B,CAAA;AAED,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,CAAC;IAC3D,OAAgB,aAAa,WAA6C;cAEjD,aAAa,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,gCAAgC,EAAE,GAC9C,OAAO,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;CAOrD"}

package/dist/browser/Erc1155Diviner.d.ts

@@ -1,17 +0,0 @@
-import { CryptoContractFunctionCallResult } from '@xyo-network/crypto-contract-function-read-payload-plugin';
-import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
-import { ContractInfo, CryptoContractDiviner, OmittedContractInfo } from './CryptoContractDiviner';
-export declare const CryptoContractErc1155DivinerConfigSchema = "network.xyo.crypto.contract.erc1155.info.diviner.config";
-export type CryptoContractErc1155DivinerConfigSchema = typeof CryptoContractErc1155DivinerConfigSchema;
-export type CryptoContractErc1155DivinerConfig = DivinerConfig;
-export type CryptoContractErc1155DivinerParams = DivinerParams<CryptoContractErc1155DivinerConfig>;
-export declare const Erc1155ContractInfoSchema = "network.xyo.crypto.contract.erc1155.info";
-export type Erc1155ContractInfoSchema = typeof Erc1155ContractInfoSchema;
-export type Erc1155ContractInfo = ContractInfo<{
-    uri?: string;
-}, Erc1155ContractInfoSchema>;
-export declare class CryptoContractErc1155Diviner<TParams extends CryptoContractErc1155DivinerParams = CryptoContractErc1155DivinerParams> extends CryptoContractDiviner<Erc1155ContractInfo, TParams> {
-    static configSchemas: string[];
-    protected reduceResults(address: string, callResults: CryptoContractFunctionCallResult[]): Promise<OmittedContractInfo<Erc1155ContractInfo>>;
-}
-//# sourceMappingURL=Erc1155Diviner.d.ts.map