@xyo-network/evm-events-witness 3.2.0-rc.1 → 3.2.0-rc.2

package/dist/neutral/Witness.d.ts

@@ -1,11 +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 { EvmEventsWitnessParams } from './model.ts';
 import type { EvmEvent, EvmEvents } from './Payload.ts';
 export declare class EvmEventsWitness<TParams extends EvmEventsWitnessParams = EvmEventsWitnessParams> extends AbstractEvmWitness<TParams, EvmEvents, EvmEvent> {
     static readonly configSchemas: Schema[];
     static readonly defaultConfigSchema: Schema;
-    get abi(): string | readonly (string | import("ethers").JsonFragment)[];
+    get abi(): InterfaceAbi;
     protected observeHandler(inPayloads?: EvmEvents[]): Promise<EvmEvent[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAItE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAGvD,qBAAa,gBAAgB,CAAC,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,kBAAkB,CACvH,OAAO,EACP,SAAS,EACT,QAAQ,CACT;IACC,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAyD;IACzG,gBAAyB,mBAAmB,EAAE,MAAM,CAA+B;IAEnF,IAAI,GAAG,iEAEN;cAEwB,cAAc,CAAC,UAAU,GAAE,SAAS,EAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAoE3F"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,QAAQ,CAAA;AAGpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAGvD,qBAAa,gBAAgB,CAAC,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,kBAAkB,CACvH,OAAO,EACP,SAAS,EACT,QAAQ,CACT;IACC,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAyD;IACzG,gBAAyB,mBAAmB,EAAE,MAAM,CAA+B;IAEnF,IAAI,GAAG,IAAI,YAAY,CAEtB;cAEwB,cAAc,CAAC,UAAU,GAAE,SAAS,EAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAoE3F"}

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import 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 EvmEventsWitnessConfigSchema = 'network.xyo.evm.events.witness.config'\nexport type EvmEventsWitnessConfigSchema = typeof EvmEventsWitnessConfigSchema\n\nexport type EvmEventsWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: Abi\n    address?: string\n    eventName?: string\n    fromBlock?: number\n    toBlock?: number\n  },\n  EvmEventsWitnessConfigSchema\n>\n\nexport type EvmEventsWitnessParams = EvmWitnessParams<EvmEventsWitnessConfig>\n","import type { Payload } from '@xyo-network/payload-model'\n\nexport const EvmEventsSchema = 'network.xyo.evm.events'\nexport type EvmEventsSchema = typeof EvmEventsSchema\n\nexport type EvmEvents = Payload<\n  {\n    address?: string\n    eventName?: string\n    fromBlock?: number\n    toBlock?: number\n  },\n  EvmEventsSchema\n>\n\nexport const EvmEventSchema = 'network.xyo.evm.event'\nexport type EvmEventSchema = typeof EvmEventSchema\n\nexport type EvmEvent = Payload<\n  {\n    address: string\n    args: Record<string, unknown>\n    block: number\n    chainId: number\n    eventName: string\n  },\n  EvmEventSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { hexFromBigInt } from '@xylabs/hex'\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 { EventLog } from 'ethers'\nimport { Contract } from 'ethers'\n\nimport type { EvmEventsWitnessParams } from './model.ts'\nimport { EvmEventsWitnessConfigSchema } from './model.ts'\nimport type { EvmEvent, EvmEvents } from './Payload.ts'\nimport { EvmEventSchema, EvmEventsSchema } from './Payload.ts'\n\nexport class EvmEventsWitness<TParams extends EvmEventsWitnessParams = EvmEventsWitnessParams> extends AbstractEvmWitness<\n  TParams,\n  EvmEvents,\n  EvmEvent\n> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmEventsWitnessConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmEventsWitnessConfigSchema\n\n  get abi() {\n    return assertEx(this.config.abi, () => 'Missing abi')\n  }\n\n  protected override async observeHandler(inPayloads: EvmEvents[] = []): Promise<EvmEvent[]> {\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 = (\n        await Promise.all(\n          inPayloads\n            .filter(isPayloadOfSchemaType<EvmEvents>(EvmEventsSchema))\n            .map(async ({\n              eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock,\n            }) => {\n              const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address')\n              const validatedEventName = assertEx(eventName ?? this.config.eventName, () => 'Missing eventName')\n\n              const provider = await this.getProvider(true, true)\n              const network = await provider.getNetwork()\n\n              const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress)\n\n              const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : undefined, () => 'Abi is not an array')\n\n              const abiEvent = assertEx(\n                abiArray.find(entry => entry.type === 'event' && entry.name === validatedEventName),\n                () => 'Could not find event',\n              )\n\n              const toBlock = this.config.toBlock ?? payloadToBlock ?? (await provider.getBlockNumber())\n              const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0\n\n              const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock)\n              // console.log(`from-to: ${fromBlock}|${toBlock} = ${allRawEvents.length}`)\n\n              const observation = allRawEvents\n                .map((rawLog) => {\n                  const rawEvent = rawLog as EventLog\n                  if (rawEvent.args) {\n                    const argsObject: Record<string, unknown> = {}\n\n                    abiEvent.inputs.map((input: { name: string }, index: number) => {\n                      const value = rawEvent.args[index]\n                      argsObject[input.name] = typeof value === 'bigint' ? hexFromBigInt(value) : value\n                    })\n\n                    const eventResult: EvmEvent = {\n                      address: rawEvent.address,\n                      args: argsObject,\n                      block: rawEvent.blockNumber,\n                      chainId: Number(network.chainId),\n                      eventName: validatedEventName,\n                      schema: EvmEventSchema,\n                    }\n                    return eventResult\n                  }\n                })\n                .filter(exists)\n\n              return observation\n            }),\n        )\n      ).flat()\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":";AAKO,IAAM,+BAA+B;;;ACHrC,IAAM,kBAAkB;AAaxB,IAAM,iBAAiB;;;ACf9B,SAAS,gBAAgB;AACzB,SAAS,cAAc;AACvB,SAAS,qBAAqB;AAE9B,SAAS,6BAA6B;AACtC,SAAS,0BAA0B;AAEnC,SAAS,gBAAgB;AAOlB,IAAM,mBAAN,cAAgG,mBAIrG;AAAA,EACA,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,4BAA4B;AAAA,EACxG,OAAyB,sBAA8B;AAAA,EAEvD,IAAI,MAAM;AACR,WAAO,SAAS,KAAK,OAAO,KAAK,MAAM,aAAa;AAAA,EACtD;AAAA,EAEA,MAAyB,eAAe,aAA0B,CAAC,GAAwB;AACzF,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,gBACJ,MAAM,QAAQ;AAAA,QACZ,WACG,OAAO,sBAAiC,eAAe,CAAC,EACxD,IAAI,OAAO;AAAA,UACV;AAAA,UAAW;AAAA,UAAS,WAAW;AAAA,UAAkB,SAAS;AAAA,QAC5D,MAAM;AACJ,gBAAM,mBAAmB,SAAS,WAAW,KAAK,OAAO,SAAS,MAAM,iBAAiB;AACzF,gBAAM,qBAAqB,SAAS,aAAa,KAAK,OAAO,WAAW,MAAM,mBAAmB;AAEjG,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAClD,gBAAM,UAAU,MAAM,SAAS,WAAW;AAE1C,gBAAM,WAAW,IAAI,SAAS,kBAAkB,KAAK,KAAK,QAAQ,EAAE,OAAO,gBAAgB;AAE3F,gBAAM,WAAW,SAAS,MAAM,QAAQ,KAAK,GAAG,IAAI,KAAK,MAAM,QAAW,MAAM,qBAAqB;AAErG,gBAAM,WAAW;AAAA,YACf,SAAS,KAAK,WAAS,MAAM,SAAS,WAAW,MAAM,SAAS,kBAAkB;AAAA,YAClF,MAAM;AAAA,UACR;AAEA,gBAAM,UAAU,KAAK,OAAO,WAAW,kBAAmB,MAAM,SAAS,eAAe;AACxF,gBAAM,YAAY,KAAK,OAAO,aAAa,oBAAoB;AAE/D,gBAAM,eAAe,MAAM,SAAS,YAAY,SAAS,QAAQ,kBAAkB,GAAG,WAAW,OAAO;AAGxG,gBAAM,cAAc,aACjB,IAAI,CAAC,WAAW;AACf,kBAAM,WAAW;AACjB,gBAAI,SAAS,MAAM;AACjB,oBAAM,aAAsC,CAAC;AAE7C,uBAAS,OAAO,IAAI,CAAC,OAAyB,UAAkB;AAC9D,sBAAM,QAAQ,SAAS,KAAK,KAAK;AACjC,2BAAW,MAAM,IAAI,IAAI,OAAO,UAAU,WAAW,cAAc,KAAK,IAAI;AAAA,cAC9E,CAAC;AAED,oBAAM,cAAwB;AAAA,gBAC5B,SAAS,SAAS;AAAA,gBAClB,MAAM;AAAA,gBACN,OAAO,SAAS;AAAA,gBAChB,SAAS,OAAO,QAAQ,OAAO;AAAA,gBAC/B,WAAW;AAAA,gBACX,QAAQ;AAAA,cACV;AACA,qBAAO;AAAA,YACT;AAAA,UACF,CAAC,EACA,OAAO,MAAM;AAEhB,iBAAO;AAAA,QACT,CAAC;AAAA,MACL,GACA,KAAK;AACP,aAAO;AAAA,IACT,SAAS,IAAI;AACX,YAAM,QAAQ;AACd,cAAQ,IAAI,UAAU,KAAK,OAAO,IAAI,MAAM,MAAM,OAAO,EAAE;AAC3D,YAAM;AAAA,IACR;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport type { Fragment, JsonFragment } from 'ethers'\n\nexport type InterfaceAbi = string | ReadonlyArray<Fragment | JsonFragment | string>\n\nexport const EvmEventsWitnessConfigSchema = 'network.xyo.evm.events.witness.config'\nexport type EvmEventsWitnessConfigSchema = typeof EvmEventsWitnessConfigSchema\n\nexport type EvmEventsWitnessConfig = EvmWitnessConfig<\n  {\n    abi?: InterfaceAbi\n    address?: string\n    eventName?: string\n    fromBlock?: number\n    toBlock?: number\n  },\n  EvmEventsWitnessConfigSchema\n>\n\nexport type EvmEventsWitnessParams = EvmWitnessParams<EvmEventsWitnessConfig>\n","import type { Payload } from '@xyo-network/payload-model'\n\nexport const EvmEventsSchema = 'network.xyo.evm.events'\nexport type EvmEventsSchema = typeof EvmEventsSchema\n\nexport type EvmEvents = Payload<\n  {\n    address?: string\n    eventName?: string\n    fromBlock?: number\n    toBlock?: number\n  },\n  EvmEventsSchema\n>\n\nexport const EvmEventSchema = 'network.xyo.evm.event'\nexport type EvmEventSchema = typeof EvmEventSchema\n\nexport type EvmEvent = Payload<\n  {\n    address: string\n    args: Record<string, unknown>\n    block: number\n    chainId: number\n    eventName: string\n  },\n  EvmEventSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { hexFromBigInt } from '@xylabs/hex'\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 { EventLog, InterfaceAbi } from 'ethers'\nimport { Contract } from 'ethers'\n\nimport type { EvmEventsWitnessParams } from './model.ts'\nimport { EvmEventsWitnessConfigSchema } from './model.ts'\nimport type { EvmEvent, EvmEvents } from './Payload.ts'\nimport { EvmEventSchema, EvmEventsSchema } from './Payload.ts'\n\nexport class EvmEventsWitness<TParams extends EvmEventsWitnessParams = EvmEventsWitnessParams> extends AbstractEvmWitness<\n  TParams,\n  EvmEvents,\n  EvmEvent\n> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmEventsWitnessConfigSchema]\n  static override readonly defaultConfigSchema: Schema = EvmEventsWitnessConfigSchema\n\n  get abi(): InterfaceAbi {\n    return assertEx(this.config.abi, () => 'Missing abi') as InterfaceAbi\n  }\n\n  protected override async observeHandler(inPayloads: EvmEvents[] = []): Promise<EvmEvent[]> {\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 = (\n        await Promise.all(\n          inPayloads\n            .filter(isPayloadOfSchemaType<EvmEvents>(EvmEventsSchema))\n            .map(async ({\n              eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock,\n            }) => {\n              const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address')\n              const validatedEventName = assertEx(eventName ?? this.config.eventName, () => 'Missing eventName')\n\n              const provider = await this.getProvider(true, true)\n              const network = await provider.getNetwork()\n\n              const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress)\n\n              const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : undefined, () => 'Abi is not an array')\n\n              const abiEvent = assertEx(\n                abiArray.find(entry => entry.type === 'event' && entry.name === validatedEventName),\n                () => 'Could not find event',\n              )\n\n              const toBlock = this.config.toBlock ?? payloadToBlock ?? (await provider.getBlockNumber())\n              const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0\n\n              const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock)\n              // console.log(`from-to: ${fromBlock}|${toBlock} = ${allRawEvents.length}`)\n\n              const observation = allRawEvents\n                .map((rawLog) => {\n                  const rawEvent = rawLog as EventLog\n                  if (rawEvent.args) {\n                    const argsObject: Record<string, unknown> = {}\n\n                    abiEvent.inputs.map((input: { name: string }, index: number) => {\n                      const value = rawEvent.args[index]\n                      argsObject[input.name] = typeof value === 'bigint' ? hexFromBigInt(value) : value\n                    })\n\n                    const eventResult: EvmEvent = {\n                      address: rawEvent.address,\n                      args: argsObject,\n                      block: rawEvent.blockNumber,\n                      chainId: Number(network.chainId),\n                      eventName: validatedEventName,\n                      schema: EvmEventSchema,\n                    }\n                    return eventResult\n                  }\n                })\n                .filter(exists)\n\n              return observation\n            }),\n        )\n      ).flat()\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":";AAKO,IAAM,+BAA+B;;;ACHrC,IAAM,kBAAkB;AAaxB,IAAM,iBAAiB;;;ACf9B,SAAS,gBAAgB;AACzB,SAAS,cAAc;AACvB,SAAS,qBAAqB;AAE9B,SAAS,6BAA6B;AACtC,SAAS,0BAA0B;AAEnC,SAAS,gBAAgB;AAOlB,IAAM,mBAAN,cAAgG,mBAIrG;AAAA,EACA,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,4BAA4B;AAAA,EACxG,OAAyB,sBAA8B;AAAA,EAEvD,IAAI,MAAoB;AACtB,WAAO,SAAS,KAAK,OAAO,KAAK,MAAM,aAAa;AAAA,EACtD;AAAA,EAEA,MAAyB,eAAe,aAA0B,CAAC,GAAwB;AACzF,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,gBACJ,MAAM,QAAQ;AAAA,QACZ,WACG,OAAO,sBAAiC,eAAe,CAAC,EACxD,IAAI,OAAO;AAAA,UACV;AAAA,UAAW;AAAA,UAAS,WAAW;AAAA,UAAkB,SAAS;AAAA,QAC5D,MAAM;AACJ,gBAAM,mBAAmB,SAAS,WAAW,KAAK,OAAO,SAAS,MAAM,iBAAiB;AACzF,gBAAM,qBAAqB,SAAS,aAAa,KAAK,OAAO,WAAW,MAAM,mBAAmB;AAEjG,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAClD,gBAAM,UAAU,MAAM,SAAS,WAAW;AAE1C,gBAAM,WAAW,IAAI,SAAS,kBAAkB,KAAK,KAAK,QAAQ,EAAE,OAAO,gBAAgB;AAE3F,gBAAM,WAAW,SAAS,MAAM,QAAQ,KAAK,GAAG,IAAI,KAAK,MAAM,QAAW,MAAM,qBAAqB;AAErG,gBAAM,WAAW;AAAA,YACf,SAAS,KAAK,WAAS,MAAM,SAAS,WAAW,MAAM,SAAS,kBAAkB;AAAA,YAClF,MAAM;AAAA,UACR;AAEA,gBAAM,UAAU,KAAK,OAAO,WAAW,kBAAmB,MAAM,SAAS,eAAe;AACxF,gBAAM,YAAY,KAAK,OAAO,aAAa,oBAAoB;AAE/D,gBAAM,eAAe,MAAM,SAAS,YAAY,SAAS,QAAQ,kBAAkB,GAAG,WAAW,OAAO;AAGxG,gBAAM,cAAc,aACjB,IAAI,CAAC,WAAW;AACf,kBAAM,WAAW;AACjB,gBAAI,SAAS,MAAM;AACjB,oBAAM,aAAsC,CAAC;AAE7C,uBAAS,OAAO,IAAI,CAAC,OAAyB,UAAkB;AAC9D,sBAAM,QAAQ,SAAS,KAAK,KAAK;AACjC,2BAAW,MAAM,IAAI,IAAI,OAAO,UAAU,WAAW,cAAc,KAAK,IAAI;AAAA,cAC9E,CAAC;AAED,oBAAM,cAAwB;AAAA,gBAC5B,SAAS,SAAS;AAAA,gBAClB,MAAM;AAAA,gBACN,OAAO,SAAS;AAAA,gBAChB,SAAS,OAAO,QAAQ,OAAO;AAAA,gBAC/B,WAAW;AAAA,gBACX,QAAQ;AAAA,cACV;AACA,qBAAO;AAAA,YACT;AAAA,UACF,CAAC,EACA,OAAO,MAAM;AAEhB,iBAAO;AAAA,QACT,CAAC;AAAA,MACL,GACA,KAAK;AACP,aAAO;AAAA,IACT,SAAS,IAAI;AACX,YAAM,QAAQ;AACd,cAAQ,IAAI,UAAU,KAAK,OAAO,IAAI,MAAM,MAAM,OAAO,EAAE;AAC3D,YAAM;AAAA,IACR;AAAA,EACF;AACF;","names":[]}

package/dist/neutral/model.d.ts

@@ -1,10 +1,10 @@
 import type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract';
-import type { JsonFragment } from 'ethers';
-export type Abi = string | ReadonlyArray<JsonFragment | string>;
+import type { Fragment, JsonFragment } from 'ethers';
+export type InterfaceAbi = string | ReadonlyArray<Fragment | JsonFragment | string>;
 export declare const EvmEventsWitnessConfigSchema = "network.xyo.evm.events.witness.config";
 export type EvmEventsWitnessConfigSchema = typeof EvmEventsWitnessConfigSchema;
 export type EvmEventsWitnessConfig = EvmWitnessConfig<{
-    abi?: Abi;
+    abi?: InterfaceAbi;
     address?: string;
     eventName?: string;
     fromBlock?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AAAA,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,4BAA4B,0CAA0C,CAAA;AACnF,MAAM,MAAM,4BAA4B,GAAG,OAAO,4BAA4B,CAAA;AAE9E,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CACnD;IACE,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,EACD,4BAA4B,CAC7B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,CAAA"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AAC3F,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAEpD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,aAAa,CAAC,QAAQ,GAAG,YAAY,GAAG,MAAM,CAAC,CAAA;AAEnF,eAAO,MAAM,4BAA4B,0CAA0C,CAAA;AACnF,MAAM,MAAM,4BAA4B,GAAG,OAAO,4BAA4B,CAAA;AAE9E,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CACnD;IACE,GAAG,CAAC,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,EACD,4BAA4B,CAC7B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,sBAAsB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/evm-events-witness",
-  "version": "3.2.0-rc.1",
+  "version": "3.2.0-rc.2",
   "description": "Typescript/Javascript Plugins for XYO Platform",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,18 +29,18 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/assert": "^4.4.12",
-    "@xylabs/exists": "^4.4.12",
-    "@xylabs/hex": "^4.4.12",
-    "@xyo-network/payload-model": "^3.6.0-rc.1",
-    "@xyo-network/witness-evm-abstract": "^3.6.0-rc.1",
+    "@xylabs/assert": "^4.4.24",
+    "@xylabs/exists": "^4.4.24",
+    "@xylabs/hex": "^4.4.24",
+    "@xyo-network/payload-model": "^3.6.0-rc.11",
+    "@xyo-network/witness-evm-abstract": "^3.6.0-rc.11",
     "ethers": "^6.13.4"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^4.2.4",
-    "@xylabs/tsconfig": "^4.2.4",
-    "@xylabs/vitest-extended": "^4.4.12",
-    "@xyo-network/open-zeppelin-typechain": "^3.2.3",
+    "@xylabs/ts-scripts-yarn3": "^4.2.6",
+    "@xylabs/tsconfig": "^4.2.6",
+    "@xylabs/vitest-extended": "^4.4.24",
+    "@xyo-network/open-zeppelin-typechain": "^3.3.2",
     "typescript": "^5.7.2",
     "vitest": "^2.1.8"
   },

package/src/Witness.ts

@@ -4,7 +4,7 @@ import { hexFromBigInt } from '@xylabs/hex'
 import type { Schema } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'
-import type { EventLog } from 'ethers'
+import type { EventLog, InterfaceAbi } from 'ethers'
 import { Contract } from 'ethers'
 
 import type { EvmEventsWitnessParams } from './model.ts'
@@ -20,8 +20,8 @@ export class EvmEventsWitness<TParams extends EvmEventsWitnessParams = EvmEvents
   static override readonly configSchemas: Schema[] = [...super.configSchemas, EvmEventsWitnessConfigSchema]
   static override readonly defaultConfigSchema: Schema = EvmEventsWitnessConfigSchema
 
-  get abi() {
-    return assertEx(this.config.abi, () => 'Missing abi')
+  get abi(): InterfaceAbi {
+    return assertEx(this.config.abi, () => 'Missing abi') as InterfaceAbi
   }
 
   protected override async observeHandler(inPayloads: EvmEvents[] = []): Promise<EvmEvent[]> {

package/src/model.ts

@@ -1,14 +1,14 @@
 import type { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'
-import type { JsonFragment } from 'ethers'
+import type { Fragment, JsonFragment } from 'ethers'
 
-export type Abi = string | ReadonlyArray<JsonFragment | string>
+export type InterfaceAbi = string | ReadonlyArray<Fragment | JsonFragment | string>
 
 export const EvmEventsWitnessConfigSchema = 'network.xyo.evm.events.witness.config'
 export type EvmEventsWitnessConfigSchema = typeof EvmEventsWitnessConfigSchema
 
 export type EvmEventsWitnessConfig = EvmWitnessConfig<
   {
-    abi?: Abi
+    abi?: InterfaceAbi
     address?: string
     eventName?: string
     fromBlock?: number

package/xy.config.ts

@@ -7,5 +7,4 @@ const config: XyTsupConfig = {
   },
 }
 
-// eslint-disable-next-line import-x/no-default-export
 export default config