@xyo-network/crypto-contract-function-read-plugin 2.77.20 → 2.78.1

package/dist/node/index.js

@@ -35,45 +35,58 @@ var import_payload_model2 = require("@xyo-network/payload-model");
 var import_payloadset_plugin = require("@xyo-network/payloadset-plugin");
 
 // src/Witness.ts
+var import_bignumber = require("@ethersproject/bignumber");
+var import_contracts = require("@ethersproject/contracts");
 var import_assert = require("@xylabs/assert");
 var import_abstract_witness = require("@xyo-network/abstract-witness");
 var import_crypto_contract_function_read_payload_plugin = require("@xyo-network/crypto-contract-function-read-payload-plugin");
-var import_hash = require("@xyo-network/hash");
 var import_payload_model = require("@xyo-network/payload-model");
-var import_ethers = require("ethers");
 var CryptoContractFunctionReadWitness = class extends import_abstract_witness.AbstractWitness {
   static configSchemas = [import_crypto_contract_function_read_payload_plugin.CryptoContractFunctionReadWitnessConfigSchema];
   async observeHandler(inPayloads = []) {
     await this.started("throw");
     try {
       const observations = await Promise.all(
-        inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(import_crypto_contract_function_read_payload_plugin.CryptoContractFunctionCallSchema)).map(async (callPayload) => {
-          const fullCallPayload = { ...{ params: [] }, ...this.config.call, ...callPayload };
-          const { address, functionName, params } = fullCallPayload;
-          const validatedAddress = (0, import_assert.assertEx)(address, "Missing address");
-          const validatedFunctionName = (0, import_assert.assertEx)(functionName, "Missing functionName");
-          const contract = this.params.factory(validatedAddress);
-          const func = (0, import_assert.assertEx)(contract.callStatic[validatedFunctionName], `functionName [${validatedFunctionName}] not found`);
-          const rawResult = await func(...params ?? []);
-          const result = import_ethers.BigNumber.isBigNumber(rawResult) ? { type: "BigNumber", value: rawResult.toHexString() } : { value: rawResult };
-          const observation = {
-            address: validatedAddress,
-            call: await import_hash.PayloadHasher.hashAsync(fullCallPayload),
-            chainId: (await contract.provider.getNetwork()).chainId,
-            functionName: validatedFunctionName,
-            params,
-            result,
-            schema: import_crypto_contract_function_read_payload_plugin.CryptoContractFunctionCallResultSchema
-          };
-          return observation;
+        inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(import_crypto_contract_function_read_payload_plugin.CryptoContractFunctionCallSchema)).map(async ({ functionName, args, address }) => {
+          const { providers } = this.params;
+          const provider = providers[Date.now() % providers.length];
+          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address");
+          const validatedFunctionName = (0, import_assert.assertEx)(functionName ?? this.config.functionName, "Missing address");
+          const mergedArgs = [...args ?? this.config.args ?? []];
+          const contract = new import_contracts.Contract(validatedAddress, this.config.contract, provider);
+          try {
+            const result = await contract.callStatic[validatedFunctionName](...mergedArgs);
+            const transformedResult = import_bignumber.BigNumber.isBigNumber(result) ? result.toHexString() : result;
+            const observation = {
+              address: validatedAddress,
+              args: mergedArgs,
+              chainId: provider.network.chainId,
+              functionName: validatedFunctionName,
+              result: transformedResult,
+              schema: import_crypto_contract_function_read_payload_plugin.CryptoContractFunctionCallResultSchema
+            };
+            return observation;
+          } catch (ex) {
+            const error = ex;
+            console.log(`Error [${this.config.name}]: ${error.code}`);
+            const observation = {
+              address: validatedAddress,
+              args: mergedArgs,
+              chainId: provider.network.chainId,
+              error: error.code,
+              functionName: validatedFunctionName,
+              schema: import_crypto_contract_function_read_payload_plugin.CryptoContractFunctionCallResultSchema
+            };
+            return observation;
+          }
         })
       );
-      return observations.flat();
+      return observations;
     } catch (ex) {
       const error = ex;
       console.log(`Error [${this.config.name}]: ${error.message}`);
+      throw error;
     }
-    return [];
   }
 };
 
