@xyo-network/evm-events-witness 2.99.5 → 2.99.6

package/dist/browser/index.cjs

@@ -3,7 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -43,13 +42,7 @@ var import_payload_model = require("@xyo-network/payload-model");
 var import_witness_evm_abstract = require("@xyo-network/witness-evm-abstract");
 var import_ethers = require("ethers");
 var EvmEventsWitness = class extends import_witness_evm_abstract.AbstractEvmWitness {
-  static {
-    __name(this, "EvmEventsWitness");
-  }
-  static configSchemas = [
-    ...super.configSchemas,
-    EvmEventsWitnessConfigSchema
-  ];
+  static configSchemas = [...super.configSchemas, EvmEventsWitnessConfigSchema];
   static defaultConfigSchema = EvmEventsWitnessConfigSchema;
   get abi() {
     return (0, import_assert.assertEx)(this.config.abi, () => "Missing abi");
@@ -58,38 +51,43 @@ var EvmEventsWitness = class extends import_witness_evm_abstract.AbstractEvmWitn
     await this.started("throw");
     await this.getProviders();
     try {
-      const observations = (await Promise.all(inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
-        const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, () => "Missing address");
-        const validatedEventName = (0, import_assert.assertEx)(eventName ?? this.config.eventName, () => "Missing eventName");
-        const provider = await this.getProvider(true, true);
-        const network = await provider.getNetwork();
-        const contract = new import_ethers.Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
-        const abiArray = (0, import_assert.assertEx)(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
-        const abiEvent = (0, import_assert.assertEx)(abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName), () => "Could not find event");
-        const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
-        const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
-        const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
-        const observation = allRawEvents.map((rawLog) => {
-          const rawEvent = rawLog;
-          if (rawEvent.args) {
-            const argsObject = {};
-            abiEvent.inputs.map((input, index) => {
-              const value = rawEvent.args[index];
-              argsObject[input.name] = typeof value === "bigint" ? (0, import_hex.hexFromBigInt)(value) : value;
-            });
-            const eventResult = {
-              address: rawEvent.address,
-              args: argsObject,
-              block: rawEvent.blockNumber,
-              chainId: Number(network.chainId),
-              eventName: validatedEventName,
-              schema: EvmEventSchema
-            };
-            return eventResult;
-          }
-        }).filter(import_exists.exists);
-        return observation;
-      }))).flat();
+      const observations = (await Promise.all(
+        inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
+          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, () => "Missing address");
+          const validatedEventName = (0, import_assert.assertEx)(eventName ?? this.config.eventName, () => "Missing eventName");
+          const provider = await this.getProvider(true, true);
+          const network = await provider.getNetwork();
+          const contract = new import_ethers.Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
+          const abiArray = (0, import_assert.assertEx)(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
+          const abiEvent = (0, import_assert.assertEx)(
+            abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName),
+            () => "Could not find event"
+          );
+          const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
+          const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
+          const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
+          const observation = allRawEvents.map((rawLog) => {
+            const rawEvent = rawLog;
+            if (rawEvent.args) {
+              const argsObject = {};
+              abiEvent.inputs.map((input, index) => {
+                const value = rawEvent.args[index];
+                argsObject[input.name] = typeof value === "bigint" ? (0, import_hex.hexFromBigInt)(value) : value;
+              });
+              const eventResult = {
+                address: rawEvent.address,
+                args: argsObject,
+                block: rawEvent.blockNumber,
+                chainId: Number(network.chainId),
+                eventName: validatedEventName,
+                schema: EvmEventSchema
+              };
+              return eventResult;
+            }
+          }).filter(import_exists.exists);
+          return observation;
+        })
+      )).flat();
       return observations;
     } catch (ex) {
       const error = ex;

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './model.ts'\nexport * from './Payload.ts'\nexport * from './Witness.ts'\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;ACKO,IAAMA,+BAA+B;;;ACHrC,IAAMC,kBAAkB;AAaxB,IAAMC,iBAAiB;;;ACf9B,oBAAyB;AACzB,oBAAuB;AACvB,iBAA8B;AAC9B,2BAA8C;AAC9C,kCAAmC;AACnC,oBAAmC;AAK5B,IAAMC,mBAAN,cAAgGC,+CAAAA;EAVvG,OAUuGA;;;EAKrG,OAAyBC,gBAA0B;OAAI,MAAMA;IAAeC;;EAC5E,OAAyBC,sBAA8BD;EAEvD,IAAIE,MAAM;AACR,eAAOC,wBAAS,KAAKC,OAAOF,KAAK,MAAM,aAAA;EACzC;EAEA,MAAyBG,eAAeC,aAA0B,CAAA,GAAyB;AACzF,UAAM,KAAKC,QAAQ,OAAA;AAEnB,UAAM,KAAKC,aAAY;AACvB,QAAI;AACF,YAAMC,gBACJ,MAAMC,QAAQC,IACZL,WACGM,WAAOC,4CAAiCC,eAAAA,CAAAA,EACxCC,IAAI,OAAO,EAAEC,WAAWC,SAASC,WAAWC,kBAAkBC,SAASC,eAAc,MAAE;AACtF,cAAMC,uBAAmBnB,wBAASc,WAAW,KAAKb,OAAOa,SAAS,MAAM,iBAAA;AACxE,cAAMM,yBAAqBpB,wBAASa,aAAa,KAAKZ,OAAOY,WAAW,MAAM,mBAAA;AAE9E,cAAMQ,WAAW,MAAM,KAAKC,YAAY,MAAM,IAAA;AAC9C,cAAMC,UAAU,MAAMF,SAASG,WAAU;AAEzC,cAAMC,WAAW,IAAIC,uBAASP,kBAAkB,KAAKpB,KAAKsB,QAAAA,EAAUM,OAAOR,gBAAAA;AAE3E,cAAMS,eAAW5B,wBAAS6B,MAAMC,QAAQ,KAAK/B,GAAG,IAAI,KAAKA,MAAMgC,QAAW,MAAM,qBAAA;AAEhF,cAAMC,eAAWhC,wBACf4B,SAASK,KAAKC,CAAAA,UAASA,MAAMC,SAAS,WAAWD,MAAME,SAAShB,kBAAAA,GAChE,MAAM,sBAAA;AAGR,cAAMH,UAAU,KAAKhB,OAAOgB,WAAWC,kBAAmB,MAAMG,SAASgB,eAAc;AACvF,cAAMtB,YAAY,KAAKd,OAAOc,aAAaC,oBAAoB;AAE/D,cAAMsB,eAAe,MAAMb,SAASc,YAAYd,SAASe,QAAQpB,kBAAAA,GAAqBL,WAAWE,OAAAA;AAGjG,cAAMwB,cAAcH,aACjB1B,IAAI,CAAC8B,WAAAA;AACJ,gBAAMC,WAAWD;AACjB,cAAIC,SAASC,MAAM;AACjB,kBAAMC,aAAsC,CAAC;AAE7Cb,qBAASc,OAAOlC,IAAI,CAACmC,OAAyBC,UAAAA;AAC5C,oBAAMC,QAAQN,SAASC,KAAKI,KAAAA;AAC5BH,yBAAWE,MAAMX,IAAI,IAAI,OAAOa,UAAU,eAAWC,0BAAcD,KAAAA,IAASA;YAC9E,CAAA;AAEA,kBAAME,cAAwB;cAC5BrC,SAAS6B,SAAS7B;cAClB8B,MAAMC;cACNO,OAAOT,SAASU;cAChBC,SAASC,OAAOhC,QAAQ+B,OAAO;cAC/BzC,WAAWO;cACXoC,QAAQC;YACV;AACA,mBAAON;UACT;QACF,CAAA,EACC1C,OAAOiD,oBAAAA;AAEV,eAAOjB;MACT,CAAA,CAAA,GAEJkB,KAAI;AACN,aAAOrD;IACT,SAASsD,IAAI;AACX,YAAMC,QAAQD;AACdE,cAAQC,IAAI,UAAU,KAAK9D,OAAOmC,IAAI,MAAMyB,MAAMG,OAAO,EAAE;AAC3D,YAAMH;IACR;EACF;AACF;","names":["EvmEventsWitnessConfigSchema","EvmEventsSchema","EvmEventSchema","EvmEventsWitness","AbstractEvmWitness","configSchemas","EvmEventsWitnessConfigSchema","defaultConfigSchema","abi","assertEx","config","observeHandler","inPayloads","started","getProviders","observations","Promise","all","filter","isPayloadOfSchemaType","EvmEventsSchema","map","eventName","address","fromBlock","payloadFromBlock","toBlock","payloadToBlock","validatedAddress","validatedEventName","provider","getProvider","network","getNetwork","contract","Contract","attach","abiArray","Array","isArray","undefined","abiEvent","find","entry","type","name","getBlockNumber","allRawEvents","queryFilter","filters","observation","rawLog","rawEvent","args","argsObject","inputs","input","index","value","hexFromBigInt","eventResult","block","blockNumber","chainId","Number","schema","EvmEventSchema","exists","flat","ex","error","console","log","message"]}
+{"version":3,"sources":["../../src/index.ts","../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './model.ts'\nexport * from './Payload.ts'\nexport * from './Witness.ts'\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACKO,IAAM,+BAA+B;;;ACHrC,IAAM,kBAAkB;AAaxB,IAAM,iBAAiB;;;ACf9B,oBAAyB;AACzB,oBAAuB;AACvB,iBAA8B;AAC9B,2BAA8C;AAC9C,kCAAmC;AACnC,oBAAmC;AAK5B,IAAM,mBAAN,cAAgG,+CAIrG;AAAA,EACA,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,4BAA4B;AAAA,EACxG,OAAyB,sBAA8B;AAAA,EAEvD,IAAI,MAAM;AACR,eAAO,wBAAS,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,WAAO,4CAAiC,eAAe,CAAC,EACxD,IAAI,OAAO,EAAE,WAAW,SAAS,WAAW,kBAAkB,SAAS,eAAe,MAAM;AAC3F,gBAAM,uBAAmB,wBAAS,WAAW,KAAK,OAAO,SAAS,MAAM,iBAAiB;AACzF,gBAAM,yBAAqB,wBAAS,aAAa,KAAK,OAAO,WAAW,MAAM,mBAAmB;AAEjG,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAClD,gBAAM,UAAU,MAAM,SAAS,WAAW;AAE1C,gBAAM,WAAW,IAAI,uBAAS,kBAAkB,KAAK,KAAK,QAAQ,EAAE,OAAO,gBAAgB;AAE3F,gBAAM,eAAW,wBAAS,MAAM,QAAQ,KAAK,GAAG,IAAI,KAAK,MAAM,QAAW,MAAM,qBAAqB;AAErG,gBAAM,eAAW;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,eAAW,0BAAc,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,oBAAM;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/browser/index.mjs

@@ -1,6 +1,3 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
 // src/model.ts
 var EvmEventsWitnessConfigSchema = "network.xyo.evm.events.witness.config";
 
@@ -16,13 +13,7 @@ import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
 import { AbstractEvmWitness } from "@xyo-network/witness-evm-abstract";
 import { Contract } from "ethers";
 var EvmEventsWitness = class extends AbstractEvmWitness {
-  static {
-    __name(this, "EvmEventsWitness");
-  }
-  static configSchemas = [
-    ...super.configSchemas,
-    EvmEventsWitnessConfigSchema
-  ];
+  static configSchemas = [...super.configSchemas, EvmEventsWitnessConfigSchema];
   static defaultConfigSchema = EvmEventsWitnessConfigSchema;
   get abi() {
     return assertEx(this.config.abi, () => "Missing abi");
@@ -31,38 +22,43 @@ var EvmEventsWitness = class extends AbstractEvmWitness {
     await this.started("throw");
     await this.getProviders();
     try {
-      const observations = (await Promise.all(inPayloads.filter(isPayloadOfSchemaType(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
-        const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address");
-        const validatedEventName = assertEx(eventName ?? this.config.eventName, () => "Missing eventName");
-        const provider = await this.getProvider(true, true);
-        const network = await provider.getNetwork();
-        const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
-        const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
-        const abiEvent = assertEx(abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName), () => "Could not find event");
-        const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
-        const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
-        const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
-        const observation = allRawEvents.map((rawLog) => {
-          const rawEvent = rawLog;
-          if (rawEvent.args) {
-            const argsObject = {};
-            abiEvent.inputs.map((input, index) => {
-              const value = rawEvent.args[index];
-              argsObject[input.name] = typeof value === "bigint" ? hexFromBigInt(value) : value;
-            });
-            const eventResult = {
-              address: rawEvent.address,
-              args: argsObject,
-              block: rawEvent.blockNumber,
-              chainId: Number(network.chainId),
-              eventName: validatedEventName,
-              schema: EvmEventSchema
-            };
-            return eventResult;
-          }
-        }).filter(exists);
-        return observation;
-      }))).flat();
+      const observations = (await Promise.all(
+        inPayloads.filter(isPayloadOfSchemaType(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
+          const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address");
+          const validatedEventName = assertEx(eventName ?? this.config.eventName, () => "Missing eventName");
+          const provider = await this.getProvider(true, true);
+          const network = await provider.getNetwork();
+          const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
+          const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
+          const abiEvent = assertEx(
+            abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName),
+            () => "Could not find event"
+          );
+          const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
+          const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
+          const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
+          const observation = allRawEvents.map((rawLog) => {
+            const rawEvent = rawLog;
+            if (rawEvent.args) {
+              const argsObject = {};
+              abiEvent.inputs.map((input, index) => {
+                const value = rawEvent.args[index];
+                argsObject[input.name] = typeof value === "bigint" ? hexFromBigInt(value) : value;
+              });
+              const eventResult = {
+                address: rawEvent.address,
+                args: argsObject,
+                block: rawEvent.blockNumber,
+                chainId: Number(network.chainId),
+                eventName: validatedEventName,
+                schema: EvmEventSchema
+              };
+              return eventResult;
+            }
+          }).filter(exists);
+          return observation;
+        })
+      )).flat();
       return observations;
     } catch (ex) {
       const error = ex;

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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,IAAMA,+BAA+B;;;ACHrC,IAAMC,kBAAkB;AAaxB,IAAMC,iBAAiB;;;ACf9B,SAASC,gBAAgB;AACzB,SAASC,cAAc;AACvB,SAASC,qBAAqB;AAC9B,SAASC,6BAAqC;AAC9C,SAASC,0BAA0B;AACnC,SAASC,gBAA0B;AAK5B,IAAMC,mBAAN,cAAgGC,mBAAAA;EAVvG,OAUuGA;;;EAKrG,OAAyBC,gBAA0B;OAAI,MAAMA;IAAeC;;EAC5E,OAAyBC,sBAA8BD;EAEvD,IAAIE,MAAM;AACR,WAAOC,SAAS,KAAKC,OAAOF,KAAK,MAAM,aAAA;EACzC;EAEA,MAAyBG,eAAeC,aAA0B,CAAA,GAAyB;AACzF,UAAM,KAAKC,QAAQ,OAAA;AAEnB,UAAM,KAAKC,aAAY;AACvB,QAAI;AACF,YAAMC,gBACJ,MAAMC,QAAQC,IACZL,WACGM,OAAOC,sBAAiCC,eAAAA,CAAAA,EACxCC,IAAI,OAAO,EAAEC,WAAWC,SAASC,WAAWC,kBAAkBC,SAASC,eAAc,MAAE;AACtF,cAAMC,mBAAmBnB,SAASc,WAAW,KAAKb,OAAOa,SAAS,MAAM,iBAAA;AACxE,cAAMM,qBAAqBpB,SAASa,aAAa,KAAKZ,OAAOY,WAAW,MAAM,mBAAA;AAE9E,cAAMQ,WAAW,MAAM,KAAKC,YAAY,MAAM,IAAA;AAC9C,cAAMC,UAAU,MAAMF,SAASG,WAAU;AAEzC,cAAMC,WAAW,IAAIC,SAASP,kBAAkB,KAAKpB,KAAKsB,QAAAA,EAAUM,OAAOR,gBAAAA;AAE3E,cAAMS,WAAW5B,SAAS6B,MAAMC,QAAQ,KAAK/B,GAAG,IAAI,KAAKA,MAAMgC,QAAW,MAAM,qBAAA;AAEhF,cAAMC,WAAWhC,SACf4B,SAASK,KAAKC,CAAAA,UAASA,MAAMC,SAAS,WAAWD,MAAME,SAAShB,kBAAAA,GAChE,MAAM,sBAAA;AAGR,cAAMH,UAAU,KAAKhB,OAAOgB,WAAWC,kBAAmB,MAAMG,SAASgB,eAAc;AACvF,cAAMtB,YAAY,KAAKd,OAAOc,aAAaC,oBAAoB;AAE/D,cAAMsB,eAAe,MAAMb,SAASc,YAAYd,SAASe,QAAQpB,kBAAAA,GAAqBL,WAAWE,OAAAA;AAGjG,cAAMwB,cAAcH,aACjB1B,IAAI,CAAC8B,WAAAA;AACJ,gBAAMC,WAAWD;AACjB,cAAIC,SAASC,MAAM;AACjB,kBAAMC,aAAsC,CAAC;AAE7Cb,qBAASc,OAAOlC,IAAI,CAACmC,OAAyBC,UAAAA;AAC5C,oBAAMC,QAAQN,SAASC,KAAKI,KAAAA;AAC5BH,yBAAWE,MAAMX,IAAI,IAAI,OAAOa,UAAU,WAAWC,cAAcD,KAAAA,IAASA;YAC9E,CAAA;AAEA,kBAAME,cAAwB;cAC5BrC,SAAS6B,SAAS7B;cAClB8B,MAAMC;cACNO,OAAOT,SAASU;cAChBC,SAASC,OAAOhC,QAAQ+B,OAAO;cAC/BzC,WAAWO;cACXoC,QAAQC;YACV;AACA,mBAAON;UACT;QACF,CAAA,EACC1C,OAAOiD,MAAAA;AAEV,eAAOjB;MACT,CAAA,CAAA,GAEJkB,KAAI;AACN,aAAOrD;IACT,SAASsD,IAAI;AACX,YAAMC,QAAQD;AACdE,cAAQC,IAAI,UAAU,KAAK9D,OAAOmC,IAAI,MAAMyB,MAAMG,OAAO,EAAE;AAC3D,YAAMH;IACR;EACF;AACF;","names":["EvmEventsWitnessConfigSchema","EvmEventsSchema","EvmEventSchema","assertEx","exists","hexFromBigInt","isPayloadOfSchemaType","AbstractEvmWitness","Contract","EvmEventsWitness","AbstractEvmWitness","configSchemas","EvmEventsWitnessConfigSchema","defaultConfigSchema","abi","assertEx","config","observeHandler","inPayloads","started","getProviders","observations","Promise","all","filter","isPayloadOfSchemaType","EvmEventsSchema","map","eventName","address","fromBlock","payloadFromBlock","toBlock","payloadToBlock","validatedAddress","validatedEventName","provider","getProvider","network","getNetwork","contract","Contract","attach","abiArray","Array","isArray","undefined","abiEvent","find","entry","type","name","getBlockNumber","allRawEvents","queryFilter","filters","observation","rawLog","rawEvent","args","argsObject","inputs","input","index","value","hexFromBigInt","eventResult","block","blockNumber","chainId","Number","schema","EvmEventSchema","exists","flat","ex","error","console","log","message"]}
+{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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;AAC9B,SAAS,6BAAqC;AAC9C,SAAS,0BAA0B;AACnC,SAAS,gBAA0B;AAK5B,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,EAAE,WAAW,SAAS,WAAW,kBAAkB,SAAS,eAAe,MAAM;AAC3F,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/index.cjs

@@ -3,7 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -43,13 +42,7 @@ var import_payload_model = require("@xyo-network/payload-model");
 var import_witness_evm_abstract = require("@xyo-network/witness-evm-abstract");
 var import_ethers = require("ethers");
 var EvmEventsWitness = class extends import_witness_evm_abstract.AbstractEvmWitness {
-  static {
-    __name(this, "EvmEventsWitness");
-  }
-  static configSchemas = [
-    ...super.configSchemas,
-    EvmEventsWitnessConfigSchema
-  ];
+  static configSchemas = [...super.configSchemas, EvmEventsWitnessConfigSchema];
   static defaultConfigSchema = EvmEventsWitnessConfigSchema;
   get abi() {
     return (0, import_assert.assertEx)(this.config.abi, () => "Missing abi");
@@ -58,38 +51,43 @@ var EvmEventsWitness = class extends import_witness_evm_abstract.AbstractEvmWitn
     await this.started("throw");
     await this.getProviders();
     try {
-      const observations = (await Promise.all(inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
-        const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, () => "Missing address");
-        const validatedEventName = (0, import_assert.assertEx)(eventName ?? this.config.eventName, () => "Missing eventName");
-        const provider = await this.getProvider(true, true);
-        const network = await provider.getNetwork();
-        const contract = new import_ethers.Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
-        const abiArray = (0, import_assert.assertEx)(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
-        const abiEvent = (0, import_assert.assertEx)(abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName), () => "Could not find event");
-        const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
-        const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
-        const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
-        const observation = allRawEvents.map((rawLog) => {
-          const rawEvent = rawLog;
-          if (rawEvent.args) {
-            const argsObject = {};
-            abiEvent.inputs.map((input, index) => {
-              const value = rawEvent.args[index];
-              argsObject[input.name] = typeof value === "bigint" ? (0, import_hex.hexFromBigInt)(value) : value;
-            });
-            const eventResult = {
-              address: rawEvent.address,
-              args: argsObject,
-              block: rawEvent.blockNumber,
-              chainId: Number(network.chainId),
-              eventName: validatedEventName,
-              schema: EvmEventSchema
-            };
-            return eventResult;
-          }
-        }).filter(import_exists.exists);
-        return observation;
-      }))).flat();
+      const observations = (await Promise.all(
+        inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
+          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, () => "Missing address");
+          const validatedEventName = (0, import_assert.assertEx)(eventName ?? this.config.eventName, () => "Missing eventName");
+          const provider = await this.getProvider(true, true);
+          const network = await provider.getNetwork();
+          const contract = new import_ethers.Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
+          const abiArray = (0, import_assert.assertEx)(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
+          const abiEvent = (0, import_assert.assertEx)(
+            abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName),
+            () => "Could not find event"
+          );
+          const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
+          const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
+          const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
+          const observation = allRawEvents.map((rawLog) => {
+            const rawEvent = rawLog;
+            if (rawEvent.args) {
+              const argsObject = {};
+              abiEvent.inputs.map((input, index) => {
+                const value = rawEvent.args[index];
+                argsObject[input.name] = typeof value === "bigint" ? (0, import_hex.hexFromBigInt)(value) : value;
+              });
+              const eventResult = {
+                address: rawEvent.address,
+                args: argsObject,
+                block: rawEvent.blockNumber,
+                chainId: Number(network.chainId),
+                eventName: validatedEventName,
+                schema: EvmEventSchema
+              };
+              return eventResult;
+            }
+          }).filter(import_exists.exists);
+          return observation;
+        })
+      )).flat();
       return observations;
     } catch (ex) {
       const error = ex;

package/dist/neutral/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './model.ts'\nexport * from './Payload.ts'\nexport * from './Witness.ts'\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;ACKO,IAAMA,+BAA+B;;;ACHrC,IAAMC,kBAAkB;AAaxB,IAAMC,iBAAiB;;;ACf9B,oBAAyB;AACzB,oBAAuB;AACvB,iBAA8B;AAC9B,2BAA8C;AAC9C,kCAAmC;AACnC,oBAAmC;AAK5B,IAAMC,mBAAN,cAAgGC,+CAAAA;EAVvG,OAUuGA;;;EAKrG,OAAyBC,gBAA0B;OAAI,MAAMA;IAAeC;;EAC5E,OAAyBC,sBAA8BD;EAEvD,IAAIE,MAAM;AACR,eAAOC,wBAAS,KAAKC,OAAOF,KAAK,MAAM,aAAA;EACzC;EAEA,MAAyBG,eAAeC,aAA0B,CAAA,GAAyB;AACzF,UAAM,KAAKC,QAAQ,OAAA;AAEnB,UAAM,KAAKC,aAAY;AACvB,QAAI;AACF,YAAMC,gBACJ,MAAMC,QAAQC,IACZL,WACGM,WAAOC,4CAAiCC,eAAAA,CAAAA,EACxCC,IAAI,OAAO,EAAEC,WAAWC,SAASC,WAAWC,kBAAkBC,SAASC,eAAc,MAAE;AACtF,cAAMC,uBAAmBnB,wBAASc,WAAW,KAAKb,OAAOa,SAAS,MAAM,iBAAA;AACxE,cAAMM,yBAAqBpB,wBAASa,aAAa,KAAKZ,OAAOY,WAAW,MAAM,mBAAA;AAE9E,cAAMQ,WAAW,MAAM,KAAKC,YAAY,MAAM,IAAA;AAC9C,cAAMC,UAAU,MAAMF,SAASG,WAAU;AAEzC,cAAMC,WAAW,IAAIC,uBAASP,kBAAkB,KAAKpB,KAAKsB,QAAAA,EAAUM,OAAOR,gBAAAA;AAE3E,cAAMS,eAAW5B,wBAAS6B,MAAMC,QAAQ,KAAK/B,GAAG,IAAI,KAAKA,MAAMgC,QAAW,MAAM,qBAAA;AAEhF,cAAMC,eAAWhC,wBACf4B,SAASK,KAAKC,CAAAA,UAASA,MAAMC,SAAS,WAAWD,MAAME,SAAShB,kBAAAA,GAChE,MAAM,sBAAA;AAGR,cAAMH,UAAU,KAAKhB,OAAOgB,WAAWC,kBAAmB,MAAMG,SAASgB,eAAc;AACvF,cAAMtB,YAAY,KAAKd,OAAOc,aAAaC,oBAAoB;AAE/D,cAAMsB,eAAe,MAAMb,SAASc,YAAYd,SAASe,QAAQpB,kBAAAA,GAAqBL,WAAWE,OAAAA;AAGjG,cAAMwB,cAAcH,aACjB1B,IAAI,CAAC8B,WAAAA;AACJ,gBAAMC,WAAWD;AACjB,cAAIC,SAASC,MAAM;AACjB,kBAAMC,aAAsC,CAAC;AAE7Cb,qBAASc,OAAOlC,IAAI,CAACmC,OAAyBC,UAAAA;AAC5C,oBAAMC,QAAQN,SAASC,KAAKI,KAAAA;AAC5BH,yBAAWE,MAAMX,IAAI,IAAI,OAAOa,UAAU,eAAWC,0BAAcD,KAAAA,IAASA;YAC9E,CAAA;AAEA,kBAAME,cAAwB;cAC5BrC,SAAS6B,SAAS7B;cAClB8B,MAAMC;cACNO,OAAOT,SAASU;cAChBC,SAASC,OAAOhC,QAAQ+B,OAAO;cAC/BzC,WAAWO;cACXoC,QAAQC;YACV;AACA,mBAAON;UACT;QACF,CAAA,EACC1C,OAAOiD,oBAAAA;AAEV,eAAOjB;MACT,CAAA,CAAA,GAEJkB,KAAI;AACN,aAAOrD;IACT,SAASsD,IAAI;AACX,YAAMC,QAAQD;AACdE,cAAQC,IAAI,UAAU,KAAK9D,OAAOmC,IAAI,MAAMyB,MAAMG,OAAO,EAAE;AAC3D,YAAMH;IACR;EACF;AACF;","names":["EvmEventsWitnessConfigSchema","EvmEventsSchema","EvmEventSchema","EvmEventsWitness","AbstractEvmWitness","configSchemas","EvmEventsWitnessConfigSchema","defaultConfigSchema","abi","assertEx","config","observeHandler","inPayloads","started","getProviders","observations","Promise","all","filter","isPayloadOfSchemaType","EvmEventsSchema","map","eventName","address","fromBlock","payloadFromBlock","toBlock","payloadToBlock","validatedAddress","validatedEventName","provider","getProvider","network","getNetwork","contract","Contract","attach","abiArray","Array","isArray","undefined","abiEvent","find","entry","type","name","getBlockNumber","allRawEvents","queryFilter","filters","observation","rawLog","rawEvent","args","argsObject","inputs","input","index","value","hexFromBigInt","eventResult","block","blockNumber","chainId","Number","schema","EvmEventSchema","exists","flat","ex","error","console","log","message"]}
+{"version":3,"sources":["../../src/index.ts","../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './model.ts'\nexport * from './Payload.ts'\nexport * from './Witness.ts'\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACKO,IAAM,+BAA+B;;;ACHrC,IAAM,kBAAkB;AAaxB,IAAM,iBAAiB;;;ACf9B,oBAAyB;AACzB,oBAAuB;AACvB,iBAA8B;AAC9B,2BAA8C;AAC9C,kCAAmC;AACnC,oBAAmC;AAK5B,IAAM,mBAAN,cAAgG,+CAIrG;AAAA,EACA,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,4BAA4B;AAAA,EACxG,OAAyB,sBAA8B;AAAA,EAEvD,IAAI,MAAM;AACR,eAAO,wBAAS,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,WAAO,4CAAiC,eAAe,CAAC,EACxD,IAAI,OAAO,EAAE,WAAW,SAAS,WAAW,kBAAkB,SAAS,eAAe,MAAM;AAC3F,gBAAM,uBAAmB,wBAAS,WAAW,KAAK,OAAO,SAAS,MAAM,iBAAiB;AACzF,gBAAM,yBAAqB,wBAAS,aAAa,KAAK,OAAO,WAAW,MAAM,mBAAmB;AAEjG,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAClD,gBAAM,UAAU,MAAM,SAAS,WAAW;AAE1C,gBAAM,WAAW,IAAI,uBAAS,kBAAkB,KAAK,KAAK,QAAQ,EAAE,OAAO,gBAAgB;AAE3F,gBAAM,eAAW,wBAAS,MAAM,QAAQ,KAAK,GAAG,IAAI,KAAK,MAAM,QAAW,MAAM,qBAAqB;AAErG,gBAAM,eAAW;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,eAAW,0BAAc,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,oBAAM;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/index.mjs

@@ -1,6 +1,3 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
 // src/model.ts
 var EvmEventsWitnessConfigSchema = "network.xyo.evm.events.witness.config";
 
@@ -16,13 +13,7 @@ import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
 import { AbstractEvmWitness } from "@xyo-network/witness-evm-abstract";
 import { Contract } from "ethers";
 var EvmEventsWitness = class extends AbstractEvmWitness {
-  static {
-    __name(this, "EvmEventsWitness");
-  }
-  static configSchemas = [
-    ...super.configSchemas,
-    EvmEventsWitnessConfigSchema
-  ];
+  static configSchemas = [...super.configSchemas, EvmEventsWitnessConfigSchema];
   static defaultConfigSchema = EvmEventsWitnessConfigSchema;
   get abi() {
     return assertEx(this.config.abi, () => "Missing abi");
@@ -31,38 +22,43 @@ var EvmEventsWitness = class extends AbstractEvmWitness {
     await this.started("throw");
     await this.getProviders();
     try {
-      const observations = (await Promise.all(inPayloads.filter(isPayloadOfSchemaType(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
-        const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address");
-        const validatedEventName = assertEx(eventName ?? this.config.eventName, () => "Missing eventName");
-        const provider = await this.getProvider(true, true);
-        const network = await provider.getNetwork();
-        const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
-        const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
-        const abiEvent = assertEx(abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName), () => "Could not find event");
-        const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
-        const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
-        const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
-        const observation = allRawEvents.map((rawLog) => {
-          const rawEvent = rawLog;
-          if (rawEvent.args) {
-            const argsObject = {};
-            abiEvent.inputs.map((input, index) => {
-              const value = rawEvent.args[index];
-              argsObject[input.name] = typeof value === "bigint" ? hexFromBigInt(value) : value;
-            });
-            const eventResult = {
-              address: rawEvent.address,
-              args: argsObject,
-              block: rawEvent.blockNumber,
-              chainId: Number(network.chainId),
-              eventName: validatedEventName,
-              schema: EvmEventSchema
-            };
-            return eventResult;
-          }
-        }).filter(exists);
-        return observation;
-      }))).flat();
+      const observations = (await Promise.all(
+        inPayloads.filter(isPayloadOfSchemaType(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
+          const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address");
+          const validatedEventName = assertEx(eventName ?? this.config.eventName, () => "Missing eventName");
+          const provider = await this.getProvider(true, true);
+          const network = await provider.getNetwork();
+          const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
+          const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
+          const abiEvent = assertEx(
+            abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName),
+            () => "Could not find event"
+          );
+          const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
+          const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
+          const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
+          const observation = allRawEvents.map((rawLog) => {
+            const rawEvent = rawLog;
+            if (rawEvent.args) {
+              const argsObject = {};
+              abiEvent.inputs.map((input, index) => {
+                const value = rawEvent.args[index];
+                argsObject[input.name] = typeof value === "bigint" ? hexFromBigInt(value) : value;
+              });
+              const eventResult = {
+                address: rawEvent.address,
+                args: argsObject,
+                block: rawEvent.blockNumber,
+                chainId: Number(network.chainId),
+                eventName: validatedEventName,
+                schema: EvmEventSchema
+              };
+              return eventResult;
+            }
+          }).filter(exists);
+          return observation;
+        })
+      )).flat();
       return observations;
     } catch (ex) {
       const error = ex;

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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,IAAMA,+BAA+B;;;ACHrC,IAAMC,kBAAkB;AAaxB,IAAMC,iBAAiB;;;ACf9B,SAASC,gBAAgB;AACzB,SAASC,cAAc;AACvB,SAASC,qBAAqB;AAC9B,SAASC,6BAAqC;AAC9C,SAASC,0BAA0B;AACnC,SAASC,gBAA0B;AAK5B,IAAMC,mBAAN,cAAgGC,mBAAAA;EAVvG,OAUuGA;;;EAKrG,OAAyBC,gBAA0B;OAAI,MAAMA;IAAeC;;EAC5E,OAAyBC,sBAA8BD;EAEvD,IAAIE,MAAM;AACR,WAAOC,SAAS,KAAKC,OAAOF,KAAK,MAAM,aAAA;EACzC;EAEA,MAAyBG,eAAeC,aAA0B,CAAA,GAAyB;AACzF,UAAM,KAAKC,QAAQ,OAAA;AAEnB,UAAM,KAAKC,aAAY;AACvB,QAAI;AACF,YAAMC,gBACJ,MAAMC,QAAQC,IACZL,WACGM,OAAOC,sBAAiCC,eAAAA,CAAAA,EACxCC,IAAI,OAAO,EAAEC,WAAWC,SAASC,WAAWC,kBAAkBC,SAASC,eAAc,MAAE;AACtF,cAAMC,mBAAmBnB,SAASc,WAAW,KAAKb,OAAOa,SAAS,MAAM,iBAAA;AACxE,cAAMM,qBAAqBpB,SAASa,aAAa,KAAKZ,OAAOY,WAAW,MAAM,mBAAA;AAE9E,cAAMQ,WAAW,MAAM,KAAKC,YAAY,MAAM,IAAA;AAC9C,cAAMC,UAAU,MAAMF,SAASG,WAAU;AAEzC,cAAMC,WAAW,IAAIC,SAASP,kBAAkB,KAAKpB,KAAKsB,QAAAA,EAAUM,OAAOR,gBAAAA;AAE3E,cAAMS,WAAW5B,SAAS6B,MAAMC,QAAQ,KAAK/B,GAAG,IAAI,KAAKA,MAAMgC,QAAW,MAAM,qBAAA;AAEhF,cAAMC,WAAWhC,SACf4B,SAASK,KAAKC,CAAAA,UAASA,MAAMC,SAAS,WAAWD,MAAME,SAAShB,kBAAAA,GAChE,MAAM,sBAAA;AAGR,cAAMH,UAAU,KAAKhB,OAAOgB,WAAWC,kBAAmB,MAAMG,SAASgB,eAAc;AACvF,cAAMtB,YAAY,KAAKd,OAAOc,aAAaC,oBAAoB;AAE/D,cAAMsB,eAAe,MAAMb,SAASc,YAAYd,SAASe,QAAQpB,kBAAAA,GAAqBL,WAAWE,OAAAA;AAGjG,cAAMwB,cAAcH,aACjB1B,IAAI,CAAC8B,WAAAA;AACJ,gBAAMC,WAAWD;AACjB,cAAIC,SAASC,MAAM;AACjB,kBAAMC,aAAsC,CAAC;AAE7Cb,qBAASc,OAAOlC,IAAI,CAACmC,OAAyBC,UAAAA;AAC5C,oBAAMC,QAAQN,SAASC,KAAKI,KAAAA;AAC5BH,yBAAWE,MAAMX,IAAI,IAAI,OAAOa,UAAU,WAAWC,cAAcD,KAAAA,IAASA;YAC9E,CAAA;AAEA,kBAAME,cAAwB;cAC5BrC,SAAS6B,SAAS7B;cAClB8B,MAAMC;cACNO,OAAOT,SAASU;cAChBC,SAASC,OAAOhC,QAAQ+B,OAAO;cAC/BzC,WAAWO;cACXoC,QAAQC;YACV;AACA,mBAAON;UACT;QACF,CAAA,EACC1C,OAAOiD,MAAAA;AAEV,eAAOjB;MACT,CAAA,CAAA,GAEJkB,KAAI;AACN,aAAOrD;IACT,SAASsD,IAAI;AACX,YAAMC,QAAQD;AACdE,cAAQC,IAAI,UAAU,KAAK9D,OAAOmC,IAAI,MAAMyB,MAAMG,OAAO,EAAE;AAC3D,YAAMH;IACR;EACF;AACF;","names":["EvmEventsWitnessConfigSchema","EvmEventsSchema","EvmEventSchema","assertEx","exists","hexFromBigInt","isPayloadOfSchemaType","AbstractEvmWitness","Contract","EvmEventsWitness","AbstractEvmWitness","configSchemas","EvmEventsWitnessConfigSchema","defaultConfigSchema","abi","assertEx","config","observeHandler","inPayloads","started","getProviders","observations","Promise","all","filter","isPayloadOfSchemaType","EvmEventsSchema","map","eventName","address","fromBlock","payloadFromBlock","toBlock","payloadToBlock","validatedAddress","validatedEventName","provider","getProvider","network","getNetwork","contract","Contract","attach","abiArray","Array","isArray","undefined","abiEvent","find","entry","type","name","getBlockNumber","allRawEvents","queryFilter","filters","observation","rawLog","rawEvent","args","argsObject","inputs","input","index","value","hexFromBigInt","eventResult","block","blockNumber","chainId","Number","schema","EvmEventSchema","exists","flat","ex","error","console","log","message"]}
+{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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;AAC9B,SAAS,6BAAqC;AAC9C,SAAS,0BAA0B;AACnC,SAAS,gBAA0B;AAK5B,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,EAAE,WAAW,SAAS,WAAW,kBAAkB,SAAS,eAAe,MAAM;AAC3F,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/node/index.cjs

@@ -2,11 +2,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __reflectGet = Reflect.get;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -20,8 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
 
 // src/index.ts
 var src_exports = {};
@@ -47,7 +41,9 @@ var import_hex = require("@xylabs/hex");
 var import_payload_model = require("@xyo-network/payload-model");
 var import_witness_evm_abstract = require("@xyo-network/witness-evm-abstract");
 var import_ethers = require("ethers");
-var _EvmEventsWitness = class _EvmEventsWitness extends import_witness_evm_abstract.AbstractEvmWitness {
+var EvmEventsWitness = class extends import_witness_evm_abstract.AbstractEvmWitness {
+  static configSchemas = [...super.configSchemas, EvmEventsWitnessConfigSchema];
+  static defaultConfigSchema = EvmEventsWitnessConfigSchema;
   get abi() {
     return (0, import_assert.assertEx)(this.config.abi, () => "Missing abi");
   }
@@ -55,38 +51,43 @@ var _EvmEventsWitness = class _EvmEventsWitness extends import_witness_evm_abstr
     await this.started("throw");
     await this.getProviders();
     try {
-      const observations = (await Promise.all(inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
-        const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, () => "Missing address");
-        const validatedEventName = (0, import_assert.assertEx)(eventName ?? this.config.eventName, () => "Missing eventName");
-        const provider = await this.getProvider(true, true);
-        const network = await provider.getNetwork();
-        const contract = new import_ethers.Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
-        const abiArray = (0, import_assert.assertEx)(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
-        const abiEvent = (0, import_assert.assertEx)(abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName), () => "Could not find event");
-        const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
-        const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
-        const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
-        const observation = allRawEvents.map((rawLog) => {
-          const rawEvent = rawLog;
-          if (rawEvent.args) {
-            const argsObject = {};
-            abiEvent.inputs.map((input, index) => {
-              const value = rawEvent.args[index];
-              argsObject[input.name] = typeof value === "bigint" ? (0, import_hex.hexFromBigInt)(value) : value;
-            });
-            const eventResult = {
-              address: rawEvent.address,
-              args: argsObject,
-              block: rawEvent.blockNumber,
-              chainId: Number(network.chainId),
-              eventName: validatedEventName,
-              schema: EvmEventSchema
-            };
-            return eventResult;
-          }
-        }).filter(import_exists.exists);
-        return observation;
-      }))).flat();
+      const observations = (await Promise.all(
+        inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
+          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, () => "Missing address");
+          const validatedEventName = (0, import_assert.assertEx)(eventName ?? this.config.eventName, () => "Missing eventName");
+          const provider = await this.getProvider(true, true);
+          const network = await provider.getNetwork();
+          const contract = new import_ethers.Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
+          const abiArray = (0, import_assert.assertEx)(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
+          const abiEvent = (0, import_assert.assertEx)(
+            abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName),
+            () => "Could not find event"
+          );
+          const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
+          const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
+          const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
+          const observation = allRawEvents.map((rawLog) => {
+            const rawEvent = rawLog;
+            if (rawEvent.args) {
+              const argsObject = {};
+              abiEvent.inputs.map((input, index) => {
+                const value = rawEvent.args[index];
+                argsObject[input.name] = typeof value === "bigint" ? (0, import_hex.hexFromBigInt)(value) : value;
+              });
+              const eventResult = {
+                address: rawEvent.address,
+                args: argsObject,
+                block: rawEvent.blockNumber,
+                chainId: Number(network.chainId),
+                eventName: validatedEventName,
+                schema: EvmEventSchema
+              };
+              return eventResult;
+            }
+          }).filter(import_exists.exists);
+          return observation;
+        })
+      )).flat();
       return observations;
     } catch (ex) {
       const error = ex;
@@ -95,13 +96,6 @@ var _EvmEventsWitness = class _EvmEventsWitness extends import_witness_evm_abstr
     }
   }
 };
-__name(_EvmEventsWitness, "EvmEventsWitness");
-__publicField(_EvmEventsWitness, "configSchemas", [
-  ...__superGet(_EvmEventsWitness, _EvmEventsWitness, "configSchemas"),
-  EvmEventsWitnessConfigSchema
-]);
-__publicField(_EvmEventsWitness, "defaultConfigSchema", EvmEventsWitnessConfigSchema);
-var EvmEventsWitness = _EvmEventsWitness;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   EvmEventSchema,

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './model.ts'\nexport * from './Payload.ts'\nexport * from './Witness.ts'\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;ACKO,IAAMA,+BAA+B;;;ACHrC,IAAMC,kBAAkB;AAaxB,IAAMC,iBAAiB;;;ACf9B,oBAAyB;AACzB,oBAAuB;AACvB,iBAA8B;AAC9B,2BAA8C;AAC9C,kCAAmC;AACnC,oBAAmC;AAK5B,IAAMC,oBAAN,MAAMA,0BAA0FC,+CAAAA;EAQrG,IAAIC,MAAM;AACR,eAAOC,wBAAS,KAAKC,OAAOF,KAAK,MAAM,aAAA;EACzC;EAEA,MAAyBG,eAAeC,aAA0B,CAAA,GAAyB;AACzF,UAAM,KAAKC,QAAQ,OAAA;AAEnB,UAAM,KAAKC,aAAY;AACvB,QAAI;AACF,YAAMC,gBACJ,MAAMC,QAAQC,IACZL,WACGM,WAAOC,4CAAiCC,eAAAA,CAAAA,EACxCC,IAAI,OAAO,EAAEC,WAAWC,SAASC,WAAWC,kBAAkBC,SAASC,eAAc,MAAE;AACtF,cAAMC,uBAAmBnB,wBAASc,WAAW,KAAKb,OAAOa,SAAS,MAAM,iBAAA;AACxE,cAAMM,yBAAqBpB,wBAASa,aAAa,KAAKZ,OAAOY,WAAW,MAAM,mBAAA;AAE9E,cAAMQ,WAAW,MAAM,KAAKC,YAAY,MAAM,IAAA;AAC9C,cAAMC,UAAU,MAAMF,SAASG,WAAU;AAEzC,cAAMC,WAAW,IAAIC,uBAASP,kBAAkB,KAAKpB,KAAKsB,QAAAA,EAAUM,OAAOR,gBAAAA;AAE3E,cAAMS,eAAW5B,wBAAS6B,MAAMC,QAAQ,KAAK/B,GAAG,IAAI,KAAKA,MAAMgC,QAAW,MAAM,qBAAA;AAEhF,cAAMC,eAAWhC,wBACf4B,SAASK,KAAKC,CAAAA,UAASA,MAAMC,SAAS,WAAWD,MAAME,SAAShB,kBAAAA,GAChE,MAAM,sBAAA;AAGR,cAAMH,UAAU,KAAKhB,OAAOgB,WAAWC,kBAAmB,MAAMG,SAASgB,eAAc;AACvF,cAAMtB,YAAY,KAAKd,OAAOc,aAAaC,oBAAoB;AAE/D,cAAMsB,eAAe,MAAMb,SAASc,YAAYd,SAASe,QAAQpB,kBAAAA,GAAqBL,WAAWE,OAAAA;AAGjG,cAAMwB,cAAcH,aACjB1B,IAAI,CAAC8B,WAAAA;AACJ,gBAAMC,WAAWD;AACjB,cAAIC,SAASC,MAAM;AACjB,kBAAMC,aAAsC,CAAC;AAE7Cb,qBAASc,OAAOlC,IAAI,CAACmC,OAAyBC,UAAAA;AAC5C,oBAAMC,QAAQN,SAASC,KAAKI,KAAAA;AAC5BH,yBAAWE,MAAMX,IAAI,IAAI,OAAOa,UAAU,eAAWC,0BAAcD,KAAAA,IAASA;YAC9E,CAAA;AAEA,kBAAME,cAAwB;cAC5BrC,SAAS6B,SAAS7B;cAClB8B,MAAMC;cACNO,OAAOT,SAASU;cAChBC,SAASC,OAAOhC,QAAQ+B,OAAO;cAC/BzC,WAAWO;cACXoC,QAAQC;YACV;AACA,mBAAON;UACT;QACF,CAAA,EACC1C,OAAOiD,oBAAAA;AAEV,eAAOjB;MACT,CAAA,CAAA,GAEJkB,KAAI;AACN,aAAOrD;IACT,SAASsD,IAAI;AACX,YAAMC,QAAQD;AACdE,cAAQC,IAAI,UAAU,KAAK9D,OAAOmC,IAAI,MAAMyB,MAAMG,OAAO,EAAE;AAC3D,YAAMH;IACR;EACF;AACF;AA9EuG/D;AAKrG,cALWD,mBAKcoE,iBAA0B;KAAI,iDAAMA;EAAeC;;AAC5E,cANWrE,mBAMcsE,uBAA8BD;AANlD,IAAMrE,mBAAN;","names":["EvmEventsWitnessConfigSchema","EvmEventsSchema","EvmEventSchema","EvmEventsWitness","AbstractEvmWitness","abi","assertEx","config","observeHandler","inPayloads","started","getProviders","observations","Promise","all","filter","isPayloadOfSchemaType","EvmEventsSchema","map","eventName","address","fromBlock","payloadFromBlock","toBlock","payloadToBlock","validatedAddress","validatedEventName","provider","getProvider","network","getNetwork","contract","Contract","attach","abiArray","Array","isArray","undefined","abiEvent","find","entry","type","name","getBlockNumber","allRawEvents","queryFilter","filters","observation","rawLog","rawEvent","args","argsObject","inputs","input","index","value","hexFromBigInt","eventResult","block","blockNumber","chainId","Number","schema","EvmEventSchema","exists","flat","ex","error","console","log","message","configSchemas","EvmEventsWitnessConfigSchema","defaultConfigSchema"]}
+{"version":3,"sources":["../../src/index.ts","../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './model.ts'\nexport * from './Payload.ts'\nexport * from './Witness.ts'\n","import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { JsonFragment } from 'ethers'\n\nexport type Abi = string | ReadonlyArray<JsonFragment | string>\n\nexport const 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACKO,IAAM,+BAA+B;;;ACHrC,IAAM,kBAAkB;AAaxB,IAAM,iBAAiB;;;ACf9B,oBAAyB;AACzB,oBAAuB;AACvB,iBAA8B;AAC9B,2BAA8C;AAC9C,kCAAmC;AACnC,oBAAmC;AAK5B,IAAM,mBAAN,cAAgG,+CAIrG;AAAA,EACA,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,4BAA4B;AAAA,EACxG,OAAyB,sBAA8B;AAAA,EAEvD,IAAI,MAAM;AACR,eAAO,wBAAS,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,WAAO,4CAAiC,eAAe,CAAC,EACxD,IAAI,OAAO,EAAE,WAAW,SAAS,WAAW,kBAAkB,SAAS,eAAe,MAAM;AAC3F,gBAAM,uBAAmB,wBAAS,WAAW,KAAK,OAAO,SAAS,MAAM,iBAAiB;AACzF,gBAAM,yBAAqB,wBAAS,aAAa,KAAK,OAAO,WAAW,MAAM,mBAAmB;AAEjG,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAClD,gBAAM,UAAU,MAAM,SAAS,WAAW;AAE1C,gBAAM,WAAW,IAAI,uBAAS,kBAAkB,KAAK,KAAK,QAAQ,EAAE,OAAO,gBAAgB;AAE3F,gBAAM,eAAW,wBAAS,MAAM,QAAQ,KAAK,GAAG,IAAI,KAAK,MAAM,QAAW,MAAM,qBAAqB;AAErG,gBAAM,eAAW;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,eAAW,0BAAc,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,oBAAM;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/node/index.mjs

@@ -1,11 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __reflectGet = Reflect.get;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
-
 // src/model.ts
 var EvmEventsWitnessConfigSchema = "network.xyo.evm.events.witness.config";
 
@@ -20,7 +12,9 @@ import { hexFromBigInt } from "@xylabs/hex";
 import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
 import { AbstractEvmWitness } from "@xyo-network/witness-evm-abstract";
 import { Contract } from "ethers";
-var _EvmEventsWitness = class _EvmEventsWitness extends AbstractEvmWitness {
+var EvmEventsWitness = class extends AbstractEvmWitness {
+  static configSchemas = [...super.configSchemas, EvmEventsWitnessConfigSchema];
+  static defaultConfigSchema = EvmEventsWitnessConfigSchema;
   get abi() {
     return assertEx(this.config.abi, () => "Missing abi");
   }
@@ -28,38 +22,43 @@ var _EvmEventsWitness = class _EvmEventsWitness extends AbstractEvmWitness {
     await this.started("throw");
     await this.getProviders();
     try {
-      const observations = (await Promise.all(inPayloads.filter(isPayloadOfSchemaType(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
-        const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address");
-        const validatedEventName = assertEx(eventName ?? this.config.eventName, () => "Missing eventName");
-        const provider = await this.getProvider(true, true);
-        const network = await provider.getNetwork();
-        const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
-        const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
-        const abiEvent = assertEx(abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName), () => "Could not find event");
-        const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
-        const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
-        const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
-        const observation = allRawEvents.map((rawLog) => {
-          const rawEvent = rawLog;
-          if (rawEvent.args) {
-            const argsObject = {};
-            abiEvent.inputs.map((input, index) => {
-              const value = rawEvent.args[index];
-              argsObject[input.name] = typeof value === "bigint" ? hexFromBigInt(value) : value;
-            });
-            const eventResult = {
-              address: rawEvent.address,
-              args: argsObject,
-              block: rawEvent.blockNumber,
-              chainId: Number(network.chainId),
-              eventName: validatedEventName,
-              schema: EvmEventSchema
-            };
-            return eventResult;
-          }
-        }).filter(exists);
-        return observation;
-      }))).flat();
+      const observations = (await Promise.all(
+        inPayloads.filter(isPayloadOfSchemaType(EvmEventsSchema)).map(async ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {
+          const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address");
+          const validatedEventName = assertEx(eventName ?? this.config.eventName, () => "Missing eventName");
+          const provider = await this.getProvider(true, true);
+          const network = await provider.getNetwork();
+          const contract = new Contract(validatedAddress, this.abi, provider).attach(validatedAddress);
+          const abiArray = assertEx(Array.isArray(this.abi) ? this.abi : void 0, () => "Abi is not an array");
+          const abiEvent = assertEx(
+            abiArray.find((entry) => entry.type === "event" && entry.name === validatedEventName),
+            () => "Could not find event"
+          );
+          const toBlock = this.config.toBlock ?? payloadToBlock ?? await provider.getBlockNumber();
+          const fromBlock = this.config.fromBlock ?? payloadFromBlock ?? 0;
+          const allRawEvents = await contract.queryFilter(contract.filters[validatedEventName], fromBlock, toBlock);
+          const observation = allRawEvents.map((rawLog) => {
+            const rawEvent = rawLog;
+            if (rawEvent.args) {
+              const argsObject = {};
+              abiEvent.inputs.map((input, index) => {
+                const value = rawEvent.args[index];
+                argsObject[input.name] = typeof value === "bigint" ? hexFromBigInt(value) : value;
+              });
+              const eventResult = {
+                address: rawEvent.address,
+                args: argsObject,
+                block: rawEvent.blockNumber,
+                chainId: Number(network.chainId),
+                eventName: validatedEventName,
+                schema: EvmEventSchema
+              };
+              return eventResult;
+            }
+          }).filter(exists);
+          return observation;
+        })
+      )).flat();
       return observations;
     } catch (ex) {
       const error = ex;
@@ -68,13 +67,6 @@ var _EvmEventsWitness = class _EvmEventsWitness extends AbstractEvmWitness {
     }
   }
 };
-__name(_EvmEventsWitness, "EvmEventsWitness");
-__publicField(_EvmEventsWitness, "configSchemas", [
-  ...__superGet(_EvmEventsWitness, _EvmEventsWitness, "configSchemas"),
-  EvmEventsWitnessConfigSchema
-]);
-__publicField(_EvmEventsWitness, "defaultConfigSchema", EvmEventsWitnessConfigSchema);
-var EvmEventsWitness = _EvmEventsWitness;
 export {
   EvmEventSchema,
   EvmEventsSchema,

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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,IAAMA,+BAA+B;;;ACHrC,IAAMC,kBAAkB;AAaxB,IAAMC,iBAAiB;;;ACf9B,SAASC,gBAAgB;AACzB,SAASC,cAAc;AACvB,SAASC,qBAAqB;AAC9B,SAASC,6BAAqC;AAC9C,SAASC,0BAA0B;AACnC,SAASC,gBAA0B;AAK5B,IAAMC,oBAAN,MAAMA,0BAA0FC,mBAAAA;EAQrG,IAAIC,MAAM;AACR,WAAOC,SAAS,KAAKC,OAAOF,KAAK,MAAM,aAAA;EACzC;EAEA,MAAyBG,eAAeC,aAA0B,CAAA,GAAyB;AACzF,UAAM,KAAKC,QAAQ,OAAA;AAEnB,UAAM,KAAKC,aAAY;AACvB,QAAI;AACF,YAAMC,gBACJ,MAAMC,QAAQC,IACZL,WACGM,OAAOC,sBAAiCC,eAAAA,CAAAA,EACxCC,IAAI,OAAO,EAAEC,WAAWC,SAASC,WAAWC,kBAAkBC,SAASC,eAAc,MAAE;AACtF,cAAMC,mBAAmBnB,SAASc,WAAW,KAAKb,OAAOa,SAAS,MAAM,iBAAA;AACxE,cAAMM,qBAAqBpB,SAASa,aAAa,KAAKZ,OAAOY,WAAW,MAAM,mBAAA;AAE9E,cAAMQ,WAAW,MAAM,KAAKC,YAAY,MAAM,IAAA;AAC9C,cAAMC,UAAU,MAAMF,SAASG,WAAU;AAEzC,cAAMC,WAAW,IAAIC,SAASP,kBAAkB,KAAKpB,KAAKsB,QAAAA,EAAUM,OAAOR,gBAAAA;AAE3E,cAAMS,WAAW5B,SAAS6B,MAAMC,QAAQ,KAAK/B,GAAG,IAAI,KAAKA,MAAMgC,QAAW,MAAM,qBAAA;AAEhF,cAAMC,WAAWhC,SACf4B,SAASK,KAAKC,CAAAA,UAASA,MAAMC,SAAS,WAAWD,MAAME,SAAShB,kBAAAA,GAChE,MAAM,sBAAA;AAGR,cAAMH,UAAU,KAAKhB,OAAOgB,WAAWC,kBAAmB,MAAMG,SAASgB,eAAc;AACvF,cAAMtB,YAAY,KAAKd,OAAOc,aAAaC,oBAAoB;AAE/D,cAAMsB,eAAe,MAAMb,SAASc,YAAYd,SAASe,QAAQpB,kBAAAA,GAAqBL,WAAWE,OAAAA;AAGjG,cAAMwB,cAAcH,aACjB1B,IAAI,CAAC8B,WAAAA;AACJ,gBAAMC,WAAWD;AACjB,cAAIC,SAASC,MAAM;AACjB,kBAAMC,aAAsC,CAAC;AAE7Cb,qBAASc,OAAOlC,IAAI,CAACmC,OAAyBC,UAAAA;AAC5C,oBAAMC,QAAQN,SAASC,KAAKI,KAAAA;AAC5BH,yBAAWE,MAAMX,IAAI,IAAI,OAAOa,UAAU,WAAWC,cAAcD,KAAAA,IAASA;YAC9E,CAAA;AAEA,kBAAME,cAAwB;cAC5BrC,SAAS6B,SAAS7B;cAClB8B,MAAMC;cACNO,OAAOT,SAASU;cAChBC,SAASC,OAAOhC,QAAQ+B,OAAO;cAC/BzC,WAAWO;cACXoC,QAAQC;YACV;AACA,mBAAON;UACT;QACF,CAAA,EACC1C,OAAOiD,MAAAA;AAEV,eAAOjB;MACT,CAAA,CAAA,GAEJkB,KAAI;AACN,aAAOrD;IACT,SAASsD,IAAI;AACX,YAAMC,QAAQD;AACdE,cAAQC,IAAI,UAAU,KAAK9D,OAAOmC,IAAI,MAAMyB,MAAMG,OAAO,EAAE;AAC3D,YAAMH;IACR;EACF;AACF;AA9EuG/D;AAKrG,cALWD,mBAKcoE,iBAA0B;KAAI,iDAAMA;EAAeC;;AAC5E,cANWrE,mBAMcsE,uBAA8BD;AANlD,IAAMrE,mBAAN;","names":["EvmEventsWitnessConfigSchema","EvmEventsSchema","EvmEventSchema","assertEx","exists","hexFromBigInt","isPayloadOfSchemaType","AbstractEvmWitness","Contract","EvmEventsWitness","AbstractEvmWitness","abi","assertEx","config","observeHandler","inPayloads","started","getProviders","observations","Promise","all","filter","isPayloadOfSchemaType","EvmEventsSchema","map","eventName","address","fromBlock","payloadFromBlock","toBlock","payloadToBlock","validatedAddress","validatedEventName","provider","getProvider","network","getNetwork","contract","Contract","attach","abiArray","Array","isArray","undefined","abiEvent","find","entry","type","name","getBlockNumber","allRawEvents","queryFilter","filters","observation","rawLog","rawEvent","args","argsObject","inputs","input","index","value","hexFromBigInt","eventResult","block","blockNumber","chainId","Number","schema","EvmEventSchema","exists","flat","ex","error","console","log","message","configSchemas","EvmEventsWitnessConfigSchema","defaultConfigSchema"]}
+{"version":3,"sources":["../../src/model.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\nimport { 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 { 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 { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness } from '@xyo-network/witness-evm-abstract'\nimport { Contract, EventLog } from 'ethers'\n\nimport { EvmEventsWitnessConfigSchema, EvmEventsWitnessParams } from './model.ts'\nimport { EvmEvent, EvmEvents, 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 ({ eventName, address, fromBlock: payloadFromBlock, toBlock: payloadToBlock }) => {\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;AAC9B,SAAS,6BAAqC;AAC9C,SAAS,0BAA0B;AACnC,SAAS,gBAA0B;AAK5B,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,EAAE,WAAW,SAAS,WAAW,kBAAkB,SAAS,eAAe,MAAM;AAC3F,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/package.json

@@ -10,18 +10,18 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.6.8",
-    "@xylabs/exists": "^3.6.8",
-    "@xylabs/hex": "^3.6.8",
-    "@xyo-network/payload-model": "^2.111.2",
-    "@xyo-network/witness-evm-abstract": "^2.111.2",
+    "@xylabs/assert": "^3.6.12",
+    "@xylabs/exists": "^3.6.12",
+    "@xylabs/hex": "^3.6.12",
+    "@xyo-network/payload-model": "^2.111.3",
+    "@xyo-network/witness-evm-abstract": "^2.111.3",
     "ethers": "^6.13.2"
   },
   "devDependencies": {
-    "@xylabs/jest-helpers": "^3.6.8",
-    "@xylabs/ts-scripts-yarn3": "^3.15.13",
-    "@xylabs/tsconfig": "^3.15.13",
-    "@xyo-network/open-zeppelin-typechain": "^3.0.5",
+    "@xylabs/jest-helpers": "^3.6.12",
+    "@xylabs/ts-scripts-yarn3": "^3.15.14",
+    "@xylabs/tsconfig": "^3.15.14",
+    "@xyo-network/open-zeppelin-typechain": "^3.1.0",
     "jest": "^29.7.0",
     "typescript": "^5.5.4"
   },
@@ -64,6 +64,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.99.5",
+  "version": "2.99.6",
   "type": "module"
 }