Merge branch 'main' into ma/binary-upgrade-test-scenarios

Author: sveitser

.github/workflows/backport.yml

@@ -3,6 +3,16 @@ name: Backport merged pull request
 on:
   pull_request_target:
     types: [closed]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "PR number to backport"
+        required: true
+        type: string
+      target_branch:
+        description: "Target branch"
+        required: true
+        type: string
 permissions:
   contents: write # so it can comment
   pull-requests: write # so it can create pull requests

AGENTS.md

@@ -70,9 +70,9 @@ just demo-native                      # Full local network via process-compose
 - Use `forge fmt` before committing
 - Upgradeable contracts: V2 extends V1, never modify V1 storage
 - Events: Emit for all state changes that external systems need to track
-- Contract ABIs are supersets: V3 includes all V2 types, V2 includes all V1 types. Always use the
-  latest version's Rust bindings (`StakeTableV3`) for runtime code (contract calls, event decoding).
-  V1/V2 bindings are only needed in deploy/upgrade code.
+- Contract ABIs are supersets: V3 includes all V2 types, V2 includes all V1 types. Always use the latest version's Rust
+  bindings (`StakeTableV3`) for runtime code (contract calls, event decoding). V1/V2 bindings are only needed in
+  deploy/upgrade code.
 
 ## Architecture Overview
 
@@ -212,14 +212,14 @@ table sync.
 Versions in `crates/espresso/types/src/v0/mod.rs`. `SequencerVersions<Base, Upgrade>` defines version pairs for network
 operation.
 
-| Version | Alias                        | Key Changes                                                                |
-| ------- | ---------------------------- | -------------------------------------------------------------------------- |
-| V0_1    | -                            | Base types: Header, ChainConfig, Transaction, ADVZ VID proofs              |
-| V0_2    | `FeeVersion`                 | Fee support (version marker)                                               |
-| V0_3    | `EpochVersion`               | PoS: stake_table_contract, reward_merkle_tree, AvidM VID proofs            |
-| V0_4    | `DrbAndHeaderUpgradeVersion` | Header adds timestamp_millis, total_reward_distributed, RewardMerkleTreeV2 |
-| V0_5    | `DaUpgradeVersion`           | DA upgrade (version marker)                                                |
-| V0_6    | `Vid2UpgradeVersion`         | VID2 (AvidmGf2) proofs                                                     |
+| Version | Alias                        | Key Changes                                                                     |
+| ------- | ---------------------------- | ------------------------------------------------------------------------------- |
+| V0_1    | -                            | Base types: Header, ChainConfig, Transaction, ADVZ VID proofs                   |
+| V0_2    | `FeeVersion`                 | Fee support (version marker)                                                    |
+| V0_3    | `EpochVersion`               | PoS: stake_table_contract, reward_merkle_tree, AvidM VID proofs                 |
+| V0_4    | `DrbAndHeaderUpgradeVersion` | Header adds timestamp_millis, total_reward_distributed, RewardMerkleTreeV2      |
+| V0_5    | `EpochRewardVersion`         | Epoch reward / DRB fix                                                          |
+| V0_6    | `NEW_PROTOCOL_VERSION`       | DA upgrade + VID2 (AvidmGf2) proofs + cliquenet + new protocol (bundled at 0.6) |
 
 ## Consensus Upgrades
 

Cargo.lock

@@ -42,8 +42,6 @@ pub enum DevNodeVersion {
     V0_4,
     #[value(name = "0.5")]
     V0_5,
-    #[value(name = "0.6")]
-    V0_6,
 }
 
 impl fmt::Display for DevNodeVersion {
@@ -52,7 +50,6 @@ impl fmt::Display for DevNodeVersion {
             DevNodeVersion::V0_3 => write!(f, "0.3"),
             DevNodeVersion::V0_4 => write!(f, "0.4"),
             DevNodeVersion::V0_5 => write!(f, "0.5"),
-            DevNodeVersion::V0_6 => write!(f, "0.6"),
         }
     }
 }

crates/espresso/dev-node/src/lib.rs