@@ -92,25 +105,15 @@ var CryptoContractFunctionReadWitnessPlugin = () => (0, import_payloadset_plugin
 var import_assert2 = require("@xylabs/assert");
 var import_abstract_diviner = require("@xyo-network/abstract-diviner");
 var import_crypto_contract_function_read_payload_plugin2 = require("@xyo-network/crypto-contract-function-read-payload-plugin");
-var import_hash2 = require("@xyo-network/hash");
 var import_payload_model3 = require("@xyo-network/payload-model");
 var CryptoContractDivinerConfigSchema = "network.xyo.crypto.contract.diviner.config";
 var ContractInfoSchema = "network.xyo.crypto.contract.info";
 var CryptoContractDiviner = class _CryptoContractDiviner extends import_abstract_diviner.AbstractDiviner {
   static configSchemas = [CryptoContractDivinerConfigSchema];
-  static async findCallResult(address, functionName, params, payloads) {
-    const callHash = await this.generateCallHash(address, functionName, params);
-    const foundPayload = payloads.find((payload) => payload.call === callHash);
-    return foundPayload == null ? void 0 : foundPayload.result.value;
-  }
-  static async generateCallHash(address, functionName, params) {
-    const callPayload = {
-      address,
-      functionName,
-      params,
-      schema: import_crypto_contract_function_read_payload_plugin2.CryptoContractFunctionCallSchema
-    };
-    return await import_hash2.PayloadHasher.hashAsync(callPayload);
+  static findCallResult(address, functionName, payloads) {
+    var _a;
+    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address);
+    return (_a = (0, import_crypto_contract_function_read_payload_plugin2.asCryptoContractFunctionCallSuccess)(foundPayload)) == null ? void 0 : _a.result;
   }
   static matchingExistingField(objs, field) {
     var _a;
@@ -151,7 +154,8 @@ var CryptoContractDiviner = class _CryptoContractDiviner extends import_abstract
   }
   reduceResults(callResults) {
     return callResults.reduce((prev, callResult) => {
-      prev[callResult.functionName] = callResult.result;
+      var _a;
+      prev[callResult.functionName] = (_a = (0, import_crypto_contract_function_read_payload_plugin2.asCryptoContractFunctionCallSuccess)(callResult)) == null ? void 0 : _a.result;
       return prev;
     }, {});
   }

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness.ts","../../src/CryptoContractDiviner.ts"],"sourcesContent":["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","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"],"mappings":"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","names":["import_payload_model","import_assert","import_crypto_contract_function_read_payload_plugin","import_hash","import_payload_model","result"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness.ts","../../src/CryptoContractDiviner.ts"],"sourcesContent":["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","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 { BigNumber } from '@ethersproject/bignumber'\nimport { Contract } from '@ethersproject/contracts'\nimport { JsonRpcProvider } from '@ethersproject/providers'\nimport { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport {\n  CryptoContractFunctionCall,\n  CryptoContractFunctionCallFailure,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n  CryptoContractFunctionCallSchema,\n  CryptoContractFunctionCallSuccess,\n  CryptoContractFunctionReadWitnessConfig,\n  CryptoContractFunctionReadWitnessConfigSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessParams } from '@xyo-network/witness-model'\n\nexport type CryptoContractFunctionReadWitnessParams = WitnessParams<\n  AnyConfigSchema<CryptoContractFunctionReadWitnessConfig>,\n  {\n    providers: JsonRpcProvider[]\n  }\n>\n\nexport class CryptoContractFunctionReadWitness<\n  TParams extends CryptoContractFunctionReadWitnessParams = CryptoContractFunctionReadWitnessParams,\n> extends AbstractWitness<TParams, CryptoContractFunctionCall, CryptoContractFunctionCallResult> {\n  static override configSchemas = [CryptoContractFunctionReadWitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: CryptoContractFunctionCall[] = []): Promise<CryptoContractFunctionCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async ({ functionName, args, address }) => {\n          const { providers } = this.params\n          const provider = providers[Date.now() % providers.length] //pick a random provider\n          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')\n          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, 'Missing address')\n          const mergedArgs = [...(args ?? this.config.args ?? [])]\n\n          const contract = new Contract(validatedAddress, this.config.contract, provider)\n          try {\n            const result = await contract.callStatic[validatedFunctionName](...mergedArgs)\n            const transformedResult = BigNumber.isBigNumber(result) ? result.toHexString() : result\n            const observation: CryptoContractFunctionCallSuccess = {\n              address: validatedAddress,\n              args: mergedArgs,\n              chainId: provider.network.chainId,\n              functionName: validatedFunctionName,\n              result: transformedResult,\n              schema: CryptoContractFunctionCallResultSchema,\n            }\n            return observation\n          } catch (ex) {\n            const error = ex as Error & { code: string }\n            console.log(`Error [${this.config.name}]: ${error.code}`)\n            const observation: CryptoContractFunctionCallFailure = {\n              address: validatedAddress,\n              args: mergedArgs,\n              chainId: provider.network.chainId,\n              error: error.code,\n              functionName: validatedFunctionName,\n              schema: CryptoContractFunctionCallResultSchema,\n            }\n            return observation\n          }\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport {\n  asCryptoContractFunctionCallSuccess,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\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, unknown>\n  },\n  ContractInfoSchema\n>\n\nexport class CryptoContractDiviner<TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [CryptoContractDivinerConfigSchema]\n\n  protected static findCallResult<TResult = string>(\n    address: string,\n    functionName: string,\n    payloads: CryptoContractFunctionCallResult[],\n  ): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asCryptoContractFunctionCallSuccess(foundPayload)?.result as TResult | undefined\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, unknown>>((prev, callResult) => {\n      prev[callResult.functionName] = asCryptoContractFunctionCallSuccess(callResult)?.result\n      return prev\n    }, {})\n  }\n}\n"],"mappings":"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","names":["import_payload_model","import_assert","import_crypto_contract_function_read_payload_plugin","import_payload_model","result"]}

