@aztec/ethereum 0.61.0 → 0.62.0

package/dest/index.d.ts

@@ -3,4 +3,5 @@ export * from './deploy_l1_contracts.js';
 export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
 export * from './ethereum_chain.js';
+export * from './utils.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC"}

package/dest/index.js

@@ -3,4 +3,5 @@ export * from './deploy_l1_contracts.js';
 export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
 export * from './ethereum_chain.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDIn0=
+export * from './utils.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsWUFBWSxDQUFDIn0=

package/dest/utils.d.ts

@@ -0,0 +1,11 @@
+import { type Fr } from '@aztec/foundation/fields';
+import { type DebugLogger } from '@aztec/foundation/log';
+import { type Abi, type ContractEventName, type DecodeEventLogReturnType, type Hex, type Log } from 'viem';
+export interface L2Claim {
+    claimSecret: Fr;
+    claimAmount: Fr;
+    messageHash: Hex;
+    messageLeafIndex: bigint;
+}
+export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: DebugLogger): TEventType;
+//# sourceMappingURL=utils.d.ts.map

package/dest/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EACL,KAAK,GAAG,EACR,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAET,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,WAAW,GACnB,UAAU,CAMZ"}

package/dest/utils.js

@@ -0,0 +1,27 @@
+import { decodeEventLog, } from 'viem';
+export function extractEvent(logs, address, abi, eventName, filter, logger) {
+    const event = tryExtractEvent(logs, address, abi, eventName, filter, logger);
+    if (!event) {
+        throw new Error(`Failed to find matching event ${eventName} for contract ${address}`);
+    }
+    return event;
+}
+function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
+    for (const log of logs) {
+        if (log.address === address) {
+            try {
+                const decodedEvent = decodeEventLog({ abi, ...log });
+                if (decodedEvent.eventName === eventName) {
+                    const matchingEvent = decodedEvent;
+                    if (!filter || filter(matchingEvent)) {
+                        return matchingEvent;
+                    }
+                }
+            }
+            catch (err) {
+                logger?.warn(`Failed to decode event log for contract ${address}: ${err}`);
+            }
+        }
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQU1MLGNBQWMsR0FDZixNQUFNLE1BQU0sQ0FBQztBQVNkLE1BQU0sVUFBVSxZQUFZLENBSzFCLElBQVcsRUFDWCxPQUFZLEVBQ1osR0FBUyxFQUNULFNBQXFCLEVBQ3JCLE1BQXFDLEVBQ3JDLE1BQW9CO0lBRXBCLE1BQU0sS0FBSyxHQUFHLGVBQWUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzdFLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNYLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLFNBQVMsaUJBQWlCLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDeEYsQ0FBQztJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQztBQUVELFNBQVMsZUFBZSxDQUt0QixJQUFXLEVBQ1gsT0FBWSxFQUNaLEdBQVMsRUFDVCxTQUFxQixFQUNyQixNQUFxQyxFQUNyQyxNQUFvQjtJQUVwQixLQUFLLE1BQU0sR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ3ZCLElBQUksR0FBRyxDQUFDLE9BQU8sS0FBSyxPQUFPLEVBQUUsQ0FBQztZQUM1QixJQUFJLENBQUM7Z0JBQ0gsTUFBTSxZQUFZLEdBQUcsY0FBYyxDQUFDLEVBQUUsR0FBRyxFQUFFLEdBQUcsR0FBRyxFQUFFLENBQUMsQ0FBQztnQkFDckQsSUFBSSxZQUFZLENBQUMsU0FBUyxLQUFLLFNBQVMsRUFBRSxDQUFDO29CQUN6QyxNQUFNLGFBQWEsR0FBRyxZQUEwQixDQUFDO29CQUNqRCxJQUFJLENBQUMsTUFBTSxJQUFJLE1BQU0sQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO3dCQUNyQyxPQUFPLGFBQWEsQ0FBQztvQkFDdkIsQ0FBQztnQkFDSCxDQUFDO1lBQ0gsQ0FBQztZQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7Z0JBQ2IsTUFBTSxFQUFFLElBQUksQ0FBQywyQ0FBMkMsT0FBTyxLQUFLLEdBQUcsRUFBRSxDQUFDLENBQUM7WUFDN0UsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.61.0",
+  "version": "0.62.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -24,8 +24,8 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/foundation": "0.61.0",
-    "@aztec/l1-artifacts": "0.61.0",
+    "@aztec/foundation": "0.62.0",
+    "@aztec/l1-artifacts": "0.62.0",
     "dotenv": "^16.0.3",
     "tslib": "^2.4.0",
     "viem": "^2.7.15"

package/src/index.ts

@@ -3,3 +3,4 @@ export * from './deploy_l1_contracts.js';
 export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
 export * from './ethereum_chain.js';
+export * from './utils.js';

package/src/utils.ts

@@ -0,0 +1,66 @@
+import { type Fr } from '@aztec/foundation/fields';
+import { type DebugLogger } from '@aztec/foundation/log';
+
+import {
+  type Abi,
+  type ContractEventName,
+  type DecodeEventLogReturnType,
+  type Hex,
+  type Log,
+  decodeEventLog,
+} from 'viem';
+
+export interface L2Claim {
+  claimSecret: Fr;
+  claimAmount: Fr;
+  messageHash: Hex;
+  messageLeafIndex: bigint;
+}
+
+export function extractEvent<
+  const TAbi extends Abi | readonly unknown[],
+  TEventName extends ContractEventName<TAbi>,
+  TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>,
+>(
+  logs: Log[],
+  address: Hex,
+  abi: TAbi,
+  eventName: TEventName,
+  filter?: (log: TEventType) => boolean,
+  logger?: DebugLogger,
+): TEventType {
+  const event = tryExtractEvent(logs, address, abi, eventName, filter, logger);
+  if (!event) {
+    throw new Error(`Failed to find matching event ${eventName} for contract ${address}`);
+  }
+  return event;
+}
+
+function tryExtractEvent<
+  const TAbi extends Abi | readonly unknown[],
+  TEventName extends ContractEventName<TAbi>,
+  TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>,
+>(
+  logs: Log[],
+  address: Hex,
+  abi: TAbi,
+  eventName: TEventName,
+  filter?: (log: TEventType) => boolean,
+  logger?: DebugLogger,
+): TEventType | undefined {
+  for (const log of logs) {
+    if (log.address === address) {
+      try {
+        const decodedEvent = decodeEventLog({ abi, ...log });
+        if (decodedEvent.eventName === eventName) {
+          const matchingEvent = decodedEvent as TEventType;
+          if (!filter || filter(matchingEvent)) {
+            return matchingEvent;
+          }
+        }
+      } catch (err) {
+        logger?.warn(`Failed to decode event log for contract ${address}: ${err}`);
+      }
+    }
+  }
+}