Remove settlement_mode from gas adjuster

Signed-off-by: Danil <[email protected]>

core/bin/block_reverter/src/main.rs

@@ -25,7 +25,7 @@ use zksync_dal::{ConnectionPool, Core};
 use zksync_env_config::{object_store::SnapshotsObjectStoreConfig, FromEnv};
 use zksync_object_store::ObjectStoreFactory;
 use zksync_protobuf_config::proto;
-use zksync_types::{Address, L1BatchNumber};
+use zksync_types::{settlement::SettlementMode, Address, L1BatchNumber};
 
 #[derive(Debug, Parser)]
 #[command(author = "Matter Labs", version, about = "Block revert utility", long_about = None)]
@@ -202,7 +202,6 @@ async fn main() -> anyhow::Result<()> {
 
     let gas_adjuster = eth_sender.gas_adjuster.context("gas_adjuster")?;
     let default_priority_fee_per_gas = gas_adjuster.default_priority_fee_per_gas;
-    let settlement_mode = gas_adjuster.settlement_mode;
 
     let database_secrets = match &secrets_config {
         Some(secrets_config) => secrets_config
@@ -236,12 +235,16 @@ async fn main() -> anyhow::Result<()> {
 
     let contracts = SettlementLayerContracts::new(&contracts, None);
 
-    let sl_rpc_url = if settlement_mode.is_gateway() {
-        l1_secrets
-            .gateway_rpc_url
-            .context("Gateway URL not found")?
+    // TODO think more about it
+    let (sl_rpc_url, settlement_mode) = if opts.gateway_chain_path.is_some() {
+        (
+            l1_secrets
+                .gateway_rpc_url
+                .context("Gateway URL not found")?,
+            SettlementMode::Gateway,
+        )
     } else {
-        l1_secrets.l1_rpc_url
+        (l1_secrets.l1_rpc_url, SettlementMode::SettlesToL1)
     };
 
     let sl_diamond_proxy = contracts

core/lib/config/src/configs/eth_sender.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use anyhow::Context as _;
 use serde::Deserialize;
-use zksync_basic_types::{pubdata_da::PubdataSendingMode, settlement::SettlementMode, H256};
+use zksync_basic_types::{pubdata_da::PubdataSendingMode, H256};
 use zksync_crypto_primitives::K256PrivateKey;
 
 use crate::EthWatchConfig;
@@ -57,7 +57,6 @@ impl EthConfig {
                 num_samples_for_blob_base_fee_estimate: 10,
                 internal_pubdata_pricing_multiplier: 1.0,
                 max_blob_base_fee: None,
-                settlement_mode: Default::default(),
             }),
             watcher: Some(EthWatchConfig {
                 confirmations_for_eth_event: None,
@@ -206,10 +205,6 @@ pub struct GasAdjusterConfig {
     pub internal_pubdata_pricing_multiplier: f64,
     /// Max blob base fee that is allowed to be used.
     pub max_blob_base_fee: Option<u64>,
-    /// Whether the gas adjuster should require that the L2 node is used as a settlement layer.
-    /// It offers a runtime check for correctly provided values.
-    #[serde(default)]
-    pub settlement_mode: SettlementMode,
 }
 
 impl GasAdjusterConfig {

core/lib/config/src/testonly.rs

@@ -440,8 +440,6 @@ impl Distribution<configs::eth_sender::GasAdjusterConfig> for EncodeDist {
             num_samples_for_blob_base_fee_estimate: self.sample(rng),
             internal_pubdata_pricing_multiplier: self.sample(rng),
             max_blob_base_fee: self.sample(rng),
-            // TODO(EVM-676): generate it randomly once this value is used
-            settlement_mode: Default::default(),
         }
     }
 }

core/lib/env_config/src/eth_sender.rs

@@ -90,7 +90,6 @@ mod tests {
                     num_samples_for_blob_base_fee_estimate: 10,
                     internal_pubdata_pricing_multiplier: 1.0,
                     max_blob_base_fee: None,
-                    settlement_mode: Default::default(),
                 }),
                 watcher: Some(EthWatchConfig {
                     confirmations_for_eth_event: Some(0),

core/lib/protobuf_config/src/eth.rs

@@ -1,7 +1,7 @@
 use anyhow::Context as _;
 use zksync_config::configs::{self};
 use zksync_protobuf::{required, ProtoRepr};
-use zksync_types::{pubdata_da::PubdataSendingMode, settlement::SettlementMode};
+use zksync_types::pubdata_da::PubdataSendingMode;
 
 use crate::{proto::eth as proto, read_optional_repr};
 
@@ -45,24 +45,6 @@ impl proto::PubdataSendingMode {
     }
 }
 
-impl proto::SettlementMode {
-    fn new(x: &SettlementMode) -> Self {
-        use SettlementMode as From;
-        match x {
-            From::SettlesToL1 => Self::SettlesToL1,
-            From::Gateway => Self::Gateway,
-        }
-    }
-
-    fn parse(&self) -> SettlementMode {
-        use SettlementMode as To;
-        match self {
-            Self::SettlesToL1 => To::SettlesToL1,
-            Self::Gateway => To::Gateway,
-        }
-    }
-}
-
 impl ProtoRepr for proto::Eth {
     type Type = configs::eth_sender::EthConfig;
 
@@ -191,12 +173,6 @@ impl ProtoRepr for proto::GasAdjuster {
             )
             .context("internal_pubdata_pricing_multiplier")?,
             max_blob_base_fee: self.max_blob_base_fee,
-            settlement_mode: self
-                .settlement_mode
-                .map(proto::SettlementMode::try_from)
-                .transpose()?
-                .map(|x| x.parse())
-                .unwrap_or_default(),
         })
     }
 
@@ -218,7 +194,7 @@ impl ProtoRepr for proto::GasAdjuster {
             ),
             internal_pubdata_pricing_multiplier: Some(this.internal_pubdata_pricing_multiplier),
             max_blob_base_fee: this.max_blob_base_fee,
-            settlement_mode: Some(proto::SettlementMode::new(&this.settlement_mode).into()),
+            settlement_mode: None,
         }
     }
 }

