@xyo-network/evm-call-witness 5.3.2 → 5.3.4

package/dist/neutral/Diviner.d.ts

@@ -0,0 +1,38 @@
+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';
+import { EvmCallDivinerLabels } from './Labels.ts';
+import type { EvmCallResult } from './Payload.ts';
+export type FindCallResult<TResult = string, TPayload = Payload> = [TResult, TPayload] | [undefined, TPayload] | [undefined, undefined];
+export declare const EvmCallDivinerConfigSchema: "network.xyo.evm.call.diviner.config" & {
+    readonly __schema: true;
+};
+export type EvmCallDivinerConfigSchema = typeof EvmCallDivinerConfigSchema;
+export type EvmCallDivinerConfig = DivinerConfig<{
+    schema: EvmCallDivinerConfigSchema;
+}>;
+export type EvmCallDivinerParams = DivinerParams<EvmCallDivinerConfig>;
+export declare const EvmCallResultsSchema: "network.xyo.evm.call.results" & {
+    readonly __schema: true;
+};
+export type EvmCallResultsSchema = typeof EvmCallResultsSchema;
+export type EvmCallResults = Payload<{
+    address: string;
+    chainId: number;
+    results?: Record<string, {
+        args?: unknown[];
+        result: unknown;
+    }>;
+}, EvmCallResultsSchema>;
+export declare class EvmCallDiviner<TParams extends EvmCallDivinerParams = EvmCallDivinerParams> extends AbstractDiviner<TParams> {
+    static readonly configSchemas: Schema[];
+    static readonly defaultConfigSchema: Schema;
+    static readonly labels: EvmCallDivinerLabels;
+    protected static findCallResult<TResult = string>(address: string, functionName: string, payloads: EvmCallResult[]): TResult | undefined;
+    protected static matchingExistingField<R = string, T extends Payload = Payload>(objs: T[], field: keyof T): R | undefined;
+    protected contractInfoRequiredFields(callResults: EvmCallResult[]): EvmCallResults;
+    protected divineHandler(inPayloads?: EvmCallResult[]): Promise<EvmCallResults[]>;
+    protected reduceResults(callResults: EvmCallResult[]): Promisable<EvmCallResults['results']>;
+}
+//# sourceMappingURL=Diviner.d.ts.map

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

