@aztec/ethereum 0.0.1-commit.c2eed6949 → 0.0.1-commit.c52d6e7

package/dest/contracts/multicall.js

@@ -1,9 +1,19 @@
-import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
-import { TimeoutError } from '@aztec/foundation/error';
-import { encodeFunctionData, multicall3Abi } from 'viem';
-import { FormattedViemError, formatViemError } from '../utils.js';
-import { RollupContract } from './rollup.js';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { decodeFunctionResult, encodeFunctionData, multicall3Abi } from 'viem';
+import { tryDecodeRevertReason } from '../utils.js';
 export const MULTI_CALL_3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11';
+/**
+ * Thrown by `Multicall3.forward` when the forwarder transaction lands but the receipt reports a
+ * reverted status. This is not expected (aggregate3 uses allowFailure: true), so callers should
+ * treat it as a fatal on-chain failure rather than retrying on a different publisher.
+ */ export class MulticallForwarderRevertedError extends Error {
+    receipt;
+    txState;
+    constructor(receipt, txState){
+        super(`Multicall3 forwarder tx reverted: ${receipt.transactionHash}`), this.receipt = receipt, this.txState = txState;
+        this.name = 'MulticallForwarderRevertedError';
+    }
+}
 /** ABI fragment for aggregate3Value — not included in viem's multicall3Abi. */ export const aggregate3ValueAbi = [
     {
         inputs: [
@@ -60,105 +70,119 @@ export const MULTI_CALL_3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11'
     }
 ];
 export class Multicall3 {
-    static async forward(requests, l1TxUtils, gasConfig, blobConfig, rollupAddress, logger, opts = {}) {
-        requests = requests.filter((request)=>request.to !== null);
-        const args = requests.map((r)=>({
+    /**
+   * Returns true iff Multicall3 bytecode is deployed at MULTI_CALL_3_ADDRESS. An empty result from
+   * a non-existent contract would otherwise silently validate any bundle that uses Multicall3.
+   */ static async hasCode(l1TxUtils) {
+        const code = await l1TxUtils.getCode(EthAddress.fromString(MULTI_CALL_3_ADDRESS));
+        return !!code && code !== '0x';
+    }
+    /**
+   * Simulates an aggregate3 call composed of the given requests via eth_simulateV1 and decodes the
+   * per-entry Result[]. Entries that revert are returned with a decoded revertReason (if the request
+   * provided an abi).
+   *
+   * Use this to pre-validate a bundle before sending it through `Multicall3.forward`. The caller can
+   * drop reverted entries from the bundle and re-simulate with the reduced list to get an accurate
+   * `gasUsed`.
+   */ static async simulateAggregate3(requests, l1TxUtils, opts = {}) {
+        const calldata = encodeFunctionData({
+            abi: multicall3Abi,
+            functionName: 'aggregate3',
+            args: [
+                requests.map((r)=>({
+                        target: r.to,
+                        callData: r.data,
+                        allowFailure: true
+                    }))
+            ]
+        });
+        const stateOverrides = [
+            ...opts.stateOverrides ?? []
+        ];
+        if (opts.fakeSenderBalance !== undefined) {
+            stateOverrides.push({
+                address: l1TxUtils.getSenderAddress().toString(),
+                balance: opts.fakeSenderBalance
+            });
+        }
+        const simResult = await l1TxUtils.simulate({
+            to: MULTI_CALL_3_ADDRESS,
+            data: calldata,
+            gas: opts.gas
+        }, opts.blockOverrides, stateOverrides, multicall3Abi, {
+            fallbackGasEstimate: opts.fallbackGasEstimate
+        });
+        if (simResult.result === '0x') {
+            return {
+                kind: 'fallback',
+                gasUsed: simResult.gasUsed
+            };
+        }
+        const decoded = decodeFunctionResult({
+            abi: multicall3Abi,
+            functionName: 'aggregate3',
+            data: simResult.result
+        });
+        const entries = decoded.map((entry, i)=>{
+            if (entry.success) {
+                return {
+                    success: true,
+                    returnData: entry.returnData
+                };
+            }
+            const abi = requests[i].abi;
+            const revertReason = abi ? tryDecodeRevertReason(entry.returnData, abi) : undefined;
+            return {
+                success: false,
+                returnData: entry.returnData,
+                revertReason
+            };
+        });
+        return {
+            kind: 'decoded',
+            entries,
+            gasUsed: simResult.gasUsed
+        };
+    }
+    /**
+   * Sends a batch of requests through aggregate3. Individual calls may fail (allowFailure: true),
+   * but the top-level multicall is expected to land successfully. Throws if the send fails or if
+   * the receipt reports a reverted status.
+   */ static async forward(requests, l1TxUtils, gasConfig, blobConfig, opts = {}) {
+        if (opts.gasLimitRequired && !gasConfig?.gasLimit) {
+            throw new Error('Multicall gasLimit is required when gasLimitRequired is true');
+        }
+        const args = requests.filter((request)=>request.to !== null).map((r)=>({
                 target: r.to,
                 callData: r.data,
-                allowFailure: !opts.revertOnFailure
+                allowFailure: true
             }));
-        const forwarderFunctionData = {
+        const encodedForwarderData = encodeFunctionData({
             abi: multicall3Abi,
             functionName: 'aggregate3',
             args: [
                 args
             ]
-        };
-        const encodedForwarderData = encodeFunctionData(forwarderFunctionData);
-        try {
-            const { receipt, state } = await l1TxUtils.sendAndMonitorTransaction({
-                to: MULTI_CALL_3_ADDRESS,
-                data: encodedForwarderData,
-                abi: multicall3Abi
-            }, gasConfig, blobConfig);
-            if (receipt.status === 'success') {
-                const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
-                return {
-                    receipt,
-                    stats
-                };
-            } else {
-                logger.error('Forwarder transaction failed', undefined, {
-                    receipt
-                });
-                const args = {
-                    ...forwarderFunctionData,
-                    address: MULTI_CALL_3_ADDRESS
-                };
-                let errorMsg;
-                if (blobConfig) {
-                    const maxFeePerBlobGas = blobConfig.maxFeePerBlobGas ?? state.gasPrice.maxFeePerBlobGas;
-                    if (maxFeePerBlobGas === undefined) {
-                        errorMsg = 'maxFeePerBlobGas is required to get the error message';
-                    } else {
-                        logger.debug('Trying to get error from reverted tx with blob config');
-                        errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, {
-                            blobs: blobConfig.blobs,
-                            kzg: blobConfig.kzg,
-                            maxFeePerBlobGas
-                        }, [
-                            {
-                                address: rollupAddress,
-                                stateDiff: [
-                                    {
-                                        slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
-                                        value: toPaddedHex(0n, true)
-                                    }
-                                ]
-                            }
-                        ]);
-                    }
-                } else {
-                    logger.debug('Trying to get error from reverted tx without blob config');
-                    errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, undefined, []);
-                }
-                return {
-                    receipt,
-                    errorMsg
-                };
-            }
-        } catch (err) {
-            if (err instanceof TimeoutError) {
-                throw err;
-            }
-            for (const request of requests){
-                logger.debug('Simulating request', {
-                    request
-                });
-                const result = await l1TxUtils.simulate(request, undefined, [
-                    {
-                        address: rollupAddress,
-                        stateDiff: [
-                            {
-                                slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
-                                value: toPaddedHex(0n, true)
-                            }
-                        ]
-                    }
-                ]).catch((err)=>formatViemError(err, request.abi));
-                if (result instanceof FormattedViemError) {
-                    logger.error('Found error in simulation', result, {
-                        to: request.to ?? 'null',
-                        data: request.data
-                    });
-                    return result;
-                }
-            }
-            logger.warn('Failed to get error from reverted tx', {
-                err
-            });
-            throw err;
+        });
+        const { receipt, state } = await l1TxUtils.sendAndMonitorTransaction({
+            to: MULTI_CALL_3_ADDRESS,
+            data: encodedForwarderData,
+            abi: multicall3Abi
+        }, gasConfig, blobConfig);
+        // This shouldn't happen. Any failure in individual calls is swallowed by forward since we set
+        // allowFailure to true for all calls, so a reverted status here would indicate a problem with
+        // the Multicall3 contract itself or the forwarder transaction (such as an out-of-gas).
+        if (receipt.status !== 'success') {
+            throw new MulticallForwarderRevertedError(receipt, state);
         }
+        const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
+        return {
+            receipt,
+            stats,
+            multicallData: encodedForwarderData,
+            state
+        };
     }
     /** Batch multiple value transfers into a single aggregate3Value call on Multicall3. */ static async forwardValue(calls, l1TxUtils, logger) {
         const args = calls.map((c)=>({

package/dest/contracts/outbox.d.ts

@@ -1,4 +1,5 @@
 import type { EpochNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { OutboxAbi } from '@aztec/l1-artifacts/OutboxAbi';
 import { type GetContractReturnType, type Hex } from 'viem';
@@ -23,19 +24,41 @@ export declare class OutboxContract {
     private readonly outbox;
     static getFromL1ContractsValues(deployL1ContractsValues: DeployAztecL1ContractsReturnType): OutboxContract;
     static getFromConfig(config: L1ReaderConfig): OutboxContract;
-    static getEpochRootStorageSlot(epoch: EpochNumber): bigint;
+    /**
+     * Storage slot of `epochs[epoch].roots[numCheckpointsInEpoch - 1]` in the Outbox contract.
+     *
+     * The Outbox lays out storage as `mapping(Epoch => EpochData) internal epochs` at base slot 0
+     * (ROLLUP and VERSION are immutable and do not occupy slots). For a mapping at slot `b`, the
+     * value for key `k` begins at `keccak256(abi.encode(k, b))`. `EpochData` starts with a fixed-
+     * size `bytes32[MAX_CHECKPOINTS_PER_EPOCH] roots` array, so `roots[i]` sits at the EpochData's
+     * base slot plus `i`. `numCheckpointsInEpoch` is 1-indexed (matches `Outbox.insert`/`consume`).
+     */
+    static getEpochRootStorageSlot(epoch: EpochNumber, numCheckpointsInEpoch: number): bigint;
     constructor(client: ViemClient, address: Hex | EthAddress);
     get address(): `0x${string}`;
     getContract(): GetContractReturnType<typeof OutboxAbi, ViemClient>;
     hasMessageBeenConsumedAtEpoch(epoch: EpochNumber, leafId: bigint): Promise<boolean>;
-    getRootData(epoch: EpochNumber): Promise<`0x${string}`>;
-    consume(message: ViemL2ToL1Msg, epoch: EpochNumber, leafIndex: bigint, path: Hex[]): Promise<`0x${string}`>;
+    getRootData(epoch: EpochNumber, numCheckpointsInEpoch: number): Promise<`0x${string}`>;
+    /**
+     * Returns every root stored for `epoch`. Slot `i` of the returned array holds the root inserted
+     * for `numCheckpointsInEpoch = i + 1`, or `Fr.ZERO` if no proof of that depth has been inserted
+     * yet. The array length is always `MAX_CHECKPOINTS_PER_EPOCH`.
+     *
+     * @param opts - Optional viem read options. Pass `blockNumber` to pin the read to a specific L1
+     *   block, which is important for callers that want a consistent snapshot across multiple reads
+     *   (e.g. the archiver's outbox-trees resolver, which pins to the node's synced L1 block).
+     */
+    getRoots(epoch: EpochNumber, opts?: {
+        blockNumber?: bigint;
+    }): Promise<Fr[]>;
+    consume(message: ViemL2ToL1Msg, epoch: EpochNumber, numCheckpointsInEpoch: number, leafIndex: bigint, path: Hex[]): Promise<`0x${string}`>;
     getMessageConsumedEvents(l1BlockHash: Hex): Promise<{
         epoch: bigint;
         root: Hex;
         messageHash: Hex;
         leafId: bigint;
+        numCheckpointsInEpoch: bigint;
     }[]>;
     private assertWallet;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0Ym94LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL291dGJveC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTFELE9BQU8sRUFBRSxLQUFLLHFCQUFxQixFQUFFLEtBQUssR0FBRyxFQUE0RCxNQUFNLE1BQU0sQ0FBQztBQUd0SCxPQUFPLEtBQUssRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hGLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3RELE9BQU8sRUFBaUMsS0FBSyxVQUFVLEVBQW9CLE1BQU0sYUFBYSxDQUFDO0FBRS9GLE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEIsS0FBSyxFQUFFLEdBQUcsQ0FBQztJQUNYLE9BQU8sRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQUVGLE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEIsS0FBSyxFQUFFLEdBQUcsQ0FBQztJQUNYLE9BQU8sRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQUVGLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsTUFBTSxFQUFFLFdBQVcsQ0FBQztJQUNwQixTQUFTLEVBQUUsV0FBVyxDQUFDO0lBQ3ZCLE9BQU8sRUFBRSxHQUFHLENBQUM7Q0FDZCxDQUFDO0FBRUYscUJBQWEsY0FBYzthQXNCUCxNQUFNLEVBQUUsVUFBVTtJQXJCcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQXNEO0lBRTdFLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyx1QkFBdUIsRUFBRSxnQ0FBZ0Msa0JBTXhGO0lBRUQsTUFBTSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsY0FBYyxrQkFJMUM7SUFFRCxNQUFNLENBQUMsdUJBQXVCLENBQUMsS0FBSyxFQUFFLFdBQVcsVUFFaEQ7SUFFRCxZQUNrQixNQUFNLEVBQUUsVUFBVSxFQUNsQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFVBQVUsRUFNMUI7SUFFRCxJQUFXLE9BQU8sa0JBRWpCO0lBRU0sV0FBVyxJQUFJLHFCQUFxQixDQUFDLE9BQU8sU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUV4RTtJQUVNLDZCQUE2QixDQUFDLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBRXRFO0lBRU0sV0FBVyxDQUFDLEtBQUssRUFBRSxXQUFXLDBCQUVwQztJQUVNLE9BQU8sQ0FBQyxPQUFPLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLDBCQUd4RjtJQUVZLHdCQUF3QixDQUNuQyxXQUFXLEVBQUUsR0FBRyxHQUNmLE9BQU8sQ0FBQztRQUFFLEtBQUssRUFBRSxNQUFNLENBQUM7UUFBQyxJQUFJLEVBQUUsR0FBRyxDQUFDO1FBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQztRQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7S0FBRSxFQUFFLENBQUMsQ0FRM0U7SUFFRCxPQUFPLENBQUMsWUFBWTtDQU1yQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0Ym94LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL291dGJveC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsS0FBSyxxQkFBcUIsRUFBRSxLQUFLLEdBQUcsRUFBNEQsTUFBTSxNQUFNLENBQUM7QUFHdEgsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN4RixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN0RCxPQUFPLEVBQWlDLEtBQUssVUFBVSxFQUFvQixNQUFNLGFBQWEsQ0FBQztBQUUvRixNQUFNLE1BQU0sV0FBVyxHQUFHO0lBQ3hCLEtBQUssRUFBRSxHQUFHLENBQUM7SUFDWCxPQUFPLEVBQUUsTUFBTSxDQUFDO0NBQ2pCLENBQUM7QUFFRixNQUFNLE1BQU0sV0FBVyxHQUFHO0lBQ3hCLEtBQUssRUFBRSxHQUFHLENBQUM7SUFDWCxPQUFPLEVBQUUsTUFBTSxDQUFDO0NBQ2pCLENBQUM7QUFFRixNQUFNLE1BQU0sYUFBYSxHQUFHO0lBQzFCLE1BQU0sRUFBRSxXQUFXLENBQUM7SUFDcEIsU0FBUyxFQUFFLFdBQVcsQ0FBQztJQUN2QixPQUFPLEVBQUUsR0FBRyxDQUFDO0NBQ2QsQ0FBQztBQUVGLHFCQUFhLGNBQWM7YUFrQ1AsTUFBTSxFQUFFLFVBQVU7SUFqQ3BDLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFzRDtJQUU3RSxNQUFNLENBQUMsd0JBQXdCLENBQUMsdUJBQXVCLEVBQUUsZ0NBQWdDLGtCQU14RjtJQUVELE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBTSxFQUFFLGNBQWMsa0JBSTFDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxNQUFNLENBQUMsdUJBQXVCLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLFVBSy9FO0lBRUQsWUFDa0IsTUFBTSxFQUFFLFVBQVUsRUFDbEMsT0FBTyxFQUFFLEdBQUcsR0FBRyxVQUFVLEVBTTFCO0lBRUQsSUFBVyxPQUFPLGtCQUVqQjtJQUVNLFdBQVcsSUFBSSxxQkFBcUIsQ0FBQyxPQUFPLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FFeEU7SUFFTSw2QkFBNkIsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUV0RTtJQUVNLFdBQVcsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sMEJBRW5FO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSxRQUFRLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxJQUFJLENBQUMsRUFBRTtRQUFFLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBR3hGO0lBRU0sT0FBTyxDQUNaLE9BQU8sRUFBRSxhQUFhLEVBQ3RCLEtBQUssRUFBRSxXQUFXLEVBQ2xCLHFCQUFxQixFQUFFLE1BQU0sRUFDN0IsU0FBUyxFQUFFLE1BQU0sRUFDakIsSUFBSSxFQUFFLEdBQUcsRUFBRSwwQkFJWjtJQUVZLHdCQUF3QixDQUNuQyxXQUFXLEVBQUUsR0FBRyxHQUNmLE9BQU8sQ0FBQztRQUFFLEtBQUssRUFBRSxNQUFNLENBQUM7UUFBQyxJQUFJLEVBQUUsR0FBRyxDQUFDO1FBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQztRQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFBQyxxQkFBcUIsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUFFLENBQUMsQ0FTMUc7SUFFRCxPQUFPLENBQUMsWUFBWTtDQU1yQiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"outbox.d.ts","sourceRoot":"","sources":["../../src/contracts/outbox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,GAAG,EAA4D,MAAM,MAAM,CAAC;AAGtH,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAiC,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAE/F,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,qBAAa,cAAc;aAsBP,MAAM,EAAE,UAAU;IArBpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsD;IAE7E,MAAM,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,gCAAgC,kBAMxF;IAED,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,kBAI1C;IAED,MAAM,CAAC,uBAAuB,CAAC,KAAK,EAAE,WAAW,UAEhD;IAED,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAM1B;IAED,IAAW,OAAO,kBAEjB;IAEM,WAAW,IAAI,qBAAqB,CAAC,OAAO,SAAS,EAAE,UAAU,CAAC,CAExE;IAEM,6BAA6B,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,oBAEtE;IAEM,WAAW,CAAC,KAAK,EAAE,WAAW,0BAEpC;IAEM,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,0BAGxF;IAEY,wBAAwB,CACnC,WAAW,EAAE,GAAG,GACf,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;QAAC,WAAW,EAAE,GAAG,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAQ3E;IAED,OAAO,CAAC,YAAY;CAMrB"}
+{"version":3,"file":"outbox.d.ts","sourceRoot":"","sources":["../../src/contracts/outbox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,GAAG,EAA4D,MAAM,MAAM,CAAC;AAGtH,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAiC,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAE/F,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,qBAAa,cAAc;aAkCP,MAAM,EAAE,UAAU;IAjCpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsD;IAE7E,MAAM,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,gCAAgC,kBAMxF;IAED,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,kBAI1C;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,UAK/E;IAED,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAM1B;IAED,IAAW,OAAO,kBAEjB;IAEM,WAAW,IAAI,qBAAqB,CAAC,OAAO,SAAS,EAAE,UAAU,CAAC,CAExE;IAEM,6BAA6B,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,oBAEtE;IAEM,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,0BAEnE;IAED;;;;;;;;OAQG;IACU,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAGxF;IAEM,OAAO,CACZ,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,WAAW,EAClB,qBAAqB,EAAE,MAAM,EAC7B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,GAAG,EAAE,0BAIZ;IAEY,wBAAwB,CACnC,WAAW,EAAE,GAAG,GACf,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;QAAC,WAAW,EAAE,GAAG,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,qBAAqB,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAS1G;IAED,OAAO,CAAC,YAAY;CAMrB"}

package/dest/contracts/outbox.js

@@ -1,3 +1,4 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { OutboxAbi } from '@aztec/l1-artifacts/OutboxAbi';
 import { encodeAbiParameters, getContract, hexToBigInt, keccak256 } from 'viem';
@@ -12,11 +13,19 @@ export class OutboxContract {
     }
     static getFromConfig(config) {
         const client = getPublicClient(config);
-        const address = config.l1Contracts.outboxAddress.toString();
+        const address = config.outboxAddress.toString();
         return new OutboxContract(client, address);
     }
-    static getEpochRootStorageSlot(epoch) {
-        return hexToBigInt(keccak256(encodeAbiParameters([
+    /**
+   * Storage slot of `epochs[epoch].roots[numCheckpointsInEpoch - 1]` in the Outbox contract.
+   *
+   * The Outbox lays out storage as `mapping(Epoch => EpochData) internal epochs` at base slot 0
+   * (ROLLUP and VERSION are immutable and do not occupy slots). For a mapping at slot `b`, the
+   * value for key `k` begins at `keccak256(abi.encode(k, b))`. `EpochData` starts with a fixed-
+   * size `bytes32[MAX_CHECKPOINTS_PER_EPOCH] roots` array, so `roots[i]` sits at the EpochData's
+   * base slot plus `i`. `numCheckpointsInEpoch` is 1-indexed (matches `Outbox.insert`/`consume`).
+   */ static getEpochRootStorageSlot(epoch, numCheckpointsInEpoch) {
+        const epochDataSlot = hexToBigInt(keccak256(encodeAbiParameters([
             {
                 type: 'uint256'
             },
@@ -27,6 +36,7 @@ export class OutboxContract {
             BigInt(epoch),
             0n
         ])));
+        return epochDataSlot + BigInt(numCheckpointsInEpoch - 1);
     }
     constructor(client, address){
         this.client = client;
@@ -51,16 +61,32 @@ export class OutboxContract {
             leafId
         ]);
     }
-    getRootData(epoch) {
+    getRootData(epoch, numCheckpointsInEpoch) {
         return this.outbox.read.getRootData([
-            BigInt(epoch)
+            BigInt(epoch),
+            BigInt(numCheckpointsInEpoch)
         ]);
     }
-    consume(message, epoch, leafIndex, path) {
+    /**
+   * Returns every root stored for `epoch`. Slot `i` of the returned array holds the root inserted
+   * for `numCheckpointsInEpoch = i + 1`, or `Fr.ZERO` if no proof of that depth has been inserted
+   * yet. The array length is always `MAX_CHECKPOINTS_PER_EPOCH`.
+   *
+   * @param opts - Optional viem read options. Pass `blockNumber` to pin the read to a specific L1
+   *   block, which is important for callers that want a consistent snapshot across multiple reads
+   *   (e.g. the archiver's outbox-trees resolver, which pins to the node's synced L1 block).
+   */ async getRoots(epoch, opts) {
+        const raw = await this.outbox.read.getRoots([
+            BigInt(epoch)
+        ], opts);
+        return raw.map((hex)=>Fr.fromString(hex));
+    }
+    consume(message, epoch, numCheckpointsInEpoch, leafIndex, path) {
         const wallet = this.assertWallet();
         return wallet.write.consume([
             message,
             BigInt(epoch),
+            BigInt(numCheckpointsInEpoch),
             leafIndex,
             path
         ]);
@@ -74,7 +100,8 @@ export class OutboxContract {
                 epoch: event.args.epoch,
                 root: event.args.root,
                 messageHash: event.args.messageHash,
-                leafId: event.args.leafId
+                leafId: event.args.leafId,
+                numCheckpointsInEpoch: event.args.numCheckpointsInEpoch
             }));
     }
     assertWallet() {