fix(l2): ignore deposits after state reconstruction (#2642)

**Motivation**

Currently, If we start our l2 node with a reconstructed state, the node
will process all deposit logs from l1 and mint them again in l2. This is
because, in a reconstructed store, we don't have the included
transactions to determine whether a deposit was previously processed or
not.

**Description**

- Fixes the reconstruct algorithm to start from batch_number=1.
- Fixes the `l2MintTxHash` emitted in the `CommonBridge` contract.
- Adds an additional check to the `integration_test` to wait for the
deposit receipt on L2.
- Reuses the emitted `l2MintTxHash` instead of recalculating it in the
watcher.
- Checks, in the `CommonBridge` contract, whether a deposit is pending
or not before minting the transaction.
- Creates `DepositData` struct in `l1_watcher`

### How to test

Here we are going to run the integration test on a node with a
reconstructed state.
You may want to lower the `commit_time_ms`.

1. Start the prover and network  with:

```
make init-prover
make init
```

2. Wait until batch 6 is verified and stop the l2 node with `ctrl + c`:

```
INFO ethrex_l2::sequencer::l1_proof_sender: Sent proof for batch 6...
ctrl + c
```


> [!NOTE]
> This is because we are going to use already created blobs with 6
batches and we need
> to advance the L1 until that point.


3. Clean db:

```
make rm-db-l2
```

4. Reconstruct the state choosing a `path_to_store`:
```
cargo run --release --manifest-path ../../cmd/ethrex_l2/Cargo.toml --bin ethrex_l2 -- stack reconstruct -g ../../test_data/genesis-l2.json -b ../../test_data/blobs/ -s path_to_store -c 0x0007a881CD95B1484fca47615B64803dad620C8d
```

5. Start the l2 node using `path_to_store`:

```
make init-l2 ethrex_L2_DEV_LIBMDBX=path_to_store
```

You should observe that all deposits are skipped now.

6. In a new terminal, run the integration test:

```
cd crates/l2
make test
```

> [!WARNING]
> Before running the integration test, wait for 20 blocks to be built in
the L2.
> This is because the test currently uses
[estimate_gas_tip](https://github.com/lambdaclass/ethrex/blob/aa3c41b8da043ff5cd1ad699ce882c41edefc460/crates/networking/rpc/eth/fee_calculator.rs#L30)
that needs at least 20 blocks to estimate the gas price.

Closes #1279

Author: avilagaston9

cmd/ethrex_l2/src/commands/stack.rs

@@ -202,7 +202,7 @@ impl Command {
                 .await?;
                 let rollup_store = StoreRollup::new(
                     store_path
-                        .join("../rollup_store")
+                        .join("./rollup_store")
                         .to_str()
                         .expect("Invalid store path"),
                     EngineTypeRollup::Libmdbx,
@@ -224,11 +224,12 @@ impl Command {
 
                 // Iterate over each blob
                 let files: Vec<std::fs::DirEntry> = read_dir(blobs_dir)?.try_collect()?;
-                for (batch_number, file) in files
+                for (file_number, file) in files
                     .into_iter()
                     .sorted_by_key(|f| f.file_name())
                     .enumerate()
                 {
+                    let batch_number = file_number as u64 + 1;
                     let blob = std::fs::read(file.path())?;
 
                     if blob.len() != BYTES_PER_BLOB {
@@ -294,7 +295,7 @@ impl Command {
                     // Store batch info in L2 storage
                     rollup_store
                         .store_batch(
-                            batch_number as u64,
+                            batch_number,
                             first_block_number,
                             last_block_number,
                             withdrawal_hashes,

crates/l2/Makefile

@@ -60,7 +60,7 @@ ethrex_L2_CONTRACTS_PATH=./contracts
 L1_RPC_URL=http://localhost:8545
 L1_PRIVATE_KEY=0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924
 
-ethrex_L2_DEV_LIBMDBX=dev_ethrex_l2
+ethrex_L2_DEV_LIBMDBX?=dev_ethrex_l2
 ethrex_L1_DEV_LIBMDBX=dev_ethrex_l1
 L1_PORT=8545
 L2_PORT=1729

crates/l2/configs/sequencer_config_example.toml

@@ -23,7 +23,7 @@ maximum_allowed_max_fee_per_gas = 10000000000
 maximum_allowed_max_fee_per_blob_gas = 10000000000
 
 [watcher]
-bridge_address = "0x266ffef34e21a7c4ce2e0e42dc780c2c273ca440"
+bridge_address = "0x554a14cd047c485b3ac3edbd9fbb373d6f84ad3f"
 check_interval_ms = 1000
 max_block_step = 5000
 l2_proposer_private_key = "0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924"

crates/l2/contracts/src/l1/CommonBridge.sol

@@ -76,30 +76,19 @@ contract CommonBridge is ICommonBridge, Ownable, ReentrancyGuard {
         require(msg.value > 0, "CommonBridge: amount to deposit is zero");
 
         bytes32 l2MintTxHash = keccak256(
-            abi.encodePacked(
-                msg.sender,
-                depositValues.to,
-                depositValues.recipient,
-                msg.value,
-                depositValues.gasLimit,
-                depositId,
-                depositValues.data
+            bytes.concat(
+                bytes20(depositValues.to),
+                bytes32(msg.value),
+                bytes32(depositId),
+                bytes20(depositValues.recipient),
+                bytes20(msg.sender),
+                bytes32(depositValues.gasLimit),
+                bytes32(keccak256(depositValues.data))
             )
         );
 
-        pendingDepositLogs.push(
-            keccak256(
-                bytes.concat(
-                    bytes20(depositValues.to),
-                    bytes32(msg.value),
-                    bytes32(depositId),
-                    bytes20(depositValues.recipient),
-                    bytes20(msg.sender),
-                    bytes32(depositValues.gasLimit),
-                    bytes32(keccak256(depositValues.data))
-                )
-            )
-        );
+        pendingDepositLogs.push(l2MintTxHash);
+
         emit DepositInitiated(
             msg.value,
             depositValues.to,

crates/l2/sdk/src/sdk.rs

@@ -13,10 +13,10 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 pub mod calldata;
 pub mod merkle_tree;
 
-// 0x6bf26397c5676a208d5c4e5f35cb479bacbbe454
+// 0x554a14cd047c485b3ac3edbd9fbb373d6f84ad3f
 pub const DEFAULT_BRIDGE_ADDRESS: Address = H160([
-    0x6b, 0xf2, 0x63, 0x97, 0xc5, 0x67, 0x6a, 0x20, 0x8d, 0x5c, 0x4e, 0x5f, 0x35, 0xcb, 0x47, 0x9b,
-    0xac, 0xbb, 0xe4, 0x54,
+    0x55, 0x4a, 0x14, 0xcd, 0x04, 0x7c, 0x48, 0x5b, 0x3a, 0xc3, 0xed, 0xbd, 0x9f, 0xbb, 0x37, 0x3d,
+    0x6f, 0x84, 0xad, 0x3f,
 ]);
 
 pub const COMMON_BRIDGE_L2_ADDRESS: Address = H160([
@@ -32,7 +32,7 @@ pub enum SdkError {
     FailedToParseAddressFromHex,
 }
 
-/// BRIDGE_ADDRESS or 0x6bf26397c5676a208d5c4e5f35cb479bacbbe454
+/// BRIDGE_ADDRESS or 0x554a14cd047c485b3ac3edbd9fbb373d6f84ad3f
 pub fn bridge_address() -> Result<Address, SdkError> {
     std::env::var("L1_WATCHER_BRIDGE_ADDRESS")
         .unwrap_or(format!("{DEFAULT_BRIDGE_ADDRESS:#x}"))