feat(conductor): include sequencer block hash (#1999)

## Summary
Adds a `sequencer_block_hash` to Execution API `Block` and
`ExecuteBlock` shapes such that an execution can include it in their
block space.

This is an addition but is backwards compatible. Old rollups can run the
new binary, rollups that don't use the sequencer hash can utilize the
old binary. Rollup forks which rely on the sequencer hash must utilize
the new binary.

## Background
We are upgrading Flame to the `Cancun` upgrade which includes
`BeaconRoot` in the block hash. This is a natural time to add the
sequencer block, as it is a similar concept.

## Changes
- Add new hash field to execution v1 protos and `astria-core`
- Added the field to in development execution v2 protos
- Update conductor to include the new data in `ExecuteBlock` requests
- Added information to the execute API spec.

## Testing
CI/CD testing has been updated to run the smoke tests with an updated
version of geth that utilizes the sequencer and includes a beacon root
contract in genesis.

I have done manual testing of the following:
- old geth w/ new conductor unchanged
- new geth w/ cancun upgrade disabled

## Changelogs
Changelogs updated

## Breaking Changelist
This is not a breaking change as it is a protobuf addition.

Author: joroshiba

crates/astria-conductor/CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
 - Remove panic source on shutdown [#1919](https://github.com/astriaorg/astria/pull/1919).
 
+### Added
+
+- Send `sequencer_block_hash` as part of `ExecuteBlockRequest` [#1999](https://github.com/astriaorg/astria/pull/1999).
+
 ## [1.0.0] - 2024-10-25
 
 ### Changed

crates/astria-conductor/src/executor/client.rs

@@ -119,6 +119,7 @@ impl Client {
         prev_block_hash: Bytes,
         transactions: Vec<Bytes>,
         timestamp: Timestamp,
+        sequencer_block_hash: Bytes,
     ) -> eyre::Result<Block> {
         use prost::Message;
 
@@ -132,6 +133,7 @@ impl Client {
             prev_block_hash,
             transactions,
             timestamp: Some(timestamp),
+            sequencer_block_hash,
         };
         let response = tryhard::retry_fn(|| {
             let mut client = self.inner.clone();

crates/astria-conductor/src/executor/mod.rs

@@ -496,16 +496,18 @@ impl Initialized {
         block: ExecutableBlock,
     ) -> eyre::Result<Block> {
         let ExecutableBlock {
+            hash,
             transactions,
             timestamp,
             ..
         } = block;
 
         let n_transactions = transactions.len();
+        let sequencer_block_hash = hash.as_bytes().to_vec().into();
 
         let executed_block = self
             .client
-            .execute_block_with_retry(parent_hash, transactions, timestamp)
+            .execute_block_with_retry(parent_hash, transactions, timestamp, sequencer_block_hash)
             .await
             .wrap_err("failed to run execute_block RPC")?;
 

crates/astria-conductor/src/executor/state.rs

@@ -347,6 +347,7 @@ mod tests {
                 seconds: 123_456,
                 nanos: 789,
             }),
+            sequencer_block_hash: Bytes::new(),
         })
         .unwrap();
         let soft = Block::try_from_raw(raw::Block {
@@ -357,6 +358,7 @@ mod tests {
                 seconds: 123_456,
                 nanos: 789,
             }),
+            sequencer_block_hash: Bytes::new(),
         })
         .unwrap();
         CommitmentState::builder()

crates/astria-conductor/src/executor/tests.rs

@@ -32,6 +32,7 @@ fn make_block(number: u32) -> raw::Block {
             seconds: 0,
             nanos: 0,
         }),
+        sequencer_block_hash: Bytes::new(),
     }
 }
 

crates/astria-conductor/tests/blackbox/helpers/macros.rs

@@ -9,6 +9,7 @@ macro_rules! block {
                 seconds: 1,
                 nanos: 1,
             }),
+            sequencer_block_hash: ::bytes::Bytes::new(),
         }
     };
 }

crates/astria-core/src/execution/v1/mod.rs

@@ -159,6 +159,8 @@ pub struct Block {
     parent_block_hash: Bytes,
     /// Timestamp on the block, standardized to google protobuf standard.
     timestamp: Timestamp,
+    /// The hash of the sequencer block that this block is derived from.
+    sequencer_block_hash: Bytes,
 }
 
 impl Block {
@@ -183,6 +185,11 @@ impl Block {
         // effectively just a copy
         self.timestamp.clone()
     }
+
+    #[must_use]
+    pub fn sequencer_block_hash(&self) -> &Bytes {
+        &self.sequencer_block_hash
+    }
 }
 
 impl From<Block> for raw::Block {
@@ -201,6 +208,7 @@ impl Protobuf for Block {
             hash,
             parent_block_hash,
             timestamp,
+            sequencer_block_hash,
         } = raw;
         // Cloning timestamp is effectively a copy because timestamp is just a (i32, i64) tuple
         let timestamp = timestamp
@@ -212,6 +220,7 @@ impl Protobuf for Block {
             hash: hash.clone(),
             parent_block_hash: parent_block_hash.clone(),
             timestamp,
+            sequencer_block_hash: sequencer_block_hash.clone(),
         })
     }
 
@@ -221,6 +230,7 @@ impl Protobuf for Block {
             hash,
             parent_block_hash,
             timestamp,
+            sequencer_block_hash,
         } = self;
         Self::Raw {
             number: *number,
@@ -229,6 +239,7 @@ impl Protobuf for Block {
             // Cloning timestamp is effectively a copy because timestamp is just a (i32, i64)
             // tuple
             timestamp: Some(timestamp.clone()),
+            sequencer_block_hash: sequencer_block_hash.clone(),
         }
     }
 }

