@aztec/ethereum 0.63.1 → 0.64.0

package/dest/contracts/index.d.ts

@@ -0,0 +1,2 @@
+export * from './rollup.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/contracts/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}

package/dest/contracts/index.js

@@ -0,0 +1,2 @@
+export * from './rollup.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsYUFBYSxDQUFDIn0=

package/dest/contracts/rollup.d.ts

@@ -0,0 +1,14 @@
+import { type Hex, type PublicClient } from 'viem';
+import { type L1ReaderConfig } from '../l1_reader.js';
+export declare class RollupContract {
+    private readonly rollup;
+    constructor(client: PublicClient, address: Hex);
+    getL1StartBlock(): Promise<bigint>;
+    getL1GenesisTime(): Promise<bigint>;
+    getBlockNumber(): Promise<bigint>;
+    getProvenBlockNumber(): Promise<bigint>;
+    getSlotNumber(): Promise<bigint>;
+    getEpochNumber(blockNumber?: bigint): Promise<bigint>;
+    static getFromConfig(config: L1ReaderConfig): RollupContract;
+}
+//# sourceMappingURL=rollup.d.ts.map

package/dest/contracts/rollup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,GAAG,EAER,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8E;gBAEzF,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG;IAK9C,eAAe;IAKf,gBAAgB;IAIhB,cAAc;IAId,oBAAoB;IAIpB,aAAa;IAIP,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM;IAKzC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc;CAQ5C"}

package/dest/contracts/rollup.js