package/dist/node/index.mjs

@@ -4,6 +4,8 @@ import { PayloadSetSchema } from "@xyo-network/payload-model";
 import { createPayloadSetWitnessPlugin } from "@xyo-network/payloadset-plugin";
 
 // src/Witness.ts
+import { BigNumber } from "@ethersproject/bignumber";
+import { Contract } from "@ethersproject/contracts";
 import { assertEx } from "@xylabs/assert";
 import { AbstractWitness } from "@xyo-network/abstract-witness";
 import {
@@ -11,42 +13,53 @@ import {
   CryptoContractFunctionCallSchema,
   CryptoContractFunctionReadWitnessConfigSchema
 } from "@xyo-network/crypto-contract-function-read-payload-plugin";
-import { PayloadHasher } from "@xyo-network/hash";
 import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
-import { BigNumber } from "ethers";
 var CryptoContractFunctionReadWitness = class extends AbstractWitness {
   static configSchemas = [CryptoContractFunctionReadWitnessConfigSchema];
   async observeHandler(inPayloads = []) {
     await this.started("throw");
     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;
+        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async ({ functionName, args, address }) => {
+          const { providers } = this.params;
+          const provider = providers[Date.now() % providers.length];
+          const validatedAddress = assertEx(address ?? this.config.address, "Missing address");
+          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, "Missing address");
+          const mergedArgs = [...args ?? this.config.args ?? []];
+          const contract = new Contract(validatedAddress, this.config.contract, provider);
+          try {
+            const result = await contract.callStatic[validatedFunctionName](...mergedArgs);
+            const transformedResult = BigNumber.isBigNumber(result) ? result.toHexString() : result;
+            const observation = {
+              address: validatedAddress,
+              args: mergedArgs,
+              chainId: provider.network.chainId,
+              functionName: validatedFunctionName,
+              result: transformedResult,
+              schema: CryptoContractFunctionCallResultSchema
+            };
+            return observation;
+          } catch (ex) {
+            const error = ex;
+            console.log(`Error [${this.config.name}]: ${error.code}`);
+            const observation = {
+              address: validatedAddress,
+              args: mergedArgs,
+              chainId: provider.network.chainId,
+              error: error.code,
+              functionName: validatedFunctionName,
+              schema: CryptoContractFunctionCallResultSchema
+            };
+            return observation;
+          }
         })
       );
-      return observations.flat();
+      return observations;
     } catch (ex) {
       const error = ex;
       console.log(`Error [${this.config.name}]: ${error.message}`);
+      throw error;
     }
-    return [];
   }
 };
 
@@ -65,28 +78,18 @@ var CryptoContractFunctionReadWitnessPlugin = () => createPayloadSetWitnessPlugi
 import { assertEx as assertEx2 } from "@xylabs/assert";
 import { AbstractDiviner } from "@xyo-network/abstract-diviner";
 import {
-  CryptoContractFunctionCallResultSchema as CryptoContractFunctionCallResultSchema2,
-  CryptoContractFunctionCallSchema as CryptoContractFunctionCallSchema2
+  asCryptoContractFunctionCallSuccess,
+  CryptoContractFunctionCallResultSchema as CryptoContractFunctionCallResultSchema2
 } from "@xyo-network/crypto-contract-function-read-payload-plugin";
