feat: Add timeouts for request / response stream connections

l1-contracts/src/core/Rollup.sol

@@ -182,15 +182,16 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
    * @param _signatures - Signatures from the validators
    * @param _body - The body of the L2 block
    */
-  function propose(
+  function proposeWithBody(
     bytes calldata _header,
     bytes32 _archive,
     bytes32 _blockHash,
+    bytes32[] memory _txHashes,
     SignatureLib.Signature[] memory _signatures,
     bytes calldata _body
   ) external override(IRollup) {
     AVAILABILITY_ORACLE.publish(_body);
-    propose(_header, _archive, _blockHash, _signatures);
+    propose(_header, _archive, _blockHash, _txHashes, _signatures);
   }
 
   /**
@@ -386,6 +387,7 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
       revert Errors.Rollup__SlotAlreadyInChain(lastSlot, slot);
     }
 
+    // Make sure that the proposer is up to date
     bytes32 tipArchive = archive();
     if (tipArchive != _archive) {
       revert Errors.Rollup__InvalidArchive(tipArchive, _archive);
@@ -423,7 +425,7 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
   }
 
   /**
-   * @notice propose an incoming L2 block with signatures
+   * @notice Propose an incoming L2 block with signatures
    *
    * @param _header - The L2 block header
    * @param _archive - A root of the archive tree after the L2 block is applied
@@ -434,15 +436,18 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
     bytes calldata _header,
     bytes32 _archive,
     bytes32 _blockHash,
+    bytes32[] memory _txHashes,
     SignatureLib.Signature[] memory _signatures
   ) public override(IRollup) {
     // Decode and validate header
     HeaderLib.Header memory header = HeaderLib.decode(_header);
     setupEpoch();
+
+    bytes32 digest = keccak256(abi.encodePacked(_archive, _txHashes));
     _validateHeader({
       _header: header,
       _signatures: _signatures,
-      _digest: _archive,
+      _digest: digest,
       _currentTime: block.timestamp,
       _flags: DataStructures.ExecutionFlags({ignoreDA: false, ignoreSignatures: false})
     });
@@ -496,7 +501,8 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
     override(IRollup)
   {
     SignatureLib.Signature[] memory emptySignatures = new SignatureLib.Signature[](0);
-    propose(_header, _archive, _blockHash, emptySignatures);
+    bytes32[] memory emptyTxHashes = new bytes32[](0);
+    propose(_header, _archive, _blockHash, emptyTxHashes, emptySignatures);
   }
 
   /**

l1-contracts/src/core/interfaces/IRollup.sol

@@ -34,10 +34,11 @@ interface IRollup {
 
   function OUTBOX() external view returns (IOutbox);
 
-  function propose(
+  function proposeWithBody(
     bytes calldata _header,
     bytes32 _archive,
     bytes32 _blockHash,
+    bytes32[] memory _txHashes,
     SignatureLib.Signature[] memory _signatures,
     bytes calldata _body
   ) external;
@@ -52,6 +53,7 @@ interface IRollup {
     bytes calldata _header,
     bytes32 _archive,
     bytes32 _blockHash,
+    bytes32[] memory _txHashes,
     SignatureLib.Signature[] memory _signatures
   ) external;
 

l1-contracts/src/core/sequencer_selection/Leonidas.sol

@@ -152,9 +152,6 @@ contract Leonidas is Ownable, ILeonidas {
 
   /**
    * @notice  Get the validator set for the current epoch
-   *
-   * @dev Makes a call to setupEpoch under the hood, this should ONLY be called as a view function, and not from within
-   *      this contract.
    * @return The validator set for the current epoch
    */
   function getCurrentEpochCommittee() external view override(ILeonidas) returns (address[] memory) {

l1-contracts/test/sparta/Sparta.t.sol

@@ -182,14 +182,17 @@ contract SpartaTest is DecoderBase {
 
     rollup.setupEpoch();
 
+    bytes32[] memory txHashes = new bytes32[](0);
+
     if (_signatureCount > 0 && ree.proposer != address(0)) {
       address[] memory validators = rollup.getEpochCommittee(rollup.getCurrentEpoch());
       ree.needed = validators.length * 2 / 3 + 1;
 
       SignatureLib.Signature[] memory signatures = new SignatureLib.Signature[](_signatureCount);
 
+      bytes32 digest = keccak256(abi.encodePacked(archive, txHashes));
       for (uint256 i = 0; i < _signatureCount; i++) {
-        signatures[i] = createSignature(validators[i], archive);
+        signatures[i] = createSignature(validators[i], digest);
       }
 
       if (_expectRevert) {
@@ -219,7 +222,7 @@ contract SpartaTest is DecoderBase {
       }
 
       vm.prank(ree.proposer);
-      rollup.propose(header, archive, bytes32(0), signatures);
+      rollup.propose(header, archive, bytes32(0), txHashes, signatures);
 
       if (ree.shouldRevert) {
         return;

yarn-project/archiver/src/archiver/eth_log_handlers.ts

@@ -110,7 +110,7 @@ async function getBlockMetadataFromRollupTx(
     data,
   });
 
-  if (!(functionName === 'propose')) {
+  if (!(functionName === 'propose' || functionName === 'proposeWithBody')) {
     throw new Error(`Unexpected method called ${functionName}`);
   }
   const [headerHex, archiveRootHex, _] = args! as readonly [Hex, Hex, Hex];
@@ -152,17 +152,19 @@ async function getBlockBodiesFromAvailabilityOracleTx(
   // [
   //   "propose(bytes,bytes32,bytes32,(bool,uint8,bytes32,bytes32)[],bytes)": "08978fe9",
   //   "propose(bytes,bytes32,bytes32,bytes)": "81e6f472",
+  //   "proposeWithBody(bytes,bytes32,bytes32,bytes32[],(bool,uint8,bytes32,bytes32)[],bytes)": "b2283b07",
   //   "publish(bytes calldata _body)"
   // ]
-  const DATA_INDEX = [4, 3, 0];
-  const SUPPORTED_SIGS = ['0x08978fe9', '0x81e6f472', '0x7fd28346'];
+  const DATA_INDEX = [4, 3, 5, 0]; // index where the body is, in the parameters list
+  const SUPPORTED_SIGS = ['0x08978fe9', '0x81e6f472', '0xb2283b07', '0x7fd28346'];
 
   const signature = slice(data, 0, 4);
 
   if (!SUPPORTED_SIGS.includes(signature)) {
     throw new Error(`Unexpected method called ${signature}`);
   }
 
+  // Check if explicitly calling the DA oracle
   if (signature === SUPPORTED_SIGS[SUPPORTED_SIGS.length - 1]) {
     const { args } = decodeFunctionData({
       abi: AvailabilityOracleAbi,

yarn-project/circuit-types/src/p2p/block_attestation.ts

@@ -3,8 +3,9 @@ import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { recoverMessageAddress } from 'viem';
+import { keccak256, recoverMessageAddress } from 'viem';
 
+import { TxHash } from '../tx/tx_hash.js';
 import { Gossipable } from './gossipable.js';
 import { Signature } from './signature.js';
 import { TopicType, createTopicString } from './topic_type.js';
@@ -31,6 +32,7 @@ export class BlockAttestation extends Gossipable {
     public readonly header: Header,
     // TODO(https://github.com/AztecProtocol/aztec-packages/pull/7727#discussion_r1713670830): temporary
     public readonly archive: Fr,
+    public readonly txHashes: TxHash[],
     /** The signature of the block attester */
     public readonly signature: Signature,
   ) {
@@ -53,8 +55,9 @@ export class BlockAttestation extends Gossipable {
   async getSender() {
     if (!this.sender) {
       // Recover the sender from the attestation
+      const hashed = keccak256(this.getPayload());
       const address = await recoverMessageAddress({
-        message: { raw: this.p2pMessageIdentifier().to0xString() },
+        message: { raw: hashed },
         signature: this.signature.to0xString(),
       });
       // Cache the sender for later use
@@ -64,16 +67,25 @@ export class BlockAttestation extends Gossipable {
     return this.sender;
   }
 
+  getPayload(): Buffer {
+    return serializeToBuffer([this.archive, this.txHashes]);
+  }
+
   toBuffer(): Buffer {
-    return serializeToBuffer([this.header, this.archive, this.signature]);
+    return serializeToBuffer([this.header, this.archive, this.txHashes.length, this.txHashes, this.signature]);
   }
 
   static fromBuffer(buf: Buffer | BufferReader): BlockAttestation {
     const reader = BufferReader.asReader(buf);
-    return new BlockAttestation(reader.readObject(Header), reader.readObject(Fr), reader.readObject(Signature));
+    return new BlockAttestation(
+      reader.readObject(Header),
+      reader.readObject(Fr),
+      reader.readArray(reader.readNumber(), TxHash),
+      reader.readObject(Signature),
+    );
   }
 
   static empty(): BlockAttestation {
-    return new BlockAttestation(Header.empty(), Fr.ZERO, Signature.empty());
+    return new BlockAttestation(Header.empty(), Fr.ZERO, [], Signature.empty());
   }
 }

yarn-project/circuit-types/src/p2p/block_proposal.ts

@@ -3,7 +3,7 @@ import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { recoverMessageAddress } from 'viem';
+import { keccak256, recoverMessageAddress } from 'viem';
 
 import { TxHash } from '../tx/tx_hash.js';
 import { Gossipable } from './gossipable.js';
@@ -55,8 +55,9 @@ export class BlockProposal extends Gossipable {
   async getSender() {
     if (!this.sender) {
       // performance note(): this signature method requires another hash behind the scenes
+      const hashed = keccak256(this.getPayload());
       const address = await recoverMessageAddress({
-        message: { raw: this.p2pMessageIdentifier().to0xString() },
+        message: { raw: hashed },
         signature: this.signature.to0xString(),
       });
       // Cache the sender for later use
@@ -66,6 +67,10 @@ export class BlockProposal extends Gossipable {
     return this.sender;
   }
 
+  getPayload() {
+    return serializeToBuffer([this.archive, this.txs]);
+  }
+
   toBuffer(): Buffer {
     return serializeToBuffer([this.header, this.archive, this.txs.length, this.txs, this.signature]);
   }

yarn-project/circuit-types/src/p2p/mocks.ts

@@ -1,7 +1,9 @@
 import { makeHeader } from '@aztec/circuits.js/testing';
 import { Fr } from '@aztec/foundation/fields';
+import { serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { type PrivateKeyAccount } from 'viem';
+import { keccak256 } from 'viem';
 import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 
 import { TxHash } from '../tx/tx_hash.js';
@@ -15,7 +17,8 @@ export const makeBlockProposal = async (signer?: PrivateKeyAccount): Promise<Blo
   const blockHeader = makeHeader(1);
   const archive = Fr.random();
   const txs = [0, 1, 2, 3, 4, 5].map(() => TxHash.random());
-  const signature = Signature.from0xString(await signer.signMessage({ message: { raw: archive.toString() } }));
+  const hash = keccak256(serializeToBuffer([archive, txs]));
+  const signature = Signature.from0xString(await signer.signMessage({ message: { raw: hash } }));
 
   return new BlockProposal(blockHeader, archive, txs, signature);
 };
@@ -26,9 +29,11 @@ export const makeBlockAttestation = async (signer?: PrivateKeyAccount): Promise<
 
   const blockHeader = makeHeader(1);
   const archive = Fr.random();
-  const signature = Signature.from0xString(await signer.signMessage({ message: { raw: archive.toString() } }));
+  const txs = [0, 1, 2, 3, 4, 5].map(() => TxHash.random());
+  const hash = keccak256(serializeToBuffer([archive, txs]));
+  const signature = Signature.from0xString(await signer.signMessage({ message: { raw: hash } }));
 
-  return new BlockAttestation(blockHeader, archive, signature);
+  return new BlockAttestation(blockHeader, archive, txs, signature);
 };
 
 export const randomSigner = (): PrivateKeyAccount => {

yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts

@@ -408,7 +408,7 @@ describe('L1Publisher integration', () => {
 
       writeJson(`mixed_block_${block.number}`, block, l1ToL2Content, recipientAddress, deployerAccount.address);
 
-      await publisher.processL2Block(block);
+      await publisher.proposeL2Block(block);
 
       const logs = await publicClient.getLogs({
         address: rollupAddress,
@@ -508,7 +508,7 @@ describe('L1Publisher integration', () => {
 
       writeJson(`empty_block_${block.number}`, block, [], AztecAddress.ZERO, deployerAccount.address);
 
-      await publisher.processL2Block(block);
+      await publisher.proposeL2Block(block);
 
       const logs = await publicClient.getLogs({
         address: rollupAddress,