rename gateway_url

matter-labs · Nov 27, 2024 · 013815f · 013815f
1 parent 5cec8b4
commit 013815f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/core/bin/external_node/src/config/mod.rs b/core/bin/external_node/src/config/mod.rs
@@ -728,7 +728,10 @@ impl OptionalENConfig {
                 .unwrap_or_else(Self::default_main_node_rate_limit_rps),
             api_namespaces,
             contracts_diamond_proxy_addr: None,
-            gateway_url: secrets.l1.as_ref().and_then(|l1| l1.gateway_url.clone()),
+            gateway_url: secrets
+                .l1
+                .as_ref()
+                .and_then(|l1| l1.gateway_rpc_url.clone()),
             bridge_addresses_refresh_interval_sec: enconfig.bridge_addresses_refresh_interval_sec,
             timestamp_asserter_min_time_till_end_sec: general_config
                 .timestamp_asserter_config

diff --git a/core/bin/zksync_server/src/node_builder.rs b/core/bin/zksync_server/src/node_builder.rs
@@ -161,7 +161,7 @@ impl MainNodeBuilder {
         let query_eth_client_layer = QueryEthClientLayer::new(
             genesis.settlement_layer_id(),
             eth_config.l1_rpc_url,
-            eth_config.gateway_url,
+            eth_config.gateway_rpc_url,
         );
         self.node.add_layer(query_eth_client_layer);
         Ok(self)

diff --git a/core/lib/config/src/configs/secrets.rs b/core/lib/config/src/configs/secrets.rs
@@ -16,7 +16,7 @@ pub struct DatabaseSecrets {
 #[derive(Debug, Clone, PartialEq)]
 pub struct L1Secrets {
     pub l1_rpc_url: SensitiveUrl,
-    pub gateway_url: Option<SensitiveUrl>,
+    pub gateway_rpc_url: Option<SensitiveUrl>,
 }
 
 #[derive(Debug, Clone, PartialEq)]

diff --git a/core/lib/config/src/testonly.rs b/core/lib/config/src/testonly.rs
@@ -852,7 +852,7 @@ impl Distribution<configs::secrets::L1Secrets> for EncodeDist {
         use configs::secrets::L1Secrets;
         L1Secrets {
             l1_rpc_url: format!("localhost:{}", rng.gen::<u16>()).parse().unwrap(),
-            gateway_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
+            gateway_rpc_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
         }
     }
 }

diff --git a/core/lib/env_config/src/eth_sender.rs b/core/lib/env_config/src/eth_sender.rs
@@ -23,7 +23,7 @@ impl FromEnv for L1Secrets {
                 .context("ETH_CLIENT_WEB3_URL")?
                 .parse()
                 .context("ETH_CLIENT_WEB3_URL")?,
-            gateway_url: std::env::var("ETH_CLIENT_GATEWAY_WEB3_URL")
+            gateway_rpc_url: std::env::var("ETH_CLIENT_GATEWAY_WEB3_URL")
                 .ok()
                 .map(|url| url.parse().expect("ETH_CLIENT_GATEWAY_WEB3_URL")),
         })
@@ -100,7 +100,7 @@ mod tests {
             },
             L1Secrets {
                 l1_rpc_url: "http://127.0.0.1:8545".to_string().parse().unwrap(),
-                gateway_url: Some("http://127.0.0.1:8547".to_string().parse().unwrap()),
+                gateway_rpc_url: Some("http://127.0.0.1:8547".to_string().parse().unwrap()),
             },
         )
     }

diff --git a/core/lib/protobuf_config/src/proto/config/secrets.proto b/core/lib/protobuf_config/src/proto/config/secrets.proto
@@ -11,7 +11,7 @@ message DatabaseSecrets {
 
 message L1Secrets {
   optional string l1_rpc_url = 1; // required
-  optional string gateway_url = 2; // optional
+  optional string gateway_rpc_url = 2; // optional
 }
 
 message ConsensusSecrets {

diff --git a/core/lib/protobuf_config/src/secrets.rs b/core/lib/protobuf_config/src/secrets.rs
@@ -86,20 +86,20 @@ impl ProtoRepr for proto::L1Secrets {
     fn read(&self) -> anyhow::Result<Self::Type> {
         Ok(Self::Type {
             l1_rpc_url: SensitiveUrl::from_str(required(&self.l1_rpc_url).context("l1_rpc_url")?)?,
-            gateway_url: self
-                .gateway_url
+            gateway_rpc_url: self
+                .gateway_rpc_url
                 .clone()
                 .map(|url| SensitiveUrl::from_str(&url))
                 .transpose()
-                .context("gateway_url")?,
+                .context("gateway_rpc_url")?,
         })
     }
 
     fn build(this: &Self::Type) -> Self {
         Self {
             l1_rpc_url: Some(this.l1_rpc_url.expose_str().to_string()),
-            gateway_url: this
-                .gateway_url
+            gateway_rpc_url: this
+                .gateway_rpc_url
                 .as_ref()
                 .map(|url| url.expose_url().to_string()),
         }

diff --git a/zkstack_cli/crates/zkstack/src/commands/external_node/prepare_configs.rs b/zkstack_cli/crates/zkstack/src/commands/external_node/prepare_configs.rs
@@ -111,7 +111,7 @@ fn prepare_configs(
         }),
         l1: Some(L1Secrets {
             l1_rpc_url: SensitiveUrl::from_str(&args.l1_rpc_url).context("l1_rpc_url")?,
-            gateway_url: None,
+            gateway_rpc_url: None,
         }),
         data_availability: None,
     };