@xyo-network/evm-call-witness 2.85.1 → 2.85.2

package/dist/browser/Diviner.d.cts

@@ -1,5 +1,5 @@
 import { Promisable } from '@xylabs/promise';
-import { AbstractDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/diviner-abstract';
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
 import { Payload } from '@xyo-network/payload-model';
 import { EvmCallDivinerLabels } from './Labels';
@@ -15,7 +15,7 @@ export declare const EvmCallResultsSchema = "network.xyo.evm.call.results";
 export type EvmCallResultsSchema = typeof EvmCallResultsSchema;
 export type EvmCallResults = Payload<{
     address: string;
-    chainId: string;
+    chainId: number;
     results?: Record<string, {
         args?: unknown[];
         result: unknown;

package/dist/browser/Diviner.d.mts

@@ -1,5 +1,5 @@
 import { Promisable } from '@xylabs/promise';
-import { AbstractDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/diviner-abstract';
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
 import { Payload } from '@xyo-network/payload-model';
 import { EvmCallDivinerLabels } from './Labels';
@@ -15,7 +15,7 @@ export declare const EvmCallResultsSchema = "network.xyo.evm.call.results";
 export type EvmCallResultsSchema = typeof EvmCallResultsSchema;
 export type EvmCallResults = Payload<{
     address: string;
-    chainId: string;
+    chainId: number;
     results?: Record<string, {
         args?: unknown[];
         result: unknown;

package/dist/browser/Diviner.d.ts

@@ -1,5 +1,5 @@
 import { Promisable } from '@xylabs/promise';
-import { AbstractDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/diviner-abstract';
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
 import { Payload } from '@xyo-network/payload-model';
 import { EvmCallDivinerLabels } from './Labels';
@@ -15,7 +15,7 @@ export declare const EvmCallResultsSchema = "network.xyo.evm.call.results";
 export type EvmCallResultsSchema = typeof EvmCallResultsSchema;
 export type EvmCallResults = Payload<{
     address: string;
-    chainId: string;
+    chainId: number;
     results?: Record<string, {
         args?: unknown[];
         result: unknown;

package/dist/browser/index.cjs

@@ -38,7 +38,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/Diviner.ts
 var import_assert = require("@xylabs/assert");
-var import_abstract_diviner = require("@xyo-network/abstract-diviner");
+var import_diviner_abstract = require("@xyo-network/diviner-abstract");
 var import_payload_model2 = require("@xyo-network/payload-model");
 
 // src/Labels.ts
@@ -63,7 +63,7 @@ var asEvmCallFailure = (payload) => isEvmCallFailure(payload) ? payload : void 0
 // src/Diviner.ts
 var EvmCallDivinerConfigSchema = "network.xyo.evm.call.diviner.config";
 var EvmCallResultsSchema = "network.xyo.evm.call.results";
-var EvmCallDiviner = class _EvmCallDiviner extends import_abstract_diviner.AbstractDiviner {
+var EvmCallDiviner = class _EvmCallDiviner extends import_diviner_abstract.AbstractDiviner {
   static configSchemas = [EvmCallDivinerConfigSchema];
   static labels = EvmCallDivinerLabels;
   static findCallResult(address, functionName, payloads) {

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["export * from './Diviner'\nexport * from './Labels'\nexport * from './model'\nexport * from './Payload'\nexport * from './Witness'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: string\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":"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","names":["import_payload_model","result","import_assert","import_payload_model"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["export * from './Diviner'\nexport * from './Labels'\nexport * from './model'\nexport * from './Payload'\nexport * from './Witness'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: number\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":"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","names":["import_payload_model","result","import_assert","import_payload_model"]}

package/dist/browser/index.js

@@ -1,6 +1,6 @@
 // src/Diviner.ts
 import { assertEx } from "@xylabs/assert";
-import { AbstractDiviner } from "@xyo-network/abstract-diviner";
+import { AbstractDiviner } from "@xyo-network/diviner-abstract";
 import { isPayloadOfSchemaType as isPayloadOfSchemaType2 } from "@xyo-network/payload-model";
 
 // src/Labels.ts

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: string\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":"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","names":["isPayloadOfSchemaType","isPayloadOfSchemaType","result","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}
+{"version":3,"sources":["../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: number\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":";AAAA,SAAS,gBAAgB;AAEzB,SAAS,uBAAuB;AAEhC,SAAS,yBAAAA,8BAAsC;;;ACQxC,IAAM,uBAA6C;AAAA,EACxD,oCAAoC;AACtC;;;ACdA,SAAS,6BAAsC;AAExC,IAAM,gBAAgB;AAatB,IAAM,sBAAsB;AAyB5B,IAAM,mBAAmB,CAAC,YAAuD;AACtF,SAAQ,SAAwC,WAAW;AAC7D;AAEO,IAAM,mBAAmB,CAAC,YAAuD;AACtF,SAAQ,SAAwC,UAAU;AAC5D;AAEO,IAAM,kBAAkB,sBAAqC,mBAAmB;AAEhF,IAAM,mBAAmB,CAAC,YAA6B,iBAAiB,OAAO,IAAI,UAAU;AAE7F,IAAM,mBAAmB,CAAC,YAA6B,iBAAiB,OAAO,IAAI,UAAU;;;AFzC7F,IAAM,6BAA6B;AAQnC,IAAM,uBAAuB;AAkB7B,IAAM,iBAAN,MAAM,wBAAoF,gBAAyB;AAAA,EACxH,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAC3D,OAAO,SAA+B;AAAA,EAEtC,OAAiB,eAAiC,SAAiB,cAAsB,UAAgD;AACvI,UAAM,eAAe,SAAS,KAAK,CAAC,YAAY,QAAQ,iBAAiB,gBAAgB,QAAQ,YAAY,OAAO;AACpH,WAAO,iBAAiB,YAAY,GAAG;AAAA,EACzC;AAAA,EAEA,OAAiB,sBAA+D,MAAW,OAA+B;AACxH,UAAM,gBAAgB,KAAK,GAAG,CAAC,IAAI,KAAK;AAExC,UAAM,cAAc,KAAK,OAAO,CAAC,MAAM,QAAQ;AAC7C,aAAO,QAAQ,IAAI,KAAK,MAAM;AAAA,IAChC,GAAG,KAAK;AACR,WAAO,cAAc,SAAY;AAAA,EACnC;AAAA,EAEU,2BAA2B,aAA8C;AACjF,WAAO;AAAA,MACL,SAAS,SAAS,gBAAe,sBAAsB,aAAa,SAAS,GAAG,oBAAoB;AAAA,MACpG,SAAS,SAAS,gBAAe,sBAAsB,aAAa,SAAS,GAAG,oBAAoB;AAAA,MACpG,QAAQ;AAAA,IACV;AAAA,EACF;AAAA,EAEA,MAAyB,cAAc,aAA8B,CAAC,GAA8B;AAClG,UAAM,cAAc,WAAW,OAAOC,uBAAqC,mBAAmB,CAAC;AAC/F,UAAM,YAAY,OAAO;AAAA;AAAA,MAEvB,YAAY,OAAgC,CAAC,MAAMC,YAAW;AAC5D,YAAIA,QAAO,SAAS;AAClB,eAAKA,QAAO,OAAO,IAAI;AAAA,QACzB;AACA,eAAO;AAAA,MACT,GAAG,CAAC,CAAC;AAAA,IACP;AACA,UAAM,SAAS,MAAM,QAAQ;AAAA,MAC3B,UAAU,IAAI,OAAO,YAAY;AAC/B,cAAM,mBAAmB,YAAY,OAAO,CAAC,eAAe,WAAW,YAAY,OAAO;AAC1F,cAAM,UAA0B;AAAA,UAC9B,SAAS,MAAM,KAAK,cAAc,gBAAgB;AAAA,UAClD,GAAG,KAAK,2BAA2B,gBAAgB;AAAA,QACrD;AACA,eAAO;AAAA,MACT,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,EACT;AAAA,EAEU,cAAc,aAAqE;AAE3F,WAAO,YAAY,OAQjB,CAAC,MAAM,eAAe;AACtB,YAAM,kBAAkB,iBAAiB,UAAU;AACnD,UAAI,iBAAiB;AACnB,aAAK,WAAW,YAAY,IAAI,EAAE,MAAM,gBAAgB,MAAM,QAAQ,iBAAiB,OAAO;AAAA,MAChG;AACA,aAAO;AAAA,IACT,GAAG,CAAC,CAAC;AAAA,EACP;AACF;;;AGrGO,IAAM,6BAA6B;;;ACL1C,SAAS,YAAAC,iBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,4BAA4B;AACrC,SAAS,4BAA4B;AACrC,SAAS,yBAAAC,8BAA6B;AACtC,SAAS,0BAA0B;AACnC,SAAS,gBAAgB;AAKlB,IAAM,iBAAN,cAA0F,mBAAoD;AAAA,EACnJ,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,IAAI,MAAM;AACR,WAAOC,UAAS,KAAK,OAAO,KAAK,aAAa;AAAA,EAChD;AAAA,EAEA,MAAyB,eAAe,aAAwB,CAAC,GAA6B;AAC5F,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,OAAOC,uBAA+B,aAAa,CAAC,EAAE,IAAI,OAAO,EAAE,cAAc,MAAM,SAAS,OAAO,aAAa,MAAM;AACnI,gBAAM,mBAAmBD,UAAS,WAAW,KAAK,OAAO,SAAS,iBAAiB;AACnF,gBAAM,wBAAwBA,UAAS,gBAAgB,KAAK,OAAO,cAAc,iBAAiB;AAClG,gBAAM,aAAa,CAAC,GAAI,QAAQ,KAAK,OAAO,QAAQ,CAAC,CAAE;AAEvD,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAElD,gBAAM,QAAQ,KAAK,OAAO,SAAS,gBAAiB,MAAM,SAAS,eAAe;AAGlF,gBAAM,gBAAgB,MAAM,qBAAqB,UAAU,kBAAkB,KAAK;AAGlF,gBAAM,gBAAgB,MAAM,qBAAqB,UAAU,kBAAkB,KAAK;AAElF,gBAAM,iBAAiB,UAAU,cAAc,MAAM,kBAAkB,MAAM,IAAI,cAAc,iBAAiB,cAAc;AAE9H,gBAAM,WAAW,IAAI,SAAS,gBAAgB,KAAK,KAAK,QAAQ;AAChE,cAAI;AACJ,cAAI;AACF,kBAAM,SAAS,MAAM,SAAS,qBAAqB,EAAE,GAAG,UAAU;AAClE,gCAAoB,OAAO,WAAW,WAAW,KAAK,OAAO,SAAS,EAAE,CAAC,KAAK;AAAA,UAChF,QAAQ;AAAA,UAGR;AACA,gBAAM,cAA8B;AAAA,YAClC,SAAS;AAAA,YACT,MAAM;AAAA,YACN;AAAA,YACA,SAAS,QAAQ,MAAM,SAAS,WAAW,GAAG,OAAO;AAAA,YACrD,cAAc;AAAA,YACd,QAAQ;AAAA,YACR,QAAQ;AAAA,UACV;AACA,cAAI,mBAAmB,kBAAkB;AACvC,wBAAY,iBAAiB;AAAA,UAC/B;AACA,kBAAQ,IAAI,gBAAgB,KAAK,UAAU,aAAa,MAAM,CAAC,CAAC,EAAE;AAClE,iBAAO;AAAA,QACT,CAAC;AAAA,MACH;AACA,aAAO;AAAA,IACT,SAAS,IAAI;AACX,YAAM,QAAQ;AACd,cAAQ,IAAI,UAAU,KAAK,OAAO,IAAI,MAAM,MAAM,OAAO,EAAE;AAC3D,YAAM;AAAA,IACR;AAAA,EACF;AACF;","names":["isPayloadOfSchemaType","isPayloadOfSchemaType","result","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}

package/dist/node/Diviner.d.cts

@@ -1,5 +1,5 @@
 import { Promisable } from '@xylabs/promise';
-import { AbstractDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/diviner-abstract';
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
 import { Payload } from '@xyo-network/payload-model';
 import { EvmCallDivinerLabels } from './Labels';
@@ -15,7 +15,7 @@ export declare const EvmCallResultsSchema = "network.xyo.evm.call.results";
 export type EvmCallResultsSchema = typeof EvmCallResultsSchema;
 export type EvmCallResults = Payload<{
     address: string;
-    chainId: string;
+    chainId: number;
     results?: Record<string, {
         args?: unknown[];
         result: unknown;

package/dist/node/Diviner.d.mts

@@ -1,5 +1,5 @@
 import { Promisable } from '@xylabs/promise';
-import { AbstractDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/diviner-abstract';
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
 import { Payload } from '@xyo-network/payload-model';
 import { EvmCallDivinerLabels } from './Labels';
@@ -15,7 +15,7 @@ export declare const EvmCallResultsSchema = "network.xyo.evm.call.results";
 export type EvmCallResultsSchema = typeof EvmCallResultsSchema;
 export type EvmCallResults = Payload<{
     address: string;
-    chainId: string;
+    chainId: number;
     results?: Record<string, {
         args?: unknown[];
         result: unknown;

package/dist/node/Diviner.d.ts

@@ -1,5 +1,5 @@
 import { Promisable } from '@xylabs/promise';
-import { AbstractDiviner } from '@xyo-network/abstract-diviner';
+import { AbstractDiviner } from '@xyo-network/diviner-abstract';
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
 import { Payload } from '@xyo-network/payload-model';
 import { EvmCallDivinerLabels } from './Labels';
@@ -15,7 +15,7 @@ export declare const EvmCallResultsSchema = "network.xyo.evm.call.results";
 export type EvmCallResultsSchema = typeof EvmCallResultsSchema;
 export type EvmCallResults = Payload<{
     address: string;
-    chainId: string;
+    chainId: number;
     results?: Record<string, {
         args?: unknown[];
         result: unknown;

package/dist/node/index.cjs

@@ -38,7 +38,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/Diviner.ts
 var import_assert = require("@xylabs/assert");
-var import_abstract_diviner = require("@xyo-network/abstract-diviner");
+var import_diviner_abstract = require("@xyo-network/diviner-abstract");
 var import_payload_model2 = require("@xyo-network/payload-model");
 
 // src/Labels.ts
@@ -63,7 +63,7 @@ var asEvmCallFailure = (payload) => isEvmCallFailure(payload) ? payload : void 0
 // src/Diviner.ts
 var EvmCallDivinerConfigSchema = "network.xyo.evm.call.diviner.config";
 var EvmCallResultsSchema = "network.xyo.evm.call.results";
-var EvmCallDiviner = class _EvmCallDiviner extends import_abstract_diviner.AbstractDiviner {
+var EvmCallDiviner = class _EvmCallDiviner extends import_diviner_abstract.AbstractDiviner {
   static configSchemas = [EvmCallDivinerConfigSchema];
   static labels = EvmCallDivinerLabels;
   static findCallResult(address, functionName, payloads) {

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["export * from './Diviner'\nexport * from './Labels'\nexport * from './model'\nexport * from './Payload'\nexport * from './Witness'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: string\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":"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","names":["import_payload_model","result","import_assert","import_payload_model"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["export * from './Diviner'\nexport * from './Labels'\nexport * from './model'\nexport * from './Payload'\nexport * from './Witness'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: number\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":"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","names":["import_payload_model","result","import_assert","import_payload_model"]}

package/dist/node/index.js

@@ -1,6 +1,6 @@
 // src/Diviner.ts
 import { assertEx } from "@xylabs/assert";
-import { AbstractDiviner } from "@xyo-network/abstract-diviner";
+import { AbstractDiviner } from "@xyo-network/diviner-abstract";
 import { isPayloadOfSchemaType as isPayloadOfSchemaType2 } from "@xyo-network/payload-model";
 
 // src/Labels.ts

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/abstract-diviner'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: string\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":"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","names":["isPayloadOfSchemaType","isPayloadOfSchemaType","result","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}
+{"version":3,"sources":["../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels'\nimport { asEvmCallSuccess, EvmCallResult, EvmCallResultSchema } from './Payload'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = 'network.xyo.evm.call.diviner.config'\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = 'network.xyo.evm.call.results'\nexport type EvmCallResultsSchema = typeof EvmCallResultsSchema\n\nexport type EvmCallResults = Payload<\n  {\n    address: string\n    chainId: number\n    results?: Record<\n      string,\n      {\n        args?: unknown[]\n        result: unknown\n      }\n    >\n  },\n  EvmCallResultsSchema\n>\n\nexport class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {\n  static override configSchemas = [EvmCallDivinerConfigSchema]\n  static labels: EvmCallDivinerLabels = EvmCallDivinerLabels\n\n  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {\n    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address)\n    return asEvmCallSuccess(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    // eslint-disable-next-line unicorn/no-array-reduce\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: EvmCallResult[]): EvmCallResults {\n    return {\n      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), 'Mismatched address'),\n      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), 'Mismatched chainId'),\n      schema: EvmCallResultsSchema,\n    }\n  }\n\n  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {\n    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))\n    const addresses = Object.keys(\n      // eslint-disable-next-line unicorn/no-array-reduce\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 results: EvmCallResults = {\n          results: await this.reduceResults(foundCallResults),\n          ...this.contractInfoRequiredFields(foundCallResults),\n        }\n        return results\n      }),\n    )\n\n    return result\n  }\n\n  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return callResults.reduce<\n      Record<\n        string,\n        {\n          args?: unknown[]\n          result: unknown\n        }\n      >\n    >((prev, callResult) => {\n      const typedCallResult = asEvmCallSuccess(callResult)\n      if (typedCallResult) {\n        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }\n      }\n      return prev\n    }, {})\n  }\n}\n","import { Labels } from '@xyo-network/module-model'\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport interface EvmCallDivinerLabels extends Labels {\n  'network.xyo.crypto.contract.info': 'diviner'\n}\n\n/**\n * Labels for Crypto Contract Diviner components\n */\nexport const EvmCallDivinerLabels: EvmCallDivinerLabels = {\n  'network.xyo.crypto.contract.info': 'diviner',\n}\n","import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.evm.call'\nexport type EvmCallSchema = typeof EvmCallSchema\n\nexport type EvmCall = Payload<\n  {\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallSchema\n>\n\nexport const EvmCallResultSchema = 'network.xyo.evm.call.result'\nexport type EvmCallResultSchema = typeof EvmCallResultSchema\n\nexport type EvmCallResultBase = Payload<\n  {\n    address: string\n    args: unknown[]\n    block?: number\n    chainId: number\n    functionName: string\n    implementation?: string\n  },\n  EvmCallResultSchema\n>\n\nexport type EvmCallSuccess = EvmCallResultBase & {\n  result: unknown\n}\n\nexport type EvmCallFailure = EvmCallResultBase & {\n  error: string\n}\n\nexport type EvmCallResult = EvmCallSuccess | EvmCallFailure\n\nexport const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {\n  return (payload as EvmCallSuccess | undefined)?.result !== undefined\n}\n\nexport const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {\n  return (payload as EvmCallFailure | undefined)?.error !== undefined\n}\n\nexport const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)\n\nexport const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = 'network.xyo.evm.call.witness.config'\nexport type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema\n\nexport type EvmCallWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>\n","import { assertEx } from '@xylabs/assert'\nimport { isHexZero } from '@xylabs/hex'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract } from 'ethers'\n\nimport { EvmCallWitnessConfigSchema, EvmCallWitnessParams } from './model'\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override configSchemas = [EvmCallWitnessConfigSchema]\n\n  get abi() {\n    return assertEx(this.config.abi, 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {\n    await this.started('throw')\n    //calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({ functionName, args, address, block: payloadBlock }) => {\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 provider = await this.getProvider(true, true)\n\n          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())\n\n          //Check if ERC-1967 Upgradeable\n          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          //Check if ERC-1822 Upgradeable\n          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation\n\n          const contract = new Contract(implementation, this.abi, provider)\n          let transformedResult: unknown\n          try {\n            const result = await contract[validatedFunctionName](...mergedArgs)\n            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result\n          } catch {\n            //const error = ex as Error & { code: string }\n            //this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)\n          }\n          const observation: EvmCallSuccess = {\n            address: validatedAddress,\n            args: mergedArgs,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            functionName: validatedFunctionName,\n            result: transformedResult,\n            schema: EvmCallResultSchema,\n          }\n          if (implementation !== validatedAddress) {\n            observation.implementation = implementation\n          }\n          console.log(`observation: ${JSON.stringify(observation, null, 2)}`)\n          return observation\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"],"mappings":"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","names":["isPayloadOfSchemaType","isPayloadOfSchemaType","result","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}

package/package.json

@@ -10,34 +10,46 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.13.22",
-    "@xylabs/hex": "^2.13.22",
-    "@xylabs/promise": "^2.13.22",
-    "@xyo-network/abstract-diviner": "^2.85.3",
-    "@xyo-network/diviner-model": "^2.85.3",
-    "@xyo-network/erc1822-witness": "~2.85.1",
-    "@xyo-network/erc1967-witness": "~2.85.1",
-    "@xyo-network/payload-model": "^2.85.3",
-    "@xyo-network/witness-evm-abstract": "^2.85.3",
-    "ethers": "^6.9.1"
+    "@xylabs/assert": "^2.13.23",
+    "@xylabs/hex": "^2.13.23",
+    "@xylabs/promise": "^2.13.23",
+    "@xyo-network/diviner-abstract": "^2.85.8",
+    "@xyo-network/diviner-model": "^2.85.8",
+    "@xyo-network/erc1822-witness": "~2.85.2",
+    "@xyo-network/erc1967-witness": "~2.85.2",
+    "@xyo-network/payload-model": "^2.85.8",
+    "@xyo-network/witness-evm-abstract": "^2.85.8",
+    "ethers": "^6.9.2"
   },
   "devDependencies": {
-    "@xylabs/jest-helpers": "^2.13.22",
-    "@xylabs/profile": "^2.13.22",
+    "@xylabs/delay": "^2.13.23",
+    "@xylabs/jest-helpers": "^2.13.23",
+    "@xylabs/profile": "^2.13.23",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig": "^3.2.25",
-    "@xyo-network/account": "^2.85.3",
-    "@xyo-network/diviner-jsonpatch-memory": "^2.85.3",
-    "@xyo-network/diviner-jsonpath-aggregate-memory": "^2.85.3",
-    "@xyo-network/diviner-range": "^2.85.3",
-    "@xyo-network/evm-contract-witness": "~2.85.1",
-    "@xyo-network/evm-token-interface-diviner": "~2.85.1",
-    "@xyo-network/manifest": "^2.85.3",
-    "@xyo-network/module-model": "^2.85.3",
+    "@xyo-network/account": "^2.85.8",
+    "@xyo-network/archivist-memory": "^2.85.8",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "~2.85.2",
+    "@xyo-network/diviner-boundwitness-memory": "^2.85.8",
+    "@xyo-network/diviner-jsonpatch": "^2.85.8",
+    "@xyo-network/diviner-jsonpatch-memory": "^2.85.8",
+    "@xyo-network/diviner-jsonpath-aggregate-memory": "^2.85.8",
+    "@xyo-network/diviner-payload-memory": "^2.85.8",
+    "@xyo-network/diviner-payload-model": "^2.85.8",
+    "@xyo-network/diviner-range": "^2.85.8",
+    "@xyo-network/diviner-temporal-indexing": "^2.85.8",
+    "@xyo-network/evm-contract-witness": "~2.85.2",
+    "@xyo-network/evm-nft-id-payload-plugin": "~2.85.2",
+    "@xyo-network/evm-token-interface-diviner": "~2.85.2",
+    "@xyo-network/manifest": "^2.85.8",
+    "@xyo-network/module-model": "^2.85.8",
+    "@xyo-network/node-memory": "^2.85.8",
     "@xyo-network/open-zeppelin-typechain": "^3.0.5",
-    "@xyo-network/sentinel-model": "^2.85.3",
-    "@xyo-network/witness-adhoc": "^2.85.3",
-    "@xyo-network/witness-model": "^2.85.3",
+    "@xyo-network/sentinel-model": "^2.85.8",
+    "@xyo-network/witness-adhoc": "^2.85.8",
+    "@xyo-network/witness-model": "^2.85.8",
+    "@xyo-network/witness-timestamp": "^2.85.8",
+    "async-mutex": "^0.4.0",
     "jest": "^29.7.0",
     "typescript": "^5.3.3"
   },
@@ -80,6 +92,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.85.1",
+  "version": "2.85.2",
   "type": "module"
 }

package/src/Diviner.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { Promisable } from '@xylabs/promise'
-import { AbstractDiviner } from '@xyo-network/abstract-diviner'
+import { AbstractDiviner } from '@xyo-network/diviner-abstract'
 import { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'
 import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'
 
@@ -23,7 +23,7 @@ export type EvmCallResultsSchema = typeof EvmCallResultsSchema
 export type EvmCallResults = Payload<
   {
     address: string
-    chainId: string
+    chainId: number
     results?: Record<
       string,
       {

package/src/spec/imported/AddressToContract/AddressToContractIndex/Contract.Sentinel.Node.json

@@ -20,7 +20,7 @@
             "config": {
               "functionName": "name",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721NameWitness",
@@ -32,7 +32,7 @@
             "config": {
               "functionName": "symbol",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721SymbolWitness",
@@ -44,7 +44,7 @@
             "config": {
               "functionName": "tokenURI",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721TokenURIWitness",
@@ -55,7 +55,7 @@
             "config": {
               "functionName": "ownerOf",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721OwnerOfWitness",
@@ -66,7 +66,7 @@
             "config": {
               "functionName": "totalSupply",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TotalSupplyWitness",
@@ -81,7 +81,7 @@
               ],
               "functionName": "uri",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc1155"
+                "network.xyo.evm.interface": "Erc1155"
               },
               "language": "javascript",
               "name": "Erc1155UriWitness",

package/src/spec/imported/AddressToContract/Erc721Sentinel.json

@@ -12,7 +12,7 @@
             "config": {
               "functionName": "name",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721NameWitness",
@@ -24,7 +24,7 @@
             "config": {
               "functionName": "symbol",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721SymbolWitness",
@@ -36,7 +36,7 @@
             "config": {
               "functionName": "tokenURI",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721TokenURIWitness",
@@ -47,7 +47,7 @@
             "config": {
               "functionName": "ownerOf",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721"
+                "network.xyo.evm.interface": "Erc721"
               },
               "language": "javascript",
               "name": "Erc721OwnerOfWitness",
@@ -58,7 +58,7 @@
             "config": {
               "functionName": "totalSupply",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TotalSupplyWitness",
@@ -70,7 +70,7 @@
             "config": {
               "functionName": "tokenByIndex",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TokenByIndexWitness",
@@ -81,7 +81,7 @@
             "config": {
               "functionName": "uri",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc1155"
+                "network.xyo.evm.interface": "Erc1155"
               },
               "language": "javascript",
               "name": "Erc1155UriWitness",

package/src/spec/imported/AddressToTotalSupplyIndex/Erc721.TotalSupply.Index.json

@@ -155,7 +155,7 @@
             "config": {
               "functionName": "totalSupply",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "name": "Erc721TotalSupplyWitness",
               "schema": "network.xyo.evm.call.witness.config"

package/src/spec/imported/NftIndexToNftIdIndex/Erc721.NftId.Index.json

@@ -52,9 +52,7 @@
           {
             "config": {
               "filter": {
-                "payload_schemas": [
-                  "network.xyo.evm.nft.index"
-                ]
+                "payload_schemas": ["network.xyo.evm.nft.id"]
               },
               "labels": {
                 "network.xyo.diviner.stage": "stateToIndexCandidateDiviner"
@@ -76,7 +74,7 @@
               "name": "IndexCandidateToIndexDiviner",
               "schema": "network.xyo.diviner.indexing.temporal.stage.indexCandidateToIndexDiviner.config",
               "schemaTransforms": {
-                "network.xyo.evm.nft.index": [
+                "network.xyo.evm.nft.id": [
                   {
                     "destinationField": "address",
                     "sourcePathExpression": "$.address"
@@ -86,8 +84,8 @@
                     "sourcePathExpression": "$.chainId"
                   },
                   {
-                    "destinationField": "index",
-                    "sourcePathExpression": "$.index"
+                    "destinationField": "tokenId",
+                    "sourcePathExpression": "$.tokenId"
                   }
                 ],
                 "network.xyo.timestamp": [
@@ -120,6 +118,11 @@
                     "destinationField": "chainId",
                     "sourcePathExpression": "$.chainId"
                   },
+                  {
+                    "defaultValue": 1,
+                    "destinationField": "tokenId",
+                    "sourcePathExpression": "$.tokenId"
+                  },
                   {
                     "defaultValue": 1,
                     "destinationField": "limit",
@@ -222,7 +225,7 @@
             "config": {
               "functionName": "tokenByIndex",
               "labels": {
-                "network.xyo.crypto.contract.interface": "Erc721Enumerable"
+                "network.xyo.evm.interface": "Erc721Enumerable"
               },
               "language": "javascript",
               "name": "Erc721TokenByIndexWitness",
@@ -232,9 +235,7 @@
           {
             "config": {
               "archiving": {
-                "archivists": [
-                  "Archivist"
-                ]
+                "archivists": ["Archivist"]
               },
               "name": "TokenIndexToTokenIdSentinel",
               "schema": "network.xyo.sentinel.config",
@@ -296,9 +297,7 @@
           {
             "config": {
               "archiving": {
-                "archivists": [
-                  "Archivist"
-                ]
+                "archivists": ["Archivist"]
               },
               "name": "Sentinel",
               "schema": "network.xyo.sentinel.config",
@@ -309,10 +308,12 @@
                   "module": "Erc721TokenByIndexWitness"
                 },
                 {
-                  "input": [
-                    "Erc721TokenByIndexWitness"
-                  ],
+                  "input": ["Erc721TokenByIndexWitness"],
                   "module": "NftIdPartialToNftIdTransformDiviner"
+                },
+                {
+                  "input": ["Erc721TokenByIndexWitness"],
+                  "module": "TimestampWitness"
                 }
               ]
             }
@@ -322,4 +323,4 @@
     }
   ],
   "schema": "network.xyo.manifest"
-}
+}