Fix builder versions (#3614)

* fix builder versions

* build 0.4 fix

* nightly fmt

Author: rob-maron

crates/builder/src/bin/permissionless-builder.rs

@@ -2,7 +2,9 @@ use std::{num::NonZeroUsize, path::PathBuf, time::Duration};
 
 use builder::non_permissioned::{build_instance_state, BuilderConfig};
 use clap::Parser;
-use espresso_types::{eth_signature_key::EthKeyPair, parse_duration, SequencerVersions};
+use espresso_types::{
+    eth_signature_key::EthKeyPair, parse_duration, FeeVersion, SequencerVersions,
+};
 use futures::future::pending;
 use hotshot::traits::ValidatedState;
 use hotshot_types::{
@@ -113,26 +115,60 @@ async fn main() -> anyhow::Result<()> {
     let upgrade = genesis.upgrade_version;
 
     match (base, upgrade) {
+        #[cfg(all(feature = "pos", feature = "drb-and-header"))]
+        (
+            espresso_types::EpochVersion::VERSION,
+            espresso_types::DrbAndHeaderUpgradeVersion::VERSION,
+        ) => {
+            run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::EpochVersion>>(
+                genesis, opt,
+            )
+            .await
+        },
+        #[cfg(all(feature = "fee", feature = "drb-and-header"))]
+        (
+            espresso_types::FeeVersion::VERSION,
+            espresso_types::DrbAndHeaderUpgradeVersion::VERSION,
+        ) => {
+            run::<
+                SequencerVersions<
+                    espresso_types::FeeVersion,
+                    espresso_types::DrbAndHeaderUpgradeVersion,
+                >,
+            >(genesis, opt)
+            .await
+        },
+        #[cfg(feature = "drb-and-header")]
+        (espresso_types::DrbAndHeaderUpgradeVersion::VERSION, _) => {
+            run::<
+                SequencerVersions<
+                    espresso_types::DrbAndHeaderUpgradeVersion,
+                    espresso_types::DrbAndHeaderUpgradeVersion,
+                >,
+            >(genesis, opt)
+            .await
+        },
         #[cfg(all(feature = "fee", feature = "pos"))]
-        (espresso_types::FeeVersion::VERSION, espresso_types::EpochVersion::VERSION) => {
+        (FeeVersion::VERSION, espresso_types::EpochVersion::VERSION) => {
             run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::EpochVersion>>(
                 genesis, opt,
             )
             .await
         },
         #[cfg(feature = "pos")]
-        (espresso_types::EpochVersion::VERSION, _) => {
-            // Specifying V0_0 disables upgrades
-            run::<SequencerVersions<espresso_types::EpochVersion, espresso_types::V0_0>>(
+        (espresso_types::EpochVersion::VERSION, espresso_types::EpochVersion::VERSION) => {
+            run::<SequencerVersions<espresso_types::EpochVersion, espresso_types::EpochVersion>>(
                 genesis, opt,
+                // Specifying V0_0 disables upgrades
             )
             .await
         },
         #[cfg(feature = "fee")]
-        (espresso_types::FeeVersion::VERSION, _) => {
-            // Specifying V0_0 disables upgrades
-            run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::V0_0>>(genesis, opt)
-                .await
+        (FeeVersion::VERSION, espresso_types::FeeVersion::VERSION) => {
+            run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::FeeVersion>>(
+                genesis, opt,
+            )
+            .await
         },
         _ => panic!(
             "Invalid base ({base}) and upgrade ({upgrade}) versions specified in the toml file."