@aztec/archiver 0.0.1-commit.f2ce05ee → 0.0.1-commit.f504929

package/dest/l1/calldata_retriever.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calldata_retriever.d.ts","sourceRoot":"","sources":["../../src/l1/calldata_retriever.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calldata_retriever.d.ts","sourceRoot":"","sources":["../../src/l1/calldata_retriever.ts"],"names":[],"mappings":"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"}

package/dest/l1/calldata_retriever.js

@@ -1,33 +1,36 @@
 import { MULTI_CALL_3_ADDRESS } from '@aztec/ethereum/contracts';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { EmpireSlashingProposerAbi, GovernanceProposerAbi, RollupAbi, SlashFactoryAbi, TallySlashingProposerAbi } from '@aztec/l1-artifacts';
+import { RollupAbi } from '@aztec/l1-artifacts';
 import { CommitteeAttestation } from '@aztec/stdlib/block';
 import { ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { decodeFunctionData, encodeAbiParameters, hexToBytes, keccak256, multicall3Abi, toFunctionSelector } from 'viem';
 import { getSuccessfulCallsFromDebug } from './debug_tx.js';
-import { getCallFromSpireProposer } from './spire_proposer.js';
+import { getCallsFromSpireProposer } from './spire_proposer.js';
 import { getSuccessfulCallsFromTrace } from './trace_tx.js';
 /**
  * Extracts calldata to the `propose` method of the rollup contract from an L1 transaction
- * in order to reconstruct an L2 block header.
+ * in order to reconstruct an L2 block header. Uses hash matching against expected hashes
+ * from the CheckpointProposed event to verify the correct propose calldata.
  */ export class CalldataRetriever {
     publicClient;
     debugClient;
     targetCommitteeSize;
     instrumentation;
     logger;
-    /** Pre-computed valid contract calls for validation */ validContractCalls;
     rollupAddress;
-    constructor(publicClient, debugClient, targetCommitteeSize, instrumentation, logger, contractAddresses){
+    /** Tx hashes we've already logged for trace+debug failure (log once per tx per process). */ static traceFailureWarnedTxHashes = new Set();
+    /** Clears the trace-failure warned set. For testing only. */ static resetTraceFailureWarnedForTesting() {
+        CalldataRetriever.traceFailureWarnedTxHashes.clear();
+    }
+    constructor(publicClient, debugClient, targetCommitteeSize, instrumentation, logger, rollupAddress){
         this.publicClient = publicClient;
         this.debugClient = debugClient;
         this.targetCommitteeSize = targetCommitteeSize;
         this.instrumentation = instrumentation;
         this.logger = logger;
-        this.rollupAddress = contractAddresses.rollupAddress;
-        this.validContractCalls = computeValidContractCalls(contractAddresses);
+        this.rollupAddress = rollupAddress;
     }
     /**
    * Gets checkpoint header and metadata from the calldata of an L1 transaction.
@@ -35,84 +38,94 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
    * @param txHash - Hash of the tx that published it.
    * @param blobHashes - Blob hashes for the checkpoint.
    * @param checkpointNumber - Checkpoint number.
-   * @param expectedHashes - Optional expected hashes from the CheckpointProposed event for validation
+   * @param expectedHashes - Expected hashes from the CheckpointProposed event for validation
    * @returns Checkpoint header and metadata from the calldata, deserialized
    */ async getCheckpointFromRollupTx(txHash, _blobHashes, checkpointNumber, expectedHashes) {
-        this.logger.trace(`Fetching checkpoint ${checkpointNumber} from rollup tx ${txHash}`, {
-            willValidateHashes: !!expectedHashes.attestationsHash || !!expectedHashes.payloadDigest,
-            hasAttestationsHash: !!expectedHashes.attestationsHash,
-            hasPayloadDigest: !!expectedHashes.payloadDigest
-        });
+        this.logger.trace(`Fetching checkpoint ${checkpointNumber} from rollup tx ${txHash}`);
         const tx = await this.publicClient.getTransaction({
             hash: txHash
         });
-        const proposeCalldata = await this.getProposeCallData(tx, checkpointNumber);
-        return this.decodeAndBuildCheckpoint(proposeCalldata, tx.blockHash, checkpointNumber, expectedHashes);
+        return this.getCheckpointFromTx(tx, checkpointNumber, expectedHashes);
     }
-    /** Gets rollup propose calldata from a transaction */ async getProposeCallData(tx, checkpointNumber) {
-        // Try to decode as multicall3 with validation
-        const proposeCalldata = this.tryDecodeMulticall3(tx);
-        if (proposeCalldata) {
+    /** Gets checkpoint data from a transaction by trying decode strategies then falling back to trace. */ async getCheckpointFromTx(tx, checkpointNumber, expectedHashes) {
+        // Try to decode as multicall3 with hash-verified matching
+        const multicall3Result = this.tryDecodeMulticall3(tx, expectedHashes, checkpointNumber, tx.blockHash);
+        if (multicall3Result) {
             this.logger.trace(`Decoded propose calldata from multicall3 for tx ${tx.hash}`);
             this.instrumentation?.recordBlockProposalTxTarget(tx.to, false);
-            return proposeCalldata;
+            return multicall3Result;
         }
         // Try to decode as direct propose call
-        const directProposeCalldata = this.tryDecodeDirectPropose(tx);
-        if (directProposeCalldata) {
+        const directResult = this.tryDecodeDirectPropose(tx, expectedHashes, checkpointNumber, tx.blockHash);
+        if (directResult) {
             this.logger.trace(`Decoded propose calldata from direct call for tx ${tx.hash}`);
             this.instrumentation?.recordBlockProposalTxTarget(tx.to, false);
-            return directProposeCalldata;
+            return directResult;
         }
         // Try to decode as Spire Proposer multicall wrapper
-        const spireProposeCalldata = await this.tryDecodeSpireProposer(tx);
-        if (spireProposeCalldata) {
+        const spireResult = await this.tryDecodeSpireProposer(tx, expectedHashes, checkpointNumber, tx.blockHash);
+        if (spireResult) {
             this.logger.trace(`Decoded propose calldata from Spire Proposer for tx ${tx.hash}`);
             this.instrumentation?.recordBlockProposalTxTarget(tx.to, false);
-            return spireProposeCalldata;
+            return spireResult;
         }
         // Fall back to trace-based extraction
         this.logger.warn(`Failed to decode multicall3, direct propose, or Spire proposer for L1 tx ${tx.hash}, falling back to trace for checkpoint ${checkpointNumber}`);
         this.instrumentation?.recordBlockProposalTxTarget(tx.to ?? EthAddress.ZERO.toString(), true);
-        return await this.extractCalldataViaTrace(tx.hash);
+        const tracedCalldata = await this.extractCalldataViaTrace(tx.hash);
+        const tracedResult = this.tryDecodeAndVerifyPropose(tracedCalldata, expectedHashes, checkpointNumber, tx.blockHash);
+        if (!tracedResult) {
+            throw new Error(`Hash mismatch for traced propose calldata in tx ${tx.hash} for checkpoint ${checkpointNumber}`);
+        }
+        return tracedResult;
     }
     /**
    * Attempts to decode a transaction as a Spire Proposer multicall wrapper.
-   * If successful, extracts the wrapped call and validates it as either multicall3 or direct propose.
+   * If successful, iterates all wrapped calls and validates each as either multicall3
+   * or direct propose, verifying against expected hashes.
    * @param tx - The transaction to decode
-   * @returns The propose calldata if successfully decoded and validated, undefined otherwise
-   */ async tryDecodeSpireProposer(tx) {
-        // Try to decode as Spire Proposer multicall (extracts the wrapped call)
-        const spireWrappedCall = await getCallFromSpireProposer(tx, this.publicClient, this.logger);
-        if (!spireWrappedCall) {
+   * @param expectedHashes - Expected hashes for hash-verified matching
+   * @param checkpointNumber - The checkpoint number
+   * @param blockHash - The L1 block hash
+   * @returns The checkpoint data if successfully decoded and validated, undefined otherwise
+   */ async tryDecodeSpireProposer(tx, expectedHashes, checkpointNumber, blockHash) {
+        // Try to decode as Spire Proposer multicall (extracts all wrapped calls)
+        const spireWrappedCalls = await getCallsFromSpireProposer(tx, this.publicClient, this.logger);
+        if (!spireWrappedCalls) {
             return undefined;
         }
-        this.logger.trace(`Decoded Spire Proposer wrapping for tx ${tx.hash}, inner call to ${spireWrappedCall.to}`);
-        // Now try to decode the wrapped call as either multicall3 or direct propose
-        const wrappedTx = {
-            to: spireWrappedCall.to,
-            input: spireWrappedCall.data,
-            hash: tx.hash
-        };
-        const multicall3Calldata = this.tryDecodeMulticall3(wrappedTx);
-        if (multicall3Calldata) {
-            this.logger.trace(`Decoded propose calldata from Spire Proposer to multicall3 for tx ${tx.hash}`);
-            return multicall3Calldata;
-        }
-        const directProposeCalldata = this.tryDecodeDirectPropose(wrappedTx);
-        if (directProposeCalldata) {
-            this.logger.trace(`Decoded propose calldata from Spire Proposer to direct propose for tx ${tx.hash}`);
-            return directProposeCalldata;
+        this.logger.trace(`Decoded Spire Proposer wrapping for tx ${tx.hash}, ${spireWrappedCalls.length} inner call(s)`);
+        // Try each wrapped call as either multicall3 or direct propose
+        for (const spireWrappedCall of spireWrappedCalls){
+            const wrappedTx = {
+                to: spireWrappedCall.to,
+                input: spireWrappedCall.data,
+                hash: tx.hash
+            };
+            const multicall3Result = this.tryDecodeMulticall3(wrappedTx, expectedHashes, checkpointNumber, blockHash);
+            if (multicall3Result) {
+                this.logger.trace(`Decoded propose calldata from Spire Proposer to multicall3 for tx ${tx.hash}`);
+                return multicall3Result;
+            }
+            const directResult = this.tryDecodeDirectPropose(wrappedTx, expectedHashes, checkpointNumber, blockHash);
+            if (directResult) {
+                this.logger.trace(`Decoded propose calldata from Spire Proposer to direct propose for tx ${tx.hash}`);
+                return directResult;
+            }
         }
-        this.logger.warn(`Spire Proposer wrapped call could not be decoded as multicall3 or direct propose for tx ${tx.hash}`);
+        this.logger.warn(`Spire Proposer wrapped calls could not be decoded as multicall3 or direct propose for tx ${tx.hash}`);
         return undefined;
     }
     /**
    * Attempts to decode transaction input as multicall3 and extract propose calldata.
-   * Returns undefined if validation fails.
+   * Finds all calls matching the rollup address and propose selector, then decodes
+   * and verifies each candidate against expected hashes from the CheckpointProposed event.
    * @param tx - The transaction-like object with to, input, and hash
-   * @returns The propose calldata if successfully validated, undefined otherwise
-   */ tryDecodeMulticall3(tx) {
+   * @param expectedHashes - Expected hashes from CheckpointProposed event
+   * @param checkpointNumber - The checkpoint number
+   * @param blockHash - The L1 block hash
+   * @returns The checkpoint data if successfully validated, undefined otherwise
+   */ tryDecodeMulticall3(tx, expectedHashes, checkpointNumber, blockHash) {
         const txHash = tx.hash;
         try {
             // Check if transaction is to Multicall3 address
@@ -142,59 +155,51 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
                 return undefined;
             }
             const [calls] = multicall3Args;
-            // Validate all calls and find propose calls
+            // Find all calls matching rollup address + propose selector
             const rollupAddressLower = this.rollupAddress.toString().toLowerCase();
-            const proposeCalls = [];
-            for(let i = 0; i < calls.length; i++){
-                const addr = calls[i].target.toLowerCase();
-                const callData = calls[i].callData;
-                // Extract function selector (first 4 bytes)
+            const proposeSelectorLower = PROPOSE_SELECTOR.toLowerCase();
+            const candidates = [];
+            for (const call of calls){
+                const addr = call.target.toLowerCase();
+                const callData = call.callData;
                 if (callData.length < 10) {
-                    // "0x" + 8 hex chars = 10 chars minimum for a valid function call
-                    this.logger.warn(`Invalid calldata length at index ${i} (${callData.length})`, {
-                        txHash
-                    });
-                    return undefined;
+                    continue;
                 }
-                const functionSelector = callData.slice(0, 10);
-                // Validate this call is allowed by searching through valid calls
-                const validCall = this.validContractCalls.find((vc)=>vc.address === addr && vc.functionSelector === functionSelector);
-                if (!validCall) {
-                    this.logger.warn(`Invalid contract call detected in multicall3`, {
-                        index: i,
-                        targetAddress: addr,
-                        functionSelector,
-                        validCalls: this.validContractCalls.map((c)=>({
-                                address: c.address,
-                                selector: c.functionSelector
-                            })),
-                        txHash
-                    });
-                    return undefined;
+                const selector = callData.slice(0, 10).toLowerCase();
+                if (addr === rollupAddressLower && selector === proposeSelectorLower) {
+                    candidates.push(callData);
                 }
-                this.logger.trace(`Valid call found to ${addr}`, {
-                    validCall
+            }
+            if (candidates.length === 0) {
+                this.logger.debug(`No propose candidates found in multicall3`, {
+                    txHash
                 });
-                // Collect propose calls specifically
-                if (addr === rollupAddressLower && validCall.functionName === 'propose') {
-                    proposeCalls.push(callData);
+                return undefined;
+            }
+            // Decode, verify, and build for each candidate
+            const verified = [];
+            for (const candidate of candidates){
+                const result = this.tryDecodeAndVerifyPropose(candidate, expectedHashes, checkpointNumber, blockHash);
+                if (result) {
+                    verified.push(result);
                 }
             }
-            // Validate exactly ONE propose call
-            if (proposeCalls.length === 0) {
-                this.logger.warn(`No propose calls found in multicall3`, {
+            if (verified.length === 1) {
+                this.logger.trace(`Verified single propose candidate via hash matching`, {
                     txHash
                 });
-                return undefined;
+                return verified[0];
             }
-            if (proposeCalls.length > 1) {
-                this.logger.warn(`Multiple propose calls found in multicall3 (${proposeCalls.length})`, {
+            if (verified.length > 1) {
+                this.logger.warn(`Multiple propose candidates verified (${verified.length}), returning first (identical data)`, {
                     txHash
                 });
-                return undefined;
+                return verified[0];
             }
-            // Successfully extracted single propose call
-            return proposeCalls[0];
+            this.logger.debug(`No candidates verified against expected hashes`, {
+                txHash
+            });
+            return undefined;
         } catch (err) {
             // Any decoding error triggers fallback to trace
             this.logger.warn(`Failed to decode multicall3: ${err}`, {
@@ -205,10 +210,13 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
     }
     /**
    * Attempts to decode transaction as a direct propose call to the rollup contract.
-   * Returns undefined if validation fails.
+   * Decodes, verifies hashes, and builds checkpoint data in a single pass.
    * @param tx - The transaction-like object with to, input, and hash
-   * @returns The propose calldata if successfully validated, undefined otherwise
-   */ tryDecodeDirectPropose(tx) {
+   * @param expectedHashes - Expected hashes from CheckpointProposed event
+   * @param checkpointNumber - The checkpoint number
+   * @param blockHash - The L1 block hash
+   * @returns The checkpoint data if successfully validated, undefined otherwise
+   */ tryDecodeDirectPropose(tx, expectedHashes, checkpointNumber, blockHash) {
         const txHash = tx.hash;
         try {
             // Check if transaction is to the rollup address
@@ -218,23 +226,22 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
                 });
                 return undefined;
             }
-            // Try to decode as propose call
+            // Validate it's a propose call before full decode+verify
             const { functionName } = decodeFunctionData({
                 abi: RollupAbi,
                 data: tx.input
             });
-            // If not propose, return undefined
             if (functionName !== 'propose') {
                 this.logger.warn(`Transaction to rollup is not propose (got ${functionName})`, {
                     txHash
                 });
                 return undefined;
             }
-            // Successfully validated direct propose call
+            // Decode, verify hashes, and build checkpoint data
             this.logger.trace(`Validated direct propose call to rollup`, {
                 txHash
             });
-            return tx.input;
+            return this.tryDecodeAndVerifyPropose(tx.input, expectedHashes, checkpointNumber, blockHash);
         } catch (err) {
             // Any decoding error means it's not a valid propose call
             this.logger.warn(`Failed to decode as direct propose: ${err}`, {
@@ -260,7 +267,8 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
             this.logger.debug(`Successfully traced using trace_transaction, found ${calls.length} calls`);
         } catch (err) {
             const traceError = err instanceof Error ? err : new Error(String(err));
-            this.logger.verbose(`Failed trace_transaction for ${txHash}`, {
+            this.logger.verbose(`Failed trace_transaction for ${txHash}: ${traceError.message}`);
+            this.logger.debug(`Trace failure details for ${txHash}`, {
                 traceError
             });
             try {
@@ -270,7 +278,13 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
                 this.logger.debug(`Successfully traced using debug_traceTransaction, found ${calls.length} calls`);
             } catch (debugErr) {
                 const debugError = debugErr instanceof Error ? debugErr : new Error(String(debugErr));
-                this.logger.warn(`All tracing methods failed for tx ${txHash}`, {
+                // Log once per tx so we don't spam on every sync cycle when sync point doesn't advance
+                if (!CalldataRetriever.traceFailureWarnedTxHashes.has(txHash)) {
+                    CalldataRetriever.traceFailureWarnedTxHashes.add(txHash);
+                    this.logger.warn(`Cannot decode L1 tx ${txHash}: trace and debug RPC failed or unavailable. ` + `trace_transaction: ${traceError.message}; debug_traceTransaction: ${debugError.message}`);
+                }
+                // Full error objects can be very long; keep at debug only
+                this.logger.debug(`Trace/debug failure details for tx ${txHash}`, {
                     traceError,
                     debugError,
                     txHash
@@ -289,9 +303,81 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
         return calls[0].input;
     }
     /**
+   * Decodes propose calldata, verifies against expected hashes, and builds checkpoint data.
+   * Returns undefined on decode errors or hash mismatches (soft failure for try-based callers).
+   * @param proposeCalldata - The propose function calldata
+   * @param expectedHashes - Expected hashes from the CheckpointProposed event
+   * @param checkpointNumber - The checkpoint number
+   * @param blockHash - The L1 block hash
+   * @returns The decoded checkpoint data, or undefined on failure
+   */ tryDecodeAndVerifyPropose(proposeCalldata, expectedHashes, checkpointNumber, blockHash) {
+        try {
+            const { functionName, args } = decodeFunctionData({
+                abi: RollupAbi,
+                data: proposeCalldata
+            });
+            if (functionName !== 'propose') {
+                return undefined;
+            }
+            const [decodedArgs, packedAttestations] = args;
+            // Verify attestationsHash
+            const computedAttestationsHash = this.computeAttestationsHash(packedAttestations);
+            if (!Buffer.from(hexToBytes(computedAttestationsHash)).equals(Buffer.from(hexToBytes(expectedHashes.attestationsHash)))) {
+                this.logger.warn(`Attestations hash mismatch during verification`, {
+                    computed: computedAttestationsHash,
+                    expected: expectedHashes.attestationsHash
+                });
+                return undefined;
+            }
+            // Verify payloadDigest
+            const header = CheckpointHeader.fromViem(decodedArgs.header);
+            const archiveRoot = new Fr(Buffer.from(hexToBytes(decodedArgs.archive)));
+            const feeAssetPriceModifier = decodedArgs.oracleInput.feeAssetPriceModifier;
+            const computedPayloadDigest = this.computePayloadDigest(header, archiveRoot, feeAssetPriceModifier);
+            if (!Buffer.from(hexToBytes(computedPayloadDigest)).equals(Buffer.from(hexToBytes(expectedHashes.payloadDigest)))) {
+                this.logger.warn(`Payload digest mismatch during verification`, {
+                    computed: computedPayloadDigest,
+                    expected: expectedHashes.payloadDigest
+                });
+                return undefined;
+            }
+            const attestations = CommitteeAttestation.fromPacked(packedAttestations, this.targetCommitteeSize);
+            this.logger.trace(`Validated and decoded propose calldata for checkpoint ${checkpointNumber}`, {
+                checkpointNumber,
+                archive: decodedArgs.archive,
+                header: decodedArgs.header,
+                l1BlockHash: blockHash,
+                attestations,
+                packedAttestations,
+                targetCommitteeSize: this.targetCommitteeSize
+            });
+            return {
+                checkpointNumber,
+                archiveRoot,
+                header,
+                attestations,
+                blockHash,
+                feeAssetPriceModifier
+            };
+        } catch  {
+            return undefined;
+        }
+    }
+    /** Computes the keccak256 hash of ABI-encoded CommitteeAttestations. */ computeAttestationsHash(packedAttestations) {
+        return keccak256(encodeAbiParameters([
+            this.getCommitteeAttestationsStructDef()
+        ], [
+            packedAttestations
+        ]));
+    }
+    /** Computes the keccak256 payload digest from the checkpoint header, archive root, and fee asset price modifier. */ computePayloadDigest(header, archiveRoot, feeAssetPriceModifier) {
+        const consensusPayload = new ConsensusPayload(header, archiveRoot, feeAssetPriceModifier);
+        const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
+        return keccak256(payloadToSign);
+    }
+    /**
    * Extracts the CommitteeAttestations struct definition from RollupAbi.
    * Finds the _attestations parameter by name in the propose function.
-   * Lazy-loaded to avoid issues during module initialization.
    */ getCommitteeAttestationsStructDef() {
         const proposeFunction = RollupAbi.find((item)=>item.type === 'function' && item.name === 'propose');
         if (!proposeFunction) {
@@ -312,160 +398,5 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
             components: tupleParam.components || []
         };
     }
-    /**
-   * Decodes propose calldata and builds the checkpoint header structure.
-   * @param proposeCalldata - The propose function calldata
-   * @param blockHash - The L1 block hash containing this transaction
-   * @param checkpointNumber - The checkpoint number
-   * @param expectedHashes - Optional expected hashes from the CheckpointProposed event for validation
-   * @returns The decoded checkpoint header and metadata
-   */ decodeAndBuildCheckpoint(proposeCalldata, blockHash, checkpointNumber, expectedHashes) {
-        const { functionName: rollupFunctionName, args: rollupArgs } = decodeFunctionData({
-            abi: RollupAbi,
-            data: proposeCalldata
-        });
-        if (rollupFunctionName !== 'propose') {
-            throw new Error(`Unexpected rollup method called ${rollupFunctionName}`);
-        }
-        const [decodedArgs, packedAttestations, _signers, _attestationsAndSignersSignature, _blobInput] = rollupArgs;
-        const attestations = CommitteeAttestation.fromPacked(packedAttestations, this.targetCommitteeSize);
-        const header = CheckpointHeader.fromViem(decodedArgs.header);
-        const archiveRoot = new Fr(Buffer.from(hexToBytes(decodedArgs.archive)));
-        // Validate attestationsHash if provided (skip for backwards compatibility with older events)
-        if (expectedHashes.attestationsHash) {
-            // Compute attestationsHash: keccak256(abi.encode(CommitteeAttestations))
-            const computedAttestationsHash = keccak256(encodeAbiParameters([
-                this.getCommitteeAttestationsStructDef()
-            ], [
-                packedAttestations
-            ]));
-            // Compare as buffers to avoid case-sensitivity and string comparison issues
-            const computedBuffer = Buffer.from(hexToBytes(computedAttestationsHash));
-            const expectedBuffer = Buffer.from(hexToBytes(expectedHashes.attestationsHash));
-            if (!computedBuffer.equals(expectedBuffer)) {
-                throw new Error(`Attestations hash mismatch for checkpoint ${checkpointNumber}: ` + `computed=${computedAttestationsHash}, expected=${expectedHashes.attestationsHash}`);
-            }
-            this.logger.trace(`Validated attestationsHash for checkpoint ${checkpointNumber}`, {
-                computedAttestationsHash,
-                expectedAttestationsHash: expectedHashes.attestationsHash
-            });
-        }
-        // Validate payloadDigest if provided (skip for backwards compatibility with older events)
-        if (expectedHashes.payloadDigest) {
-            // Use ConsensusPayload to compute the digest - this ensures we match the exact logic
-            // used by the network for signing and verification
-            const consensusPayload = new ConsensusPayload(header, archiveRoot);
-            const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
-            const computedPayloadDigest = keccak256(payloadToSign);
-            // Compare as buffers to avoid case-sensitivity and string comparison issues
-            const computedBuffer = Buffer.from(hexToBytes(computedPayloadDigest));
-            const expectedBuffer = Buffer.from(hexToBytes(expectedHashes.payloadDigest));
-            if (!computedBuffer.equals(expectedBuffer)) {
-                throw new Error(`Payload digest mismatch for checkpoint ${checkpointNumber}: ` + `computed=${computedPayloadDigest}, expected=${expectedHashes.payloadDigest}`);
-            }
-            this.logger.trace(`Validated payloadDigest for checkpoint ${checkpointNumber}`, {
-                computedPayloadDigest,
-                expectedPayloadDigest: expectedHashes.payloadDigest
-            });
-        }
-        this.logger.trace(`Decoded propose calldata`, {
-            checkpointNumber,
-            archive: decodedArgs.archive,
-            header: decodedArgs.header,
-            l1BlockHash: blockHash,
-            attestations,
-            packedAttestations,
-            targetCommitteeSize: this.targetCommitteeSize
-        });
-        return {
-            checkpointNumber,
-            archiveRoot,
-            header,
-            attestations,
-            blockHash
-        };
-    }
-}
-/**
- * Pre-computed function selectors for all valid contract calls.
- * These are computed once at module load time from the ABIs.
- * Based on analysis of sequencer-client/src/publisher/sequencer-publisher.ts
- */ // Rollup contract function selectors (always valid)
-const PROPOSE_SELECTOR = toFunctionSelector(RollupAbi.find((x)=>x.type === 'function' && x.name === 'propose'));
-const INVALIDATE_BAD_ATTESTATION_SELECTOR = toFunctionSelector(RollupAbi.find((x)=>x.type === 'function' && x.name === 'invalidateBadAttestation'));
-const INVALIDATE_INSUFFICIENT_ATTESTATIONS_SELECTOR = toFunctionSelector(RollupAbi.find((x)=>x.type === 'function' && x.name === 'invalidateInsufficientAttestations'));
-// Governance proposer function selectors
-const GOVERNANCE_SIGNAL_WITH_SIG_SELECTOR = toFunctionSelector(GovernanceProposerAbi.find((x)=>x.type === 'function' && x.name === 'signalWithSig'));
-// Slash factory function selectors
-const CREATE_SLASH_PAYLOAD_SELECTOR = toFunctionSelector(SlashFactoryAbi.find((x)=>x.type === 'function' && x.name === 'createSlashPayload'));
-// Empire slashing proposer function selectors
-const EMPIRE_SIGNAL_WITH_SIG_SELECTOR = toFunctionSelector(EmpireSlashingProposerAbi.find((x)=>x.type === 'function' && x.name === 'signalWithSig'));
-const EMPIRE_SUBMIT_ROUND_WINNER_SELECTOR = toFunctionSelector(EmpireSlashingProposerAbi.find((x)=>x.type === 'function' && x.name === 'submitRoundWinner'));
-// Tally slashing proposer function selectors
-const TALLY_VOTE_SELECTOR = toFunctionSelector(TallySlashingProposerAbi.find((x)=>x.type === 'function' && x.name === 'vote'));
-const TALLY_EXECUTE_ROUND_SELECTOR = toFunctionSelector(TallySlashingProposerAbi.find((x)=>x.type === 'function' && x.name === 'executeRound'));
-/**
- * All valid contract calls that the sequencer publisher can make.
- * Builds the list of valid (address, selector) pairs for validation.
- *
- * Alternatively, if we are absolutely sure that no code path from any of these
- * contracts can eventually land on another call to `propose`, we can remove the
- * function selectors.
- */ function computeValidContractCalls(addresses) {
-    const { rollupAddress, governanceProposerAddress, slashFactoryAddress, slashingProposerAddress } = addresses;
-    const calls = [];
-    // Rollup contract calls (always present)
-    calls.push({
-        address: rollupAddress.toString().toLowerCase(),
-        functionSelector: PROPOSE_SELECTOR,
-        functionName: 'propose'
-    }, {
-        address: rollupAddress.toString().toLowerCase(),
-        functionSelector: INVALIDATE_BAD_ATTESTATION_SELECTOR,
-        functionName: 'invalidateBadAttestation'
-    }, {
-        address: rollupAddress.toString().toLowerCase(),
-        functionSelector: INVALIDATE_INSUFFICIENT_ATTESTATIONS_SELECTOR,
-        functionName: 'invalidateInsufficientAttestations'
-    });
-    // Governance proposer calls (optional)
-    if (governanceProposerAddress && !governanceProposerAddress.isZero()) {
-        calls.push({
-            address: governanceProposerAddress.toString().toLowerCase(),
-            functionSelector: GOVERNANCE_SIGNAL_WITH_SIG_SELECTOR,
-            functionName: 'signalWithSig'
-        });
-    }
-    // Slash factory calls (optional)
-    if (slashFactoryAddress && !slashFactoryAddress.isZero()) {
-        calls.push({
-            address: slashFactoryAddress.toString().toLowerCase(),
-            functionSelector: CREATE_SLASH_PAYLOAD_SELECTOR,
-            functionName: 'createSlashPayload'
-        });
-    }
-    // Slashing proposer calls (optional, can be either Empire or Tally)
-    if (slashingProposerAddress && !slashingProposerAddress.isZero()) {
-        // Empire calls
-        calls.push({
-            address: slashingProposerAddress.toString().toLowerCase(),
-            functionSelector: EMPIRE_SIGNAL_WITH_SIG_SELECTOR,
-            functionName: 'signalWithSig (empire)'
-        }, {
-            address: slashingProposerAddress.toString().toLowerCase(),
-            functionSelector: EMPIRE_SUBMIT_ROUND_WINNER_SELECTOR,
-            functionName: 'submitRoundWinner'
-        });
-        // Tally calls
-        calls.push({
-            address: slashingProposerAddress.toString().toLowerCase(),
-            functionSelector: TALLY_VOTE_SELECTOR,
-            functionName: 'vote'
-        }, {
-            address: slashingProposerAddress.toString().toLowerCase(),
-            functionSelector: TALLY_EXECUTE_ROUND_SELECTOR,
-            functionName: 'executeRound'
-        });
-    }
-    return calls;
 }
+/** Function selector for the `propose` method of the rollup contract. */ const PROPOSE_SELECTOR = toFunctionSelector(RollupAbi.find((x)=>x.type === 'function' && x.name === 'propose'));