@@ -0,0 +1 @@
+{"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/Labels.d.ts

@@ -0,0 +1,12 @@
+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 declare const EvmCallDivinerLabels: EvmCallDivinerLabels;
+//# sourceMappingURL=Labels.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Labels.d.ts","sourceRoot":"","sources":["../../src/Labels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAEvD;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,MAAM;IAClD,kCAAkC,EAAE,SAAS,CAAA;CAC9C;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,oBAAwE,CAAA"}

package/dist/neutral/Payload.d.ts

@@ -0,0 +1,36 @@
+import type { Payload } from '@xyo-network/payload-model';
+export declare const EvmCallSchema: "network.xyo.evm.call" & {
+    readonly __schema: true;
+};
+export type EvmCallSchema = typeof EvmCallSchema;
+export type EvmCall = Payload<{
+    address?: string;
+    args?: unknown[];
+    block?: number;
+    functionName?: string;
+}, EvmCallSchema>;
+export declare const EvmCallResultSchema: "network.xyo.evm.call.result" & {
+    readonly __schema: 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 declare const isEvmCallSuccess: (payload?: EvmCallResult) => payload is EvmCallSuccess;
+export declare const isEvmCallFailure: (payload?: EvmCallResult) => payload is EvmCallFailure;
+export declare const isEvmCallResult: (x?: unknown | null) => x is EvmCallResult;
+export declare const asEvmCallSuccess: (payload?: EvmCallResult) => EvmCallSuccess | undefined;
+export declare const asEvmCallFailure: (payload?: EvmCallResult) => EvmCallFailure | undefined;
+//# sourceMappingURL=Payload.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGzD,eAAO,MAAM,aAAa;;CAAyC,CAAA;AACnE,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAA;AAEhD,MAAM,MAAM,OAAO,GAAG,OAAO,CAC3B;IACE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,EAAE,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,EACD,aAAa,CACd,CAAA;AAED,eAAO,MAAM,mBAAmB;;CAAgD,CAAA;AAChF,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAA;AAE5D,MAAM,MAAM,iBAAiB,GAAG,OAAO,CACrC;IACE,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,OAAO,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,EACD,mBAAmB,CACpB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,iBAAiB,GAAG;IAC/C,MAAM,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,iBAAiB,GAAG;IAC/C,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,cAAc,CAAA;AAE3D,eAAO,MAAM,gBAAgB,GAAI,UAAU,aAAa,KAAG,OAAO,IAAI,cAErE,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,aAAa,KAAG,OAAO,IAAI,cAErE,CAAA;AAED,eAAO,MAAM,eAAe,4CAA4D,CAAA;AAExF,eAAO,MAAM,gBAAgB,GAAI,UAAU,aAAa,+BAAsD,CAAA;AAE9G,eAAO,MAAM,gBAAgB,GAAI,UAAU,aAAa,+BAAsD,CAAA"}

package/dist/neutral/Witness.d.ts

@@ -0,0 +1,12 @@
+import type { Schema } from '@xyo-network/payload-model';
+import { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract';
+import type { InterfaceAbi } from 'ethers';
+import type { EvmCallWitnessParams } from './model.ts';
+import type { EvmCall, EvmCallResult } from './Payload.ts';
+export declare class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractEvmWitness<TParams, EvmCall, EvmCallResult> {
+    static readonly configSchemas: Schema[];
+    static readonly defaultConfigSchema: Schema;
+    get abi(): InterfaceAbi;
+    protected observeHandler(inPayloads?: EvmCall[]): Promise<EvmCallResult[]>;
+}
+//# sourceMappingURL=Witness.d.ts.map

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

@@ -0,0 +1 @@
+{"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.d.ts

@@ -0,0 +1,6 @@
+export * from './Diviner.ts';
+export * from './Labels.ts';
+export * from './model.ts';
+export * from './Payload.ts';
+export * from './Witness.ts';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA"}

package/dist/neutral/index.mjs

@@ -0,0 +1,167 @@
+// src/Diviner.ts
+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";
+
+// src/Labels.ts
+var EvmCallDivinerLabels = { "network.xyo.crypto.contract.info": "diviner" };
+
+// src/Payload.ts
+import { asSchema, isPayloadOfSchemaType } from "@xyo-network/payload-model";
+var EvmCallSchema = asSchema("network.xyo.evm.call", true);
+var EvmCallResultSchema = asSchema("network.xyo.evm.call.result", true);
+var isEvmCallSuccess = (payload) => {
+  return payload?.result !== void 0;
+};
+var isEvmCallFailure = (payload) => {
+  return payload?.error !== void 0;
+};
+var isEvmCallResult = isPayloadOfSchemaType(EvmCallResultSchema);
+var asEvmCallSuccess = (payload) => isEvmCallSuccess(payload) ? payload : void 0;
+var asEvmCallFailure = (payload) => isEvmCallFailure(payload) ? payload : void 0;
+
+// src/Diviner.ts
+var EvmCallDivinerConfigSchema = asSchema2("network.xyo.evm.call.diviner.config", true);
+var EvmCallResultsSchema = asSchema2("network.xyo.evm.call.results", true);
+var EvmCallDiviner = class _EvmCallDiviner extends AbstractDiviner {
+  static configSchemas = [...super.configSchemas, EvmCallDivinerConfigSchema];
+  static defaultConfigSchema = EvmCallDivinerConfigSchema;
+  static labels = { ...super.labels, ...EvmCallDivinerLabels };
+  static findCallResult(address, functionName, payloads) {
+    const foundPayload = payloads.find((payload) => payload.functionName === functionName && payload.address === address);
+    return asEvmCallSuccess(foundPayload)?.result;
+  }
+  static matchingExistingField(objs, field) {
+    const expectedValue = objs.at(0)?.[field];
+    const didNotMatch = objs.reduce((prev, obj) => {
+      return prev || obj[field] !== expectedValue;
+    }, false);
+    return didNotMatch ? void 0 : expectedValue;
+  }
+  contractInfoRequiredFields(callResults) {
+    return {
+      address: assertEx(_EvmCallDiviner.matchingExistingField(callResults, "address"), () => "Mismatched address"),
+      chainId: assertEx(_EvmCallDiviner.matchingExistingField(callResults, "chainId"), () => "Mismatched chainId"),
+      schema: EvmCallResultsSchema
+    };
+  }
+  async divineHandler(inPayloads = []) {
+    const callResults = inPayloads.filter(isPayloadOfSchemaType2(EvmCallResultSchema));
+    const addresses = Object.keys(
+      // eslint-disable-next-line unicorn/no-array-reduce
+      callResults.reduce((prev, result2) => {
+        if (result2.address) {
+          prev[result2.address] = true;
+        }
+        return prev;
+      }, {})
+    );
+    const result = await Promise.all(
+      addresses.map(async (address) => {
+        const foundCallResults = callResults.filter((callResult) => callResult.address === address);
+        const results = {
+          results: await this.reduceResults(foundCallResults),
+          ...this.contractInfoRequiredFields(foundCallResults)
+        };
+        return results;
+      })
+    );
+    return result;
+  }
+  reduceResults(callResults) {
+    return callResults.reduce((prev, callResult) => {
+      const typedCallResult = asEvmCallSuccess(callResult);
+      if (typedCallResult) {
+        prev[callResult.functionName] = { args: typedCallResult.args, result: typedCallResult?.result };
+      }
+      return prev;
+    }, {});
+  }
+};
+
+// src/model.ts
+import { asSchema as asSchema3 } from "@xyo-network/payload-model";
+var EvmCallWitnessConfigSchema = asSchema3("network.xyo.evm.call.witness.config", true);
+
+// src/Witness.ts
+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";
+import { AbstractEvmWitness } from "@xyo-network/witness-evm-abstract";
+import { Contract } from "ethers";
+var EvmCallWitness = class extends AbstractEvmWitness {
+  static configSchemas = [...super.configSchemas, EvmCallWitnessConfigSchema];
+  static defaultConfigSchema = EvmCallWitnessConfigSchema;
+  get abi() {
+    return assertEx2(this.config.abi, () => "Missing abi");
+  }
+  async observeHandler(inPayloads = []) {
+    await this.started("throw");
+    await this.getProviders();
+    try {
+      const observations = await Promise.all(
+        inPayloads.filter(isPayloadOfSchemaType3(EvmCallSchema)).map(async ({
+          functionName,
+          args,
+          address,
+          block: payloadBlock
+        }) => {
+          const validatedAddress = asEthAddress(assertEx2(address ?? this.config.address, () => "Missing address"), true);
+          const validatedFunctionName = assertEx2(functionName ?? this.config.functionName, () => "Missing address");
+          const mergedArgs = [...args ?? this.config.args ?? []];
+          const provider = await this.getProvider(true, true);
+          const block = this.config.block ?? payloadBlock ?? await provider.getBlockNumber();
+          const erc1967Status = await getErc1967SlotStatus(provider, validatedAddress, block);
+          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;
+          try {
+            const result = await contract[validatedFunctionName](...mergedArgs);
+            transformedResult = typeof result === "bigint" ? `0x${result.toString(16)}` : result;
+          } catch {
+          }
+          const observation = {
+            address: validatedAddress,
+            args: mergedArgs,
+            block,
+            chainId: Number((await provider.getNetwork()).chainId),
+            functionName: validatedFunctionName,
+            result: transformedResult,
+            schema: EvmCallResultSchema
+          };
+          if (implementation !== validatedAddress) {
+            observation.implementation = implementation;
+          }
+          return observation;
+        })
+      );
+      return observations;
+    } catch (ex) {
+      const error = ex;
+      console.log(`Error [${this.config.name}]: ${error.message}`);
+      throw error;
+    }
+  }
+};
+export {
+  EvmCallDiviner,
+  EvmCallDivinerConfigSchema,
+  EvmCallDivinerLabels,
+  EvmCallResultSchema,
+  EvmCallResultsSchema,
+  EvmCallSchema,
+  EvmCallWitness,
+  EvmCallWitnessConfigSchema,
+  asEvmCallFailure,
+  asEvmCallSuccess,
+  isEvmCallFailure,
+  isEvmCallResult,
+  isEvmCallSuccess
+};
+//# sourceMappingURL=index.mjs.map

package/dist/neutral/index.mjs.map

@@ -0,0 +1 @@
+{"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/dist/neutral/model.d.ts

@@ -0,0 +1,16 @@
+import type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract';
+import type { JsonFragment } from 'ethers';
+export type Abi = string | ReadonlyArray<JsonFragment | string>;
+export declare const EvmCallWitnessConfigSchema: "network.xyo.evm.call.witness.config" & {
+    readonly __schema: 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>;
+//# sourceMappingURL=model.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AAC3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAE1C,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,aAAa,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;AAE/D,eAAO,MAAM,0BAA0B;;CAAwD,CAAA;AAC/F,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CACjD;IACE,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,EAAE,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,EACD,0BAA0B,CAC3B,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/evm-call-witness",
-  "version": "5.3.2",
+  "version": "5.3.4",
   "description": "Typescript/Javascript Plugins for XYO Platform",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -30,18 +30,20 @@
   "types": "dist/neutral/index.d.ts",
   "files": [
     "dist",
-    "src",
-    "!**/*.bench.*",
-    "!**/*.spec.*",
-    "!**/*.test.*"
+    "README.md"
   ],
+  "dependencies": {
+    "@xyo-network/erc1822-witness": "~5.3.4",
+    "@xyo-network/erc1967-witness": "~5.3.4"
+  },
   "devDependencies": {
     "@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.2",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "5.3.4",
     "@xyo-network/diviner-abstract": "~5.3.5",
     "@xyo-network/diviner-boundwitness-memory": "~5.3.5",
     "@xyo-network/diviner-jsonpatch": "~5.3.5",
@@ -52,11 +54,9 @@
     "@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/erc1822-witness": "5.3.2",
-    "@xyo-network/erc1967-witness": "5.3.2",
-    "@xyo-network/evm-contract-witness": "5.3.2",
-    "@xyo-network/evm-nft-id-payload-plugin": "5.3.2",
-    "@xyo-network/evm-token-interface-diviner": "5.3.2",
+    "@xyo-network/evm-contract-witness": "5.3.4",
+    "@xyo-network/evm-nft-id-payload-plugin": "5.3.4",
+    "@xyo-network/evm-token-interface-diviner": "5.3.4",
     "@xyo-network/module-factory-locator": "~5.3.5",
     "@xyo-network/module-model": "~5.3.5",
     "@xyo-network/node-memory": "~5.3.5",
@@ -78,6 +78,11 @@
   },
   "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"
   },

package/src/Diviner.ts

@@ -1,110 +0,0 @@
-import type { Promisable } from '@xylabs/sdk-js'
-import { assertEx } 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'
-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)