core/node/eth_sender/src/tester.rs

@@ -5,7 +5,10 @@ use zksync_config::{
     ContractsConfig, EthConfig, GasAdjusterConfig,
 };
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_eth_client::{clients::MockSettlementLayer, BaseFees, BoundEthInterface};
+use zksync_eth_client::{
+    clients::{DynClient, MockSettlementLayer, L1},
+    BaseFees, BoundEthInterface,
+};
 use zksync_l1_contract_interface::i_executor::methods::{ExecuteBatches, ProveBatches};
 use zksync_node_fee_model::l1_gas_price::{GasAdjuster, GasAdjusterClient};
 use zksync_node_test_utils::{create_l1_batch, l1_batch_metadata_to_commitment_artifacts};
@@ -220,9 +223,10 @@ impl EthSenderTester {
         gateway_blobs.advance_block_number(Self::WAIT_CONFIRMATIONS);
         let gateway_blobs = Box::new(gateway_blobs);
 
+        let client: Box<DynClient<L1>> = Box::new(gateway.clone().into_client());
         let gas_adjuster = Arc::new(
             GasAdjuster::new(
-                GasAdjusterClient::from_l1(Box::new(gateway.clone().into_client())),
+                GasAdjusterClient::from(client),
                 GasAdjusterConfig {
                     max_base_fee_samples: Self::MAX_BASE_FEE_SAMPLES,
                     pricing_formula_parameter_a: 3.0,

core/node/fee_model/src/l1_gas_price/gas_adjuster/mod.rs

@@ -23,35 +23,22 @@ mod tests;
 
 #[derive(Debug)]
 pub struct GasAdjusterClient {
-    gateway_mode: bool,
     inner: Box<dyn EthFeeInterface>,
 }
 
-impl GasAdjusterClient {
-    pub fn from_l1(inner: Box<DynClient<L1>>) -> Self {
-        Self {
-            inner: Box::new(inner.for_component("gas_adjuster")),
-            gateway_mode: false,
-        }
-    }
-
-    pub fn from_l2(inner: Box<DynClient<L2>>) -> Self {
+impl From<Box<DynClient<L1>>> for GasAdjusterClient {
+    fn from(inner: Box<DynClient<L1>>) -> Self {
         Self {
             inner: Box::new(inner.for_component("gas_adjuster")),
-            gateway_mode: true,
         }
     }
 }
 
-impl From<Box<DynClient<L1>>> for GasAdjusterClient {
-    fn from(inner: Box<DynClient<L1>>) -> Self {
-        Self::from_l1(inner)
-    }
-}
-
 impl From<Box<DynClient<L2>>> for GasAdjusterClient {
     fn from(inner: Box<DynClient<L2>>) -> Self {
-        Self::from_l2(inner)
+        Self {
+            inner: Box::new(inner.for_component("gas_adjuster")),
+        }
     }
 }
 
@@ -84,21 +71,21 @@ impl GasAdjuster {
         commitment_mode: L1BatchCommitmentMode,
     ) -> anyhow::Result<Self> {
         // A runtime check to ensure consistent config.
-        if config.settlement_mode.is_gateway() {
-            anyhow::ensure!(client.gateway_mode, "Must be L2 client in L2 mode");
-
-            anyhow::ensure!(
-                matches!(pubdata_sending_mode, PubdataSendingMode::RelayedL2Calldata | PubdataSendingMode::Custom),
-                "Only relayed L2 calldata or Custom is available for L2 mode, got: {pubdata_sending_mode:?}"
-            );
-        } else {
-            anyhow::ensure!(!client.gateway_mode, "Must be L1 client in L1 mode");
-
-            anyhow::ensure!(
-                !matches!(pubdata_sending_mode, PubdataSendingMode::RelayedL2Calldata),
-                "Relayed L2 calldata is only available in L2 mode"
-            );
-        }
+        // if config.settlement_mode.is_gateway() {
+        //     anyhow::ensure!(client.gateway_mode, "Must be L2 client in L2 mode");
+        //
+        //     anyhow::ensure!(
+        //         matches!(pubdata_sending_mode, PubdataSendingMode::RelayedL2Calldata | PubdataSendingMode::Custom),
+        //         "Only relayed L2 calldata or Custom is available for L2 mode, got: {pubdata_sending_mode:?}"
+        //     );
+        // } else {
+        //     anyhow::ensure!(!client.gateway_mode, "Must be L1 client in L1 mode");
+        //
+        //     anyhow::ensure!(
+        //         !matches!(pubdata_sending_mode, PubdataSendingMode::RelayedL2Calldata),
+        //         "Relayed L2 calldata is only available in L2 mode"
+        //     );
+        // }
 
         // Subtracting 1 from the "latest" block number to prevent errors in case
         // the info about the latest block is not yet present on the node.

core/node/fee_model/src/l1_gas_price/gas_adjuster/tests.rs

@@ -6,7 +6,7 @@ use zksync_eth_client::{clients::MockSettlementLayer, BaseFees};
 use zksync_types::{
     commitment::L1BatchCommitmentMode, pubdata_da::PubdataSendingMode, settlement::SettlementMode,
 };
-use zksync_web3_decl::client::L2;
+use zksync_web3_decl::client::{DynClient, L2};
 
 use super::{GasAdjuster, GasStatistics, GasStatisticsInner};
 use crate::l1_gas_price::GasAdjusterClient;
@@ -72,7 +72,6 @@ fn test_config(settlement_mode: SettlementMode) -> GasAdjusterConfig {
         num_samples_for_blob_base_fee_estimate: 3,
         internal_pubdata_pricing_multiplier: 1.0,
         max_blob_base_fee: None,
-        settlement_mode,
     }
 }
 
@@ -102,8 +101,9 @@ async fn kept_updated(commitment_mode: L1BatchCommitmentMode) {
     eth_client.advance_block_number(6);
 
     let config = test_config(SettlementMode::SettlesToL1);
+    let client: Box<DynClient<L2>> = Box::new(eth_client.clone().into_client());
     let adjuster = GasAdjuster::new(
-        GasAdjusterClient::from_l1(Box::new(eth_client.clone().into_client())),
+        GasAdjusterClient::from(client),
         config,
         PubdataSendingMode::Calldata,
         commitment_mode,
@@ -166,8 +166,10 @@ async fn kept_updated_l2(commitment_mode: L1BatchCommitmentMode) {
     eth_client.advance_block_number(6);
 
     let config = test_config(SettlementMode::Gateway);
+    let client: Box<DynClient<L2>> = Box::new(eth_client.clone().into_client());
+
     let adjuster = GasAdjuster::new(
-        GasAdjusterClient::from_l2(Box::new(eth_client.clone().into_client())),
+        GasAdjusterClient::from(client),
         config,
         PubdataSendingMode::RelayedL2Calldata,
         commitment_mode,

core/node/fee_model/src/lib.rs

@@ -181,6 +181,7 @@ mod tests {
         pubdata_da::PubdataSendingMode,
         U256,
     };
+    use zksync_web3_decl::client::{DynClient, L2};
 
     use super::*;
 
@@ -383,8 +384,10 @@ mod tests {
             ..Default::default()
         };
 
+        let client: Box<DynClient<L2>> = Box::new(mock.clone().into_client());
+
         GasAdjuster::new(
-            GasAdjusterClient::from_l1(Box::new(mock.into_client())),
+            GasAdjusterClient::from(client),
             gas_adjuster_config,
             PubdataSendingMode::Blobs,
             L1BatchCommitmentMode::Rollup,

core/node/state_keeper/src/io/tests/tester.rs

@@ -9,7 +9,10 @@ use zksync_config::{
 };
 use zksync_contracts::BaseSystemContracts;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
-use zksync_eth_client::{clients::MockSettlementLayer, BaseFees};
+use zksync_eth_client::{
+    clients::{DynClient, MockSettlementLayer, L1},
+    BaseFees,
+};
 use zksync_multivm::{
     interface::{
         tracer::ValidationTraces, TransactionExecutionMetrics, TransactionExecutionResult,
@@ -82,11 +85,12 @@ impl Tester {
             num_samples_for_blob_base_fee_estimate: 10,
             internal_pubdata_pricing_multiplier: 1.0,
             max_blob_base_fee: None,
-            settlement_mode: Default::default(),
         };
 
+        let client: Box<DynClient<L1>> = Box::new(eth_client.into_client());
+
         GasAdjuster::new(
-            GasAdjusterClient::from_l1(Box::new(eth_client.into_client())),
+            GasAdjusterClient::from(client),
             gas_adjuster_config,
             PubdataSendingMode::Calldata,
             self.commitment_mode,