apollo_gateway_config: create proof archive writer config

Author: einat-starkware

crates/apollo_deployments/resources/app_configs/replacer_proof_manager_config.json

@@ -1,3 +1,3 @@
 {
-    "proof_manager_config.persistent_root": "/data/proofs"
-}
+  "proof_manager_config.persistent_root": "/data/proofs"
+}

crates/apollo_deployments/resources/testing_secrets.json

@@ -1,9 +1,10 @@
 {
     "base_layer_config.ordered_l1_endpoint_urls": "http://anvil-service.anvil.svc.cluster.local:8545",
     "consensus_manager_config.network_config.secret_key": "0x0101010101010101010101010101010101010101010101010101010101010101",
+    "gateway_config.proof_archive_writer_config.bucket_name": "test-proof-archive-bucket",
     "l1_gas_price_provider_config.eth_to_strk_oracle_config.url_header_list": "http://dummy-eth2strk-oracle-service.dummy-eth2strk-oracle.svc.cluster.local/eth_to_strk_oracle?timestamp=:9000",
-    "mempool_p2p_config.network_config.secret_key" : "0x0101010101010101010101010101010101010101010101010101010101010101",
+    "mempool_p2p_config.network_config.secret_key": "0x0101010101010101010101010101010101010101010101010101010101010101",
     "recorder_url": "http://dummy-recorder-service.dummy-recorder.svc.cluster.local:8080",
     "state_sync_config.central_sync_client_config.central_source_config.http_headers": "",
-    "state_sync_config.network_config.secret_key" : "0x0101010101010101010101010101010101010101010101010101010101010101"
+    "state_sync_config.network_config.secret_key": "0x0101010101010101010101010101010101010101010101010101010101010101"
 }

crates/apollo_deployments/src/test_utils.rs

@@ -21,6 +21,9 @@ pub struct SecretsConfigOverride {
         serialize_with = "serialize_optional_vec_u8_wrapper"
     )]
     consensus_manager_config_network_config_secret_key: Option<Vec<u8>>,
+    #[serde(rename = "gateway_config.proof_archive_writer_config.bucket_name")]
+    gateway_config_proof_archive_writer_config_bucket_name: String,
+
     #[serde(
         rename = "l1_gas_price_provider_config.eth_to_strk_oracle_config.url_header_list",
         serialize_with = "serialize_optional_list_with_url_and_headers_wrapper"
@@ -52,6 +55,8 @@ impl Default for SecretsConfigOverride {
                 Url::parse("https://arbitrary.ordered_l1_endpoint_2.url").unwrap(),
             ],
             consensus_manager_config_network_config_secret_key: None,