@@ -670,7 +670,6 @@ async fn async_main(migrated_envs: Vec<(&str, &str)>) -> anyhow::Result<()> {
             DevNodeVersion::V0_3 => Upgrade::trivial(versions::version(0, 3)),
             DevNodeVersion::V0_4 => Upgrade::trivial(versions::version(0, 4)),
             DevNodeVersion::V0_5 => Upgrade::trivial(versions::version(0, 5)),
-            DevNodeVersion::V0_6 => Upgrade::trivial(versions::version(0, 6)),
         };
         TestNetwork::new(config, u).await
     };

crates/espresso/dev-node/src/main.rs

@@ -47,12 +47,7 @@ impl Drop for BackgroundProcess {
 #[rstest::rstest]
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
 async fn slow_dev_node_test(
-    #[values(
-        DevNodeVersion::V0_3,
-        DevNodeVersion::V0_4,
-        DevNodeVersion::V0_5,
-        DevNodeVersion::V0_6
-    )]
+    #[values(DevNodeVersion::V0_3, DevNodeVersion::V0_4, DevNodeVersion::V0_5)]
     version: DevNodeVersion,
 ) {
     let builder_port = reserve_tcp_port().unwrap();

crates/espresso/dev-node/tests/dev_node_tests.rs

@@ -175,7 +175,7 @@ impl TryFrom<KeySetOptions> for KeySet {
             bail!("neither mnemonic, key file nor full set of private keys was provided")
         };
 
-        // TODO: remove this fallback once the network upgrades to CLIQUENET_VERSION and x25519
+        // TODO: remove this fallback once the network upgrades to NEW_PROTOCOL_VERSION and x25519
         // keys become required. For now, generate a random key so existing deployments without an
         // x25519 key configured can still start.
         let x25519 = match x25519 {

crates/espresso/keyset/src/lib.rs

@@ -3257,7 +3257,10 @@ mod test {
     };
     use tokio::time::sleep;
     use vbs::version::StaticVersion;
-    use versions::{DRB_AND_HEADER_UPGRADE_VERSION, EPOCH_VERSION, FEE_VERSION, Upgrade, version};
+    use versions::{
+        DRB_AND_HEADER_UPGRADE_VERSION, EPOCH_REWARD_VERSION, EPOCH_VERSION, FEE_VERSION, Upgrade,
+        version,
+    };
 
     use self::{
         data_source::testing::TestableSequencerDataSource, options::HotshotEvents,
@@ -4983,7 +4986,7 @@ mod test {
         const EPOCH_HEIGHT: u64 = 10;
         const NUM_NODES: usize = 5;
 
-        const V6: Upgrade = Upgrade::trivial(version(0, 6));
+        const V5: Upgrade = Upgrade::trivial(EPOCH_REWARD_VERSION);
 
         let network_config = TestConfigBuilder::default()
             .epoch_height(EPOCH_HEIGHT)
@@ -5014,12 +5017,12 @@ mod test {
                     &NoMetrics,
                 )
             }))
-            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V6)
+            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V5)
             .await
             .unwrap()
             .build();
 
-        let _network = TestNetwork::new(config, V6).await;
+        let _network = TestNetwork::new(config, V5).await;
         let client: Client<ServerError, SequencerApiVersion> =
             Client::new(format!("http://localhost:{api_port}").parse().unwrap());
 
@@ -5088,7 +5091,7 @@ mod test {
         const EPOCH_HEIGHT: u64 = 10;
         const NUM_NODES: usize = 5;
 
-        const V6: Upgrade = Upgrade::trivial(version(0, 6));
+        const V5: Upgrade = Upgrade::trivial(EPOCH_REWARD_VERSION);
 
         let network_config = TestConfigBuilder::default()
             .epoch_height(EPOCH_HEIGHT)
@@ -5119,12 +5122,12 @@ mod test {
                     &NoMetrics,
                 )
             }))
-            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V6)
+            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V5)
             .await
             .unwrap()
             .build();
 