-import { PayloadHasher as PayloadHasher2 } from "@xyo-network/hash";
 import { isPayloadOfSchemaType as isPayloadOfSchemaType2 } from "@xyo-network/payload-model";
 var CryptoContractDivinerConfigSchema = "network.xyo.crypto.contract.diviner.config";
 var ContractInfoSchema = "network.xyo.crypto.contract.info";
 var CryptoContractDiviner = class _CryptoContractDiviner extends AbstractDiviner {
   static configSchemas = [CryptoContractDivinerConfigSchema];
-  static async findCallResult(address, functionName, params, payloads) {
-    const callHash = await this.generateCallHash(address, functionName, params);
-    const foundPayload = payloads.find((payload) => payload.call === callHash);
-    return foundPayload == null ? void 0 : foundPayload.result.value;
-  }
-  static async generateCallHash(address, functionName, params) {
-    const callPayload = {
-      address,
-      functionName,
-      params,
-      schema: CryptoContractFunctionCallSchema2
-    };
-    return await PayloadHasher2.hashAsync(callPayload);
+  static findCallResult(address, functionName, payloads) {
+    var _a;
+    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address);
+    return (_a = asCryptoContractFunctionCallSuccess(foundPayload)) == null ? void 0 : _a.result;
   }
   static matchingExistingField(objs, field) {
     var _a;
@@ -127,7 +130,8 @@ var CryptoContractDiviner = class _CryptoContractDiviner extends AbstractDiviner
   }
   reduceResults(callResults) {
     return callResults.reduce((prev, callResult) => {
-      prev[callResult.functionName] = callResult.result;
+      var _a;
+      prev[callResult.functionName] = (_a = asCryptoContractFunctionCallSuccess(callResult)) == null ? void 0 : _a.result;
       return prev;
     }, {});
   }

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"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"]}
+{"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 { BigNumber } from '@ethersproject/bignumber'\nimport { Contract } from '@ethersproject/contracts'\nimport { JsonRpcProvider } from '@ethersproject/providers'\nimport { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport {\n  CryptoContractFunctionCall,\n  CryptoContractFunctionCallFailure,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n  CryptoContractFunctionCallSchema,\n  CryptoContractFunctionCallSuccess,\n  CryptoContractFunctionReadWitnessConfig,\n  CryptoContractFunctionReadWitnessConfigSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { WitnessParams } from '@xyo-network/witness-model'\n\nexport type CryptoContractFunctionReadWitnessParams = WitnessParams<\n  AnyConfigSchema<CryptoContractFunctionReadWitnessConfig>,\n  {\n    providers: JsonRpcProvider[]\n  }\n>\n\nexport class CryptoContractFunctionReadWitness<\n  TParams extends CryptoContractFunctionReadWitnessParams = CryptoContractFunctionReadWitnessParams,\n> extends AbstractWitness<TParams, CryptoContractFunctionCall, CryptoContractFunctionCallResult> {\n  static override configSchemas = [CryptoContractFunctionReadWitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: CryptoContractFunctionCall[] = []): Promise<CryptoContractFunctionCallResult[]> {\n    await this.started('throw')\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType(CryptoContractFunctionCallSchema)).map(async ({ functionName, args, address }) => {\n          const { providers } = this.params\n          const provider = providers[Date.now() % providers.length] //pick a random provider\n          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')\n          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, 'Missing address')\n          const mergedArgs = [...(args ?? this.config.args ?? [])]\n\n          const contract = new Contract(validatedAddress, this.config.contract, provider)\n          try {\n            const result = await contract.callStatic[validatedFunctionName](...mergedArgs)\n            const transformedResult = BigNumber.isBigNumber(result) ? result.toHexString() : result\n            const observation: CryptoContractFunctionCallSuccess = {\n              address: validatedAddress,\n              args: mergedArgs,\n              chainId: provider.network.chainId,\n              functionName: validatedFunctionName,\n              result: transformedResult,\n              schema: CryptoContractFunctionCallResultSchema,\n            }\n            return observation\n          } catch (ex) {\n            const error = ex as Error & { code: string }\n            console.log(`Error [${this.config.name}]: ${error.code}`)\n            const observation: CryptoContractFunctionCallFailure = {\n              address: validatedAddress,\n              args: mergedArgs,\n              chainId: provider.network.chainId,\n              error: error.code,\n              functionName: validatedFunctionName,\n              schema: CryptoContractFunctionCallResultSchema,\n            }\n            return observation\n          }\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport {\n  asCryptoContractFunctionCallSuccess,\n  CryptoContractFunctionCallResult,\n  CryptoContractFunctionCallResultSchema,\n} from '@xyo-network/crypto-contract-function-read-payload-plugin'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\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, unknown>\n  },\n  ContractInfoSchema\n>\n\nexport class CryptoContractDiviner<TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [CryptoContractDivinerConfigSchema]\n\n  protected static findCallResult<TResult = string>(\n    address: string,\n    functionName: string,\n    payloads: CryptoContractFunctionCallResult[],\n  ): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asCryptoContractFunctionCallSuccess(foundPayload)?.result as TResult | undefined\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, unknown>>((prev, callResult) => {\n      prev[callResult.functionName] = asCryptoContractFunctionCallSuccess(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","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.20",
-    "@xyo-network/abstract-witness": "~2.77.20",
-    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.77.20",
-    "@xyo-network/crypto-nft-payload-plugin": "~2.77.20",
-    "@xyo-network/diviner-model": "~2.77.20",
-    "@xyo-network/hash": "~2.77.20",
-    "@xyo-network/module-model": "~2.77.20",
-    "@xyo-network/payload-model": "~2.77.20",
-    "@xyo-network/payloadset-plugin": "~2.77.20",
-    "@xyo-network/witness-model": "~2.77.20"
+    "@xyo-network/abstract-diviner": "~2.78.1",
+    "@xyo-network/abstract-witness": "~2.78.1",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.78.1",
+    "@xyo-network/crypto-nft-payload-plugin": "~2.78.1",
+    "@xyo-network/diviner-model": "~2.78.1",
+    "@xyo-network/hash": "~2.78.1",
+    "@xyo-network/module-model": "~2.78.1",
+    "@xyo-network/payload-model": "~2.78.1",
+    "@xyo-network/payloadset-plugin": "~2.78.1",
+    "@xyo-network/witness-model": "~2.78.1"
   },
   "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.20",
