refactor(l2): restart processes with the proposed API

cmd/ethrex_l2/src/commands/test.rs

@@ -89,6 +89,7 @@ async fn transfer_from(
         let tx = client
             .build_eip1559_transaction(
                 to_address,
+                address,
                 Bytes::new(),
                 Overrides {
                     chain_id: Some(cfg.network.l2_chain_id),
@@ -103,10 +104,7 @@ async fn transfer_from(
             .await
             .unwrap();
 
-        while let Err(e) = client
-            .send_eip1559_transaction(tx.clone(), &private_key)
-            .await
-        {
+        while let Err(e) = client.send_eip1559_transaction(&tx, &private_key).await {
             println!("Transaction failed (PK: {pk} - Nonce: {}): {e}", tx.nonce);
             retries += 1;
             sleep(std::time::Duration::from_secs(2));

cmd/ethrex_l2/src/commands/wallet.rs

@@ -341,6 +341,7 @@ impl Command {
                 let tx = eth_client
                     .build_eip1559_transaction(
                         cfg.contracts.common_bridge,
+                        cfg.wallet.address,
                         claim_withdrawal_data.into(),
                         Overrides {
                             chain_id: Some(cfg.network.l1_chain_id),
@@ -350,7 +351,7 @@ impl Command {
                     )
                     .await?;
                 let tx_hash = eth_client
-                    .send_eip1559_transaction(tx, &cfg.wallet.private_key)
+                    .send_eip1559_transaction(&tx, &cfg.wallet.private_key)
                     .await?;
 
                 println!("Withdrawal claim sent: {tx_hash:#x}");
@@ -377,6 +378,7 @@ impl Command {
                 let transfer_tx = client
                     .build_eip1559_transaction(
                         to,
+                        cfg.wallet.address,
                         Bytes::new(),
                         Overrides {
                             value: Some(amount),
@@ -394,7 +396,7 @@ impl Command {
                     .await?;
 
                 let tx_hash = client
-                    .send_eip1559_transaction(transfer_tx, &cfg.wallet.private_key)
+                    .send_eip1559_transaction(&transfer_tx, &cfg.wallet.private_key)
                     .await?;
 
                 println!(
@@ -418,6 +420,7 @@ impl Command {
                     .build_privileged_transaction(
                         PrivilegedTxType::Withdrawal,
                         to.unwrap_or(cfg.wallet.address),
+                        to.unwrap_or(cfg.wallet.address),
                         Bytes::new(),
                         Overrides {
                             nonce,
@@ -431,7 +434,7 @@ impl Command {
                     .await?;
 
                 let tx_hash = rollup_client
-                    .send_privileged_l2_transaction(withdraw_transaction, &cfg.wallet.private_key)
+                    .send_privileged_l2_transaction(&withdraw_transaction, &cfg.wallet.private_key)
                     .await?;
 
                 println!("Withdrawal sent: {tx_hash:#x}");
@@ -470,6 +473,7 @@ impl Command {
                 let tx = client
                     .build_eip1559_transaction(
                         to,
+                        cfg.wallet.address,
                         calldata,
                         Overrides {
                             value: Some(value),
@@ -490,7 +494,7 @@ impl Command {
                     )
                     .await?;
                 let tx_hash = client
-                    .send_eip1559_transaction(tx, &cfg.wallet.private_key)
+                    .send_eip1559_transaction(&tx, &cfg.wallet.private_key)
                     .await?;
 
                 println!(

crates/l2/Makefile

@@ -98,7 +98,7 @@ rm_dev_libmdbx_l2: ## 🛑 Removes the Libmdbx DB used by the L2
 
 # CI Testing
 
-test:
+test: ## 🚧 Runs the L2's integration test
 	docker compose -f ${ethrex_L2_DOCKER_COMPOSE_PATH} down
 	docker compose -f ${ethrex_L2_DOCKER_COMPOSE_PATH} up -d --build
 	BRIDGE_ADDRESS=$$(grep 'L1_WATCHER_BRIDGE_ADDRESS' .env | cut -d= -f2) ON_CHAIN_PROPOSER_ADDRESS=$$(grep 'COMMITTER_ON_CHAIN_PROPOSER_ADDRESS' .env | cut -d= -f2) cargo test --release testito -- --nocapture

crates/l2/contracts/deployer.rs

@@ -1,10 +1,7 @@
 use bytes::Bytes;
 use colored::Colorize;
 use ethereum_types::{Address, H160, H256};
-use ethrex_core::{
-    types::{GAS_LIMIT_ADJUSTMENT_FACTOR, GAS_LIMIT_MINIMUM},
-    U256,
-};
+use ethrex_core::U256;
 use ethrex_l2::utils::{
     config::{read_env_as_lines, read_env_file, write_env},
     eth_client::{eth_sender::Overrides, EthClient},
@@ -220,18 +217,6 @@ async fn deploy_contracts(
     eth_client: &EthClient,
     contracts_path: &Path,
 ) -> (Address, Address) {
-    let gas_price = if eth_client.url.contains("localhost:8545") {
-        Some(1_000_000_000)
-    } else {
-        Some(eth_client.get_gas_price().await.unwrap().as_u64() * 2)
-    };
-
-    let overrides = Overrides {
-        gas_limit: Some(GAS_LIMIT_MINIMUM * GAS_LIMIT_ADJUSTMENT_FACTOR),
-        gas_price,
-        ..Default::default()
-    };
-
     let deploy_frames = spinner!(["📭❱❱", "❱📬❱", "❱❱📫"], 220);
 
     let mut spinner = Spinner::new(
@@ -241,14 +226,7 @@ async fn deploy_contracts(
     );
 
     let (on_chain_proposer_deployment_tx_hash, on_chain_proposer_address) =
-        deploy_on_chain_proposer(
-            deployer,
-            deployer_private_key,
-            overrides.clone(),
-            eth_client,
-            contracts_path,
-        )
-        .await;
+        deploy_on_chain_proposer(deployer, deployer_private_key, eth_client, contracts_path).await;
 
     let msg = format!(
         "OnChainProposer:\n\tDeployed at address {} with tx hash {}",
@@ -258,14 +236,8 @@ async fn deploy_contracts(
     spinner.success(&msg);
 
     let mut spinner = Spinner::new(deploy_frames, "Deploying CommonBridge", Color::Cyan);
-    let (bridge_deployment_tx_hash, bridge_address) = deploy_bridge(
-        deployer,
-        deployer_private_key,
-        overrides,
-        eth_client,
-        contracts_path,
-    )
-    .await;
+    let (bridge_deployment_tx_hash, bridge_address) =
+        deploy_bridge(deployer, deployer_private_key, eth_client, contracts_path).await;
 
     let msg = format!(
         "CommonBridge:\n\tDeployed at address {} with tx hash {}",
@@ -280,7 +252,6 @@ async fn deploy_contracts(
 async fn deploy_on_chain_proposer(
     deployer: Address,
     deployer_private_key: SecretKey,
-    overrides: Overrides,
     eth_client: &EthClient,
     contracts_path: &Path,
 ) -> (H256, Address) {
@@ -295,7 +266,6 @@ async fn deploy_on_chain_proposer(
         deployer,
         deployer_private_key,
         &on_chain_proposer_init_code,
-        overrides,
         eth_client,
     )
     .await;
@@ -306,7 +276,6 @@ async fn deploy_on_chain_proposer(
 async fn deploy_bridge(
     deployer: Address,
     deployer_private_key: SecretKey,
-    overrides: Overrides,
     eth_client: &EthClient,
     contracts_path: &Path,
 ) -> (H256, Address) {
@@ -329,7 +298,6 @@ async fn deploy_bridge(
         deployer,
         deployer_private_key,
         &bridge_init_code.into(),
-        overrides,
         eth_client,
     )
     .await;
@@ -341,24 +309,21 @@ async fn create2_deploy(
     deployer: Address,
     deployer_private_key: SecretKey,
     init_code: &Bytes,
-    overrides: Overrides,
     eth_client: &EthClient,
 ) -> (H256, Address) {
     let calldata = [SALT.lock().unwrap().as_bytes(), init_code].concat();
     let deploy_tx = eth_client
         .build_eip1559_transaction(
             DETERMINISTIC_CREATE2_ADDRESS,
+            deployer,
             calldata.into(),
-            Overrides {
-                from: Some(deployer),
-                ..overrides
-            },
+            Overrides::default(),
         )
         .await
         .expect("Failed to build create2 deploy tx");
 
     let deploy_tx_hash = eth_client
-        .send_eip1559_transaction(deploy_tx, &deployer_private_key)
+        .send_eip1559_transaction(&deploy_tx, &deployer_private_key)
         .await
         .expect("Failed to send create2 deploy tx");
 
@@ -493,16 +458,14 @@ async fn initialize_on_chain_proposer(
     let initialize_tx = eth_client
         .build_eip1559_transaction(
             on_chain_proposer,
+            deployer,
             on_chain_proposer_initialization_calldata.into(),
-            Overrides {
-                from: Some(deployer),
-                ..Default::default()
-            },
+            Overrides::default(),
         )
         .await
         .expect("Failed to build initialize transaction");
     let initialize_tx_hash = eth_client
-        .send_eip1559_transaction(initialize_tx, &deployer_private_key)
+        .send_eip1559_transaction(&initialize_tx, &deployer_private_key)
         .await
         .expect("Failed to send initialize transaction");
 
@@ -537,16 +500,14 @@ async fn initialize_bridge(
     let initialize_tx = eth_client
         .build_eip1559_transaction(
             bridge,
+            deployer,
             bridge_initialization_calldata.into(),
-            Overrides {
-                from: Some(deployer),
-                ..Default::default()
-            },
+            Overrides::default(),
         )
         .await
         .expect("Failed to build initialize transaction");
     let initialize_tx_hash = eth_client
-        .send_eip1559_transaction(initialize_tx, &deployer_private_key)
+        .send_eip1559_transaction(&initialize_tx, &deployer_private_key)
         .await
         .expect("Failed to send initialize transaction");
 

crates/l2/proposer/errors.rs

@@ -61,6 +61,8 @@ pub enum CommitterError {
     FailedToReExecuteBlock(#[from] EvmError),
     #[error("Committer failed to send transaction: {0}")]
     FailedToSendCommitment(String),
+    #[error("Withdrawal transaction was invalid")]
+    InvalidWithdrawalTransaction,
 }
 
 #[derive(Debug, thiserror::Error)]