Revert "Revert "Conditionally compile versions (#2559)""

This reverts commit 51719dd.
EspressoSystems · Feb 13, 2025 · 822dfe2 · 822dfe2
1 parent 51719dd
commit 822dfe2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/cargo-features.yml b/.github/workflows/cargo-features.yml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   cargo-features:
-    runs-on: ubuntu-latest
+    runs-on: buildjet-8vcpu-ubuntu-2204
     steps:
       - uses: taiki-e/install-action@cargo-hack
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,6 +19,7 @@ concurrency:
 
 env:
   RUST_LOG: info,libp2p=off,node=error
+  RUSTFLAGS: "--cfg feature=\"fee\" --cfg feature=\"marketplace\""
   CARGO_TERM_COLOR: always
   # Save the process compose logs
   PC_LOGS: /tmp/pc.log

diff --git a/sequencer/Cargo.toml b/sequencer/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
+default = ["fee"]
 testing = [
     "hotshot-testing",
     "marketplace-builder-core",
@@ -15,6 +16,9 @@ testing = [
 ]
 benchmarking = []
 embedded-db = ["hotshot-query-service/embedded-db"]
+fee = []
+pos = []
+marketplace = []
 
 [[bin]]
 name = "espresso-dev-node"

diff --git a/sequencer/src/run.rs b/sequencer/src/run.rs
@@ -8,6 +8,7 @@ use super::{
     persistence, Genesis, L1Params, NetworkParams,
 };
 use clap::Parser;
+#[allow(unused_imports)]
 use espresso_types::{
     traits::NullEventConsumer, FeeVersion, MarketplaceVersion, SequencerVersions,
     SolverAuctionResultsProvider, V0_0,
@@ -38,6 +39,7 @@ pub async fn main() -> anyhow::Result<()> {
     let upgrade = genesis.upgrade_version;
 
     match (base, upgrade) {
+        #[cfg(all(feature = "fee", feature = "marketplace"))]
         (FeeVersion::VERSION, MarketplaceVersion::VERSION) => {
             run(
                 genesis,
@@ -47,6 +49,7 @@ pub async fn main() -> anyhow::Result<()> {
             )
             .await
         }
+        #[cfg(feature = "fee")]
         (FeeVersion::VERSION, _) => {
             run(
                 genesis,
@@ -56,6 +59,7 @@ pub async fn main() -> anyhow::Result<()> {
             )
             .await
         }
+        #[cfg(feature = "marketplace")]
         (MarketplaceVersion::VERSION, _) => {
             run(
                 genesis,