apollo_node_config: made validation only node hold full state

Author: sirandreww-starkware

crates/apollo_integration_tests/src/utils.rs

@@ -91,7 +91,7 @@ use apollo_storage::storage_reader_server::{
     StorageReaderServerDynamicConfig,
     StorageReaderServerStaticConfig,
 };
-use apollo_storage::{StorageConfig, StorageScope};
+use apollo_storage::StorageConfig;
 use axum::extract::Query;
 use axum::routing::{get, post};
 use axum::{serve, Json, Router};
@@ -379,9 +379,9 @@ pub fn create_node_config(
     // expect a mempool client. The config pointer in CONFIG_POINTERS only propagates this when
     // loading from a file; when building in code we set it directly.
     batcher_config.static_config.validation_only = validation_only;
-    if validation_only {
-        state_sync_config.static_config.storage_config.scope = StorageScope::StateOnly;
-    }
+    // TODO(Asaf): once consensus works on a StateOnly state_sync (see
+    // `validate_validation_only_config` in apollo_node_config), restore an
+    // `if validation_only { scope = StateOnly }` override here.
     let batcher_config = wrap_if_component_config_expected!(batcher, batcher_config);
     let class_manager_config =
         wrap_if_component_config_expected!(class_manager, class_manager_config);

crates/apollo_node_config/src/config_test.rs

@@ -115,10 +115,13 @@ fn monitoring_config(
     assert_eq!(component_exe_config.validate().is_ok(), expected_successful_validation);
 }
 
-fn state_sync_config_with_state_only() -> StateSyncConfig {
+fn state_sync_config_with_full_archive() -> StateSyncConfig {
     StateSyncConfig {
         static_config: StateSyncStaticConfig {
-            storage_config: StorageConfig { scope: StorageScope::StateOnly, ..Default::default() },
+            storage_config: StorageConfig {
+                scope: StorageScope::FullArchive,
+                ..Default::default()
+            },
             ..Default::default()
         },
         ..Default::default()
@@ -136,7 +139,7 @@ fn validation_only_with_gateway_enabled_fails() {
             mempool_p2p: ReactiveComponentExecutionConfig::default(),
             ..Default::default()
         },
-        state_sync_config: Some(state_sync_config_with_state_only()),
+        state_sync_config: Some(state_sync_config_with_full_archive()),
         ..Default::default()
     };
     let err = config.validate_node_config().unwrap_err();
@@ -156,7 +159,7 @@ fn validation_only_with_http_server_enabled_fails() {
             ..Default::default()
         },
         gateway_config: None,
-        state_sync_config: Some(state_sync_config_with_state_only()),
+        state_sync_config: Some(state_sync_config_with_full_archive()),
         ..Default::default()
     };
     let err = config.validate_node_config().unwrap_err();
@@ -177,7 +180,7 @@ fn validation_only_with_mempool_enabled_fails() {
         },
         gateway_config: None,
         http_server_config: None,
-        state_sync_config: Some(state_sync_config_with_state_only()),
+        state_sync_config: Some(state_sync_config_with_full_archive()),
         ..Default::default()
     };
     let err = config.validate_node_config().unwrap_err();
@@ -199,7 +202,7 @@ fn validation_only_with_mempool_p2p_enabled_fails() {
         gateway_config: None,
         http_server_config: None,
         mempool_config: None,
-        state_sync_config: Some(state_sync_config_with_state_only()),
+        state_sync_config: Some(state_sync_config_with_full_archive()),
         ..Default::default()
     };
     let err = config.validate_node_config().unwrap_err();
@@ -221,14 +224,14 @@ fn validation_only_with_tx_ingestion_disabled_succeeds() {
         http_server_config: None,
         mempool_config: None,
         mempool_p2p_config: None,
-        state_sync_config: Some(state_sync_config_with_state_only()),
+        state_sync_config: Some(state_sync_config_with_full_archive()),
         ..Default::default()
     };
     assert!(config.validate_node_config().is_ok());
 }
 
 #[test]
-fn validation_only_with_full_archive_state_sync_fails() {
+fn validation_only_with_state_only_state_sync_fails() {
     let config = SequencerNodeConfig {
         validation_only: true,
         components: ComponentConfig {
@@ -245,7 +248,7 @@ fn validation_only_with_full_archive_state_sync_fails() {
         state_sync_config: Some(StateSyncConfig {
             static_config: StateSyncStaticConfig {
                 storage_config: StorageConfig {
-                    scope: StorageScope::FullArchive,
+                    scope: StorageScope::StateOnly,
                     ..Default::default()
                 },
                 ..Default::default()
@@ -255,5 +258,5 @@ fn validation_only_with_full_archive_state_sync_fails() {
         ..Default::default()
     };
     let err = config.validate_node_config().unwrap_err();
-    assert!(format!("{err:?}").contains("StateOnly"), "Unexpected error: {err:?}");
+    assert!(format!("{err:?}").contains("FullArchive"), "Unexpected error: {err:?}");
 }

crates/apollo_node_config/src/node_config.rs

@@ -604,10 +604,16 @@ impl SequencerNodeConfig {
             }
             other => other,
         })?;
+        // TODO(Asaf): validation-only nodes should ideally use StorageScope::StateOnly to
+        // save disk and write traffic, but the SNIP-35 fee_proposals bootstrap calls
+        // state_sync.get_block(), which reads transaction_metadata - a table excluded from
+        // StateOnly (see apollo_storage::StorageScope). Find a way to either (a) make
+        // get_block work without transaction_metadata or (b) skip the bootstrap call on
+        // validation-only nodes, then flip this back to requiring StateOnly.
         if let Some(state_sync_config) = &self.state_sync_config {
-            if state_sync_config.static_config.storage_config.scope != StorageScope::StateOnly {
+            if state_sync_config.static_config.storage_config.scope != StorageScope::FullArchive {
                 return Err(ConfigError::ComponentConfigMismatch {
-                    component_config_mismatch: "state_sync storage scope must be StateOnly when \
+                    component_config_mismatch: "state_sync storage scope must be FullArchive when \
                                                 validation_only is true"
                         .to_string(),
                 });