@aztec/ethereum 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/contracts/inbox.js

@@ -1,4 +1,7 @@
-import { Buffer16 } from '@aztec/foundation/buffer';
+import { maxBigint } from '@aztec/foundation/bigint';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { InboxAbi } from '@aztec/l1-artifacts/InboxAbi';
 import { getContract } from 'viem';
@@ -13,7 +16,7 @@ export class InboxContract {
     }
     static getFromConfig(config) {
         const client = getPublicClient(config);
-        const address = config.l1Contracts.inboxAddress.toString();
+        const address = config.inboxAddress.toString();
         return new InboxContract(client, address);
     }
     constructor(client, address){
@@ -33,6 +36,10 @@ export class InboxContract {
     getContract() {
         return this.inbox;
     }
+    async getLag(opts = {}) {
+        await checkBlockTag(opts.blockNumber, this.client);
+        return await this.inbox.read.LAG(opts);
+    }
     async getState(opts = {}) {
         await checkBlockTag(opts.blockNumber, this.client);
         const state = await this.inbox.read.getState(opts);
@@ -42,4 +49,37 @@ export class InboxContract {
             treeInProgress: state.inProgress
         };
     }
+    /** Fetches MessageSent events within the given block range. */ async getMessageSentEvents(fromBlock, toBlock) {
+        const logs = await this.inbox.getEvents.MessageSent({}, {
+            fromBlock,
+            toBlock
+        });
+        return logs.filter((log)=>log.blockNumber >= fromBlock && log.blockNumber <= toBlock).map((log)=>this.mapMessageSentLog(log));
+    }
+    /** Fetches MessageSent events for a specific message hash around a specific block. */ async getMessageSentEventByHash(msgHash, aroundL1BlockNumber) {
+        // We don't use blockHash here because we don't want the query to throw if the L1 block number no longer exists on chain
+        // due to an L1 reorg. The use case for this method is usually checking if a message still exists on the Inbox after
+        // a reorg, so it's possible the message was moved one block up or down, and that the original L1 block where we
+        // saw it no longer exists, rendering the block-by-hash approach invalid.
+        const [log] = await this.inbox.getEvents.MessageSent({
+            hash: msgHash
+        }, {
+            fromBlock: maxBigint(aroundL1BlockNumber - 5n, 1n),
+            toBlock: aroundL1BlockNumber + 5n
+        });
+        return log && this.mapMessageSentLog(log);
+    }
+    mapMessageSentLog(log) {
+        return {
+            l1BlockNumber: log.blockNumber,
+            l1BlockHash: Buffer32.fromString(log.blockHash),
+            l1TransactionHash: log.transactionHash,
+            args: {
+                index: log.args.index,
+                leaf: Fr.fromString(log.args.hash),
+                checkpointNumber: CheckpointNumber.fromBigInt(log.args.checkpointNumber),
+                rollingHash: Buffer16.fromString(log.args.rollingHash)
+            }
+        };
+    }
 }

package/dest/contracts/index.d.ts

@@ -1,15 +1,18 @@
+export * from './chain_state_override.js';
 export * from './empire_base.js';
 export * from './errors.js';
 export * from './fee_asset_handler.js';
+export * from './fee_asset_price_oracle.js';
 export * from './fee_juice.js';
 export * from './governance.js';
 export * from './governance_proposer.js';
 export * from './gse.js';
 export * from './inbox.js';
+export * from './log.js';
 export * from './multicall.js';
+export * from './outbox.js';
 export * from './registry.js';
 export * from './rollup.js';
-export * from './empire_slashing_proposer.js';
-export * from './tally_slashing_proposer.js';
+export * from './slashing_proposer.js';
 export * from './slasher_contract.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsdUJBQXVCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLFVBQVUsQ0FBQztBQUN6QixjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLFVBQVUsQ0FBQztBQUN6QixjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyx1QkFBdUIsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC"}

package/dest/contracts/index.js

@@ -1,14 +1,17 @@
+export * from './chain_state_override.js';
 export * from './empire_base.js';
 export * from './errors.js';
 export * from './fee_asset_handler.js';
+export * from './fee_asset_price_oracle.js';
 export * from './fee_juice.js';
 export * from './governance.js';
 export * from './governance_proposer.js';
 export * from './gse.js';
 export * from './inbox.js';
+export * from './log.js';
 export * from './multicall.js';
+export * from './outbox.js';
 export * from './registry.js';
 export * from './rollup.js';
-export * from './empire_slashing_proposer.js';
-export * from './tally_slashing_proposer.js';
+export * from './slashing_proposer.js';
 export * from './slasher_contract.js';

package/dest/contracts/log.d.ts

@@ -0,0 +1,13 @@
+import type { Buffer32 } from '@aztec/foundation/buffer';
+/** Base L1 event log with common fields. */
+export type L1EventLog<T> = {
+    /** L1 block number where the event was emitted. */
+    l1BlockNumber: bigint;
+    /** L1 block hash. */
+    l1BlockHash: Buffer32;
+    /** L1 transaction hash that emitted the event. */
+    l1TransactionHash: `0x${string}`;
+    /** Event-specific arguments. */
+    args: T;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV6RCw0Q0FBNEM7QUFDNUMsTUFBTSxNQUFNLFVBQVUsQ0FBQyxDQUFDLElBQUk7SUFDMUIsbURBQW1EO0lBQ25ELGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIscUJBQXFCO0lBQ3JCLFdBQVcsRUFBRSxRQUFRLENBQUM7SUFDdEIsa0RBQWtEO0lBQ2xELGlCQUFpQixFQUFFLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDakMsZ0NBQWdDO0lBQ2hDLElBQUksRUFBRSxDQUFDLENBQUM7Q0FDVCxDQUFDIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/contracts/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,4CAA4C;AAC5C,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;IAC1B,mDAAmD;IACnD,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB;IACrB,WAAW,EAAE,QAAQ,CAAC;IACtB,kDAAkD;IAClD,iBAAiB,EAAE,KAAK,MAAM,EAAE,CAAC;IACjC,gCAAgC;IAChC,IAAI,EAAE,CAAC,CAAC;CACT,CAAC"}

package/dest/contracts/log.js

@@ -0,0 +1 @@
+/** Base L1 event log with common fields. */ export { };

package/dest/contracts/multicall.d.ts

@@ -1,21 +1,138 @@
 import type { Logger } from '@aztec/foundation/log';
-import { type Hex } from 'viem';
-import type { L1BlobInputs, L1TxConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
+import { type Abi, type Address, type BlockOverrides, type Hex, type RequiredBy, type StateOverride, type TransactionReceipt } from 'viem';
+import type { L1BlobInputs, L1TxConfig, L1TxRequest, L1TxState, L1TxUtils } from '../l1_tx_utils/index.js';
 import type { ExtendedViemWalletClient } from '../types.js';
-import { FormattedViemError } from '../utils.js';
 export declare 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 declare class MulticallForwarderRevertedError extends Error {
+    readonly receipt: TransactionReceipt;
+    readonly txState?: L1TxState | undefined;
+    constructor(receipt: TransactionReceipt, txState?: L1TxState | undefined);
+}
+/** ABI fragment for aggregate3Value — not included in viem's multicall3Abi. */
+export declare const aggregate3ValueAbi: readonly [{
+    readonly inputs: readonly [{
+        readonly components: readonly [{
+            readonly internalType: "address";
+            readonly name: "target";
+            readonly type: "address";
+        }, {
+            readonly internalType: "bool";
+            readonly name: "allowFailure";
+            readonly type: "bool";
+        }, {
+            readonly internalType: "uint256";
+            readonly name: "value";
+            readonly type: "uint256";
+        }, {
+            readonly internalType: "bytes";
+            readonly name: "callData";
+            readonly type: "bytes";
+        }];
+        readonly internalType: "struct Multicall3.Call3Value[]";
+        readonly name: "calls";
+        readonly type: "tuple[]";
+    }];
+    readonly name: "aggregate3Value";
+    readonly outputs: readonly [{
+        readonly components: readonly [{
+            readonly internalType: "bool";
+            readonly name: "success";
+            readonly type: "bool";
+        }, {
+            readonly internalType: "bytes";
+            readonly name: "returnData";
+            readonly type: "bytes";
+        }];
+        readonly internalType: "struct Multicall3.Result[]";
+        readonly name: "returnData";
+        readonly type: "tuple[]";
+    }];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}];
+/** A single call to embed inside an aggregate3 simulation. The abi is used to decode revert reasons. */
+export type SimulateAggregate3Request = {
+    to: Address;
+    data: Hex;
+    /** Optional ABI used to decode the revert reason if this entry reverts. */
+    abi?: Abi;
+};
+export type SimulateAggregate3EntryResult = {
+    success: boolean;
+    /** Decoded revert reason text when `success === false` and a request abi was provided. */
+    revertReason?: string;
+    /** Raw return data hex. `'0x'` for successful entries with void return. */
+    returnData: Hex;
+};
+/**
+ * Outcome of a bundle simulation.
+ * - `decoded`: eth_simulateV1 ran and produced a per-entry Result[]. Use `entries` for filtering.
+ * - `fallback`: the node does not support eth_simulateV1; `fallbackGasEstimate` was returned and no
+ *    per-entry info is available. Caller should send the bundle as-is with a conservative gas cap.
+ */
+export type SimulateAggregate3Result = {
+    kind: 'decoded';
+    entries: SimulateAggregate3EntryResult[];
+    gasUsed: bigint;
+} | {
+    kind: 'fallback';
+    gasUsed: bigint;
+};
+export type SimulateAggregate3Options = {
+    blockOverrides?: BlockOverrides<bigint, number>;
+    stateOverrides?: StateOverride;
+    /**
+     * If set, append a state override that fakes the sender's balance during the simulation so a
+     * low or zero balance does not cause the simulate to fail with insufficient funds. The fake
+     * balance is applied to `l1TxUtils.getSenderAddress()`.
+     */
+    fakeSenderBalance?: bigint;
+    /** Gas cap to pass on the simulate call itself (defaults to viem's behavior). */
+    gas?: bigint;
+    /** When eth_simulateV1 is unavailable, fall back to this gas estimate instead of throwing. */
+    fallbackGasEstimate?: bigint;
+};
 export declare class Multicall3 {
-    static forward(requests: L1TxRequest[], l1TxUtils: L1TxUtils, gasConfig: L1TxConfig | undefined, blobConfig: L1BlobInputs | undefined, rollupAddress: Hex, logger: Logger, opts?: {
-        revertOnFailure?: boolean;
-    }): Promise<FormattedViemError | {
-        receipt: import("viem").TransactionReceipt;
+    /**
+     * 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 hasCode(l1TxUtils: L1TxUtils): Promise<boolean>;
+    /**
+     * 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 simulateAggregate3(requests: SimulateAggregate3Request[], l1TxUtils: L1TxUtils, opts?: SimulateAggregate3Options): Promise<SimulateAggregate3Result>;
+    /**
+     * 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 forward<TOptGasLimitRequired extends boolean>(requests: L1TxRequest[], l1TxUtils: L1TxUtils, gasConfig: TOptGasLimitRequired extends true ? RequiredBy<L1TxConfig, 'gasLimit'> : L1TxConfig | undefined, blobConfig: L1BlobInputs | undefined, opts?: {
+        gasLimitRequired?: TOptGasLimitRequired;
+    }): Promise<{
+        receipt: TransactionReceipt;
         stats: import("../l1_tx_utils/types.js").TransactionStats | undefined;
-        errorMsg?: undefined;
-    } | {
-        stats?: undefined;
-        receipt: import("viem").TransactionReceipt;
-        errorMsg: string | undefined;
+        multicallData: `0x${string}`;
+        state: L1TxState;
+    }>;
+    /** Batch multiple value transfers into a single aggregate3Value call on Multicall3. */
+    static forwardValue(calls: {
+        to: Address;
+        value: bigint;
+    }[], l1TxUtils: L1TxUtils, logger: Logger): Promise<{
+        receipt: TransactionReceipt;
     }>;
 }
 export declare function deployMulticall3(l1Client: ExtendedViemWalletClient, logger: Logger): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGljYWxsLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL211bHRpY2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQXFDLEtBQUssR0FBRyxFQUFxQyxNQUFNLE1BQU0sQ0FBQztBQUV0RyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM1RCxPQUFPLEVBQUUsa0JBQWtCLEVBQW1CLE1BQU0sYUFBYSxDQUFDO0FBR2xFLGVBQU8sTUFBTSxvQkFBb0IsOENBQXdELENBQUM7QUFFMUYscUJBQWEsVUFBVTtJQUNyQixPQUFhLE9BQU8sQ0FDbEIsUUFBUSxFQUFFLFdBQVcsRUFBRSxFQUN2QixTQUFTLEVBQUUsU0FBUyxFQUNwQixTQUFTLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDakMsVUFBVSxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQ3BDLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxHQUFFO1FBQUUsZUFBZSxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQU87Ozs7Ozs7O09BbUd6QztDQUNGO0FBRUQsd0JBQXNCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkErQnhGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGljYWxsLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL211bHRpY2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBQ1IsS0FBSyxPQUFPLEVBQ1osS0FBSyxjQUFjLEVBQ25CLEtBQUssR0FBRyxFQUNSLEtBQUssVUFBVSxFQUNmLEtBQUssYUFBYSxFQUNsQixLQUFLLGtCQUFrQixFQUl4QixNQUFNLE1BQU0sQ0FBQztBQUVkLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUc1RCxlQUFPLE1BQU0sb0JBQW9CLDhDQUF3RCxDQUFDO0FBRTFGOzs7O0dBSUc7QUFDSCxxQkFBYSwrQkFBZ0MsU0FBUSxLQUFLO2FBRXRDLE9BQU8sRUFBRSxrQkFBa0I7YUFDM0IsT0FBTyxDQUFDO0lBRjFCLFlBQ2tCLE9BQU8sRUFBRSxrQkFBa0IsRUFDM0IsT0FBTyxDQUFDLHVCQUFXLEVBSXBDO0NBQ0Y7QUFFRCxpRkFBK0U7QUFDL0UsZUFBTyxNQUFNLGtCQUFrQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQThCckIsQ0FBQztBQUVYLHdHQUF3RztBQUN4RyxNQUFNLE1BQU0seUJBQXlCLEdBQUc7SUFDdEMsRUFBRSxFQUFFLE9BQU8sQ0FBQztJQUNaLElBQUksRUFBRSxHQUFHLENBQUM7SUFDViwyRUFBMkU7SUFDM0UsR0FBRyxDQUFDLEVBQUUsR0FBRyxDQUFDO0NBQ1gsQ0FBQztBQUVGLE1BQU0sTUFBTSw2QkFBNkIsR0FBRztJQUMxQyxPQUFPLEVBQUUsT0FBTyxDQUFDO0lBQ2pCLDBGQUEwRjtJQUMxRixZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEIsMkVBQTJFO0lBQzNFLFVBQVUsRUFBRSxHQUFHLENBQUM7Q0FDakIsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsTUFBTSxNQUFNLHdCQUF3QixHQUNoQztJQUFFLElBQUksRUFBRSxTQUFTLENBQUM7SUFBQyxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsQ0FBQztJQUFDLE9BQU8sRUFBRSxNQUFNLENBQUE7Q0FBRSxHQUM5RTtJQUFFLElBQUksRUFBRSxVQUFVLENBQUM7SUFBQyxPQUFPLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQztBQUUxQyxNQUFNLE1BQU0seUJBQXlCLEdBQUc7SUFDdEMsY0FBYyxDQUFDLEVBQUUsY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNoRCxjQUFjLENBQUMsRUFBRSxhQUFhLENBQUM7SUFDL0I7Ozs7T0FJRztJQUNILGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzNCLGlGQUFpRjtJQUNqRixHQUFHLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDYiw4RkFBOEY7SUFDOUYsbUJBQW1CLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDOUIsQ0FBQztBQUVGLHFCQUFhLFVBQVU7SUFDckI7OztPQUdHO0lBQ0gsT0FBYSxPQUFPLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRzNEO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFhLGtCQUFrQixDQUM3QixRQUFRLEVBQUUseUJBQXlCLEVBQUUsRUFDckMsU0FBUyxFQUFFLFNBQVMsRUFDcEIsSUFBSSxHQUFFLHlCQUE4QixHQUNuQyxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0FpRG5DO0lBRUQ7Ozs7T0FJRztJQUNILE9BQWEsT0FBTyxDQUFDLG9CQUFvQixTQUFTLE9BQU8sRUFDdkQsUUFBUSxFQUFFLFdBQVcsRUFBRSxFQUN2QixTQUFTLEVBQUUsU0FBUyxFQUNwQixTQUFTLEVBQUUsb0JBQW9CLFNBQVMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLEdBQUcsVUFBVSxHQUFHLFNBQVMsRUFDMUcsVUFBVSxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQ3BDLElBQUksR0FBRTtRQUFFLGdCQUFnQixDQUFDLEVBQUUsb0JBQW9CLENBQUE7S0FBTzs7Ozs7T0FzQ3ZEO0lBRUQsdUZBQXVGO0lBQ3ZGLE9BQWEsWUFBWSxDQUFDLEtBQUssRUFBRTtRQUFFLEVBQUUsRUFBRSxPQUFPLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU07O09BNEJ0RztDQUNGO0FBRUQsd0JBQXNCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkErQnhGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/contracts/multicall.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAqC,KAAK,GAAG,EAAqC,MAAM,MAAM,CAAC;AAEtG,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAGlE,eAAO,MAAM,oBAAoB,8CAAwD,CAAC;AAE1F,qBAAa,UAAU;IACrB,OAAa,OAAO,CAClB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAO;;;;;;;;OAmGzC;CACF;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBA+BxF"}
+{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/contracts/multicall.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,cAAc,EACnB,KAAK,GAAG,EACR,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAIxB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC3G,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAG5D,eAAO,MAAM,oBAAoB,8CAAwD,CAAC;AAE1F;;;;GAIG;AACH,qBAAa,+BAAgC,SAAQ,KAAK;aAEtC,OAAO,EAAE,kBAAkB;aAC3B,OAAO,CAAC;IAF1B,YACkB,OAAO,EAAE,kBAAkB,EAC3B,OAAO,CAAC,uBAAW,EAIpC;CACF;AAED,iFAA+E;AAC/E,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BrB,CAAC;AAEX,wGAAwG;AACxG,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,GAAG,CAAC;IACV,2EAA2E;IAC3E,GAAG,CAAC,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,0FAA0F;IAC1F,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2EAA2E;IAC3E,UAAU,EAAE,GAAG,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,6BAA6B,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,MAAM,yBAAyB,GAAG;IACtC,cAAc,CAAC,EAAE,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iFAAiF;IACjF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,8FAA8F;IAC9F,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,qBAAa,UAAU;IACrB;;;OAGG;IACH,OAAa,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAG3D;IAED;;;;;;;;OAQG;IACH,OAAa,kBAAkB,CAC7B,QAAQ,EAAE,yBAAyB,EAAE,EACrC,SAAS,EAAE,SAAS,EACpB,IAAI,GAAE,yBAA8B,GACnC,OAAO,CAAC,wBAAwB,CAAC,CAiDnC;IAED;;;;OAIG;IACH,OAAa,OAAO,CAAC,oBAAoB,SAAS,OAAO,EACvD,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,oBAAoB,SAAS,IAAI,GAAG,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,UAAU,GAAG,SAAS,EAC1G,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,IAAI,GAAE;QAAE,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;KAAO;;;;;OAsCvD;IAED,uFAAuF;IACvF,OAAa,YAAY,CAAC,KAAK,EAAE;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;;OA4BtG;CACF;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBA+BxF"}

package/dest/contracts/multicall.js

@@ -1,108 +1,218 @@
-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: [
+            {
+                components: [
+                    {
+                        internalType: 'address',
+                        name: 'target',
+                        type: 'address'
+                    },
+                    {
+                        internalType: 'bool',
+                        name: 'allowFailure',
+                        type: 'bool'
+                    },
+                    {
+                        internalType: 'uint256',
+                        name: 'value',
+                        type: 'uint256'
+                    },
+                    {
+                        internalType: 'bytes',
+                        name: 'callData',
+                        type: 'bytes'
+                    }
+                ],
+                internalType: 'struct Multicall3.Call3Value[]',
+                name: 'calls',
+                type: 'tuple[]'
+            }
+        ],
+        name: 'aggregate3Value',
+        outputs: [
+            {
+                components: [
+                    {
+                        internalType: 'bool',
+                        name: 'success',
+                        type: 'bool'
+                    },
+                    {
+                        internalType: 'bytes',
+                        name: 'returnData',
+                        type: 'bytes'
+                    }
+                ],
+                internalType: 'struct Multicall3.Result[]',
+                name: 'returnData',
+                type: 'tuple[]'
+            }
+        ],
+        stateMutability: 'payable',
+        type: 'function'
+    }
+];
 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 { 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
         };
-        const encodedForwarderData = encodeFunctionData(forwarderFunctionData);
-        try {
-            const { receipt, state } = await l1TxUtils.sendAndMonitorTransaction({
-                to: MULTI_CALL_3_ADDRESS,
-                data: encodedForwarderData
-            }, 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;
+    }
+    /** Batch multiple value transfers into a single aggregate3Value call on Multicall3. */ static async forwardValue(calls, l1TxUtils, logger) {
+        const args = calls.map((c)=>({
+                target: c.to,
+                allowFailure: false,
+                value: c.value,
+                callData: '0x'
+            }));
+        const data = encodeFunctionData({
+            abi: aggregate3ValueAbi,
+            functionName: 'aggregate3Value',
+            args: [
+                args
+            ]
+        });
+        const totalValue = calls.reduce((sum, c)=>sum + c.value, 0n);
+        logger.info(`Sending aggregate3Value with ${calls.length} calls`, {
+            totalValue
+        });
+        const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+            to: MULTI_CALL_3_ADDRESS,
+            data,
+            value: totalValue
+        });
+        if (receipt.status !== 'success') {
+            throw new Error(`aggregate3Value transaction reverted: ${receipt.transactionHash}`);
         }
+        return {
+            receipt
+        };
     }
 }
 export async function deployMulticall3(l1Client, logger) {