@xyo-network/evm-call-witness 2.84.2 → 2.84.3

package/dist/node/Payload.d.mts

@@ -1,5 +1,5 @@
 import { Payload } from '@xyo-network/payload-model';
-export declare const EvmCallSchema = "network.xyo.blockchain.contract.call";
+export declare const EvmCallSchema = "network.xyo.evm.call";
 export type EvmCallSchema = typeof EvmCallSchema;
 export type EvmCall = Payload<{
     address?: string;
@@ -7,7 +7,7 @@ export type EvmCall = Payload<{
     block?: number;
     functionName?: string;
 }, EvmCallSchema>;
-export declare const EvmCallResultSchema = "network.xyo.blockchain.contract.call.result";
+export declare const EvmCallResultSchema = "network.xyo.evm.call.result";
 export type EvmCallResultSchema = typeof EvmCallResultSchema;
 export type EvmCallResultBase = Payload<{
     address: string;
@@ -34,7 +34,7 @@ export declare const asEvmCallSuccess: (payload?: EvmCallResult) => (import("@xy
     functionName: string;
     implementation?: string | undefined;
 } & {
-    schema: "network.xyo.blockchain.contract.call.result";
+    schema: "network.xyo.evm.call.result";
 } & {
     result: unknown;
 }) | undefined;
@@ -46,7 +46,7 @@ export declare const asEvmCallFailure: (payload?: EvmCallResult) => (import("@xy
     functionName: string;
     implementation?: string | undefined;
 } & {
-    schema: "network.xyo.blockchain.contract.call.result";
+    schema: "network.xyo.evm.call.result";
 } & {
     error: string;
 }) | undefined;

package/dist/node/Payload.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,aAAa,yCAAyC,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,gDAAgD,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,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA5B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;YAOd,OAAO;cAiB6F,CAAA;AAE9G,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA9B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;WAWf,MAAM;cAe+F,CAAA"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,aAAa,yBAAyB,CAAA;AACnD,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,gCAAgC,CAAA;AAChE,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,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA5B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;YAOd,OAAO;cAiB6F,CAAA;AAE9G,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA9B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;WAWf,MAAM;cAe+F,CAAA"}

package/dist/node/Payload.d.ts

@@ -1,5 +1,5 @@
 import { Payload } from '@xyo-network/payload-model';
-export declare const EvmCallSchema = "network.xyo.blockchain.contract.call";
+export declare const EvmCallSchema = "network.xyo.evm.call";
 export type EvmCallSchema = typeof EvmCallSchema;
 export type EvmCall = Payload<{
     address?: string;
@@ -7,7 +7,7 @@ export type EvmCall = Payload<{
     block?: number;
     functionName?: string;
 }, EvmCallSchema>;
-export declare const EvmCallResultSchema = "network.xyo.blockchain.contract.call.result";
+export declare const EvmCallResultSchema = "network.xyo.evm.call.result";
 export type EvmCallResultSchema = typeof EvmCallResultSchema;
 export type EvmCallResultBase = Payload<{
     address: string;
@@ -34,7 +34,7 @@ export declare const asEvmCallSuccess: (payload?: EvmCallResult) => (import("@xy
     functionName: string;
     implementation?: string | undefined;
 } & {
-    schema: "network.xyo.blockchain.contract.call.result";
+    schema: "network.xyo.evm.call.result";
 } & {
     result: unknown;
 }) | undefined;
@@ -46,7 +46,7 @@ export declare const asEvmCallFailure: (payload?: EvmCallResult) => (import("@xy
     functionName: string;
     implementation?: string | undefined;
 } & {
-    schema: "network.xyo.blockchain.contract.call.result";
+    schema: "network.xyo.evm.call.result";
 } & {
     error: string;
 }) | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,aAAa,yCAAyC,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,gDAAgD,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,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA5B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;YAOd,OAAO;cAiB6F,CAAA;AAE9G,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA9B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;WAWf,MAAM;cAe+F,CAAA"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,aAAa,yBAAyB,CAAA;AACnD,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,gCAAgC,CAAA;AAChE,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,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa,8BAEvD,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA5B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;YAOd,OAAO;cAiB6F,CAAA;AAE9G,eAAO,MAAM,gBAAgB,aAAc,aAAa;aA9B3C,MAAM;UACT,OAAO,EAAE;;aAEN,MAAM;kBACD,MAAM;;;;;WAWf,MAAM;cAe+F,CAAA"}

package/dist/node/Witness.d.cts

@@ -1,20 +1,9 @@
-import { AbstractBlockchainWitness, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
-import { JsonFragment } from 'ethers';
+import { AbstractBlockchainWitness } from '@xyo-network/witness-blockchain-abstract';
+import { EvmCallWitnessParams } from './model';
 import { EvmCall, EvmCallResult } from './Payload';
-export type Abi = string | ReadonlyArray<JsonFragment | string>;
-export declare const EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
-export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema;
-export type EvmCallWitnessConfig = BlockchainWitnessConfig<{
-    abi?: Abi;
-    address?: string;
-    args?: unknown[];
-    block?: number;
-    functionName?: string;
-}, EvmCallWitnessConfigSchema>;
-export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>;
 export declare class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractBlockchainWitness<TParams, EvmCall, EvmCallResult> {
     static configSchemas: string[];
-    get abi(): string | readonly (string | JsonFragment)[];
+    get abi(): string | readonly (string | import("ethers").JsonFragment)[];
     protected observeHandler(inPayloads?: EvmCall[]): Promise<EvmCallResult[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/node/Witness.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AACtI,OAAO,EAAY,YAAY,EAAE,MAAM,QAAQ,CAAA;AAE/C,OAAO,EAAE,OAAO,EAAE,aAAa,EAAsD,MAAM,WAAW,CAAA;AAEtG,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,aAAa,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;AAE/D,eAAO,MAAM,0BAA0B,wCAAwC,CAAA;AAC/E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CACxD;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,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAchF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,OAAO,EACP,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;IAE5D,IAAI,GAAG,gDAEN;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAuD9F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAA;AAGpF,OAAO,EAA8B,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,aAAa,EAAsD,MAAM,WAAW,CAAA;AAEtG,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,OAAO,EACP,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;IAE5D,IAAI,GAAG,iEAEN;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAuD9F"}

package/dist/node/Witness.d.mts

@@ -1,20 +1,9 @@
-import { AbstractBlockchainWitness, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
-import { JsonFragment } from 'ethers';
+import { AbstractBlockchainWitness } from '@xyo-network/witness-blockchain-abstract';
+import { EvmCallWitnessParams } from './model';
 import { EvmCall, EvmCallResult } from './Payload';
-export type Abi = string | ReadonlyArray<JsonFragment | string>;
-export declare const EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
-export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema;
-export type EvmCallWitnessConfig = BlockchainWitnessConfig<{
-    abi?: Abi;
-    address?: string;
-    args?: unknown[];
-    block?: number;
-    functionName?: string;
-}, EvmCallWitnessConfigSchema>;
-export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>;
 export declare class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractBlockchainWitness<TParams, EvmCall, EvmCallResult> {
     static configSchemas: string[];
-    get abi(): string | readonly (string | JsonFragment)[];
+    get abi(): string | readonly (string | import("ethers").JsonFragment)[];
     protected observeHandler(inPayloads?: EvmCall[]): Promise<EvmCallResult[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/node/Witness.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AACtI,OAAO,EAAY,YAAY,EAAE,MAAM,QAAQ,CAAA;AAE/C,OAAO,EAAE,OAAO,EAAE,aAAa,EAAsD,MAAM,WAAW,CAAA;AAEtG,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,aAAa,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;AAE/D,eAAO,MAAM,0BAA0B,wCAAwC,CAAA;AAC/E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CACxD;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,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAchF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,OAAO,EACP,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;IAE5D,IAAI,GAAG,gDAEN;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAuD9F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAA;AAGpF,OAAO,EAA8B,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,aAAa,EAAsD,MAAM,WAAW,CAAA;AAEtG,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,OAAO,EACP,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;IAE5D,IAAI,GAAG,iEAEN;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAuD9F"}

package/dist/node/Witness.d.ts

@@ -1,20 +1,9 @@
-import { AbstractBlockchainWitness, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
-import { JsonFragment } from 'ethers';
+import { AbstractBlockchainWitness } from '@xyo-network/witness-blockchain-abstract';
+import { EvmCallWitnessParams } from './model';
 import { EvmCall, EvmCallResult } from './Payload';
-export type Abi = string | ReadonlyArray<JsonFragment | string>;
-export declare const EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
-export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema;
-export type EvmCallWitnessConfig = BlockchainWitnessConfig<{
-    abi?: Abi;
-    address?: string;
-    args?: unknown[];
-    block?: number;
-    functionName?: string;
-}, EvmCallWitnessConfigSchema>;
-export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>;
 export declare class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractBlockchainWitness<TParams, EvmCall, EvmCallResult> {
     static configSchemas: string[];
-    get abi(): string | readonly (string | JsonFragment)[];
+    get abi(): string | readonly (string | import("ethers").JsonFragment)[];
     protected observeHandler(inPayloads?: EvmCall[]): Promise<EvmCallResult[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AACtI,OAAO,EAAY,YAAY,EAAE,MAAM,QAAQ,CAAA;AAE/C,OAAO,EAAE,OAAO,EAAE,aAAa,EAAsD,MAAM,WAAW,CAAA;AAEtG,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,aAAa,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;AAE/D,eAAO,MAAM,0BAA0B,wCAAwC,CAAA;AAC/E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CACxD;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,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAchF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,OAAO,EACP,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;IAE5D,IAAI,GAAG,gDAEN;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAuD9F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAA;AAGpF,OAAO,EAA8B,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,aAAa,EAAsD,MAAM,WAAW,CAAA;AAEtG,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,OAAO,EACP,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;IAE5D,IAAI,GAAG,iEAEN;cAEwB,cAAc,CAAC,UAAU,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAuD9F"}

package/dist/node/index.cjs

@@ -40,8 +40,8 @@ var import_abstract_diviner = require("@xyo-network/abstract-diviner");
 var import_payload_model = require("@xyo-network/payload-model");
 
 // src/Payload.ts
-var EvmCallSchema = "network.xyo.blockchain.contract.call";
-var EvmCallResultSchema = "network.xyo.blockchain.contract.call.result";
+var EvmCallSchema = "network.xyo.evm.call";
+var EvmCallResultSchema = "network.xyo.evm.call.result";
 var isEvmCallSuccess = (payload) => {
   return (payload == null ? void 0 : payload.result) !== void 0;
 };
@@ -109,24 +109,17 @@ var EvmCallDiviner = class _EvmCallDiviner extends import_abstract_diviner.Abstr
   }
 };
 
+// src/model.ts
+var EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
+
 // src/Witness.ts
 var import_assert2 = require("@xylabs/assert");
+var import_hex = require("@xylabs/hex");
 var import_erc1822_witness = require("@xyo-network/erc1822-witness");
 var import_erc1967_witness = require("@xyo-network/erc1967-witness");
 var import_payload_model2 = require("@xyo-network/payload-model");
 var import_witness_blockchain_abstract = require("@xyo-network/witness-blockchain-abstract");
 var import_ethers = require("ethers");
-var EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
-var prefixHex = (value) => {
-  if (value !== void 0) {
-    const lowerValue = value.toLowerCase();
-    return lowerValue.startsWith("0x") ? lowerValue : `0x${lowerValue}`;
-  }
-};
-var isHexZero = (value) => {
-  const prefixedValue = prefixHex(value);
-  return prefixedValue === void 0 ? true : BigInt(prefixedValue) === 0n;
-};
 var EvmCallWitness = class extends import_witness_blockchain_abstract.AbstractBlockchainWitness {
   static configSchemas = [EvmCallWitnessConfigSchema];
   get abi() {
@@ -145,7 +138,7 @@ var EvmCallWitness = class extends import_witness_blockchain_abstract.AbstractBl
           const block = this.config.block ?? payloadBlock ?? await provider.getBlockNumber();
           const erc1967Status = await (0, import_erc1967_witness.getErc1967SlotStatus)(provider, validatedAddress, block);
           const erc1822Status = await (0, import_erc1822_witness.getErc1822SlotStatus)(provider, validatedAddress, block);
-          const implementation = isHexZero(erc1967Status.slots.implementation) ? erc1822Status.implementation : erc1967Status.implementation;
+          const implementation = (0, import_hex.isHexZero)(erc1967Status.slots.implementation ?? "0x00") ? erc1822Status.implementation : erc1967Status.implementation;
           const contract = new import_ethers.Contract(implementation, this.abi, provider);
           let transformedResult;
           try {

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Diviner.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './Diviner'\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 { 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\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    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      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    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 { Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.blockchain.contract.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.blockchain.contract.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 asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { assertEx } from '@xylabs/assert'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractBlockchainWitness, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract'\nimport { Contract, JsonFragment } from 'ethers'\n\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\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 = BlockchainWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>\n\nconst prefixHex = (value?: string) => {\n  if (value !== undefined) {\n    const lowerValue = value.toLowerCase()\n    return lowerValue.startsWith('0x') ? lowerValue : `0x${lowerValue}`\n  }\n}\n\nconst isHexZero = (value?: string) => {\n  const prefixedValue = prefixHex(value)\n  return prefixedValue === undefined ? true : BigInt(prefixedValue) === 0n\n}\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractBlockchainWitness<\n  TParams,\n  EvmCall,\n  EvmCallResult\n> {\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(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) ? 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 (ex) {\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":["result","import_assert","import_payload_model"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Diviner.ts","../../src/Payload.ts","../../src/model.ts","../../src/Witness.ts"],"sourcesContent":["export * from './Diviner'\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 { 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\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    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      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    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 { 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 asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-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 = BlockchainWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = BlockchainWitnessParams<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 { AbstractBlockchainWitness } from '@xyo-network/witness-blockchain-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 AbstractBlockchainWitness<\n  TParams,\n  EvmCall,\n  EvmCallResult\n> {\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 (ex) {\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":["result","import_assert","import_payload_model"]}

package/dist/node/index.d.cts

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

package/dist/node/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}

package/dist/node/index.d.mts

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

package/dist/node/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}

package/dist/node/index.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}

package/dist/node/index.js

@@ -4,8 +4,8 @@ import { AbstractDiviner } from "@xyo-network/abstract-diviner";
 import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
 
 // src/Payload.ts
-var EvmCallSchema = "network.xyo.blockchain.contract.call";
-var EvmCallResultSchema = "network.xyo.blockchain.contract.call.result";
+var EvmCallSchema = "network.xyo.evm.call";
+var EvmCallResultSchema = "network.xyo.evm.call.result";
 var isEvmCallSuccess = (payload) => {
   return (payload == null ? void 0 : payload.result) !== void 0;
 };
@@ -73,24 +73,17 @@ var EvmCallDiviner = class _EvmCallDiviner extends AbstractDiviner {
   }
 };
 
+// src/model.ts
+var EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
+
 // src/Witness.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
+import { isHexZero } from "@xylabs/hex";
 import { getErc1822SlotStatus } from "@xyo-network/erc1822-witness";
 import { getErc1967SlotStatus } from "@xyo-network/erc1967-witness";
 import { isPayloadOfSchemaType as isPayloadOfSchemaType2 } from "@xyo-network/payload-model";
 import { AbstractBlockchainWitness } from "@xyo-network/witness-blockchain-abstract";
 import { Contract } from "ethers";
-var EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
-var prefixHex = (value) => {
-  if (value !== void 0) {
-    const lowerValue = value.toLowerCase();
-    return lowerValue.startsWith("0x") ? lowerValue : `0x${lowerValue}`;
-  }
-};
-var isHexZero = (value) => {
-  const prefixedValue = prefixHex(value);
-  return prefixedValue === void 0 ? true : BigInt(prefixedValue) === 0n;
-};
 var EvmCallWitness = class extends AbstractBlockchainWitness {
   static configSchemas = [EvmCallWitnessConfigSchema];
   get abi() {
@@ -109,7 +102,7 @@ var EvmCallWitness = class extends AbstractBlockchainWitness {
           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) ? erc1822Status.implementation : erc1967Status.implementation;
+          const implementation = isHexZero(erc1967Status.slots.implementation ?? "0x00") ? erc1822Status.implementation : erc1967Status.implementation;
           const contract = new Contract(implementation, this.abi, provider);
           let transformedResult;
           try {

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Diviner.ts","../../src/Payload.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 { 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\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    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      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    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 { Payload } from '@xyo-network/payload-model'\n\nexport const EvmCallSchema = 'network.xyo.blockchain.contract.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.blockchain.contract.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 asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { assertEx } from '@xylabs/assert'\nimport { getErc1822SlotStatus } from '@xyo-network/erc1822-witness'\nimport { getErc1967SlotStatus } from '@xyo-network/erc1967-witness'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport { AbstractBlockchainWitness, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract'\nimport { Contract, JsonFragment } from 'ethers'\n\nimport { EvmCall, EvmCallResult, EvmCallResultSchema, EvmCallSchema, EvmCallSuccess } from './Payload'\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 = BlockchainWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>\n\nconst prefixHex = (value?: string) => {\n  if (value !== undefined) {\n    const lowerValue = value.toLowerCase()\n    return lowerValue.startsWith('0x') ? lowerValue : `0x${lowerValue}`\n  }\n}\n\nconst isHexZero = (value?: string) => {\n  const prefixedValue = prefixHex(value)\n  return prefixedValue === undefined ? true : BigInt(prefixedValue) === 0n\n}\n\nexport class EvmCallWitness<TParams extends EvmCallWitnessParams = EvmCallWitnessParams> extends AbstractBlockchainWitness<\n  TParams,\n  EvmCall,\n  EvmCallResult\n> {\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(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) ? 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 (ex) {\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":["result","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}
+{"version":3,"sources":["../../src/Diviner.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 { 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\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    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      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    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 { 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 asEvmCallSuccess = (payload?: EvmCallResult) => (isEvmCallSuccess(payload) ? payload : undefined)\n\nexport const asEvmCallFailure = (payload?: EvmCallResult) => (isEvmCallFailure(payload) ? payload : undefined)\n","import { BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-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 = BlockchainWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    args?: unknown[]\n    block?: number\n    functionName?: string\n  },\n  EvmCallWitnessConfigSchema\n>\n\nexport type EvmCallWitnessParams = BlockchainWitnessParams<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 { AbstractBlockchainWitness } from '@xyo-network/witness-blockchain-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 AbstractBlockchainWitness<\n  TParams,\n  EvmCall,\n  EvmCallResult\n> {\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 (ex) {\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":["result","assertEx","isPayloadOfSchemaType","assertEx","isPayloadOfSchemaType"]}

package/dist/node/model.d.cts

@@ -0,0 +1,14 @@
+import { BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
+import { JsonFragment } from 'ethers';
+export type Abi = string | ReadonlyArray<JsonFragment | string>;
+export declare const EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
+export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema;
+export type EvmCallWitnessConfig = BlockchainWitnessConfig<{
+    abi?: Abi;
+    address?: string;
+    args?: unknown[];
+    block?: number;
+    functionName?: string;
+}, EvmCallWitnessConfigSchema>;
+export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>;
+//# sourceMappingURL=model.d.ts.map

package/dist/node/model.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AAC3G,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAErC,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,aAAa,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;AAE/D,eAAO,MAAM,0BAA0B,wCAAwC,CAAA;AAC/E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CACxD;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,uBAAuB,CAAC,oBAAoB,CAAC,CAAA"}

package/dist/node/model.d.mts

@@ -0,0 +1,14 @@
+import { BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
+import { JsonFragment } from 'ethers';
+export type Abi = string | ReadonlyArray<JsonFragment | string>;
+export declare const EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
+export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema;
+export type EvmCallWitnessConfig = BlockchainWitnessConfig<{
+    abi?: Abi;
+    address?: string;
+    args?: unknown[];
+    block?: number;
+    functionName?: string;
+}, EvmCallWitnessConfigSchema>;
+export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>;
+//# sourceMappingURL=model.d.ts.map

package/dist/node/model.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AAC3G,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAErC,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,aAAa,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;AAE/D,eAAO,MAAM,0BAA0B,wCAAwC,CAAA;AAC/E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CACxD;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,uBAAuB,CAAC,oBAAoB,CAAC,CAAA"}

package/dist/node/model.d.ts

@@ -0,0 +1,14 @@
+import { BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
+import { JsonFragment } from 'ethers';
+export type Abi = string | ReadonlyArray<JsonFragment | string>;
+export declare const EvmCallWitnessConfigSchema = "network.xyo.evm.call.witness.config";
+export type EvmCallWitnessConfigSchema = typeof EvmCallWitnessConfigSchema;
+export type EvmCallWitnessConfig = BlockchainWitnessConfig<{
+    abi?: Abi;
+    address?: string;
+    args?: unknown[];
+    block?: number;
+    functionName?: string;
+}, EvmCallWitnessConfigSchema>;
+export type EvmCallWitnessParams = BlockchainWitnessParams<EvmCallWitnessConfig>;
+//# sourceMappingURL=model.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAA;AAC3G,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAErC,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,aAAa,CAAC,YAAY,GAAG,MAAM,CAAC,CAAA;AAE/D,eAAO,MAAM,0BAA0B,wCAAwC,CAAA;AAC/E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CACxD;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,uBAAuB,CAAC,oBAAoB,CAAC,CAAA"}

package/package.json

@@ -11,26 +11,33 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.13.20",
+    "@xylabs/hex": "^2.13.20",
     "@xylabs/promise": "^2.13.20",
-    "@xyo-network/abstract-diviner": "^2.84.3",
-    "@xyo-network/diviner-model": "^2.84.3",
-    "@xyo-network/erc1822-witness": "~2.84.2",
-    "@xyo-network/erc1967-witness": "~2.84.2",
-    "@xyo-network/payload-model": "^2.84.3",
-    "@xyo-network/witness-blockchain-abstract": "^2.84.3",
+    "@xyo-network/abstract-diviner": "^2.84.8",
+    "@xyo-network/diviner-model": "^2.84.8",
+    "@xyo-network/erc1822-witness": "~2.84.3",
+    "@xyo-network/erc1967-witness": "~2.84.3",
+    "@xyo-network/payload-model": "^2.84.8",
+    "@xyo-network/witness-blockchain-abstract": "^2.84.8",
     "ethers": "^6.9.0"
   },
   "devDependencies": {
     "@xylabs/jest-helpers": "^2.13.20",
     "@xylabs/profile": "^2.13.20",
-    "@xylabs/ts-scripts-yarn3": "^3.2.19",
-    "@xylabs/tsconfig": "^3.2.19",
-    "@xyo-network/account": "^2.84.3",
-    "@xyo-network/manifest": "^2.84.3",
-    "@xyo-network/module-model": "^2.84.3",
+    "@xylabs/ts-scripts-yarn3": "^3.2.24",
+    "@xylabs/tsconfig": "^3.2.24",
+    "@xyo-network/account": "^2.84.8",
+    "@xyo-network/diviner-jsonpatch-memory": "^2.84.8",
+    "@xyo-network/diviner-jsonpath-aggregate-memory": "^2.84.8",
+    "@xyo-network/diviner-range": "^2.84.8",
+    "@xyo-network/evm-contract-witness": "~2.84.3",
+    "@xyo-network/evm-token-interface-diviner": "~2.84.3",
+    "@xyo-network/manifest": "^2.84.8",
+    "@xyo-network/module-model": "^2.84.8",
     "@xyo-network/open-zeppelin-typechain": "^3.0.5",
-    "@xyo-network/sentinel-model": "^2.84.3",
-    "@xyo-network/witness-model": "^2.84.3",
+    "@xyo-network/sentinel-model": "^2.84.8",
+    "@xyo-network/witness-adhoc": "^2.84.7",
+    "@xyo-network/witness-model": "^2.84.8",
     "jest": "^29.7.0",
     "typescript": "^5.3.3"
   },
@@ -73,6 +80,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.84.2",
+  "version": "2.84.3",
   "type": "module"
 }

package/src/Payload.ts

@@ -1,6 +1,6 @@
 import { Payload } from '@xyo-network/payload-model'
 
-export const EvmCallSchema = 'network.xyo.blockchain.contract.call'
+export const EvmCallSchema = 'network.xyo.evm.call'
 export type EvmCallSchema = typeof EvmCallSchema
 
 export type EvmCall = Payload<
@@ -13,7 +13,7 @@ export type EvmCall = Payload<
   EvmCallSchema
 >
 
-export const EvmCallResultSchema = 'network.xyo.blockchain.contract.call.result'
+export const EvmCallResultSchema = 'network.xyo.evm.call.result'
 export type EvmCallResultSchema = typeof EvmCallResultSchema
 
 export type EvmCallResultBase = Payload<