-    "@xyo-network/manifest": "~2.77.20",
+    "@xyo-network/account": "~2.78.1",
+    "@xyo-network/manifest": "~2.78.1",
     "@xyo-network/open-zeppelin-typechain": "^2.2.11",
-    "@xyo-network/sentinel-model": "~2.77.20",
+    "@xyo-network/sentinel-model": "~2.78.1",
     "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.20"
+  "version": "2.78.1"
 }

package/src/CryptoContractDiviner.ts

@@ -2,14 +2,11 @@ import { assertEx } from '@xylabs/assert'
 import { Promisable } from '@xylabs/promise'
 import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import {
-  ContractFunctionResult,
-  CryptoContractFunctionCall,
+  asCryptoContractFunctionCallSuccess,
   CryptoContractFunctionCallResult,
   CryptoContractFunctionCallResultSchema,
-  CryptoContractFunctionCallSchema,
 } from '@xyo-network/crypto-contract-function-read-payload-plugin'
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'
-import { PayloadHasher } from '@xyo-network/hash'
 import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'
 
 export type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]
@@ -29,7 +26,7 @@ export type ContractInfo = Payload<
   {
     address: string
     chainId: string
-    results?: Record<string, ContractFunctionResult>
+    results?: Record<string, unknown>
   },
   ContractInfoSchema
 >
@@ -37,25 +34,13 @@ export type ContractInfo = Payload<
 export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams = CryptoContractDivinerParams> extends AbstractDiviner<TParams> {
   static override configSchemas = [CryptoContractDivinerConfigSchema]
 
-  protected static async findCallResult<TResult = string>(
+  protected static findCallResult<TResult = string>(
     address: string,
     functionName: string,
-    params: unknown[],
     payloads: CryptoContractFunctionCallResult[],
-  ): Promise<TResult | undefined> {
-    const callHash = await this.generateCallHash(address, functionName, params)
-    const foundPayload = payloads.find((payload) => payload.call === callHash)
-    return foundPayload?.result.value as TResult | undefined
-  }
-
-  protected static async generateCallHash(address: string, functionName: string, params: unknown[]) {
-    const callPayload: CryptoContractFunctionCall = {
-      address,
-      functionName,
-      params,
-      schema: CryptoContractFunctionCallSchema,
-    }
-    return await PayloadHasher.hashAsync(callPayload)
+  ): TResult | undefined {
+    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)
+    return asCryptoContractFunctionCallSuccess(foundPayload)?.result as TResult | undefined
   }
 
   protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T): R | undefined {
@@ -99,8 +84,8 @@ export class CryptoContractDiviner<TParams extends CryptoContractDivinerParams =
   }
 
   protected reduceResults(callResults: CryptoContractFunctionCallResult[]): Promisable<ContractInfo['results']> {
-    return callResults.reduce<Record<string, ContractFunctionResult>>((prev, callResult) => {
-      prev[callResult.functionName] = callResult.result
+    return callResults.reduce<Record<string, unknown>>((prev, callResult) => {
+      prev[callResult.functionName] = asCryptoContractFunctionCallSuccess(callResult)?.result
       return prev
     }, {})
   }