Remove unnecessary genesis-config parameters (#4109)

ma2bd · web-flow · commit fd919c414e18 · 2025-06-15T00:39:11.000Z
## Motivation

Simplify CLI

## Proposal

Pass the genesis config path only when using a memory store.

## Test Plan

CI
diff --git a/docker/compose-proxy-entrypoint.sh b/docker/compose-proxy-entrypoint.sh
@@ -4,6 +4,5 @@ storage_replication_factor=$1
 
 exec ./linera-proxy \
   --storage scylladb:tcp:scylla:9042 \
-  --genesis /config/genesis.json \
   --storage-replication-factor $storage_replication_factor \
   /config/server.json
diff --git a/docker/compose-server-entrypoint.sh b/docker/compose-server-entrypoint.sh
@@ -7,5 +7,4 @@ exec ./linera-server run \
   --storage $storage \
   --server /config/server.json \
   --shard 0 \
-  --genesis /config/genesis.json \
   --storage-replication-factor $storage_replication_factor
diff --git a/docker/proxy-entrypoint.sh b/docker/proxy-entrypoint.sh
@@ -5,7 +5,6 @@ ORDINAL="${HOSTNAME##*-}"
 
 exec ./linera-proxy \
     --storage scylladb:tcp:scylla-client.scylla.svc.cluster.local:9042 \
-    --genesis /config/genesis.json \
     --storage-replication-factor $storage_replication_factor \
     --id "$ORDINAL" \
     /config/server.json
diff --git a/docker/server-entrypoint.sh b/docker/server-entrypoint.sh
@@ -10,5 +10,4 @@ exec ./linera-server run \
   --storage $storage \
   --server /config/server.json \
   --shard $ORDINAL \
-  --genesis /config/genesis.json \
   --storage-replication-factor $storage_replication_factor
diff --git a/linera-service/src/cli/main.rs b/linera-service/src/cli/main.rs
@@ -1296,13 +1296,9 @@ impl ClientOptions {
         let store_config = storage_config
             .add_common_config(self.common_config())
             .await?;
-        let genesis_config = self.wallet().await?.genesis_config().clone();
-        let output = Box::pin(store_config.run_with_storage(
-            &genesis_config,
-            self.wasm_runtime.with_wasm_default(),
-            job,
-        ))
-        .await?;
+        let output =
+            Box::pin(store_config.run_with_storage(self.wasm_runtime.with_wasm_default(), job))
+                .await?;
         Ok(output)
     }
 
diff --git a/linera-service/src/cli/net_up_utils.rs b/linera-service/src/cli/net_up_utils.rs
@@ -88,7 +88,7 @@ impl StorageConfigProvider {
 
     pub fn database(&self) -> anyhow::Result<Database> {
         match self.storage.storage_config {
-            StorageConfig::Memory => anyhow::bail!("Not possible to work with memory"),
+            StorageConfig::Memory { .. } => anyhow::bail!("Not possible to work with memory"),
             #[cfg(feature = "rocksdb")]
             StorageConfig::RocksDb { .. } => anyhow::bail!("Not possible to work with RocksDB"),
             #[cfg(feature = "storage-service")]
diff --git a/linera-service/src/cli_wrappers/local_net.rs b/linera-service/src/cli_wrappers/local_net.rs
@@ -588,7 +588,6 @@ impl LocalNet {
             .await?
             .arg(format!("server_{}.json", validator))
             .args(["--storage", &storage.to_string()])
-            .args(["--genesis", "genesis.json"])
             .spawn_into()?;
 
         let port = Self::proxy_public_port(validator, 0);
@@ -625,7 +624,6 @@ impl LocalNet {
             .await?
             .arg(config_path)
             .args(["--storage", &storage.to_string()])
-            .args(["--genesis", "genesis.json"])
             .spawn_into()?;
 
         match self.network.internal {
@@ -757,7 +755,6 @@ impl LocalNet {
             .args(["--storage", &storage.to_string()])
             .args(["--server", &format!("server_{}.json", validator)])
             .args(["--shard", &shard.to_string()])
-            .args(["--genesis", "genesis.json"])
             .args(self.cross_chain_config.to_args());
         let child = command.spawn_into()?;
 
diff --git a/linera-service/src/linera-exporter/main.rs b/linera-service/src/linera-exporter/main.rs
@@ -6,9 +6,9 @@ use std::path::PathBuf;
 use anyhow::Result;
 use exporter_service::ExporterContext;
 use futures::FutureExt;
-use linera_client::config::{BlockExporterConfig, GenesisConfig};
+use linera_client::config::BlockExporterConfig;
 use linera_sdk::views::ViewError;
-use linera_service::{storage::StorageConfigNamespace, util};
+use linera_service::storage::StorageConfigNamespace;
 use linera_views::{lru_caching::StorageCacheConfig, store::CommonStoreConfig};
 
 #[allow(dead_code)]
@@ -68,10 +68,6 @@ struct ExporterOptions {
     /// The maximal number of entries in the storage cache.
     #[arg(long, default_value = "1000")]
     max_cache_entries: usize,
-
-    /// Path to the file describing the initial user chains (aka genesis state)
-    #[arg(long = "genesis")]
-    genesis_config_path: PathBuf,
 }
 
 fn main() -> Result<()> {
@@ -108,8 +104,6 @@ impl ExporterOptions {
             }
         };
 
-        let genesis_config: GenesisConfig = util::read_json(&self.genesis_config_path)?;
-
         let future = async {
             let context =
                 ExporterContext::new(config.id, config.service_config, config.destination_config);
@@ -118,10 +112,7 @@ impl ExporterOptions {
                 .add_common_config(common_config)
                 .await
                 .unwrap();
-            storage_config
-                .run_with_storage(&genesis_config, None, context)
-                .boxed()
-                .await
+            storage_config.run_with_storage(None, context).boxed().await
         };
 
         let runtime = runtime_builder.enable_all().build()?;
diff --git a/linera-service/src/proxy/main.rs b/linera-service/src/proxy/main.rs
@@ -9,7 +9,7 @@ use anyhow::{anyhow, bail, ensure, Result};
 use async_trait::async_trait;
 use futures::{FutureExt as _, SinkExt, StreamExt};
 use linera_base::listen_for_shutdown_signals;
-use linera_client::config::{GenesisConfig, ValidatorServerConfig};
+use linera_client::config::ValidatorServerConfig;
 use linera_core::{node::NodeError, JoinSetExt as _};
 use linera_rpc::{
     config::{
@@ -92,10 +92,6 @@ pub struct ProxyOptions {
     #[arg(long, default_value = "1000")]
     pub max_cache_entries: usize,
 
-    /// Path to the file describing the initial user chains (aka genesis state)
-    #[arg(long = "genesis")]
-    genesis_config_path: PathBuf,
-
     /// The replication factor for the keyspace
     #[arg(long, default_value = "1")]
     storage_replication_factor: u32,
@@ -445,10 +441,9 @@ impl ProxyOptions {
             storage_cache_config,
             replication_factor: self.storage_replication_factor,
         };
-        let genesis_config: GenesisConfig = util::read_json(&self.genesis_config_path)?;
         let store_config = self.storage_config.add_common_config(common_config).await?;
         store_config
-            .run_with_storage(&genesis_config, None, ProxyContext::from_options(self)?)
+            .run_with_storage(None, ProxyContext::from_options(self)?)
             .boxed()
             .await?
     }
diff --git a/linera-service/src/server.rs b/linera-service/src/server.rs
@@ -340,10 +340,6 @@ enum ServerCommand {
         #[command(flatten)]
         notification_config: NotificationConfig,
 
-        /// Path to the file describing the initial user chains (aka genesis state)
-        #[arg(long = "genesis")]
-        genesis_config_path: PathBuf,
-
         /// Runs a specific shard (from 0 to shards-1)
         #[arg(long)]
         shard: Option<usize>,
@@ -529,7 +525,6 @@ async fn run(options: ServerOptions) {
             storage_config,
             cross_chain_config,
             notification_config,
-            genesis_config_path,
             shard,
             grace_period,
             wasm_runtime,
@@ -543,8 +538,6 @@ async fn run(options: ServerOptions) {
         } => {
             linera_version::VERSION_INFO.log();
 
-            let genesis_config: GenesisConfig =
-                util::read_json(&genesis_config_path).expect("Failed to read initial chain config");
             let server_config: ValidatorServerConfig =
                 util::read_json(&server_config_path).expect("Failed to read server config");
 
@@ -573,7 +566,7 @@ async fn run(options: ServerOptions) {
                 .await
                 .unwrap();
             store_config
-                .run_with_storage(&genesis_config, wasm_runtime, job)
+                .run_with_storage(wasm_runtime, job)
                 .boxed()
                 .await
                 .unwrap()
diff --git a/linera-service/src/storage.rs b/linera-service/src/storage.rs
@@ -1,9 +1,9 @@
 // Copyright (c) Zefchain Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::{fmt, str::FromStr};
+use std::{fmt, path::PathBuf, str::FromStr};
 
-use anyhow::anyhow;
+use anyhow::{anyhow, bail};
 use async_trait::async_trait;
 use linera_client::config::GenesisConfig;
 use linera_execution::WasmRuntime;
@@ -15,25 +15,20 @@ use linera_storage_service::{
 };
 #[cfg(feature = "dynamodb")]
 use linera_views::dynamo_db::{DynamoDbStore, DynamoDbStoreConfig};
+#[cfg(feature = "rocksdb")]
+use linera_views::rocks_db::{PathWithGuard, RocksDbSpawnMode, RocksDbStore, RocksDbStoreConfig};
 use linera_views::{
     memory::{MemoryStore, MemoryStoreConfig},
     store::{CommonStoreConfig, KeyValueStore},
 };
 use serde::{Deserialize, Serialize};
 use tracing::error;
-#[allow(unused_imports)]
-use {anyhow::bail, linera_views::store::AdminKeyValueStore as _};
 #[cfg(all(feature = "rocksdb", feature = "scylladb"))]
 use {
     linera_storage::ChainStatesFirstAssignment,
     linera_views::backends::dual::{DualStore, DualStoreConfig},
     std::path::Path,
 };
-#[cfg(feature = "rocksdb")]
-use {
-    linera_views::rocks_db::{PathWithGuard, RocksDbSpawnMode, RocksDbStore, RocksDbStoreConfig},
-    std::path::PathBuf,
-};
 #[cfg(feature = "scylladb")]
 use {
     linera_views::scylla_db::{ScyllaDbStore, ScyllaDbStoreConfig},
@@ -54,6 +49,7 @@ pub enum StoreConfig {
     Memory {
         config: MemoryStoreConfig,
         namespace: String,
+        genesis_path: PathBuf,
     },
     /// The RocksDB key value store
     #[cfg(feature = "rocksdb")]
@@ -91,7 +87,11 @@ pub enum StorageConfig {
         endpoint: String,
     },
     /// The memory description.
-    Memory,
+    Memory {
+        /// The path to the genesis configuration. This is needed because we reinitialize
+        /// memory databases from the genesis config everytime.
+        genesis_path: PathBuf,
+    },
     /// The RocksDB description.
     #[cfg(feature = "rocksdb")]
     RocksDb {
@@ -151,8 +151,7 @@ pub struct StorageConfigNamespace {
     pub namespace: String,
 }
 
-const MEMORY: &str = "memory";
-const MEMORY_EXT: &str = "memory:";
+const MEMORY: &str = "memory:";
 #[cfg(feature = "storage-service")]
 const STORAGE_SERVICE: &str = "service:";
 #[cfg(feature = "rocksdb")]
@@ -168,17 +167,23 @@ impl FromStr for StorageConfigNamespace {
     type Err = anyhow::Error;
 
     fn from_str(input: &str) -> Result<Self, Self::Err> {
-        if input == MEMORY {
-            let namespace = DEFAULT_NAMESPACE.to_string();
-            let storage_config = StorageConfig::Memory;
-            return Ok(StorageConfigNamespace {
-                storage_config,
-                namespace,
-            });
-        }
-        if let Some(s) = input.strip_prefix(MEMORY_EXT) {
-            let namespace = s.to_string();
-            let storage_config = StorageConfig::Memory;
+        if let Some(s) = input.strip_prefix(MEMORY) {
+            let parts = s.split(':').collect::<Vec<_>>();
+            if parts.len() == 1 {
+                let genesis_path = parts[0].to_string().into();
+                let namespace = DEFAULT_NAMESPACE.to_string();
+                let storage_config = StorageConfig::Memory { genesis_path };
+                return Ok(StorageConfigNamespace {
+                    storage_config,
+                    namespace,
+                });
+            }
+            if parts.len() != 2 {
+                bail!("We should have one genesis config path and one optional namespace");
+            }
+            let genesis_path = parts[0].to_string().into();
+            let namespace = parts[1].to_string();
+            let storage_config = StorageConfig::Memory { genesis_path };
             return Ok(StorageConfigNamespace {
                 storage_config,
                 namespace,
@@ -398,11 +403,16 @@ impl StorageConfigNamespace {
                 };
                 Ok(StoreConfig::Service { config, namespace })
             }
-            StorageConfig::Memory => {
+            StorageConfig::Memory { genesis_path } => {
                 let config = MemoryStoreConfig {
                     common_config: common_config.reduced(),
                 };
-                Ok(StoreConfig::Memory { config, namespace })
+                let genesis_path = genesis_path.clone();
+                Ok(StoreConfig::Memory {
+                    config,
+                    namespace,
+                    genesis_path,
+                })
             }
             #[cfg(feature = "rocksdb")]
             StorageConfig::RocksDb { path, spawn_mode } => {
@@ -451,8 +461,8 @@ impl fmt::Display for StorageConfigNamespace {
             StorageConfig::Service { endpoint } => {
                 write!(f, "service:tcp:{}:{}", endpoint, namespace)
             }
-            StorageConfig::Memory => {
-                write!(f, "memory:{}", namespace)
+            StorageConfig::Memory { genesis_path } => {
+                write!(f, "memory:{}:{}", genesis_path.display(), namespace)
             }
             #[cfg(feature = "rocksdb")]
             StorageConfig::RocksDb { path, spawn_mode } => {
@@ -511,25 +521,28 @@ pub trait RunnableWithStore {
 }
 
 impl StoreConfig {
-    #[allow(unused_variables)]
     pub async fn run_with_storage<Job>(
         self,
-        genesis_config: &GenesisConfig,
         wasm_runtime: Option<WasmRuntime>,
         job: Job,
     ) -> Result<Job::Output, anyhow::Error>
     where
         Job: Runnable,
     {
         match self {
-            StoreConfig::Memory { config, namespace } => {
+            StoreConfig::Memory {
+                config,
+                namespace,
+                genesis_path,
+            } => {
                 let store_config = MemoryStoreConfig::new(config.common_config.max_stream_queries);
                 let mut storage = DbStorage::<MemoryStore, _>::maybe_create_and_connect(
                     &store_config,
                     &namespace,
                     wasm_runtime,
                 )
                 .await?;
+                let genesis_config = crate::util::read_json::<GenesisConfig>(genesis_path)?;
                 // Memory storage must be initialized every time.
                 genesis_config.initialize_storage(&mut storage).await?;
                 Ok(job.run(storage).await)
@@ -638,26 +651,24 @@ impl RunnableWithStore for InitializeStorageJob<'_> {
 #[test]
 fn test_memory_storage_config_from_str() {
     assert_eq!(
-        StorageConfigNamespace::from_str("memory:").unwrap(),
+        StorageConfigNamespace::from_str("memory:path/to/genesis.json").unwrap(),
         StorageConfigNamespace {
-            storage_config: StorageConfig::Memory,
-            namespace: "".into()
-        }
-    );
-    assert_eq!(
-        StorageConfigNamespace::from_str("memory").unwrap(),
-        StorageConfigNamespace {
-            storage_config: StorageConfig::Memory,
+            storage_config: StorageConfig::Memory {
+                genesis_path: PathBuf::from("path/to/genesis.json")
+            },
             namespace: DEFAULT_NAMESPACE.into()
         }
     );
     assert_eq!(
-        StorageConfigNamespace::from_str("memory:table_linera").unwrap(),
+        StorageConfigNamespace::from_str("memory:path/to/genesis.json:namespace").unwrap(),
         StorageConfigNamespace {
-            storage_config: StorageConfig::Memory,
-            namespace: DEFAULT_NAMESPACE.into()
+            storage_config: StorageConfig::Memory {
+                genesis_path: PathBuf::from("path/to/genesis.json")
+            },
+            namespace: "namespace".into()
         }
     );
+    assert!(StorageConfigNamespace::from_str("memory").is_err(),);
 }
 
 #[cfg(feature = "storage-service")]