crates/astria-core/src/generated/astria.execution.v1.rs

@@ -9,6 +9,9 @@ global:
   celestiaChainId: celestia-local-0
 
 evm-rollup:
+  images:
+    geth:
+      devTag: pr-75
   genesis:
     ## These values are used to configure the genesis block of the rollup chain
     ## no defaults as they are unique to each chain
@@ -61,7 +64,7 @@ evm-rollup:
     ## Standard Eth Genesis config values
     # Configuration of Eth forks, setting to 0 will enable from height,
     # left as is these forks will not activate.
-    cancunTime: ""
+    cancunTime: "0"
     pragueTime: ""
     verkleTime: ""
     # Can configure the genesis allocs for the chain
@@ -74,6 +77,13 @@ evm-rollup:
         value:
           balance: "0"
           code: "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3"
+      # EIP-4877 Beacon Block Contract
+      # Code is defined by the contract in the spec: https://eips.ethereum.org/EIPS/eip-4788
+      - address: "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
+        value:
+          balance: "0"
+          code: "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500"
+      # The EVM Withdrawer contract
       - address: "0xA58639fB5458e65E4fA917FF951C390292C24A15"
         value:
           balance: "0"

crates/astria-core/src/generated/astria.execution.v1.serde.rs

@@ -13,6 +13,9 @@ evm-rollup:
 
 flame-rollup:
   enabled: true
+  images:
+    geth:
+      devTag: pr-49
   genesis:
     ## These values are used to configure the genesis block of the rollup chain
     ## no defaults as they are unique to each chain
@@ -66,7 +69,7 @@ flame-rollup:
     ## Standard Eth Genesis config values
     # Configuration of Eth forks, setting to 0 will enable from height,
     # left as is these forks will not activate.
-    cancunTime: ""
+    cancunTime: "0"
     pragueTime: ""
     verkleTime: ""
     # Can configure the genesis allocs for the chain
@@ -79,6 +82,12 @@ flame-rollup:
         value:
           balance: "0"
           code: "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3"
+      # EIP-4877 Beacon Block Contract
+      # Code is defined by the contract in the spec: https://eips.ethereum.org/EIPS/eip-4788
+      - address: "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02"
+        value:
+          balance: "0"
+          code: "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500"
       - address: "0xA58639fB5458e65E4fA917FF951C390292C24A15"
         value:
           balance: "0"

crates/astria-core/src/generated/astria.execution.v2.rs

@@ -30,6 +30,11 @@ message Block {
   bytes parent_block_hash = 3;
   // Timestamp on the block, standardized to google protobuf standard.
   google.protobuf.Timestamp timestamp = 4;
+  // The hash of the sequencer block from which this block was derived.
+  //
+  // (Optional) This field will only be utilized if the execution node stores
+  // this data in blocks during `ExecuteBlock`.
+  bytes sequencer_block_hash = 5;
 }
 
 // Fields which are indexed for finding blocks on a blockchain.
@@ -70,6 +75,11 @@ message ExecuteBlockRequest {
   repeated astria.sequencerblock.v1.RollupData transactions = 2;
   // Timestamp to be used for new block.
   google.protobuf.Timestamp timestamp = 3;
+  // The hash of the sequencer block from which the transactions and timestamp
+  // are derived.
+  //
+  // Utilizing this field is optional for the execution node.
+  bytes sequencer_block_hash = 4;
 }
 
 // The CommitmentState holds the block at each stage of sequencer commitment

crates/astria-core/src/generated/astria.execution.v2.serde.rs

@@ -20,4 +20,11 @@ message ExecuteBlockRequest {
   repeated astria.sequencerblock.v1.RollupData transactions = 3;
   // Timestamp to be used for new block.
   google.protobuf.Timestamp timestamp = 4;
+  // The hash of the sequencer block from which the transactions and timestamp
+  // are derived.
+  //
+  // Must be a 32 byte base16 encoded string. It may be prefixed with `0x`.
+  //
+  // Utilizing this field is optional for the execution node.
+  string sequencer_block_hash = 5;
 }

dev/values/rollup/dev.yaml

@@ -17,4 +17,11 @@ message ExecutedBlockMetadata {
   // Timestamp of the block, taken from the sequencer block that this rollup block
   // was constructed from.
   google.protobuf.Timestamp timestamp = 4;
+  // The hash of the sequencer block from which this block was derived.
+  //
+  // Must be 32 byte base16 encoded string. It may be prefixed with `0x`.
+  //
+  // (Optional) This field will only be utilized if the execution node stores
+  // this data in blocks during `ExecuteBlock`.
+  string sequencer_block_hash = 5;
 }

dev/values/rollup/flame-dev.yaml

@@ -86,7 +86,15 @@ indicated by `prev_block_hash`. The following should be respected:
 - `prev_block_hash` MUST match hash of the `SOFT` commitment state block, return
   `FAILED_PRECONDITION` otherwise.
 - If block headers have timestamps, created block MUST have matching timestamp
-- The CommitmentState is NOT modified by the execution of the block.
+- The `CommitmentState` is NOT modified by the execution of the block.
+- It is up to the execution node if it includes the `sequencer_block_hash`
+  provided as a part of the block. If utilized the server MUST throw an
+  `INVALID_ARGUMENT` error if the `sequencer_block_hash` is not included in the
+  request.\
+  \
+  This field is an addition to the original API, running old versions of the
+  client which excluded it would otherwise create non-deterministic blocks
+  between nodes running different API client software.
 
 ### GetBlock