@aztec/ethereum 0.0.1-commit.3469e52 → 0.0.1-commit.350e0a4d

package/dest/contracts/rollup.js

@@ -376,25 +376,20 @@ import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
+import { getErrorCause } from '@aztec/foundation/types';
 import { EscapeHatchAbi } from '@aztec/l1-artifacts/EscapeHatchAbi';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 import { RollupStorage } from '@aztec/l1-artifacts/RollupStorage';
 import chunk from 'lodash.chunk';
-import { encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
+import { ContractFunctionRevertedError, RpcRequestError, decodeErrorResult, encodeAbiParameters, encodeFunctionData, getContract, hexToBigInt, keccak256 } from 'viem';
 import { getPublicClient } from '../client.js';
 import { formatViemError } from '../utils.js';
-import { EmpireSlashingProposerContract } from './empire_slashing_proposer.js';
 import { GSEContract } from './gse.js';
 import { SlasherContract } from './slasher_contract.js';
-import { TallySlashingProposerContract } from './tally_slashing_proposer.js';
+import { SlashingProposerContract } from './slashing_proposer.js';
 import { checkBlockTag } from './utils.js';
-export var SlashingProposerType = /*#__PURE__*/ function(SlashingProposerType) {
-    SlashingProposerType[SlashingProposerType["None"] = 0] = "None";
-    SlashingProposerType[SlashingProposerType["Tally"] = 1] = "Tally";
-    SlashingProposerType[SlashingProposerType["Empire"] = 2] = "Empire";
-    return SlashingProposerType;
-}({});
 /**
  * Status of a validator/attester in the staking system.
  * Matches the Status enum in StakingLib.sol
@@ -405,6 +400,37 @@ export var SlashingProposerType = /*#__PURE__*/ function(SlashingProposerType) {
     AttesterStatus[AttesterStatus["EXITING"] = 3] = "EXITING";
     return AttesterStatus;
 }({});
+/** Field offsets within the CompressedTempCheckpointLog struct in Solidity storage. */ export var TempCheckpointLogField = /*#__PURE__*/ function(TempCheckpointLogField) {
+    TempCheckpointLogField[TempCheckpointLogField["HeaderHash"] = 0] = "HeaderHash";
+    TempCheckpointLogField[TempCheckpointLogField["BlobCommitmentsHash"] = 1] = "BlobCommitmentsHash";
+    TempCheckpointLogField[TempCheckpointLogField["OutHash"] = 2] = "OutHash";
+    TempCheckpointLogField[TempCheckpointLogField["AttestationsHash"] = 3] = "AttestationsHash";
+    TempCheckpointLogField[TempCheckpointLogField["PayloadDigest"] = 4] = "PayloadDigest";
+    TempCheckpointLogField[TempCheckpointLogField["SlotNumber"] = 5] = "SlotNumber";
+    TempCheckpointLogField[TempCheckpointLogField["FeeHeader"] = 6] = "FeeHeader";
+    return TempCheckpointLogField;
+}({});
+const INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR = 'ValidatorSelection__InsufficientValidatorSetSize';
+function isValidatorSelectionError(err, errorName) {
+    return getErrorCause(err, ContractFunctionRevertedError)?.data?.errorName === errorName || decodeRpcRequestErrorName(err) === errorName;
+}
+function decodeRpcRequestErrorName(err) {
+    const data = getErrorCause(err, RpcRequestError)?.data;
+    if (!isHexString(data)) {
+        return undefined;
+    }
+    try {
+        return decodeErrorResult({
+            abi: RollupAbi,
+            data
+        }).errorName;
+    } catch  {
+        return undefined;
+    }
+}
+function isHexString(value) {
+    return typeof value === 'string' && value.startsWith('0x');
+}
 export class RollupContract {
     client;
     static{
@@ -499,6 +525,16 @@ export class RollupContract {
                 2,
                 "getGenesisArchiveTreeRoot"
             ],
+            [
+                memoize,
+                2,
+                "getVkTreeRoot"
+            ],
+            [
+                memoize,
+                2,
+                "getProtocolContractsHash"
+            ],
             [
                 memoize,
                 2,
@@ -507,6 +543,7 @@ export class RollupContract {
         ], []));
     }
     rollup;
+    logger;
     static cachedStfStorageSlot;
     cachedEscapeHatch;
     static get checkBlobStorageSlot() {
@@ -525,12 +562,12 @@ export class RollupContract {
     }
     static getFromConfig(config) {
         const client = getPublicClient(config);
-        const address = config.l1Contracts.rollupAddress.toString();
+        const address = config.rollupAddress.toString();
         return new RollupContract(client, address);
     }
     constructor(client, address){
         this.client = client;
-        _initProto(this);
+        this.logger = (_initProto(this), createLogger('ethereum:rollup'));
         if (address instanceof EthAddress) {
             address = address.toString();
         }
@@ -555,34 +592,10 @@ export class RollupContract {
             return undefined;
         }
         const proposerAddress = await slasher.getProposer();
-        const proposerAbi = [
-            {
-                type: 'function',
-                name: 'SLASHING_PROPOSER_TYPE',
-                inputs: [],
-                outputs: [
-                    {
-                        name: '',
-                        type: 'uint8',
-                        internalType: 'enum SlasherFlavor'
-                    }
-                ],
-                stateMutability: 'view'
-            }
-        ];
-        const proposer = getContract({
-            address: proposerAddress.toString(),
-            abi: proposerAbi,
-            client: this.client
-        });
-        const proposerType = await proposer.read.SLASHING_PROPOSER_TYPE();
-        if (proposerType === 1..valueOf()) {
-            return new TallySlashingProposerContract(this.client, proposerAddress);
-        } else if (proposerType === 2..valueOf()) {
-            return new EmpireSlashingProposerContract(this.client, proposerAddress);
-        } else {
-            throw new Error(`Unknown slashing proposer type: ${proposerType}`);
+        if (proposerAddress.isZero()) {
+            return undefined;
         }
+        return new SlashingProposerContract(this.client, proposerAddress);
     }
     getL1StartBlock() {
         return this.rollup.read.L1_BLOCK_AT_GENESIS();
@@ -640,24 +653,44 @@ export class RollupContract {
             0n
         ]));
     }
+    async getVkTreeRoot() {
+        const slot = BigInt(RollupContract.stfStorageSlot) + 3n;
+        const value = await this.client.getStorageAt({
+            address: this.address,
+            slot: `0x${slot.toString(16)}`
+        });
+        return Fr.fromString(value ?? '0x0');
+    }
+    async getProtocolContractsHash() {
+        const slot = BigInt(RollupContract.stfStorageSlot) + 4n;
+        const value = await this.client.getStorageAt({
+            address: this.address,
+            slot: `0x${slot.toString(16)}`
+        });
+        return Fr.fromString(value ?? '0x0');
+    }
     /**
    * Returns rollup constants used for epoch queries.
    * Return type is `L1RollupConstants` which is defined in stdlib,
    * so we cant reference it until we move this contract to that package.
    */ async getRollupConstants() {
-        const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs] = await Promise.all([
+        const [l1StartBlock, l1GenesisTime, slotDuration, epochDuration, proofSubmissionEpochs, targetCommitteeSize, rollupManaLimit] = await Promise.all([
             this.getL1StartBlock(),
             this.getL1GenesisTime(),
             this.getSlotDuration(),
             this.getEpochDuration(),
-            this.getProofSubmissionEpochs()
+            this.getProofSubmissionEpochs(),
+            this.getTargetCommitteeSize(),
+            this.getManaLimit()
         ]);
         return {
             l1StartBlock,
             l1GenesisTime,
             slotDuration,
             epochDuration: Number(epochDuration),
-            proofSubmissionEpochs: Number(proofSubmissionEpochs)
+            proofSubmissionEpochs: Number(proofSubmissionEpochs),
+            targetCommitteeSize,
+            rollupManaLimit: Number(rollupManaLimit)
         };
     }
     async getSlasherAddress() {
@@ -703,7 +736,11 @@ export class RollupContract {
                 BigInt(epoch)
             ]);
             return isOpen;
-        } catch  {
+        } catch (err) {
+            this.logger.warn('isEscapeHatchOpen failed (treating as closed); RPC or contract error may cause liveness risk', {
+                epoch: Number(epoch),
+                error: err
+            });
             return false;
         }
     }
