@aztec/ethereum 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

package/dest/contracts/outbox.d.ts

@@ -0,0 +1,41 @@
+import type { EpochNumber } from '@aztec/foundation/branded-types';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { OutboxAbi } from '@aztec/l1-artifacts/OutboxAbi';
+import { type GetContractReturnType, type Hex } from 'viem';
+import type { DeployAztecL1ContractsReturnType } from '../deploy_aztec_l1_contracts.js';
+import type { L1ReaderConfig } from '../l1_reader.js';
+import { type ViemClient } from '../types.js';
+export type ViemL1Actor = {
+    actor: Hex;
+    chainId: bigint;
+};
+export type ViemL2Actor = {
+    actor: Hex;
+    version: bigint;
+};
+export type ViemL2ToL1Msg = {
+    sender: ViemL2Actor;
+    recipient: ViemL1Actor;
+    content: Hex;
+};
+export declare class OutboxContract {
+    readonly client: ViemClient;
+    private readonly outbox;
+    static getFromL1ContractsValues(deployL1ContractsValues: DeployAztecL1ContractsReturnType): OutboxContract;
+    static getFromConfig(config: L1ReaderConfig): OutboxContract;
+    static getEpochRootStorageSlot(epoch: EpochNumber): 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}`>;
+    getMessageConsumedEvents(l1BlockHash: Hex): Promise<{
+        epoch: bigint;
+        root: Hex;
+        messageHash: Hex;
+        leafId: bigint;
+    }[]>;
+    private assertWallet;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0Ym94LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL291dGJveC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTFELE9BQU8sRUFBRSxLQUFLLHFCQUFxQixFQUFFLEtBQUssR0FBRyxFQUE0RCxNQUFNLE1BQU0sQ0FBQztBQUd0SCxPQUFPLEtBQUssRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hGLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3RELE9BQU8sRUFBaUMsS0FBSyxVQUFVLEVBQW9CLE1BQU0sYUFBYSxDQUFDO0FBRS9GLE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEIsS0FBSyxFQUFFLEdBQUcsQ0FBQztJQUNYLE9BQU8sRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQUVGLE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEIsS0FBSyxFQUFFLEdBQUcsQ0FBQztJQUNYLE9BQU8sRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQUVGLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsTUFBTSxFQUFFLFdBQVcsQ0FBQztJQUNwQixTQUFTLEVBQUUsV0FBVyxDQUFDO0lBQ3ZCLE9BQU8sRUFBRSxHQUFHLENBQUM7Q0FDZCxDQUFDO0FBRUYscUJBQWEsY0FBYzthQXNCUCxNQUFNLEVBQUUsVUFBVTtJQXJCcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQXNEO0lBRTdFLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyx1QkFBdUIsRUFBRSxnQ0FBZ0Msa0JBTXhGO0lBRUQsTUFBTSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsY0FBYyxrQkFJMUM7SUFFRCxNQUFNLENBQUMsdUJBQXVCLENBQUMsS0FBSyxFQUFFLFdBQVcsVUFFaEQ7SUFFRCxZQUNrQixNQUFNLEVBQUUsVUFBVSxFQUNsQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFVBQVUsRUFNMUI7SUFFRCxJQUFXLE9BQU8sa0JBRWpCO0lBRU0sV0FBVyxJQUFJLHFCQUFxQixDQUFDLE9BQU8sU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUV4RTtJQUVNLDZCQUE2QixDQUFDLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBRXRFO0lBRU0sV0FBVyxDQUFDLEtBQUssRUFBRSxXQUFXLDBCQUVwQztJQUVNLE9BQU8sQ0FBQyxPQUFPLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLDBCQUd4RjtJQUVZLHdCQUF3QixDQUNuQyxXQUFXLEVBQUUsR0FBRyxHQUNmLE9BQU8sQ0FBQztRQUFFLEtBQUssRUFBRSxNQUFNLENBQUM7UUFBQyxJQUFJLEVBQUUsR0FBRyxDQUFDO1FBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQztRQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7S0FBRSxFQUFFLENBQUMsQ0FRM0U7SUFFRCxPQUFPLENBQUMsWUFBWTtDQU1yQiJ9

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

@@ -0,0 +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"}

package/dest/contracts/outbox.js

@@ -0,0 +1,86 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { OutboxAbi } from '@aztec/l1-artifacts/OutboxAbi';
+import { encodeAbiParameters, getContract, hexToBigInt, keccak256 } from 'viem';
+import { getPublicClient } from '../client.js';
+import { isExtendedClient } from '../types.js';
+export class OutboxContract {
+    client;
+    outbox;
+    static getFromL1ContractsValues(deployL1ContractsValues) {
+        const { l1Client, l1ContractAddresses: { outboxAddress } } = deployL1ContractsValues;
+        return new OutboxContract(l1Client, outboxAddress.toString());
+    }
+    static getFromConfig(config) {
+        const client = getPublicClient(config);
+        const address = config.l1Contracts.outboxAddress.toString();
+        return new OutboxContract(client, address);
+    }
+    static getEpochRootStorageSlot(epoch) {
+        return hexToBigInt(keccak256(encodeAbiParameters([
+            {
+                type: 'uint256'
+            },
+            {
+                type: 'uint256'
+            }
+        ], [
+            BigInt(epoch),
+            0n
+        ])));
+    }
+    constructor(client, address){
+        this.client = client;
+        if (address instanceof EthAddress) {
+            address = address.toString();
+        }
+        this.outbox = getContract({
+            address,
+            abi: OutboxAbi,
+            client
+        });
+    }
+    get address() {
+        return this.outbox.address;
+    }
+    getContract() {
+        return this.outbox;
+    }
+    hasMessageBeenConsumedAtEpoch(epoch, leafId) {
+        return this.outbox.read.hasMessageBeenConsumedAtEpoch([
+            BigInt(epoch),
+            leafId
+        ]);
+    }
+    getRootData(epoch) {
+        return this.outbox.read.getRootData([
+            BigInt(epoch)
+        ]);
+    }
+    consume(message, epoch, leafIndex, path) {
+        const wallet = this.assertWallet();
+        return wallet.write.consume([
+            message,
+            BigInt(epoch),
+            leafIndex,
+            path
+        ]);
+    }
+    async getMessageConsumedEvents(l1BlockHash) {
+        const events = await this.outbox.getEvents.MessageConsumed({}, {
+            blockHash: l1BlockHash,
+            strict: true
+        });
+        return events.map((event)=>({
+                epoch: event.args.epoch,
+                root: event.args.root,
+                messageHash: event.args.messageHash,
+                leafId: event.args.leafId
+            }));
+    }
+    assertWallet() {
+        if (!isExtendedClient(this.client)) {
+            throw new Error('Wallet client is required for this operation');
+        }
+        return this.outbox;
+    }
+}

package/dest/contracts/registry.d.ts

@@ -26,4 +26,4 @@ export declare class RegistryContract {
     getRollupVersions(): Promise<bigint[]>;
     getRewardDistributor(): Promise<EthAddress>;
 }
-//# sourceMappingURL=registry.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0cnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvcmVnaXN0cnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSzNELE9BQU8sRUFBOEIsS0FBSyxHQUFHLEVBQWUsTUFBTSxNQUFNLENBQUM7QUFFekUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFJOUMscUJBQWEsZ0JBQWdCO2FBT1QsTUFBTSxFQUFFLFVBQVU7SUFON0IsT0FBTyxFQUFFLFVBQVUsQ0FBQztJQUUzQixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBK0M7SUFDbkUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQXdEO0lBRWpGLFlBQ2tCLE1BQU0sRUFBRSxVQUFVLEVBQ2xDLE9BQU8sRUFBRSxHQUFHLEdBQUcsVUFBVSxFQU8xQjtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRTNDO0lBRUQ7Ozs7T0FJRztJQUNVLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsTUFBTSxHQUFHLFdBQVcsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBc0J6RjtJQUVEOzs7T0FHRztJQUNVLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFdEQ7SUFFWSxzQkFBc0IsSUFBSSxPQUFPLENBQzVDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSwyQkFBMkIsR0FBRyxtQkFBbUIsQ0FBQyxDQUM3RSxDQVFBO0lBRUQsT0FBb0IsZ0JBQWdCLENBQ2xDLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLGVBQWUsRUFBRSxHQUFHLEdBQUcsVUFBVSxFQUNqQyxhQUFhLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxXQUFXLEdBQzNDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQXVCOUI7SUFFWSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBR2xEO0lBRVksaUJBQWlCLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBU2xEO0lBRVksb0JBQW9CLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUV2RDtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/contracts/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,EAA8B,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAEzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,qBAAa,gBAAgB;aAOT,MAAM,EAAE,UAAU;IAN7B,OAAO,EAAE,UAAU,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;gBAG/D,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU;IASd,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IAI5C;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAwB1F;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,UAAU,CAAC;IAI1C,sBAAsB,IAAI,OAAO,CAC5C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,mBAAmB,CAAC,CAC7E;WAUmB,gBAAgB,CAClC,MAAM,EAAE,UAAU,EAClB,eAAe,EAAE,GAAG,GAAG,UAAU,EACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAC3C,OAAO,CAAC,mBAAmB,CAAC;IAyBlB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAWtC,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAGzD"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/contracts/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,EAA8B,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAEzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,qBAAa,gBAAgB;aAOT,MAAM,EAAE,UAAU;IAN7B,OAAO,EAAE,UAAU,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;IAEjF,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAO1B;IAEY,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CAE3C;IAED;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAsBzF;IAED;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,UAAU,CAAC,CAEtD;IAEY,sBAAsB,IAAI,OAAO,CAC5C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,mBAAmB,CAAC,CAC7E,CAQA;IAED,OAAoB,gBAAgB,CAClC,MAAM,EAAE,UAAU,EAClB,eAAe,EAAE,GAAG,GAAG,UAAU,EACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAC3C,OAAO,CAAC,mBAAmB,CAAC,CAuB9B;IAEY,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAGlD;IAEY,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CASlD;IAEY,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC,CAEvD;CACF"}

package/dest/contracts/rollup.d.ts

@@ -1,13 +1,17 @@
+import { CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemSignature } from '@aztec/foundation/eth-signature';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 import { type Account, type GetContractReturnType, type Hex, type StateOverride, type WatchContractEventReturnType } from 'viem';
-import type { DeployL1ContractsReturnType } from '../deploy_l1_contracts.js';
+import type { DeployAztecL1ContractsReturnType } from '../deploy_aztec_l1_contracts.js';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
 import type { L1ReaderConfig } from '../l1_reader.js';
 import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
 import type { ViemClient } from '../types.js';
 import { EmpireSlashingProposerContract } from './empire_slashing_proposer.js';
+import type { L1EventLog } from './log.js';
 import { SlasherContract } from './slasher_contract.js';
 import { TallySlashingProposerContract } from './tally_slashing_proposer.js';
 export type ViemCommitteeAttestation = {
@@ -22,11 +26,15 @@ export type L1RollupContractAddresses = Pick<L1ContractAddresses, 'rollupAddress
 export type EpochProofPublicInputArgs = {
     previousArchive: `0x${string}`;
     endArchive: `0x${string}`;
+    outHash: `0x${string}`;
     proverId: `0x${string}`;
 };
 export type ViemHeader = {
     lastArchiveRoot: `0x${string}`;
-    contentCommitment: ViemContentCommitment;
+    blockHeadersHash: `0x${string}`;
+    blobsHash: `0x${string}`;
+    inHash: `0x${string}`;
+    outHash: `0x${string}`;
     slotNumber: bigint;
     timestamp: bigint;
     coinbase: `0x${string}`;
@@ -34,63 +42,147 @@ export type ViemHeader = {
     gasFees: ViemGasFees;
     totalManaUsed: bigint;
 };
-export type ViemContentCommitment = {
-    blobsHash: `0x${string}`;
-    inHash: `0x${string}`;
-    outHash: `0x${string}`;
-};
 export type ViemGasFees = {
     feePerDaGas: bigint;
     feePerL2Gas: bigint;
 };
-export type ViemStateReference = {
-    l1ToL2MessageTree: ViemAppendOnlyTreeSnapshot;
-    partialStateReference: ViemPartialStateReference;
-};
-export type ViemPartialStateReference = {
-    noteHashTree: ViemAppendOnlyTreeSnapshot;
-    nullifierTree: ViemAppendOnlyTreeSnapshot;
-    publicDataTree: ViemAppendOnlyTreeSnapshot;
-};
-export type ViemAppendOnlyTreeSnapshot = {
-    root: `0x${string}`;
-    nextAvailableLeafIndex: number;
-};
 export declare enum SlashingProposerType {
     None = 0,
     Tally = 1,
     Empire = 2
 }
+/**
+ * Status of a validator/attester in the staking system.
+ * Matches the Status enum in StakingLib.sol
+ */
+export declare enum AttesterStatus {
+    NONE = 0,
+    VALIDATING = 1,
+    ZOMBIE = 2,
+    EXITING = 3
+}
+/**
+ * Fee header data for a checkpoint
+ */
+export type FeeHeader = {
+    excessMana: bigint;
+    manaUsed: bigint;
+    ethPerFeeAsset: bigint;
+    congestionCost: bigint;
+    proverCost: bigint;
+};
+/**
+ * Checkpoint log data returned from the rollup contract
+ */
+export type CheckpointLog = {
+    archive: Fr;
+    headerHash: Buffer32;
+    blobCommitmentsHash: Buffer32;
+    attestationsHash: Buffer32;
+    payloadDigest: Buffer32;
+    slotNumber: SlotNumber;
+    feeHeader: FeeHeader;
+};
+/**
+ * L1 fee data (base fee and blob fee)
+ */
+export type L1FeeData = {
+    baseFee: bigint;
+    blobFee: bigint;
+};
+/**
+ * Reward configuration for the rollup
+ */
+export type RewardConfig = {
+    rewardDistributor: EthAddress;
+    sequencerBps: bigint;
+    booster: EthAddress;
+    checkpointReward: bigint;
+};
+/**
+ * Exit information for a validator
+ */
+export type Exit = {
+    withdrawalId: bigint;
+    amount: bigint;
+    exitableAt: bigint;
+    recipientOrWithdrawer: EthAddress;
+    isRecipient: boolean;
+    exists: boolean;
+};
+/**
+ * Attester configuration including public key and withdrawer
+ */
+export type AttesterConfig = {
+    publicKey: {
+        x: bigint;
+        y: bigint;
+    };
+    withdrawer: EthAddress;
+};
+/**
+ * Complete view of an attester's state
+ */
+export type AttesterView = {
+    status: AttesterStatus;
+    effectiveBalance: bigint;
+    exit: Exit;
+    config: AttesterConfig;
+};
+/**
+ * Return for a status call
+ */
+export type RollupStatusResponse = {
+    provenCheckpointNumber: CheckpointNumber;
+    provenArchive: Fr;
+    pendingCheckpointNumber: CheckpointNumber;
+    pendingArchive: Fr;
+    archiveOfMyCheckpoint: Fr;
+};
+/** Arguments for the CheckpointProposed event. */
+export type CheckpointProposedArgs = {
+    checkpointNumber: CheckpointNumber;
+    archive: Fr;
+    versionedBlobHashes: Buffer[];
+    /** Hash of attestations. Undefined for older events (backwards compatibility). */
+    attestationsHash?: Buffer32;
+    /** Digest of the payload. Undefined for older events (backwards compatibility). */
+    payloadDigest?: Buffer32;
+};
+/** Log type for CheckpointProposed events. */
+export type CheckpointProposedLog = L1EventLog<CheckpointProposedArgs>;
 export declare class RollupContract {
     readonly client: ViemClient;
     private readonly rollup;
     private static cachedStfStorageSlot;
+    private cachedEscapeHatch?;
     static get checkBlobStorageSlot(): bigint;
     static get stfStorageSlot(): Hex;
-    static getFromL1ContractsValues(deployL1ContractsValues: DeployL1ContractsReturnType): RollupContract;
+    static getFromL1ContractsValues(deployL1ContractsValues: DeployAztecL1ContractsReturnType): RollupContract;
     static getFromConfig(config: L1ReaderConfig): RollupContract;
     constructor(client: ViemClient, address: Hex | EthAddress);
-    getGSE(): Promise<`0x${string}`>;
+    getGSE(): Promise<EthAddress>;
     get address(): `0x${string}`;
     getContract(): GetContractReturnType<typeof RollupAbi, ViemClient>;
     getSlashingProposer(): Promise<EmpireSlashingProposerContract | TallySlashingProposerContract | undefined>;
     getL1StartBlock(): Promise<bigint>;
     getL1GenesisTime(): Promise<bigint>;
-    getProofSubmissionEpochs(): Promise<bigint>;
-    getEpochDuration(): Promise<bigint>;
-    getSlotDuration(): Promise<bigint>;
-    getTargetCommitteeSize(): Promise<bigint>;
+    getProofSubmissionEpochs(): Promise<number>;
+    getEpochDuration(): Promise<number>;
+    getSlotDuration(): Promise<number>;
+    getTargetCommitteeSize(): Promise<number>;
     getEjectionThreshold(): Promise<bigint>;
     getLocalEjectionThreshold(): Promise<bigint>;
-    getLagInEpochs(): Promise<bigint>;
+    getLagInEpochsForValidatorSet(): Promise<number>;
+    getLagInEpochsForRandao(): Promise<number>;
     getActivationThreshold(): Promise<bigint>;
-    getExitDelay(): Promise<bigint>;
+    getExitDelay(): Promise<number>;
     getManaTarget(): Promise<bigint>;
     getProvingCostPerMana(): Promise<bigint>;
     getProvingCostPerManaInFeeAsset(): Promise<bigint>;
     getManaLimit(): Promise<bigint>;
     getVersion(): Promise<bigint>;
-    getGenesisArchiveTreeRoot(): Promise<`0x${string}`>;
+    getGenesisArchiveTreeRoot(): Promise<Fr>;
     /**
      * Returns rollup constants used for epoch queries.
      * Return type is `L1RollupConstants` which is defined in stdlib,
@@ -103,59 +195,58 @@ export declare class RollupContract {
         epochDuration: number;
         proofSubmissionEpochs: number;
     }>;
-    getSlasherAddress(): Promise<`0x${string}`>;
+    getSlasherAddress(): Promise<EthAddress>;
+    /**
+     * Returns the configured escape hatch contract address, or zero if disabled.
+     */
+    getEscapeHatchAddress(): Promise<EthAddress>;
+    private getEscapeHatchContract;
+    /**
+     * Returns whether the escape hatch is open for the given epoch.
+     * If escape hatch is not configured, returns false.
+     *
+     * This function is intentionally defensive: any failure to query the escape hatch
+     * (RPC issues, transient errors, etc.) is treated as "closed" to avoid callers
+     * needing to sprinkle try/catch everywhere.
+     */
+    isEscapeHatchOpen(epoch: EpochNumber): Promise<boolean>;
     /**
      * Returns a SlasherContract instance for interacting with the slasher contract.
      */
     getSlasherContract(): Promise<SlasherContract | undefined>;
-    getOwner(): Promise<`0x${string}`>;
-    getActiveAttesterCount(): Promise<bigint>;
+    getOwner(): Promise<EthAddress>;
+    getActiveAttesterCount(): Promise<number>;
     getSlashingProposerAddress(): Promise<EthAddress>;
-    getBlockReward(): Promise<bigint>;
-    getBlockNumber(): Promise<bigint>;
-    getProvenBlockNumber(): Promise<bigint>;
-    getSlotNumber(): Promise<bigint>;
-    getL1FeesAt(timestamp: bigint): Promise<{
-        baseFee: bigint;
-        blobFee: bigint;
-    }>;
-    getFeeAssetPerEth(): Promise<bigint>;
-    getCommitteeAt(timestamp: bigint): Promise<readonly `0x${string}`[] | undefined>;
-    getSampleSeedAt(timestamp: bigint): Promise<bigint>;
-    getCurrentSampleSeed(): Promise<bigint>;
-    getCurrentEpoch(): Promise<bigint>;
-    getCurrentEpochCommittee(): Promise<readonly `0x${string}`[] | undefined>;
-    getCurrentProposer(): Promise<`0x${string}`>;
-    getProposerAt(timestamp: bigint): Promise<`0x${string}`>;
-    getBlock(blockNumber: bigint | number): Promise<{
-        archive: `0x${string}`;
-        headerHash: `0x${string}`;
-        blobCommitmentsHash: `0x${string}`;
-        attestationsHash: `0x${string}`;
-        payloadDigest: `0x${string}`;
-        slotNumber: bigint;
-        feeHeader: {
-            excessMana: bigint;
-            manaUsed: bigint;
-            feeAssetPriceNumerator: bigint;
-            congestionCost: bigint;
-            proverCost: bigint;
-        };
-    }>;
+    getCheckpointReward(): Promise<bigint>;
+    getCheckpointNumber(): Promise<CheckpointNumber>;
+    getProvenCheckpointNumber(): Promise<CheckpointNumber>;
+    getSlotNumber(): Promise<SlotNumber>;
+    getL1FeesAt(timestamp: bigint): Promise<L1FeeData>;
+    getEthPerFeeAsset(): Promise<bigint>;
+    getCommitteeAt(timestamp: bigint): Promise<EthAddress[] | undefined>;
+    getSampleSeedAt(timestamp: bigint): Promise<Buffer32>;
+    getCurrentSampleSeed(): Promise<Buffer32>;
+    getCurrentEpoch(): Promise<EpochNumber>;
+    getCurrentEpochCommittee(): Promise<EthAddress[] | undefined>;
+    getCurrentProposer(): Promise<EthAddress>;
+    getProposerAt(timestamp: bigint): Promise<EthAddress>;
+    getCheckpoint(checkpointNumber: CheckpointNumber): Promise<CheckpointLog>;
+    /** Returns the pending checkpoint from the rollup contract */
+    getPendingCheckpoint(): Promise<CheckpointLog>;
     getTips(): Promise<{
-        pendingBlockNumber: bigint;
-        provenBlockNumber: bigint;
+        pending: CheckpointNumber;
+        proven: CheckpointNumber;
     }>;
-    getTimestampForSlot(slot: bigint): Promise<bigint>;
-    getEntryQueueLength(): Promise<bigint>;
-    getAvailableValidatorFlushes(): Promise<bigint>;
-    getNextFlushableEpoch(): Promise<bigint>;
-    getCurrentEpochNumber(): Promise<bigint>;
-    getEpochNumberForBlock(blockNumber: bigint): Promise<bigint>;
+    getTimestampForSlot(slot: SlotNumber): Promise<bigint>;
+    getEntryQueueLength(): Promise<number>;
+    getAvailableValidatorFlushes(): Promise<number>;
+    getNextFlushableEpoch(): Promise<EpochNumber>;
+    getCurrentEpochNumber(): Promise<EpochNumber>;
+    getEpochNumberForCheckpoint(checkpointNumber: CheckpointNumber): Promise<EpochNumber>;
     getRollupAddresses(): Promise<L1RollupContractAddresses>;
     getFeeJuicePortal(): Promise<EthAddress>;
-    getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint>;
-    getEpochProofPublicInputs(args: readonly [bigint, bigint, EpochProofPublicInputArgs, readonly `0x${string}`[], `0x${string}`]): Promise<readonly `0x${string}`[]>;
+    getEpochNumberForSlotNumber(slotNumber: SlotNumber): Promise<EpochNumber>;
+    getEpochProofPublicInputs(args: readonly [bigint, bigint, EpochProofPublicInputArgs, readonly `0x${string}`[], `0x${string}`]): Promise<Fr[]>;
     validateHeader(args: readonly [
         ViemHeader,
         ViemCommitteeAttestations,
@@ -174,70 +265,48 @@ export declare class RollupContract {
      * @dev     Throws if unable to propose
      *
      * @param archive - The archive that we expect to be current state
-     * @return [slot, blockNumber] - If you can propose, the L2 slot number and L2 block number of the next Ethereum block,
+     * @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
+     * timestamp of the next L1 block
      * @throws otherwise
      */
-    canProposeAtNextEthBlock(archive: Buffer, account: `0x${string}` | Account, slotDuration: bigint | number, opts?: {
-        forcePendingBlockNumber?: number;
+    canProposeAtNextEthBlock(archive: Buffer, account: `0x${string}` | Account, slotDuration: number, opts?: {
+        forcePendingCheckpointNumber?: CheckpointNumber;
     }): Promise<{
-        slot: bigint;
-        blockNumber: bigint;
+        slot: SlotNumber;
+        checkpointNumber: CheckpointNumber;
         timeOfNextL1Slot: bigint;
     }>;
     /**
-     * Returns a state override that sets the pending block number to the specified value. Useful for simulations.
-     * Requires querying the current state of the contract to get the current proven block number, as they are both
+     * Returns a state override that sets the pending checkpoint number to the specified value. Useful for simulations.
+     * Requires querying the current state of the contract to get the current proven checkpoint number, as they are both
      * stored in the same slot. If the argument is undefined, it returns an empty override.
      */
-    makePendingBlockNumberOverride(forcePendingBlockNumber: number | undefined): Promise<StateOverride>;
+    makePendingCheckpointNumberOverride(forcePendingCheckpointNumber: CheckpointNumber | undefined): Promise<StateOverride>;
     /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */
-    buildInvalidateBadAttestationRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[], invalidIndex: number): L1TxRequest;
+    buildInvalidateBadAttestationRequest(checkpointNumber: CheckpointNumber, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[], invalidIndex: number): L1TxRequest;
     /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */
-    buildInvalidateInsufficientAttestationsRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[]): L1TxRequest;
+    buildInvalidateInsufficientAttestationsRequest(checkpointNumber: CheckpointNumber, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[]): L1TxRequest;
     /** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */
-    getHasSubmittedProof(epochNumber: number, numberOfBlocksInEpoch: number, prover: Hex | EthAddress): Promise<boolean>;
-    getManaBaseFeeAt(timestamp: bigint, inFeeAsset: boolean): Promise<bigint>;
-    getSlotAt(timestamp: bigint): Promise<bigint>;
-    status(blockNumber: bigint, options?: {
+    getHasSubmittedProof(epochNumber: EpochNumber, numberOfCheckpointsInEpoch: number, prover: Hex | EthAddress): Promise<boolean>;
+    getManaMinFeeAt(timestamp: bigint, inFeeAsset: boolean): Promise<bigint>;
+    getSlotAt(timestamp: bigint): Promise<SlotNumber>;
+    status(checkpointNumber: CheckpointNumber, options?: {
         blockNumber?: bigint;
-    }): Promise<readonly [bigint, `0x${string}`, bigint, `0x${string}`, `0x${string}`, bigint]>;
+    }): Promise<RollupStatusResponse>;
     canPruneAtTime(timestamp: bigint, options?: {
         blockNumber?: bigint;
     }): Promise<boolean>;
-    archive(): Promise<`0x${string}`>;
-    archiveAt(blockNumber: bigint): Promise<`0x${string}`>;
+    archive(): Promise<Fr>;
+    archiveAt(checkpointNumber: CheckpointNumber): Promise<Fr>;
     getSequencerRewards(address: Hex | EthAddress): Promise<bigint>;
     getSpecificProverRewardsForEpoch(epoch: bigint, prover: Hex | EthAddress): Promise<bigint>;
-    getAttesters(): Promise<`0x${string}`[]>;
-    getAttesterView(address: Hex | EthAddress): Promise<{
-        status: number;
-        effectiveBalance: bigint;
-        exit: {
-            withdrawalId: bigint;
-            amount: bigint;
-            exitableAt: bigint;
-            recipientOrWithdrawer: `0x${string}`;
-            isRecipient: boolean;
-            exists: boolean;
-        };
-        config: {
-            publicKey: {
-                x: bigint;
-                y: bigint;
-            };
-            withdrawer: `0x${string}`;
-        };
-    }>;
-    getStatus(address: Hex | EthAddress): Promise<number>;
-    getBlobCommitmentsHash(blockNumber: bigint): Promise<`0x${string}`>;
-    getCurrentBlobCommitmentsHash(): Promise<`0x${string}`>;
-    getStakingAsset(): Promise<`0x${string}`>;
-    getRewardConfig(): Promise<{
-        rewardDistributor: `0x${string}`;
-        sequencerBps: number;
-        booster: `0x${string}`;
-        blockReward: bigint;
-    }>;
+    getAttesters(): Promise<EthAddress[]>;
+    getAttesterView(address: Hex | EthAddress): Promise<AttesterView>;
+    getStatus(address: Hex | EthAddress): Promise<AttesterStatus>;
+    getBlobCommitmentsHash(checkpointNumber: CheckpointNumber): Promise<Buffer32>;
+    getCurrentBlobCommitmentsHash(): Promise<Buffer32>;
+    getStakingAsset(): Promise<EthAddress>;
+    getRewardConfig(): Promise<RewardConfig>;
     setupEpoch(l1TxUtils: L1TxUtils): Promise<{
         receipt: import("viem").TransactionReceipt;
         state: import("../l1_tx_utils/types.js").L1TxState;
@@ -250,8 +319,8 @@ export declare class RollupContract {
         oldSlasher: `0x${string}`;
         newSlasher: `0x${string}`;
     }) => unknown): WatchContractEventReturnType;
-    listenToBlockInvalidated(callback: (args: {
-        blockNumber: bigint;
+    listenToCheckpointInvalidated(callback: (args: {
+        checkpointNumber: CheckpointNumber;
     }) => unknown): WatchContractEventReturnType;
     getSlashEvents(l1BlockHash: Hex): Promise<{
         amount: bigint;
@@ -261,5 +330,7 @@ export declare class RollupContract {
         amount: bigint;
         attester: EthAddress;
     }) => unknown): WatchContractEventReturnType;
+    /** Fetches CheckpointProposed events within the given block range. */
+    getCheckpointProposedEvents(fromBlock: bigint, toBlock: bigint): Promise<CheckpointProposedLog[]>;
 }
-//# sourceMappingURL=rollup.d.ts.map
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}