@xyo-network/evm-call-witness 5.3.1 → 5.3.3

package/dist/neutral/Diviner.d.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise';
+import type { Promisable } from '@xylabs/sdk-js';
 import { AbstractDiviner } from '@xyo-network/diviner-abstract';
 import type { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model';
 import type { Payload, Schema } from '@xyo-network/payload-model';

package/dist/neutral/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC9E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,MAAM,MAAM,cAAc,CAAC,OAAO,GAAG,MAAM,EAAE,QAAQ,GAAG,OAAO,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AAEvI,eAAO,MAAM,0BAA0B;;CAAwD,CAAA;AAC/F,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC;IAC/C,MAAM,EAAE,0BAA0B,CAAA;CACnC,CAAC,CAAA;AACF,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAA;AAEtE,eAAO,MAAM,oBAAoB;;CAAiD,CAAA;AAClF,MAAM,MAAM,oBAAoB,GAAG,OAAO,oBAAoB,CAAA;AAE9D,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC;IACE,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CACd,MAAM,EACN;QACE,IAAI,CAAC,EAAE,OAAO,EAAE,CAAA;QAChB,MAAM,EAAE,OAAO,CAAA;KAChB,CACF,CAAA;CACF,EACD,oBAAoB,CACrB,CAAA;AAED,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IACvH,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;IACjF,gBAAyB,MAAM,EAAE,oBAAoB,CAA+C;IAEpG,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,GAAG,SAAS;IAKxI,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS;IASzH,SAAS,CAAC,0BAA0B,CAAC,WAAW,EAAE,aAAa,EAAE,GAAG,cAAc;cAQzD,aAAa,CAAC,UAAU,GAAE,aAAa,EAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAyBnG,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;CAkB7F"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC9E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,MAAM,MAAM,cAAc,CAAC,OAAO,GAAG,MAAM,EAAE,QAAQ,GAAG,OAAO,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AAEvI,eAAO,MAAM,0BAA0B;;CAAwD,CAAA;AAC/F,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC;IAC/C,MAAM,EAAE,0BAA0B,CAAA;CACnC,CAAC,CAAA;AACF,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAA;AAEtE,eAAO,MAAM,oBAAoB;;CAAiD,CAAA;AAClF,MAAM,MAAM,oBAAoB,GAAG,OAAO,oBAAoB,CAAA;AAE9D,MAAM,MAAM,cAAc,GAAG,OAAO,CAClC;IACE,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CACd,MAAM,EACN;QACE,IAAI,CAAC,EAAE,OAAO,EAAE,CAAA;QAChB,MAAM,EAAE,OAAO,CAAA;KAChB,CACF,CAAA;CACF,EACD,oBAAoB,CACrB,CAAA;AAED,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IACvH,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;IACjF,gBAAyB,MAAM,EAAE,oBAAoB,CAA+C;IAEpG,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,GAAG,SAAS;IAKxI,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS;IASzH,SAAS,CAAC,0BAA0B,CAAC,WAAW,EAAE,aAAa,EAAE,GAAG,cAAc;cAQzD,aAAa,CAAC,UAAU,GAAE,aAAa,EAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAyBnG,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;CAkB7F"}

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAG1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,KAAK,EACV,OAAO,EAAE,aAAa,EAEvB,MAAM,cAAc,CAAA;AAGrB,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC;IAClJ,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;IAEjF,IAAI,GAAG,IACoD,YAAY,CACtE;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAyD9F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAG1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,KAAK,EACV,OAAO,EAAE,aAAa,EAEvB,MAAM,cAAc,CAAA;AAGrB,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC;IAClJ,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;IAEjF,IAAI,GAAG,IACoD,YAAY,CACtE;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAyD9F"}

package/dist/neutral/index.mjs

@@ -1,5 +1,5 @@
 // src/Diviner.ts
-import { assertEx } from "@xylabs/assert";
+import { assertEx } from "@xylabs/sdk-js";
 import { AbstractDiviner } from "@xyo-network/diviner-abstract";
 import { asSchema as asSchema2, isPayloadOfSchemaType as isPayloadOfSchemaType2 } from "@xyo-network/payload-model";
 
@@ -84,8 +84,11 @@ import { asSchema as asSchema3 } from "@xyo-network/payload-model";
 var EvmCallWitnessConfigSchema = asSchema3("network.xyo.evm.call.witness.config", true);
 
 // src/Witness.ts