+            gateway_config_proof_archive_writer_config_bucket_name: "arbitrary_bucket_name"
+                .to_string(),
             l1_gas_price_provider_config_config_eth_to_strk_oracle_config_url_header_list: Some(
                 vec![UrlAndHeaders {
                     url: Url::parse("https://arbitrary.eth_to_strk_oracle.url").unwrap(),

crates/apollo_gateway/src/gateway.rs

@@ -246,7 +246,8 @@ pub fn create_gateway(
     let stateless_tx_validator = Arc::new(StatelessTransactionValidator {
         config: config.stateless_tx_validator_config.clone(),
     });
-    let proof_archive_writer = Arc::new(GcsProofArchiveWriter::new());
+    let proof_archive_writer =
+        Arc::new(GcsProofArchiveWriter::new(config.proof_archive_writer_config.clone()));
     Gateway::new(
         config,
         state_reader_factory,

crates/apollo_gateway/src/gateway_test.rs

@@ -11,6 +11,7 @@ use apollo_config::dumping::SerializeConfig;
 use apollo_config::loading::load_and_process_config;
 use apollo_gateway_config::config::{
     GatewayConfig,
+    ProofArchiveWriterConfig,
     StatefulTransactionValidatorConfig,
     StatelessTransactionValidatorConfig,
 };
@@ -127,6 +128,7 @@ fn mock_dependencies() -> MockDependencies {
         chain_info: ChainInfo::create_for_testing(),
         block_declare: false,
         authorized_declarer_accounts: None,
+        proof_archive_writer_config: ProofArchiveWriterConfig::default(),
     };
     let state_reader_factory =
         local_test_state_reader_factory(CairoVersion::Cairo1(RunnableCairo1::Casm), true);

crates/apollo_gateway/src/proof_archive_writer.rs

@@ -1,3 +1,4 @@
+use apollo_gateway_config::config::ProofArchiveWriterConfig;
 use async_trait::async_trait;
 #[cfg(any(feature = "testing", test))]
 use mockall::automock;
@@ -22,13 +23,14 @@ pub enum ProofArchiveError {
 }
 
 #[derive(Clone, Default)]
-// TODO(Einat): Add GCS related fields.
-pub struct GcsProofArchiveWriter;
+pub struct GcsProofArchiveWriter {
+    #[allow(dead_code)]
+    config: ProofArchiveWriterConfig,
+}
 
 impl GcsProofArchiveWriter {
-    pub fn new() -> Self {
-        // TODO(Einat): connect to GCS client.
-        Self
+    pub fn new(config: ProofArchiveWriterConfig) -> Self {
+        Self { config }
     }
 }
 

crates/apollo_gateway_config/src/config.rs

@@ -11,6 +11,7 @@ use apollo_config::dumping::{
     ser_param,
     SerializeConfig,
 };
+use apollo_config::secrets::Sensitive;
 use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use blockifier::blockifier::config::ContractClassManagerConfig;
 use blockifier::blockifier_versioned_constants::VersionedConstantsOverrides;
@@ -23,6 +24,7 @@ use validator::Validate;
 use crate::compiler_version::VersionId;
 
 const JSON_RPC_VERSION: &str = "2.0";
+const DEFAULT_BUCKET_NAME: &str = "proof-archive";
 
 #[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)]
 pub struct GatewayConfig {
@@ -33,6 +35,7 @@ pub struct GatewayConfig {
     pub block_declare: bool,
     #[serde(default, deserialize_with = "deserialize_comma_separated_str")]
     pub authorized_declarer_accounts: Option<Vec<ContractAddress>>,
+    pub proof_archive_writer_config: ProofArchiveWriterConfig,
 }
 
 impl Default for GatewayConfig {
@@ -47,6 +50,7 @@ impl Default for GatewayConfig {
             chain_info: ChainInfo::default(),
             block_declare: false,
             authorized_declarer_accounts: None,
+            proof_archive_writer_config: ProofArchiveWriterConfig::default(),
         }
     }
 }
@@ -80,6 +84,10 @@ impl SerializeConfig for GatewayConfig {
              Addresses are in hex format and separated by a comma with no space.",
             ParamPrivacyInput::Public,
         ));
+        dump.extend(prepend_sub_config_name(
+            self.proof_archive_writer_config.dump(),
+            "proof_archive_writer_config",
+        ));
         dump
     }
 }
@@ -292,3 +300,25 @@ impl SerializeConfig for StatefulTransactionValidatorConfig {
         dump
     }
 }
+
+#[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)]
+pub struct ProofArchiveWriterConfig {
+    pub bucket_name: Sensitive<String>,
+}
+
+impl Default for ProofArchiveWriterConfig {
+    fn default() -> Self {
+        Self { bucket_name: DEFAULT_BUCKET_NAME.to_string().into() }
+    }
+}
+
+impl SerializeConfig for ProofArchiveWriterConfig {
+    fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
+        BTreeMap::from_iter([ser_param(
+            "bucket_name",
+            &self.bucket_name,
+            "The name of the bucket to write proofs to.",
+            ParamPrivacyInput::Private,
+        )])
+    }
+}

crates/apollo_integration_tests/src/utils.rs

@@ -26,6 +26,7 @@ use apollo_consensus_orchestrator::cende::RECORDER_WRITE_BLOB_PATH;
 use apollo_consensus_orchestrator_config::config::{CendeConfig, ContextConfig};
 use apollo_gateway_config::config::{
     GatewayConfig,
+    ProofArchiveWriterConfig,
     StatefulTransactionValidatorConfig,
     StatelessTransactionValidatorConfig,
 };
@@ -630,6 +631,7 @@ pub fn create_gateway_config(
         ..Default::default()
     };
     let contract_class_manager_config = ContractClassManagerConfig::default();
+    let proof_archive_writer_config = ProofArchiveWriterConfig::default();
 
     GatewayConfig {
         stateless_tx_validator_config,
@@ -638,6 +640,7 @@ pub fn create_gateway_config(
         chain_info,
         block_declare: false,
         authorized_declarer_accounts: None,
+        proof_archive_writer_config,
     }
 }
 

crates/apollo_node/resources/config_schema.json

@@ -2489,6 +2489,11 @@
     "privacy": "Public",
     "value": 2
   },
+  "gateway_config.proof_archive_writer_config.bucket_name": {
+    "description": "The name of the bucket to write proofs to.",
+    "privacy": "Private",
+    "value": "<<redacted>>"
+  },
   "gateway_config.stateful_tx_validator_config.max_allowed_nonce_gap": {
     "description": "The maximum allowed gap between the account nonce and the transaction nonce.",
     "privacy": "Public",

crates/apollo_node/resources/config_secrets_schema.json

@@ -1,6 +1,7 @@
 [
   "base_layer_config.ordered_l1_endpoint_urls",
   "consensus_manager_config.network_config.secret_key",
+  "gateway_config.proof_archive_writer_config.bucket_name",
   "l1_gas_price_provider_config.eth_to_strk_oracle_config.url_header_list",
   "mempool_p2p_config.network_config.secret_key",
   "recorder_url",