@@ -719,8 +756,9 @@ export class RollupContract {
     async getOwner() {
         return EthAddress.fromString(await this.rollup.read.owner());
     }
-    async getActiveAttesterCount() {
-        return Number(await this.rollup.read.getActiveAttesterCount());
+    async getActiveAttesterCount(options) {
+        await checkBlockTag(options?.blockNumber, this.client);
+        return Number(await this.rollup.read.getActiveAttesterCount(options));
     }
     async getSlashingProposerAddress() {
         const slasher = await this.getSlasherContract();
@@ -732,26 +770,42 @@ export class RollupContract {
     getCheckpointReward() {
         return this.rollup.read.getCheckpointReward();
     }
-    async getCheckpointNumber() {
-        return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber());
+    async getCheckpointNumber(options) {
+        await checkBlockTag(options?.blockNumber, this.client);
+        return CheckpointNumber.fromBigInt(await this.rollup.read.getPendingCheckpointNumber(options));
     }
-    async getProvenCheckpointNumber() {
-        return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber());
+    async getProvenCheckpointNumber(options) {
+        await checkBlockTag(options?.blockNumber, this.client);
+        return CheckpointNumber.fromBigInt(await this.rollup.read.getProvenCheckpointNumber(options));
     }
-    async getSlotNumber() {
-        return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
+    async getSlotNumber(options) {
+        await checkBlockTag(options?.blockNumber, this.client);
+        return SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot(options));
     }
-    async getL1FeesAt(timestamp) {
+    async getL1FeesAt(timestamp, options) {
+        await checkBlockTag(options?.blockNumber, this.client);
         const result = await this.rollup.read.getL1FeesAt([
             timestamp
-        ]);
+        ], options);
         return {
             baseFee: result.baseFee,
             blobFee: result.blobFee
         };
     }
-    getFeeAssetPerEth() {
-        return this.rollup.read.getFeeAssetPerEth();
+    async getFeeHeader(checkpointNumber) {
+        const result = await this.rollup.read.getFeeHeader([
+            checkpointNumber
+        ]);
+        return {
+            excessMana: result.excessMana,
+            manaUsed: result.manaUsed,
+            ethPerFeeAsset: result.ethPerFeeAsset,
+            congestionCost: result.congestionCost,
+            proverCost: result.proverCost
+        };
+    }
+    getEthPerFeeAsset() {
+        return this.rollup.read.getEthPerFeeAsset();
     }
     async getCommitteeAt(timestamp) {
         const { result } = await this.client.simulateContract({
@@ -762,7 +816,7 @@ export class RollupContract {
                 timestamp
             ]
         }).catch((e)=>{
-            if (e instanceof Error && e.message.includes('ValidatorSelection__InsufficientValidatorSetSize')) {
+            if (isValidatorSelectionError(e, INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR)) {
                 return {
                     result: undefined
                 };
@@ -789,7 +843,7 @@ export class RollupContract {
             functionName: 'getCurrentEpochCommittee',
             args: []
         }).catch((e)=>{
-            if (e instanceof Error && e.message.includes('ValidatorSelection__InsufficientValidatorSetSize')) {
+            if (isValidatorSelectionError(e, INSUFFICIENT_VALIDATOR_SET_SIZE_ERROR)) {
                 return {
                     result: undefined
                 };
@@ -818,10 +872,11 @@ export class RollupContract {
         });
         return EthAddress.fromString(result);
     }
-    async getCheckpoint(checkpointNumber) {
+    async getCheckpoint(checkpointNumber, options) {
+        await checkBlockTag(options?.blockNumber, this.client);
         const result = await this.rollup.read.getCheckpoint([
             BigInt(checkpointNumber)
-        ]);
+        ], options);
         return {
             archive: Fr.fromString(result.archive),
             headerHash: Buffer32.fromString(result.headerHash),
@@ -832,7 +887,7 @@ export class RollupContract {
             feeHeader: {
                 excessMana: result.feeHeader.excessMana,
                 manaUsed: result.feeHeader.manaUsed,
-                feeAssetPriceNumerator: result.feeHeader.feeAssetPriceNumerator,
+                ethPerFeeAsset: result.feeHeader.ethPerFeeAsset,
                 congestionCost: result.feeHeader.congestionCost,
                 proverCost: result.feeHeader.proverCost
             }
@@ -851,6 +906,28 @@ export class RollupContract {
             0.5
         ]));
     }
+    /**
+   * Returns the effective pending checkpoint, accounting for potential prunes.
+   * When a prune can happen, the L1 contract uses the proven checkpoint instead of the pending one.
+   * This mirrors the behavior of getEffectivePendingCheckpointNumber in STFLib.sol.
+   * @param atTimestamp - The timestamp to evaluate pruneability at. Defaults to the current L1 block timestamp.
+   * @param options - Optional L1 block number to pin the queries to.
+   */ getEffectivePendingCheckpoint(atTimestamp, options) {
+        return retry(async ()=>{
+            const timestamp = atTimestamp ?? (await this.client.getBlock()).timestamp;
+            const canPrune = await this.canPruneAtTime(timestamp, options);
+            if (canPrune) {
+                const provenCheckpointNumber = await this.getProvenCheckpointNumber(options);
+                return await this.getCheckpoint(provenCheckpointNumber, options);
+            }
+            const pendingCheckpointNumber = await this.getCheckpointNumber(options);
+            return await this.getCheckpoint(pendingCheckpointNumber, options);
+        }, 'getting effective pending checkpoint', makeBackoff([
+            0.5,
+            0.5,
+            0.5
+        ]));
+    }
     async getTips() {
         const { pending, proven } = await this.rollup.read.getTips();
         return {
@@ -935,9 +1012,8 @@ export class RollupContract {
    * @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
    * timestamp of the next L1 block
    * @throws otherwise
-   */ async canProposeAtNextEthBlock(archive, account, slotDuration, opts = {}) {
-        const latestBlock = await this.client.getBlock();
-        const timeOfNextL1Slot = latestBlock.timestamp + BigInt(slotDuration);
+   */ async canProposeAt(archive, account, timestamp, stateOverride = []) {
+        const timeOfNextL1Slot = timestamp;
         const who = typeof account === 'string' ? account : account.address;
         try {
             const { result: [slot, checkpointNumber] } = await this.client.simulateContract({
@@ -950,7 +1026,7 @@ export class RollupContract {
                     who
                 ],
                 account,
-                stateOverride: await this.makePendingCheckpointNumberOverride(opts.forcePendingCheckpointNumber)
+                stateOverride
             });
             return {
                 slot: SlotNumber.fromBigInt(slot),
@@ -962,11 +1038,15 @@ export class RollupContract {
         }
     }
     /**
-   * 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.
-   */ async makePendingCheckpointNumberOverride(forcePendingCheckpointNumber) {
-        if (forcePendingCheckpointNumber === undefined) {
+   * Returns a state override that sets the pending and/or proven checkpoint numbers. Useful for simulations.
+   * Both values share a single storage slot (pending in the upper 128 bits, proven in the lower 128 bits), so
+   * a single combined override is emitted to avoid the second state-diff clobbering the first. The current live
+   * value is read once to preserve any half not being overridden. Returns an empty override if neither is set.
+   *
+   * Throws if the resulting `proven > pending`, which would crash the simulation: `STFLib.canPruneAtTime` calls
+   * `getEpochForCheckpoint(proven + 1)` whenever `pending != proven`, and that asserts `_n <= tips.pending`.
+   */ async makeChainTipsOverride(override) {
+        if (override.pending === undefined && override.proven === undefined) {
             return [];
         }
         const slot = RollupContract.stfStorageSlot;
@@ -974,8 +1054,15 @@ export class RollupContract {
             address: this.address,
             slot
         });
-        const currentProvenCheckpointNumber = currentValue ? hexToBigInt(currentValue) & (1n << 128n) - 1n : 0n;
-        const newValue = BigInt(forcePendingCheckpointNumber) << 128n | currentProvenCheckpointNumber;
+        const currentRaw = currentValue ? hexToBigInt(currentValue) : 0n;
+        const currentPending = currentRaw >> 128n;
+        const currentProven = currentRaw & (1n << 128n) - 1n;
+        const newPending = override.pending !== undefined ? BigInt(override.pending) : currentPending;
+        const newProven = override.proven !== undefined ? BigInt(override.proven) : currentProven;
+        if (newProven > newPending) {
+            throw new Error(`Invalid chain tips override: proven (${newProven}) > pending (${newPending})`);
+        }
+        const newValue = newPending << 128n | newProven;
         return [
             {
                 address: this.address,
@@ -988,9 +1075,165 @@ export class RollupContract {
             }
         ];
     }
+    /**
+   * Returns a state override that patches `tempCheckpointLogs[checkpointNumber]` with every field that
+   * the L1 contract reads during `propose()` for the checkpoint that builds on top of it (proposer
+   * pipelining simulation). Mirrors the writes done by `ProposeLib.addTempCheckpointLog`.
+   *
+   * `blobCommitmentsHash` and `attestationsHash` are intentionally not exposed here — the propose path
+   * never asserts against them, so leaving them at storage zero is harmless.
+   */ async makeTempCheckpointLogOverride(checkpointNumber, fields) {
+        const constants = await this.getRollupConstants();
+        const slotAt = (field)=>`0x${this.computeTempCheckpointLogStorageSlot(checkpointNumber, field, constants).toString(16).padStart(64, '0')}`;
+        const word = (v)=>`0x${v.toString(16).padStart(64, '0')}`;
+        const stateDiff = [];
+        if (fields.headerHash) {
+            stateDiff.push({
+                slot: slotAt(0),
+                value: fields.headerHash.toString()
+            });
+        }
+        if (fields.outHash) {
+            stateDiff.push({
+                slot: slotAt(2),
+                value: fields.outHash.toString()
+            });
+        }
+        if (fields.payloadDigest) {
+            stateDiff.push({
+                slot: slotAt(4),
+                value: fields.payloadDigest.toString()
+            });
+        }
+        if (fields.slotNumber !== undefined) {
+            // CompressedSlot is uint32 on L1 (SafeCast.toUint32 reverts on overflow). Match that behavior here
+            // so a malformed override surfaces immediately rather than silently truncating into a wrong slot.
+            const slotNumber = BigInt(fields.slotNumber);
+            if (slotNumber < 0n || slotNumber > 0xffffffffn) {
+                throw new Error(`slotNumber ${slotNumber} does not fit in uint32`);
+            }
+            stateDiff.push({
+                slot: slotAt(5),
+                value: word(slotNumber)
+            });
+        }
+        if (fields.feeHeader) {
+            stateDiff.push({
+                slot: slotAt(6),
+                value: word(RollupContract.compressFeeHeader(fields.feeHeader))
+            });
+        }
+        if (stateDiff.length === 0) {
+            return [];
+        }
+        return [
+            {
+                address: this.address,
+                stateDiff
+            }
+        ];
+    }
+    /**
+   * Returns a state override that sets archives[checkpointNumber] to the given archive value.
+   * Used when simulating a canProposeAtTime call where the local archive differs from L1
+   * (e.g. pipelining where the parent checkpoint hasn't landed on L1 yet).
+   */ makeArchiveOverride(checkpointNumber, archive) {
+        const archivesMappingBase = hexToBigInt(RollupContract.stfStorageSlot) + 1n;
+        const archiveSlot = hexToBigInt(keccak256(encodeAbiParameters([
+            {
+                type: 'uint256'
+            },
+            {
+                type: 'uint256'
+            }
+        ], [
+            BigInt(checkpointNumber),
+            archivesMappingBase
+        ])));
+        return [
+            {
+                address: this.address,
+                stateDiff: [
+                    {
+                        slot: `0x${archiveSlot.toString(16).padStart(64, '0')}`,
+                        value: archive.toString()
+                    }
+                ]
+            }
+        ];
+    }
+    /** Merges multiple StateOverride arrays, combining stateDiff entries for the same address. */ static mergeStateOverrides(...overrides) {
+        const byAddress = new Map();
+        for (const override of overrides){
+            for (const entry of override){
+                const key = entry.address.toLowerCase();
+                const existing = byAddress.get(key);
+                if (existing) {
+                    existing.stateDiff.push(...entry.stateDiff ?? []);
+                    if (entry.balance !== undefined) {
+                        existing.balance = entry.balance;
+                    }
+                } else {
+                    byAddress.set(key, {
+                        address: entry.address,
+                        balance: entry.balance,
+                        stateDiff: [
+                            ...entry.stateDiff ?? []
+                        ]
+                    });
+                }
+            }
+        }
+        return [
+            ...byAddress.values()
+        ];
+    }
+    /** Compresses a FeeHeader into a uint256 matching FeeHeaderLib.compress() in FeeStructs.sol. */ static compressFeeHeader(feeHeader) {
+        const MASK_48_BITS = (1n << 48n) - 1n;
+        const MASK_64_BITS = (1n << 64n) - 1n;
+        const MASK_63_BITS = (1n << 63n) - 1n;
+        let value = BigInt(feeHeader.manaUsed) & (1n << 32n) - 1n; // bits [0:31]
+        value |= (feeHeader.excessMana < MASK_48_BITS ? feeHeader.excessMana : MASK_48_BITS) << 32n; // bits [32:79]
+        value |= (BigInt(feeHeader.ethPerFeeAsset) & MASK_48_BITS) << 80n; // bits [80:127]
+        value |= (feeHeader.congestionCost < MASK_64_BITS ? feeHeader.congestionCost : MASK_64_BITS) << 128n; // bits [128:191]
+        value |= (feeHeader.proverCost < MASK_63_BITS ? feeHeader.proverCost : MASK_63_BITS) << 192n; // bits [192:254]
+        value |= 1n << 255n; // preheat flag
+        return value;
+    }
+    /** Computes the fee header for a child checkpoint given parent fee header and child data.
+   *  Must stay in sync with Solidity FeeLib.sol (computeNewEthPerFeeAsset, clampedAdd). */ static computeChildFeeHeader(parentFeeHeader, childManaUsed, feeAssetPriceModifier, manaTarget) {
+        const MIN_ETH_PER_FEE_ASSET = 100n;
+        const MAX_ETH_PER_FEE_ASSET = 100_000_000_000_000n; // 1e14, matches FeeLib.sol
+        // excessMana = clampedAdd(parent.excessMana + parent.manaUsed, -manaTarget)
+        const sum = parentFeeHeader.excessMana + parentFeeHeader.manaUsed;
+        const excessMana = sum > manaTarget ? sum - manaTarget : 0n;
+        // ethPerFeeAsset = computeNewEthPerFeeAsset(max(parent.ethPerFeeAsset, MIN), modifier)
+        const parentPrice = parentFeeHeader.ethPerFeeAsset > MIN_ETH_PER_FEE_ASSET ? parentFeeHeader.ethPerFeeAsset : MIN_ETH_PER_FEE_ASSET;
+        let newPrice;
+        if (feeAssetPriceModifier >= 0n) {
+            newPrice = parentPrice * (10_000n + feeAssetPriceModifier) / 10_000n;
+        } else {
+            const absMod = -feeAssetPriceModifier;
+            newPrice = parentPrice * (10_000n - absMod) / 10_000n;
+        }
+        if (newPrice < MIN_ETH_PER_FEE_ASSET) {
+            newPrice = MIN_ETH_PER_FEE_ASSET;
+        }
+        if (newPrice > MAX_ETH_PER_FEE_ASSET) {
+            newPrice = MAX_ETH_PER_FEE_ASSET;
+        }
+        return {
+            excessMana,
+            manaUsed: childManaUsed,
+            ethPerFeeAsset: newPrice,
+            congestionCost: 0n,
+            proverCost: 0n
+        };
+    }
     /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(checkpointNumber, attestationsAndSigners, committee, invalidIndex) {
         return {
             to: this.address,
+            abi: RollupAbi,
             data: encodeFunctionData({
                 abi: RollupAbi,
                 functionName: 'invalidateBadAttestation',
@@ -1006,6 +1249,7 @@ export class RollupContract {
     /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */ buildInvalidateInsufficientAttestationsRequest(checkpointNumber, attestationsAndSigners, committee) {
         return {
             to: this.address,
+            abi: RollupAbi,
             data: encodeFunctionData({
                 abi: RollupAbi,
                 functionName: 'invalidateInsufficientAttestations',
@@ -1027,11 +1271,25 @@ export class RollupContract {
             prover
         ]);
     }
-    getManaMinFeeAt(timestamp, inFeeAsset) {
+    getManaMinFeeAt(timestamp, inFeeAsset, stateOverride) {
         return this.rollup.read.getManaMinFeeAt([
             timestamp,
             inFeeAsset
+        ], {
+            stateOverride
+        });
+    }
+    async getManaMinFeeComponentsAt(timestamp, inFeeAsset) {
+        const result = await this.rollup.read.getManaMinFeeComponentsAt([
+            timestamp,
+            inFeeAsset
         ]);
+        return {
+            sequencerCost: result.sequencerCost,
+            proverCost: result.proverCost,
+            congestionCost: result.congestionCost,
+            congestionMultiplier: result.congestionMultiplier
+        };
     }
     async getSlotAt(timestamp) {
         return SlotNumber.fromBigInt(await this.rollup.read.getSlotAt([
@@ -1082,15 +1340,24 @@ export class RollupContract {
             prover
         ]);
     }
-    async getAttesters() {
-        const attesterSize = await this.getActiveAttesterCount();
+    async getAttesters(timestamp) {
+        // Pin every read to a single L1 block so the attester count and the chunked index reads
+        // observe a consistent set. Without this, the count and each chunk default to `latest` and
+        // can straddle a block boundary (or reorg), yielding an inconsistent or truncated set.
+        const block = await this.client.getBlock();
+        const blockNumber = block.number ?? undefined;
+        const ts = timestamp ?? block.timestamp;
+        const attesterSize = await this.getActiveAttesterCount({
+            blockNumber
+        });
         const gse = new GSEContract(this.client, await this.getGSE());
-        const ts = (await this.client.getBlock()).timestamp;
         const indices = Array.from({
             length: attesterSize
         }, (_, i)=>BigInt(i));
         const chunks = chunk(indices, 1000);
-        const results = await Promise.all(chunks.map((chunk)=>gse.getAttestersFromIndicesAtTime(this.address, ts, chunk)));
+        const results = await Promise.all(chunks.map((chunk)=>gse.getAttestersFromIndicesAtTime(this.address, ts, chunk, {
+                blockNumber
+            })));
         return results.flat().map((addr)=>EthAddress.fromString(addr));
     }
     async getAttesterView(address) {
@@ -1151,6 +1418,7 @@ export class RollupContract {
     setupEpoch(l1TxUtils) {
         return l1TxUtils.sendAndMonitorTransaction({
             to: this.address,
+            abi: RollupAbi,
             data: encodeFunctionData({
                 abi: RollupAbi,
                 functionName: 'setupEpoch',
@@ -1161,6 +1429,7 @@ export class RollupContract {
     vote(l1TxUtils, proposalId) {
         return l1TxUtils.sendAndMonitorTransaction({
             to: this.address,
+            abi: RollupAbi,
             data: encodeFunctionData({
                 abi: RollupAbi,
                 functionName: 'vote',
@@ -1189,7 +1458,8 @@ export class RollupContract {
                     const args = log.args;
                     if (args.checkpointNumber !== undefined) {
                         callback({
-                            checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber)
+                            checkpointNumber: CheckpointNumber.fromBigInt(args.checkpointNumber),
+                            event: log
                         });
                     }
                 }
@@ -1220,6 +1490,18 @@ export class RollupContract {
             }
         });
     }
+    /**
+   * Fetches OwnershipTransferred events emitted on the L1 block this rollup was deployed on.
+   * The Rollup inherits from Ownable and emits this event in its constructor, so the event
+   * is guaranteed to exist on `l1StartBlock` for any correctly deployed rollup. Used as a
+   * probe to detect RPC nodes that prune historical logs.
+   */ async getOwnershipTransferredEventsAtDeploy() {
+        const l1StartBlock = await this.getL1StartBlock();
+        return await this.rollup.getEvents.OwnershipTransferred({}, {
+            fromBlock: l1StartBlock,
+            toBlock: l1StartBlock
+        });
+    }
     /** Fetches CheckpointProposed events within the given block range. */ async getCheckpointProposedEvents(fromBlock, toBlock) {
         const logs = await this.rollup.getEvents.CheckpointProposed({}, {
             fromBlock,
@@ -1233,9 +1515,58 @@ export class RollupContract {
                     checkpointNumber: CheckpointNumber.fromBigInt(log.args.checkpointNumber),
                     archive: Fr.fromString(log.args.archive),
                     versionedBlobHashes: log.args.versionedBlobHashes.map((h)=>Buffer.from(h.slice(2), 'hex')),
-                    attestationsHash: log.args.attestationsHash ? Buffer32.fromString(log.args.attestationsHash) : undefined,
-                    payloadDigest: log.args.payloadDigest ? Buffer32.fromString(log.args.payloadDigest) : undefined
+                    attestationsHash: (()=>{
+                        if (!log.args.attestationsHash) {
+                            throw new Error(`CheckpointProposed event missing attestationsHash for checkpoint ${log.args.checkpointNumber}`);
+                        }
+                        return Buffer32.fromString(log.args.attestationsHash);
+                    })(),
+                    payloadDigest: (()=>{
+                        if (!log.args.payloadDigest) {
+                            throw new Error(`CheckpointProposed event missing payloadDigest for checkpoint ${log.args.checkpointNumber}`);
+                        }
+                        return Buffer32.fromString(log.args.payloadDigest);
+                    })()
                 }
             }));
     }
+    /** Packs pending and proven checkpoint numbers into the chain tips storage format. */ static packChainTips(pendingCheckpointNumber, provenCheckpointNumber) {
+        return pendingCheckpointNumber << 128n | provenCheckpointNumber & (1n << 128n) - 1n;
+    }
+    /** Storage slot for the chain tips (offset 0 within the STF storage struct). */ static get chainTipsStorageSlot() {
+        return BigInt(RollupContract.stfStorageSlot);
+    }
+    /**
+   * Computes the storage slot for a field within a tempCheckpointLog entry.
+   * @param checkpointNumber - The checkpoint number
+   * @param field - The field within the CompressedTempCheckpointLog struct
+   */ async getTempCheckpointLogStorageSlot(checkpointNumber, field) {
+        const [epochDuration, proofSubmissionEpochs] = await Promise.all([
+            this.getEpochDuration(),
+            this.getProofSubmissionEpochs()
+        ]);
+        return this.computeTempCheckpointLogStorageSlot(checkpointNumber, field, {
+            epochDuration,
+            proofSubmissionEpochs
+        });
+    }
+    computeTempCheckpointLogStorageSlot(checkpointNumber, field, constants) {
+        const fieldOffset = BigInt(field);
+        const { epochDuration, proofSubmissionEpochs } = constants;
+        const roundaboutSize = BigInt(epochDuration) * (BigInt(proofSubmissionEpochs) + 1n) + 1n;
+        const tempCheckpointLogsBase = BigInt(RollupContract.stfStorageSlot) + 2n;
+        const circularIndex = BigInt(checkpointNumber) % roundaboutSize;
+        const entryBase = BigInt(keccak256(encodeAbiParameters([
+            {
+                type: 'uint256'
+            },
+            {
+                type: 'uint256'
+            }
+        ], [
+            circularIndex,
+            tempCheckpointLogsBase
+        ])));
+        return entryBase + fieldOffset;
+    }
 }