refactor: PR comments

rsksmart · Sep 29, 2023 · 915983f · 915983f
1 parent 043d3ae
commit 915983f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/core/lib/config/src/configs/eth_sender.rs b/core/lib/config/src/configs/eth_sender.rs
@@ -5,7 +5,7 @@ use serde::Deserialize;
 // Workspace uses
 use zksync_types::{network::Network, Address, H256};
 // Local uses
-use crate::{configs::chain::Eth, envy_load};
+use crate::{configs::chain::Eth, envy_load, ETHClientConfig};
 
 /// Configuration for the Rootstock sender crate.
 #[derive(Debug, Deserialize, Clone, PartialEq)]
@@ -20,9 +20,11 @@ impl ETHSenderConfig {
     pub fn from_env() -> Self {
         let eth: Eth = envy_load!("eth", "CHAIN_ETH_");
         let sender: Sender = envy_load!("eth_sender", "ETH_SENDER_SENDER_");
+        let client: ETHClientConfig = envy_load!("eth_client", "ETH_CLIENT_");
 
         assert!(
-            !(sender.complete_withdrawals && eth.network == Network::Mainnet),
+            !(sender.complete_withdrawals
+                && (eth.network == Network::Mainnet || client.chain_id == 30)),
             "The withdrawals cannot be automatic in mainnet"
         );
 
@@ -130,6 +132,10 @@ ETH_SENDER_GAS_PRICE_LIMIT_DEFAULT="400000000000"
 ETH_SENDER_GAS_PRICE_LIMIT_UPDATE_INTERVAL="150"
 ETH_SENDER_GAS_PRICE_LIMIT_SAMPLE_INTERVAL="15"
 ETH_SENDER_GAS_PRICE_LIMIT_SCALE_FACTOR="1"
+CHAIN_ETH_NETWORK="mainnet"
+ETH_CLIENT_CHAIN_ID=30
+ETH_CLIENT_GAS_PRICE_FACTOR="1"
+ETH_CLIENT_WEB3_URL="http://127.0.0.1:4444"
         "#;
         set_env(config);
 
@@ -174,6 +180,9 @@ ETH_SENDER_GAS_PRICE_LIMIT_UPDATE_INTERVAL="150"
 ETH_SENDER_GAS_PRICE_LIMIT_SAMPLE_INTERVAL="15"
 ETH_SENDER_GAS_PRICE_LIMIT_SCALE_FACTOR="1"
 CHAIN_ETH_NETWORK="mainnet"
+ETH_CLIENT_CHAIN_ID=30
+ETH_CLIENT_GAS_PRICE_FACTOR="1"
+ETH_CLIENT_WEB3_URL="http://127.0.0.1:4444"
         "#;
         set_env(config);
 

diff --git a/etc/env/mainnet/api.toml b/etc/env/mainnet/api.toml
@@ -43,7 +43,6 @@ url="http://127.0.0.1:8080"
 port=3001
 use_https=false
 url="https://127.0.0.1:3001"
-chain_id=30
 
 # Configuration for the JSON RPC server
 [api.json_rpc]
@@ -59,6 +58,7 @@ ws_url="ws://127.0.0.1:3031"
 port=3002
 url="http://127.0.0.1:3002"
 max_block_range=10
+chain_id=30
 
 # Configuration for the core private server.
 [api.private]

diff --git a/etc/env/mainnet/chain.toml b/etc/env/mainnet/chain.toml
@@ -17,7 +17,7 @@ balance_tree_depth=32
 
 [chain.eth]
 # Name of the used RSK network (since Ethers uses localhost for different works as Rootstock, different RSK networks are differentiated by its chain id in eth_client.toml)
-network="localhost"
+network="mainnet"
 
 [chain.state_keeper]
 # Block sizes to be generated by server.