-        let _network = TestNetwork::new(config, V6).await;
+        let _network = TestNetwork::new(config, V5).await;
         let client: Client<ServerError, SequencerApiVersion> =
             Client::new(format!("http://localhost:{api_port}").parse().unwrap());
 
@@ -5205,7 +5208,7 @@ mod test {
         const EPOCH_HEIGHT: u64 = 10;
         const NUM_NODES: usize = 5;
         const NUM_EPOCHS: u64 = 6;
-        const V6: Upgrade = Upgrade::trivial(version(0, 6));
+        const V5: Upgrade = Upgrade::trivial(EPOCH_REWARD_VERSION);
 
         let network_config = TestConfigBuilder::default()
             .epoch_height(EPOCH_HEIGHT)
@@ -5236,12 +5239,12 @@ mod test {
                     &NoMetrics,
                 )
             }))
-            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V6)
+            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V5)
             .await
             .unwrap()
             .build();
 
-        let network = TestNetwork::new(config, V6).await;
+        let network = TestNetwork::new(config, V5).await;
         let client: Client<ServerError, SequencerApiVersion> =
             Client::new(format!("http://localhost:{api_port}").parse().unwrap());
 
@@ -5298,13 +5301,13 @@ mod test {
         Ok(())
     }
 
-    /// Verifies that the `leader_counts` array in V6 headers is correct.
+    /// Verifies that the `leader_counts` array in V5+ headers is correct.
     #[test_log::test(tokio::test(flavor = "multi_thread"))]
     async fn test_epoch_leader_counts() -> anyhow::Result<()> {
         const EPOCH_HEIGHT: u64 = 10;
         const NUM_NODES: usize = 5;
         const NUM_EPOCHS: u64 = 6;
-        const V6: Upgrade = Upgrade::trivial(version(0, 6));
+        const V5: Upgrade = Upgrade::trivial(EPOCH_REWARD_VERSION);
 
         let network_config = TestConfigBuilder::default()
             .epoch_height(EPOCH_HEIGHT)
@@ -5335,12 +5338,12 @@ mod test {
                     &NoMetrics,
                 )
             }))
-            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V6)
+            .pos_hook(DelegationConfig::MultipleDelegators, Default::default(), V5)
             .await
             .unwrap()
             .build();
 
-        let network = TestNetwork::new(config, V6).await;
+        let network = TestNetwork::new(config, V5).await;
         let client: Client<ServerError, SequencerApiVersion> =
             Client::new(format!("http://localhost:{api_port}").parse().unwrap());
 
@@ -5369,7 +5372,7 @@ mod test {
 
             let header_leader_counts = header
                 .leader_counts()
-                .expect("V6 header must have leader_counts");
+                .expect("V5+ header must have leader_counts");
 
             // Reset counts at the start of a new epoch
             let is_epoch_start = (height - 1) % EPOCH_HEIGHT == 0;

crates/espresso/node/src/api.rs

@@ -96,7 +96,11 @@ where
         .load_earliest_cert2(requested_height)
         .await
         .map_err(internal)?
-        .ok_or_else(|| not_found("no cert2 finality proof available"))?;
+        .ok_or_else(|| {
+            not_found(format!(
+                "no cert2 finality proof available at or after height {requested_height}"
+            ))
+        })?;
 
     let cert2_height = cert2.data.block_number;
     if cert2_height < requested_height {

crates/espresso/node/src/api/light_client.rs

@@ -30,7 +30,7 @@ use hotshot_types::{
 };
 use tokio::spawn;
 use tokio_util::task::AbortOnDropHandle;
-use versions::version;
+use versions::NEW_PROTOCOL_VERSION;
 
 // TODO: `ConsensusOutput::LeafDecided` still carries fields (leaves +
 // vid_shares) rather than a `Vec<LeafInfo>`. This is because `Consensus` doesn't own `StateManager`
@@ -173,7 +173,7 @@ where
             .hotshot
             .upgrade_lock
             .version_infallible(view)
-            >= version(0, 8)
+            >= NEW_PROTOCOL_VERSION
     }
 
     async fn new_protocol(&self) -> bool {