@@ -0,0 +1,55 @@
+import { __esDecorate, __runInitializers } from "tslib";
+import { memoize } from '@aztec/foundation/decorators';
+import { RollupAbi } from '@aztec/l1-artifacts';
+import { createPublicClient, getContract, http, } from 'viem';
+import { createEthereumChain } from '../ethereum_chain.js';
+let RollupContract = (() => {
+    var _a;
+    let _instanceExtraInitializers = [];
+    let _getL1StartBlock_decorators;
+    let _getL1GenesisTime_decorators;
+    return _a = class RollupContract {
+            constructor(client, address) {
+                this.rollup = __runInitializers(this, _instanceExtraInitializers);
+                this.rollup = getContract({ address, abi: RollupAbi, client });
+            }
+            getL1StartBlock() {
+                return this.rollup.read.L1_BLOCK_AT_GENESIS();
+            }
+            getL1GenesisTime() {
+                return this.rollup.read.GENESIS_TIME();
+            }
+            getBlockNumber() {
+                return this.rollup.read.getPendingBlockNumber();
+            }
+            getProvenBlockNumber() {
+                return this.rollup.read.getProvenBlockNumber();
+            }
+            getSlotNumber() {
+                return this.rollup.read.getCurrentSlot();
+            }
+            async getEpochNumber(blockNumber) {
+                blockNumber ?? (blockNumber = await this.getBlockNumber());
+                return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);
+            }
+            static getFromConfig(config) {
+                const client = createPublicClient({
+                    transport: http(config.l1RpcUrl),
+                    chain: createEthereumChain(config.l1RpcUrl, config.l1ChainId).chainInfo,
+                });
+                const address = config.l1Contracts.rollupAddress.toString();
+                return new _a(client, address);
+            }
+        },
+        (() => {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _getL1StartBlock_decorators = [memoize];
+            _getL1GenesisTime_decorators = [memoize];
+            __esDecorate(_a, null, _getL1StartBlock_decorators, { kind: "method", name: "getL1StartBlock", static: false, private: false, access: { has: obj => "getL1StartBlock" in obj, get: obj => obj.getL1StartBlock }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _getL1GenesisTime_decorators, { kind: "method", name: "getL1GenesisTime", static: false, private: false, access: { has: obj => "getL1GenesisTime" in obj, get: obj => obj.getL1GenesisTime }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
+})();
+export { RollupContract };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9yb2xsdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFaEQsT0FBTyxFQU1MLGtCQUFrQixFQUNsQixXQUFXLEVBQ1gsSUFBSSxHQUNMLE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7SUFHOUMsY0FBYzs7Ozs7c0JBQWQsY0FBYztZQUd6QixZQUFZLE1BQW9CLEVBQUUsT0FBWTtnQkFGN0IsV0FBTSxHQURaLG1EQUFjLENBQzRFO2dCQUduRyxJQUFJLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDakUsQ0FBQztZQUdELGVBQWU7Z0JBQ2IsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1lBQ2hELENBQUM7WUFHRCxnQkFBZ0I7Z0JBQ2QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUN6QyxDQUFDO1lBRUQsY0FBYztnQkFDWixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUM7WUFDbEQsQ0FBQztZQUVELG9CQUFvQjtnQkFDbEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQ2pELENBQUM7WUFFRCxhQUFhO2dCQUNYLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDM0MsQ0FBQztZQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsV0FBb0I7Z0JBQ3ZDLFdBQVcsS0FBWCxXQUFXLEdBQUssTUFBTSxJQUFJLENBQUMsY0FBYyxFQUFFLEVBQUM7Z0JBQzVDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2xFLENBQUM7WUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLE1BQXNCO2dCQUN6QyxNQUFNLE1BQU0sR0FBRyxrQkFBa0IsQ0FBQztvQkFDaEMsU0FBUyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDO29CQUNoQyxLQUFLLEVBQUUsbUJBQW1CLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsU0FBUztpQkFDeEUsQ0FBQyxDQUFDO2dCQUNILE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUM1RCxPQUFPLElBQUksRUFBYyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztZQUM3QyxDQUFDOzs7OzJDQWxDQSxPQUFPOzRDQUtQLE9BQU87WUFKUiw4TEFBQSxlQUFlLDZEQUVkO1lBR0QsaU1BQUEsZ0JBQWdCLDZEQUVmOzs7OztTQWZVLGNBQWMifQ==

package/dest/index.d.ts

@@ -5,4 +5,5 @@ export * from './l1_reader.js';
 export * from './ethereum_chain.js';
 export * from './utils.js';
 export * from './config.js';
+export * from './types.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;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,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;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC"}

package/dest/index.js

@@ -5,4 +5,5 @@ export * from './l1_reader.js';
 export * from './ethereum_chain.js';
 export * from './utils.js';
 export * from './config.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsYUFBYSxDQUFDIn0=
+export * from './types.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsWUFBWSxDQUFDIn0=

package/dest/test/index.d.ts

@@ -0,0 +1,3 @@
+export * from './start_anvil.js';
+export * from './tx_delayer.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/test/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC"}

package/dest/test/index.js

@@ -0,0 +1,3 @@
+export * from './start_anvil.js';
+export * from './tx_delayer.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsaUJBQWlCLENBQUMifQ==

package/dest/test/start_anvil.d.ts

@@ -0,0 +1,9 @@
+import { type Anvil } from '@viem/anvil';
+/**
+ * Ensures there's a running Anvil instance and returns the RPC URL.
+ */
+export declare function startAnvil(l1BlockTime?: number): Promise<{
+    anvil: Anvil;
+    rpcUrl: string;
+}>;
+//# sourceMappingURL=start_anvil.d.ts.map

package/dest/test/start_anvil.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAItD;;GAEG;AACH,wBAAsB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA4BhG"}

package/dest/test/start_anvil.js

@@ -0,0 +1,30 @@
+import { makeBackoff, retry } from '@aztec/foundation/retry';
+import { fileURLToPath } from '@aztec/foundation/url';
+import { createAnvil } from '@viem/anvil';
+import getPort from 'get-port';
+import { dirname, resolve } from 'path';
+/**
+ * Ensures there's a running Anvil instance and returns the RPC URL.
+ */
+export async function startAnvil(l1BlockTime) {
+    let ethereumHostPort;
+    const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
+    // Start anvil.
+    // We go via a wrapper script to ensure if the parent dies, anvil dies.
+    const anvil = await retry(async () => {
+        ethereumHostPort = await getPort();
+        const anvil = createAnvil({
+            anvilBinary,
+            port: ethereumHostPort,
+            blockTime: l1BlockTime,
+        });
+        await anvil.start();
+        return anvil;
+    }, 'Start anvil', makeBackoff([5, 5, 5]));
+    if (!ethereumHostPort) {
+        throw new Error('Failed to start anvil');
+    }
+    const rpcUrl = `http://127.0.0.1:${ethereumHostPort}`;
+    return { anvil, rpcUrl };
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYW52aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9zdGFydF9hbnZpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzdELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV0RCxPQUFPLEVBQWMsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RELE9BQU8sT0FBTyxNQUFNLFVBQVUsQ0FBQztBQUMvQixPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUV4Qzs7R0FFRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsVUFBVSxDQUFDLFdBQW9CO0lBQ25ELElBQUksZ0JBQW9DLENBQUM7SUFFekMsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSwrQkFBK0IsQ0FBQyxDQUFDO0lBRWhILGVBQWU7SUFDZix1RUFBdUU7SUFDdkUsTUFBTSxLQUFLLEdBQUcsTUFBTSxLQUFLLENBQ3ZCLEtBQUssSUFBSSxFQUFFO1FBQ1QsZ0JBQWdCLEdBQUcsTUFBTSxPQUFPLEVBQUUsQ0FBQztRQUNuQyxNQUFNLEtBQUssR0FBRyxXQUFXLENBQUM7WUFDeEIsV0FBVztZQUNYLElBQUksRUFBRSxnQkFBZ0I7WUFDdEIsU0FBUyxFQUFFLFdBQVc7U0FDdkIsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDcEIsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDLEVBQ0QsYUFBYSxFQUNiLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FDdkIsQ0FBQztJQUVGLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQUcsb0JBQW9CLGdCQUFnQixFQUFFLENBQUM7SUFDdEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUMzQixDQUFDIn0=

package/dest/test/tx_delayer.d.ts

@@ -0,0 +1,23 @@
+import { type DebugLogger } from '@aztec/foundation/log';
+import { type Client, type Hex, type WalletClient } from 'viem';
+export declare function waitUntilBlock<T extends Client>(client: T, blockNumber: number | bigint, logger?: DebugLogger): Promise<boolean>;
+export declare function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: number | bigint, logger?: DebugLogger): Promise<boolean>;
+export interface Delayer {
+    /** Returns the list of all txs (not just the delayed ones) sent through the attached client. */
+    getTxs(): Hex[];
+    /** Delays the next tx to be sent so it lands on the given L1 block number. */
+    pauseNextTxUntilBlock(l1BlockNumber: number | bigint | undefined): void;
+    /** Delays the next tx to be sent so it lands on the given timestamp. */
+    pauseNextTxUntilTimestamp(l1Timestamp: number | bigint | undefined): void;
+}
+/**
+ * Returns a new client (without modifying the one passed in) with an injected tx delayer.
+ * The delayer can be used to hold off the next tx to be sent until a given block number.
+ */
+export declare function withDelayer<T extends WalletClient>(client: T, opts: {
+    ethereumSlotDuration: bigint | number;
+}): {
+    client: T;
+    delayer: Delayer;
+};
+//# sourceMappingURL=tx_delayer.d.ts.map

package/dest/test/tx_delayer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAER,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AAEd,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,oBAgB7G;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,oBAuBjH;AAED,MAAM,WAAW,OAAO;IACtB,gGAAgG;IAChG,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,8EAA8E;IAC9E,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxE,wEAAwE;IACxE,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC3E;AAwBD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,MAAM,EAAE,CAAC,EACT,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAsDjC"}

package/dest/test/tx_delayer.js

@@ -0,0 +1,102 @@
+import { createDebugLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+import { inspect } from 'util';
+import { keccak256, publicActions, walletActions, } from 'viem';
+export function waitUntilBlock(client, blockNumber, logger) {
+    const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
+        ? client
+        : client.extend(publicActions);
+    return retryUntil(async () => {
+        const currentBlockNumber = await publicClient.getBlockNumber({ cacheTime: 0 });
+        logger?.debug(`Block number is ${currentBlockNumber} (waiting until ${blockNumber})`);
+        return currentBlockNumber >= BigInt(blockNumber);
+    }, `Wait until L1 block ${blockNumber}`, 60, 0.1);
+}
+export function waitUntilL1Timestamp(client, timestamp, logger) {
+    const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
+        ? client
+        : client.extend(publicActions);
+    let lastBlock = undefined;
+    return retryUntil(async () => {
+        const currentBlockNumber = await publicClient.getBlockNumber({ cacheTime: 0 });
+        if (currentBlockNumber === lastBlock) {
+            return false;
+        }
+        lastBlock = currentBlockNumber;
+        const currentBlock = await publicClient.getBlock({ includeTransactions: false, blockNumber: currentBlockNumber });
+        const currentTs = currentBlock.timestamp;
+        logger?.debug(`Block timstamp is ${currentTs} (waiting until ${timestamp})`);
+        return currentTs >= BigInt(timestamp);
+    }, `Wait until L1 timestamp ${timestamp}`, 60, 0.1);
+}
+class DelayerImpl {
+    constructor(opts) {
+        this.nextWait = undefined;
+        this.txs = [];
+        this.ethereumSlotDuration = BigInt(opts.ethereumSlotDuration);
+    }
+    getTxs() {
+        return this.txs;
+    }
+    pauseNextTxUntilBlock(l1BlockNumber) {
+        this.nextWait = { l1BlockNumber: BigInt(l1BlockNumber) };
+    }
+    pauseNextTxUntilTimestamp(l1Timestamp) {
+        this.nextWait = { l1Timestamp: BigInt(l1Timestamp) };
+    }
+}
+/**
+ * Returns a new client (without modifying the one passed in) with an injected tx delayer.
+ * The delayer can be used to hold off the next tx to be sent until a given block number.
+ */
+export function withDelayer(client, opts) {
+    const logger = createDebugLogger('aztec:ethereum:tx_delayer');
+    const delayer = new DelayerImpl(opts);
+    const extended = client
+        // Tweak sendRawTransaction so it uses the delay defined in the delayer.
+        // Note that this will only work with local accounts (ie accounts for which we have the private key).
+        // Transactions signed by the node will not be delayed since they use sendTransaction directly,
+        // but we do not use them in our codebase at all.
+        .extend(client => ({
+        async sendRawTransaction(...args) {
+            if (delayer.nextWait !== undefined) {
+                const waitUntil = delayer.nextWait;
+                delayer.nextWait = undefined;
+                const publicClient = client;
+                const wait = 'l1BlockNumber' in waitUntil
+                    ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger)
+                    : waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger);
+                // Compute the tx hash manually so we emulate sendRawTransaction response
+                const { serializedTransaction } = args[0];
+                const txHash = keccak256(serializedTransaction);
+                logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`);
+                // Do not await here so we can return the tx hash immediately as if it had been sent on the spot.
+                // Instead, delay it so it lands on the desired block number or timestamp, assuming anvil will
+                // mine it immediately.
+                void wait
+                    .then(async () => {
+                    const txHash = await client.sendRawTransaction(...args);
+                    logger.info(`Sent previously delayed tx ${txHash} to land on ${inspect(waitUntil)}`);
+                    delayer.txs.push(txHash);
+                })
+                    .catch(err => logger.error(`Error sending tx after delay`, err));
+                return Promise.resolve(txHash);
+            }
+            else {
+                const txHash = await client.sendRawTransaction(...args);
+                logger.debug(`Sent tx immediately ${txHash}`);
+                delayer.txs.push(txHash);
+                return txHash;
+            }
+        },
+    }))
+        // Re-extend with sendTransaction so it uses the modified sendRawTransaction.
+        .extend(client => ({ sendTransaction: walletActions(client).sendTransaction }))
+        // And with the actions that depend on the modified sendTransaction
+        .extend(client => ({
+        writeContract: walletActions(client).writeContract,
+        deployContract: walletActions(client).deployContract,
+    }));
+    return { client: extended, delayer };
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZGVsYXllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3R4X2RlbGF5ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFvQixpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzVFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9CLE9BQU8sRUFLTCxTQUFTLEVBQ1QsYUFBYSxFQUNiLGFBQWEsR0FDZCxNQUFNLE1BQU0sQ0FBQztBQUVkLE1BQU0sVUFBVSxjQUFjLENBQW1CLE1BQVMsRUFBRSxXQUE0QixFQUFFLE1BQW9CO0lBQzVHLE1BQU0sWUFBWSxHQUNoQixnQkFBZ0IsSUFBSSxNQUFNLElBQUksT0FBTyxNQUFNLENBQUMsY0FBYyxLQUFLLFVBQVU7UUFDdkUsQ0FBQyxDQUFFLE1BQWtDO1FBQ3JDLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBRW5DLE9BQU8sVUFBVSxDQUNmLEtBQUssSUFBSSxFQUFFO1FBQ1QsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLFlBQVksQ0FBQyxjQUFjLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMvRSxNQUFNLEVBQUUsS0FBSyxDQUFDLG1CQUFtQixrQkFBa0IsbUJBQW1CLFdBQVcsR0FBRyxDQUFDLENBQUM7UUFDdEYsT0FBTyxrQkFBa0IsSUFBSSxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbkQsQ0FBQyxFQUNELHVCQUF1QixXQUFXLEVBQUUsRUFDcEMsRUFBRSxFQUNGLEdBQUcsQ0FDSixDQUFDO0FBQ0osQ0FBQztBQUVELE1BQU0sVUFBVSxvQkFBb0IsQ0FBbUIsTUFBUyxFQUFFLFNBQTBCLEVBQUUsTUFBb0I7SUFDaEgsTUFBTSxZQUFZLEdBQ2hCLGdCQUFnQixJ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

package/dest/types.d.ts

@@ -0,0 +1,10 @@
+import { type Chain, type Client, type HttpTransport, type PrivateKeyAccount, type PublicActions, type PublicRpcSchema, type WalletActions, type WalletRpcSchema } from 'viem';
+/**
+ * Type for a viem wallet and public client using a local private key.
+ * Created as: `createWalletClient({ account: privateKeyToAccount(key), transport: http(url), chain }).extend(publicActions)`
+ */
+export type ViemClient = Client<HttpTransport, Chain, PrivateKeyAccount, [
+    ...PublicRpcSchema,
+    ...WalletRpcSchema
+], PublicActions<HttpTransport, Chain> & WalletActions<Chain, PrivateKeyAccount>>;
+//# sourceMappingURL=types.d.ts.map

package/dest/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,eAAe,EACrB,MAAM,MAAM,CAAC;AAEd;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,CAC7B,aAAa,EACb,KAAK,EACL,iBAAiB,EACjB;IAAC,GAAG,eAAe;IAAE,GAAG,eAAe;CAAC,EACxC,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAC9E,CAAC"}

package/dest/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.63.1",
+  "version": "0.64.0",
   "type": "module",
-  "exports": "./dest/index.js",
+  "exports": {
+    ".": "./dest/index.js",
+    "./test": "./dest/test/index.js",
+    "./contracts": "./dest/contracts/index.js"
+  },
   "typedocOptions": {
     "entryPoints": [
       "./src/index.ts"
@@ -24,9 +28,11 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/foundation": "0.63.1",
-    "@aztec/l1-artifacts": "0.63.1",
+    "@aztec/foundation": "0.64.0",
+    "@aztec/l1-artifacts": "0.64.0",
+    "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
+    "get-port": "^7.1.0",
     "tslib": "^2.4.0",
     "viem": "^2.7.15",
     "zod": "^3.23.8"

package/src/contracts/index.ts

@@ -0,0 +1 @@
+export * from './rollup.js';

package/src/contracts/rollup.ts

@@ -0,0 +1,60 @@
+import { memoize } from '@aztec/foundation/decorators';
+import { RollupAbi } from '@aztec/l1-artifacts';
+
+import {
+  type Chain,
+  type GetContractReturnType,
+  type Hex,
+  type HttpTransport,
+  type PublicClient,
+  createPublicClient,
+  getContract,
+  http,
+} from 'viem';
+
+import { createEthereumChain } from '../ethereum_chain.js';
+import { type L1ReaderConfig } from '../l1_reader.js';
+
+export class RollupContract {
+  private readonly rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>;
+
+  constructor(client: PublicClient, address: Hex) {
+    this.rollup = getContract({ address, abi: RollupAbi, client });
+  }
+
+  @memoize
+  getL1StartBlock() {
+    return this.rollup.read.L1_BLOCK_AT_GENESIS();
+  }
+
+  @memoize
+  getL1GenesisTime() {
+    return this.rollup.read.GENESIS_TIME();
+  }
+
+  getBlockNumber() {
+    return this.rollup.read.getPendingBlockNumber();
+  }
+
+  getProvenBlockNumber() {
+    return this.rollup.read.getProvenBlockNumber();
+  }
+
+  getSlotNumber() {
+    return this.rollup.read.getCurrentSlot();
+  }
+
+  async getEpochNumber(blockNumber?: bigint) {
+    blockNumber ??= await this.getBlockNumber();
+    return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);
+  }
+
+  static getFromConfig(config: L1ReaderConfig) {
+    const client = createPublicClient({
+      transport: http(config.l1RpcUrl),
+      chain: createEthereumChain(config.l1RpcUrl, config.l1ChainId).chainInfo,
+    });
+    const address = config.l1Contracts.rollupAddress.toString();
+    return new RollupContract(client, address);
+  }
+}

package/src/index.ts

@@ -5,3 +5,4 @@ export * from './l1_reader.js';
 export * from './ethereum_chain.js';
 export * from './utils.js';
 export * from './config.js';
+export * from './types.js';

package/src/test/index.ts

@@ -0,0 +1,2 @@
+export * from './start_anvil.js';
+export * from './tx_delayer.js';

package/src/test/start_anvil.ts

@@ -0,0 +1,39 @@
+import { makeBackoff, retry } from '@aztec/foundation/retry';
+import { fileURLToPath } from '@aztec/foundation/url';
+
+import { type Anvil, createAnvil } from '@viem/anvil';
+import getPort from 'get-port';
+import { dirname, resolve } from 'path';
+
+/**
+ * Ensures there's a running Anvil instance and returns the RPC URL.
+ */
+export async function startAnvil(l1BlockTime?: number): Promise<{ anvil: Anvil; rpcUrl: string }> {
+  let ethereumHostPort: number | undefined;
+
+  const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
+
+  // Start anvil.
+  // We go via a wrapper script to ensure if the parent dies, anvil dies.
+  const anvil = await retry(
+    async () => {
+      ethereumHostPort = await getPort();
+      const anvil = createAnvil({
+        anvilBinary,
+        port: ethereumHostPort,
+        blockTime: l1BlockTime,
+      });
+      await anvil.start();
+      return anvil;
+    },
+    'Start anvil',
+    makeBackoff([5, 5, 5]),
+  );
+
+  if (!ethereumHostPort) {
+    throw new Error('Failed to start anvil');
+  }
+
+  const rpcUrl = `http://127.0.0.1:${ethereumHostPort}`;
+  return { anvil, rpcUrl };
+}

package/src/test/tx_delayer.ts

@@ -0,0 +1,150 @@
+import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+
+import { inspect } from 'util';
+import {
+  type Client,
+  type Hex,
+  type PublicClient,
+  type WalletClient,
+  keccak256,
+  publicActions,
+  walletActions,
+} from 'viem';
+
+export function waitUntilBlock<T extends Client>(client: T, blockNumber: number | bigint, logger?: DebugLogger) {
+  const publicClient =
+    'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
+      ? (client as unknown as PublicClient)
+      : client.extend(publicActions);
+
+  return retryUntil(
+    async () => {
+      const currentBlockNumber = await publicClient.getBlockNumber({ cacheTime: 0 });
+      logger?.debug(`Block number is ${currentBlockNumber} (waiting until ${blockNumber})`);
+      return currentBlockNumber >= BigInt(blockNumber);
+    },
+    `Wait until L1 block ${blockNumber}`,
+    60,
+    0.1,
+  );
+}
+
+export function waitUntilL1Timestamp<T extends Client>(client: T, timestamp: number | bigint, logger?: DebugLogger) {
+  const publicClient =
+    'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
+      ? (client as unknown as PublicClient)
+      : client.extend(publicActions);
+
+  let lastBlock: bigint | undefined = undefined;
+  return retryUntil(
+    async () => {
+      const currentBlockNumber = await publicClient.getBlockNumber({ cacheTime: 0 });
+      if (currentBlockNumber === lastBlock) {
+        return false;
+      }
+      lastBlock = currentBlockNumber;
+      const currentBlock = await publicClient.getBlock({ includeTransactions: false, blockNumber: currentBlockNumber });
+      const currentTs = currentBlock.timestamp;
+      logger?.debug(`Block timstamp is ${currentTs} (waiting until ${timestamp})`);
+      return currentTs >= BigInt(timestamp);
+    },
+    `Wait until L1 timestamp ${timestamp}`,
+    60,
+    0.1,
+  );
+}
+
+export interface Delayer {
+  /** Returns the list of all txs (not just the delayed ones) sent through the attached client. */
+  getTxs(): Hex[];
+  /** Delays the next tx to be sent so it lands on the given L1 block number. */
+  pauseNextTxUntilBlock(l1BlockNumber: number | bigint | undefined): void;
+  /** Delays the next tx to be sent so it lands on the given timestamp. */
+  pauseNextTxUntilTimestamp(l1Timestamp: number | bigint | undefined): void;
+}
+
+class DelayerImpl implements Delayer {
+  constructor(opts: { ethereumSlotDuration: bigint | number }) {
+    this.ethereumSlotDuration = BigInt(opts.ethereumSlotDuration);
+  }
+
+  public ethereumSlotDuration: bigint;
+  public nextWait: { l1Timestamp: bigint } | { l1BlockNumber: bigint } | undefined = undefined;
+  public txs: Hex[] = [];
+
+  getTxs() {
+    return this.txs;
+  }
+
+  pauseNextTxUntilBlock(l1BlockNumber: number | bigint) {
+    this.nextWait = { l1BlockNumber: BigInt(l1BlockNumber) };
+  }
+
+  pauseNextTxUntilTimestamp(l1Timestamp: number | bigint) {
+    this.nextWait = { l1Timestamp: BigInt(l1Timestamp) };
+  }
+}
+
+/**
+ * Returns a new client (without modifying the one passed in) with an injected tx delayer.
+ * The delayer can be used to hold off the next tx to be sent until a given block number.
+ */
+export function withDelayer<T extends WalletClient>(
+  client: T,
+  opts: { ethereumSlotDuration: bigint | number },
+): { client: T; delayer: Delayer } {
+  const logger = createDebugLogger('aztec:ethereum:tx_delayer');
+  const delayer = new DelayerImpl(opts);
+  const extended = client
+    // Tweak sendRawTransaction so it uses the delay defined in the delayer.
+    // Note that this will only work with local accounts (ie accounts for which we have the private key).
+    // Transactions signed by the node will not be delayed since they use sendTransaction directly,
+    // but we do not use them in our codebase at all.
+    .extend(client => ({
+      async sendRawTransaction(...args) {
+        if (delayer.nextWait !== undefined) {
+          const waitUntil = delayer.nextWait;
+          delayer.nextWait = undefined;
+
+          const publicClient = client as unknown as PublicClient;
+          const wait =
+            'l1BlockNumber' in waitUntil
+              ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger)
+              : waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger);
+
+          // Compute the tx hash manually so we emulate sendRawTransaction response
+          const { serializedTransaction } = args[0];
+          const txHash = keccak256(serializedTransaction);
+          logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`);
+
+          // Do not await here so we can return the tx hash immediately as if it had been sent on the spot.
+          // Instead, delay it so it lands on the desired block number or timestamp, assuming anvil will
+          // mine it immediately.
+          void wait
+            .then(async () => {
+              const txHash = await client.sendRawTransaction(...args);
+              logger.info(`Sent previously delayed tx ${txHash} to land on ${inspect(waitUntil)}`);
+              delayer.txs.push(txHash);
+            })
+            .catch(err => logger.error(`Error sending tx after delay`, err));
+
+          return Promise.resolve(txHash);
+        } else {
+          const txHash = await client.sendRawTransaction(...args);
+          logger.debug(`Sent tx immediately ${txHash}`);
+          delayer.txs.push(txHash);
+          return txHash;
+        }
+      },
+    }))
+    // Re-extend with sendTransaction so it uses the modified sendRawTransaction.
+    .extend(client => ({ sendTransaction: walletActions(client).sendTransaction }))
+    // And with the actions that depend on the modified sendTransaction
+    .extend(client => ({
+      writeContract: walletActions(client).writeContract,
+      deployContract: walletActions(client).deployContract,
+    })) as T;
+
+  return { client: extended, delayer };
+}

package/src/types.ts

@@ -0,0 +1,22 @@
+import {
+  type Chain,
+  type Client,
+  type HttpTransport,
+  type PrivateKeyAccount,
+  type PublicActions,
+  type PublicRpcSchema,
+  type WalletActions,
+  type WalletRpcSchema,
+} from 'viem';
+
+/**
+ * Type for a viem wallet and public client using a local private key.
+ * Created as: `createWalletClient({ account: privateKeyToAccount(key), transport: http(url), chain }).extend(publicActions)`
+ */
+export type ViemClient = Client<
+  HttpTransport,
+  Chain,
+  PrivateKeyAccount,
+  [...PublicRpcSchema, ...WalletRpcSchema],
+  PublicActions<HttpTransport, Chain> & WalletActions<Chain, PrivateKeyAccount>
+>;