-import { assertEx as assertEx2 } from "@xylabs/assert";
-import { asEthAddress, isHexZero } from "@xylabs/hex";
+import {
+  asEthAddress,
+  assertEx as assertEx2,
+  isHexZero
+} from "@xylabs/sdk-js";
 import { getErc1822SlotStatus } from "@xyo-network/erc1822-witness";
 import { getErc1967SlotStatus } from "@xyo-network/erc1967-witness";
 import { isPayloadOfSchemaType as isPayloadOfSchemaType3 } from "@xyo-network/payload-model";

package/dist/neutral/index.mjs.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 type { Promisable } from '@xylabs/promise'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport type { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { asSchema, isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels.ts'\nimport type { EvmCallResult } from './Payload.ts'\nimport { asEvmCallSuccess, EvmCallResultSchema } from './Payload.ts'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = asSchema('network.xyo.evm.call.diviner.config', true)\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = asSchema('network.xyo.evm.call.results', true)\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 readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallDivinerConfigSchema\n  static override readonly labels: EvmCallDivinerLabels = { ...super.labels, ...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 type { 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 = { 'network.xyo.crypto.contract.info': 'diviner' }\n","import type { Payload } from '@xyo-network/payload-model'\nimport { asSchema, isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = asSchema('network.xyo.evm.call', true)\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 = asSchema('network.xyo.evm.call.result', true)\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 { asSchema } from '@xyo-network/payload-model'\nimport type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport type { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = asSchema('network.xyo.evm.call.witness.config', true)\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 { asEthAddress, isHexZero } from '@xylabs/hex'\nimport type { JsonObject } from '@xylabs/object'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport type { Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport type { InterfaceAbi } from 'ethers'\nimport { Contract } from 'ethers'\n\nimport type { EvmCallWitnessParams } from './model.ts'\nimport { EvmCallWitnessConfigSchema } from './model.ts'\nimport type {\n  EvmCall, EvmCallResult,\n  EvmCallSuccess,\n} from './Payload.ts'\nimport { EvmCallResultSchema, EvmCallSchema } from './Payload.ts'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallWitnessConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallWitnessConfigSchema\n\n  get abi() {\n    return assertEx(this.config.abi, () => 'Missing abi') as InterfaceAbi\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 ({\n          functionName, args, address, block: payloadBlock,\n        }) => {\n          const validatedAddress = asEthAddress(assertEx(address ?? this.config.address, () => 'Missing address'), true)\n          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, () => 'Missing address')\n          const mergedArgs = [...(args ?? this.config.args ?? [])] as JsonObject[]\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":["asSchema","isPayloadOfSchemaType","asSchema","isPayloadOfSchemaType","result","asSchema","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}
+{"version":3,"sources":["../../src/Diviner.ts","../../src/Labels.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["import type { Promisable } from '@xylabs/sdk-js'\nimport { assertEx } from '@xylabs/sdk-js'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport type { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { asSchema, isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nimport { EvmCallDivinerLabels } from './Labels.ts'\nimport type { EvmCallResult } from './Payload.ts'\nimport { asEvmCallSuccess, EvmCallResultSchema } from './Payload.ts'\n\nexport type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]\n\nexport const EvmCallDivinerConfigSchema = asSchema('network.xyo.evm.call.diviner.config', true)\nexport type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema\n\nexport type EvmCallDivinerConfig = DivinerConfig<{\n  schema: EvmCallDivinerConfigSchema\n}>\nexport type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>\n\nexport const EvmCallResultsSchema = asSchema('network.xyo.evm.call.results', true)\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 readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallDivinerConfigSchema\n  static override readonly labels: EvmCallDivinerLabels = { ...super.labels, ...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 type { 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 = { 'network.xyo.crypto.contract.info': 'diviner' }\n","import type { Payload } from '@xyo-network/payload-model'\nimport { asSchema, isPayloadOfSchemaType } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = asSchema('network.xyo.evm.call', true)\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 = asSchema('network.xyo.evm.call.result', true)\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 { asSchema } from '@xyo-network/payload-model'\nimport type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport type { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const EvmCallWitnessConfigSchema = asSchema('network.xyo.evm.call.witness.config', true)\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 type { JsonObject } from '@xylabs/sdk-js'\nimport {\n  asEthAddress, assertEx, isHexZero,\n} from '@xylabs/sdk-js'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport type { Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport type { InterfaceAbi } from 'ethers'\nimport { Contract } from 'ethers'\n\nimport type { EvmCallWitnessParams } from './model.ts'\nimport { EvmCallWitnessConfigSchema } from './model.ts'\nimport type {\n  EvmCall, EvmCallResult,\n  EvmCallSuccess,\n} from './Payload.ts'\nimport { EvmCallResultSchema, EvmCallSchema } from './Payload.ts'\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallWitnessConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmCallWitnessConfigSchema\n\n  get abi() {\n    return assertEx(this.config.abi, () => 'Missing abi') as InterfaceAbi\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 ({\n          functionName, args, address, block: payloadBlock,\n        }) => {\n          const validatedAddress = asEthAddress(assertEx(address ?? this.config.address, () => 'Missing address'), true)\n          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, () => 'Missing address')\n          const mergedArgs = [...(args ?? this.config.args ?? [])] as JsonObject[]\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":["asSchema","isPayloadOfSchemaType","asSchema","isPayloadOfSchemaType","result","asSchema","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/evm-call-witness",
-  "version": "5.3.1",
+  "version": "5.3.3",
   "description": "Typescript/Javascript Plugins for XYO Platform",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -30,57 +30,61 @@
   "types": "dist/neutral/index.d.ts",
   "files": [
     "dist",
-    "src",
-    "!**/*.bench.*",
-    "!**/*.spec.*",
-    "!**/*.test.*"
+    "README.md"
   ],
   "dependencies": {
-    "@xylabs/assert": "~5.0.64",
-    "@xylabs/hex": "~5.0.64",
-    "@xylabs/promise": "~5.0.64",
-    "@xyo-network/diviner-abstract": "~5.3.2",
-    "@xyo-network/diviner-model": "~5.3.2",
-    "@xyo-network/erc1822-witness": "5.3.1",
-    "@xyo-network/erc1967-witness": "5.3.1",
-    "@xyo-network/module-model": "~5.3.2",
-    "@xyo-network/payload-model": "~5.3.2",
-    "@xyo-network/witness-evm-abstract": "~5.3.2",
-    "ethers": "^6.16.0"
+    "@xyo-network/erc1822-witness": "workspace:^",
+    "@xyo-network/erc1967-witness": "workspace:^"
   },
   "devDependencies": {
-    "@xylabs/delay": "~5.0.64",
-    "@xylabs/object": "~5.0.64",
-    "@xylabs/profile": "~5.0.64",
-    "@xylabs/ts-scripts-yarn3": "~7.3.2",
-    "@xylabs/tsconfig": "~7.3.2",
-    "@xylabs/vitest-extended": "~5.0.64",
-    "@xyo-network/archivist-memory": "~5.3.2",
-    "@xyo-network/crypto-contract-function-read-payload-plugin": "5.3.1",
-    "@xyo-network/diviner-boundwitness-memory": "~5.3.2",
-    "@xyo-network/diviner-jsonpatch": "~5.3.2",
-    "@xyo-network/diviner-jsonpatch-memory": "~5.3.2",
-    "@xyo-network/diviner-jsonpath-aggregate-memory": "~5.3.2",
-    "@xyo-network/diviner-payload-generic": "~5.3.2",
-    "@xyo-network/diviner-payload-model": "~5.3.2",
-    "@xyo-network/diviner-range": "~5.3.2",
-    "@xyo-network/diviner-temporal-indexing": "~5.3.2",
-    "@xyo-network/evm-contract-witness": "5.3.1",
-    "@xyo-network/evm-nft-id-payload-plugin": "5.3.1",
-    "@xyo-network/evm-token-interface-diviner": "5.3.1",
-    "@xyo-network/manifest": "~5.3.2",
-    "@xyo-network/module-factory-locator": "~5.3.2",
-    "@xyo-network/node-memory": "~5.3.2",
+    "@xylabs/sdk-js": "^5.0.90",
+    "@xylabs/ts-scripts-common": "~7.5.10",
+    "@xylabs/ts-scripts-yarn3": "~7.5.10",
+    "@xylabs/tsconfig": "~7.5.10",
+    "@xylabs/vitest-extended": "~5.0.90",
+    "@xyo-network/archivist-memory": "~5.3.5",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "5.3.3",
+    "@xyo-network/diviner-abstract": "~5.3.5",
+    "@xyo-network/diviner-boundwitness-memory": "~5.3.5",
+    "@xyo-network/diviner-jsonpatch": "~5.3.5",
+    "@xyo-network/diviner-jsonpatch-memory": "~5.3.5",
+    "@xyo-network/diviner-jsonpath-aggregate-memory": "~5.3.5",
+    "@xyo-network/diviner-model": "~5.3.5",
+    "@xyo-network/diviner-payload-generic": "~5.3.5",
+    "@xyo-network/diviner-payload-model": "~5.3.5",
+    "@xyo-network/diviner-range": "~5.3.5",
+    "@xyo-network/diviner-temporal-indexing": "~5.3.5",
+    "@xyo-network/evm-contract-witness": "5.3.3",
+    "@xyo-network/evm-nft-id-payload-plugin": "5.3.3",
+    "@xyo-network/evm-token-interface-diviner": "5.3.3",
+    "@xyo-network/module-factory-locator": "~5.3.5",
+    "@xyo-network/module-model": "~5.3.5",
+    "@xyo-network/node-memory": "~5.3.5",
     "@xyo-network/open-zeppelin-typechain": "~4.1.1",
-    "@xyo-network/sentinel-model": "~5.3.2",
-    "@xyo-network/wallet": "~5.3.2",
-    "@xyo-network/wallet-model": "~5.3.2",
-    "@xyo-network/witness-adhoc": "~5.3.2",
-    "@xyo-network/witness-model": "~5.3.2",
-    "@xyo-network/witness-timestamp": "~5.3.2",
+    "@xyo-network/payload-model": "~5.3.5",
+    "@xyo-network/sdk-js": "~5.3.5",
+    "@xyo-network/sentinel-model": "~5.3.5",
+    "@xyo-network/wallet": "~5.3.5",
+    "@xyo-network/wallet-model": "~5.3.5",
+    "@xyo-network/witness-adhoc": "~5.3.5",
+    "@xyo-network/witness-evm-abstract": "~5.3.5",
+    "@xyo-network/witness-model": "~5.3.5",
+    "@xyo-network/witness-timestamp": "~5.3.5",
     "async-mutex": "~0.5.0",
+    "ethers": "^6.16.0",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.18"
+    "vitest": "~4.1.2",
+    "zod": "^4.3.6"
+  },
+  "peerDependencies": {
+    "@xylabs/sdk-js": "^5",
+    "@xyo-network/diviner-abstract": "^5",
+    "@xyo-network/diviner-model": "^5",
+    "@xyo-network/module-model": "^5",
+    "@xyo-network/payload-model": "^5",
+    "@xyo-network/witness-evm-abstract": "^5",
+    "ethers": "^6",
+    "zod": "^4"
   },
   "publishConfig": {
     "access": "public"

package/src/Diviner.ts

@@ -1,110 +0,0 @@
-import { assertEx } from '@xylabs/assert'
-import type { Promisable } from '@xylabs/promise'
-import { AbstractDiviner } from '@xyo-network/diviner-abstract'
-import type { DivinerConfig, DivinerParams } from '@xyo-network/diviner-model'
-import type { Payload, Schema } from '@xyo-network/payload-model'
-import { asSchema, isPayloadOfSchemaType } from '@xyo-network/payload-model'
-
-import { EvmCallDivinerLabels } from './Labels.ts'
-import type { EvmCallResult } from './Payload.ts'
-import { asEvmCallSuccess, EvmCallResultSchema } from './Payload.ts'
-
-export type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined]
-
-export const EvmCallDivinerConfigSchema = asSchema('network.xyo.evm.call.diviner.config', true)
-export type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema
-
-export type EvmCallDivinerConfig = DivinerConfig<{
-  schema: EvmCallDivinerConfigSchema
-}>
-export type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>
-
-export const EvmCallResultsSchema = asSchema('network.xyo.evm.call.results', true)
-export type EvmCallResultsSchema = typeof EvmCallResultsSchema
-
-export type EvmCallResults = Payload<
-  {
-    address: string
-    chainId: number
-    results?: Record<
-      string,
-      {
-        args?: unknown[]
-        result: unknown
-      }
-    >
-  },
-  EvmCallResultsSchema
->
-
-export class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {
-  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallDivinerConfigSchema]
-  static override readonly defaultConfigSchema: Schema = EvmCallDivinerConfigSchema
-  static override readonly labels: EvmCallDivinerLabels = { ...super.labels, ...EvmCallDivinerLabels }
-
-  protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined {
-    const foundPayload = payloads.find(payload => payload.functionName === functionName && payload.address === address)
-    return asEvmCallSuccess(foundPayload)?.result as TResult | undefined
-  }
-
-  protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T): R | undefined {
-    const expectedValue = objs.at(0)?.[field] as R
-    // eslint-disable-next-line unicorn/no-array-reduce
-    const didNotMatch = objs.reduce((prev, obj) => {
-      return prev || obj[field] !== expectedValue
-    }, false)
-    return didNotMatch ? undefined : expectedValue
-  }
-
-  protected contractInfoRequiredFields(callResults: EvmCallResult[]): EvmCallResults {
-    return {
-      address: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'address'), () => 'Mismatched address'),
-      chainId: assertEx(EvmCallDiviner.matchingExistingField(callResults, 'chainId'), () => 'Mismatched chainId'),
-      schema: EvmCallResultsSchema,
-    }
-  }
-
-  protected override async divineHandler(inPayloads: EvmCallResult[] = []): Promise<EvmCallResults[]> {
-    const callResults = inPayloads.filter(isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema))
-    const addresses = Object.keys(
-      // eslint-disable-next-line unicorn/no-array-reduce
-      callResults.reduce<Record<string, boolean>>((prev, result) => {
-        if (result.address) {
-          prev[result.address] = true
-        }
-        return prev
-      }, {}),
-    )
-    const result = await Promise.all(
-      addresses.map(async (address) => {
-        const foundCallResults = callResults.filter(callResult => callResult.address === address)
-        const results: EvmCallResults = {
-          results: await this.reduceResults(foundCallResults),
-          ...this.contractInfoRequiredFields(foundCallResults),
-        }
-        return results
-      }),
-    )
-
-    return result
-  }
-
-  protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']> {
-    // eslint-disable-next-line unicorn/no-array-reduce
-    return callResults.reduce<
-      Record<
-        string,
-        {
-          args?: unknown[]
-          result: unknown
-        }
-      >
-    >((prev, callResult) => {
-      const typedCallResult = asEvmCallSuccess(callResult)
-      if (typedCallResult) {
-        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result }
-      }
-      return prev
-    }, {})
-  }
-}

package/src/Labels.ts

@@ -1,13 +0,0 @@
-import type { Labels } from '@xyo-network/module-model'
-
-/**
- * Labels for Crypto Contract Diviner components
- */
-export interface EvmCallDivinerLabels extends Labels {
-  'network.xyo.crypto.contract.info': 'diviner'
-}
-
-/**
- * Labels for Crypto Contract Diviner components
- */
-export const EvmCallDivinerLabels: EvmCallDivinerLabels = { 'network.xyo.crypto.contract.info': 'diviner' }

package/src/Payload.ts

@@ -1,54 +0,0 @@
-import type { Payload } from '@xyo-network/payload-model'
-import { asSchema, isPayloadOfSchemaType } from '@xyo-network/payload-model'
-
-export const EvmCallSchema = asSchema('network.xyo.evm.call', true)
-export type EvmCallSchema = typeof EvmCallSchema
-
-export type EvmCall = Payload<
-  {
-    address?: string
-    args?: unknown[]
-    block?: number
-    functionName?: string
-  },
-  EvmCallSchema
->
-
-export const EvmCallResultSchema = asSchema('network.xyo.evm.call.result', true)
-export type EvmCallResultSchema = typeof EvmCallResultSchema
-
-export type EvmCallResultBase = Payload<
-  {
-    address: string
-    args: unknown[]
-    block?: number
-    chainId: number
-    functionName: string
-    implementation?: string
-  },
-  EvmCallResultSchema
->
-
-export type EvmCallSuccess = EvmCallResultBase & {
-  result: unknown
-}
-
-export type EvmCallFailure = EvmCallResultBase & {
-  error: string
-}
-
-export type EvmCallResult = EvmCallSuccess | EvmCallFailure
-
-export const isEvmCallSuccess = (payload?: EvmCallResult): payload is EvmCallSuccess => {
-  return (payload as EvmCallSuccess | undefined)?.result !== undefined
-}
-
-export const isEvmCallFailure = (payload?: EvmCallResult): payload is EvmCallFailure => {
-  return (payload as EvmCallFailure | undefined)?.error !== undefined
-}
-
-export const isEvmCallResult = isPayloadOfSchemaType<EvmCallResult>(EvmCallResultSchema)
-
-export const asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)
-
-export const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)

package/src/Witness.ts

@@ -1,85 +0,0 @@
-import { assertEx } from '@xylabs/assert'
-import { asEthAddress, isHexZero } from '@xylabs/hex'
-import type { JsonObject } from '@xylabs/object'
-import { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'
-import { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'
-import type { Schema } from '@xyo-network/payload-model'
-import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
-import { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'
-import type { InterfaceAbi } from 'ethers'
-import { Contract } from 'ethers'
-
-import type { EvmCallWitnessParams } from './model.ts'
-import { EvmCallWitnessConfigSchema } from './model.ts'
-import type {
-  EvmCall, EvmCallResult,
-  EvmCallSuccess,
-} from './Payload.ts'
-import { EvmCallResultSchema, EvmCallSchema } from './Payload.ts'
-
-export class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {
-  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmCallWitnessConfigSchema]
-  static override readonly defaultConfigSchema: Schema = EvmCallWitnessConfigSchema
-
-  get abi() {
-    return assertEx(this.config.abi, () => 'Missing abi') as InterfaceAbi
-  }
-
-  protected override async observeHandler(inPayloads: EvmCall[] = []): Promise<EvmCallResult[]> {
-    await this.started('throw')
-    // calling it here to make sure we rests the cache
-    await this.getProviders()
-    try {
-      const observations = await Promise.all(
-        inPayloads.filter(isPayloadOfSchemaType<EvmCall>(EvmCallSchema)).map(async ({
-          functionName, args, address, block: payloadBlock,
-        }) => {
-          const validatedAddress = asEthAddress(assertEx(address ?? this.config.address, () => 'Missing address'), true)
-          const validatedFunctionName = assertEx(functionName ?? this.config.functionName, () => 'Missing address')
-          const mergedArgs = [...(args ?? this.config.args ?? [])] as JsonObject[]
-
-          const provider = await this.getProvider(true, true)
-
-          const block = this.config.block ?? payloadBlock ?? (await provider.getBlockNumber())
-
-          // Check if ERC-1967 Upgradeable
-          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block)
-
-          // Check if ERC-1822 Upgradeable
-          const erc1822Status = await getErc1822SlotStatus(provider, validatedAddress, block)
-
-          const implementation = isHexZero(erc1967Status.slots.implementation ?? '0x00') ? erc1822Status.implementation : erc1967Status.implementation
-
-          const contract = new Contract(implementation, this.abi, provider)
-          let transformedResult: unknown
-          try {
-            const result = await contract[validatedFunctionName](...mergedArgs)
-            transformedResult = typeof result === 'bigint' ? `0x${result.toString(16)}` : result
-          } catch {
-            // const error = ex as Error & { code: string }
-            // this.logger.error(`Error [${this.config.name}]: ${error.code} : ${error.message}`)
-          }
-          const observation: EvmCallSuccess = {
-            address: validatedAddress,
-            args: mergedArgs,
-            block,
-            chainId: Number((await provider.getNetwork()).chainId),
-            functionName: validatedFunctionName,
-            result: transformedResult,
-            schema: EvmCallResultSchema,
-          }
-          if (implementation !== validatedAddress) {
-            observation.implementation = implementation
-          }
-          // console.log(`observation: ${JSON.stringify(observation, null, 2)}`)
-          return observation
-        }),
-      )
-      return observations
-    } catch (ex) {
-      const error = ex as Error
-      console.log(`Error [${this.config.name}]: ${error.message}`)
-      throw error
-    }
-  }
-}

package/src/index.ts

@@ -1,5 +0,0 @@
-export * from './Diviner.ts'
-export * from './Labels.ts'
-export * from './model.ts'
-export * from './Payload.ts'
-export * from './Witness.ts'

package/src/model.ts

@@ -1,21 +0,0 @@
-import { asSchema } from '@xyo-network/payload-model'
-import type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'
-import type { JsonFragment } from 'ethers'
-
-export type Abi = string | ReadonlyArray<JsonFragment | string>
-
-export const EvmCallWitnessConfigSchema = asSchema('network.xyo.evm.call.witness.config', true)
-export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema
-
-export type EvmCallWitnessConfig = EvmWitnessConfig<
-  {
-    abi?: Abi
-    address?: string
-    args?: unknown[]
-    block?: number
-    functionName?: string
-  },
-  EvmCallWitnessConfigSchema
->
-
-export type EvmCallWitnessParams = EvmWitnessParams<EvmCallWitnessConfig>