feat: adds withdrawal finalizing logic.

chain-events/src/l2_events.rs

@@ -322,8 +322,6 @@ impl L2EventsListener {
             WithdrawalFilter::signature(),
         ];
 
-        let tokens = self.tokens.iter().cloned().collect::<Vec<_>>();
-
         vlog::debug!("last_seen_l2_token_block {last_seen_l2_token_block:?}");
         vlog::debug!("from_block {from_block:?}");
 
@@ -345,6 +343,8 @@ impl L2EventsListener {
             .await?;
         }
 
+        let tokens = self.tokens.iter().cloned().collect::<Vec<_>>();
+
         let past_filter = Filter::new()
             .from_block(from_block)
             .to_block(latest_block)

client/src/lib.rs

@@ -86,7 +86,7 @@ impl WithdrawalParams {
 }
 
 /// A key that uniquely identifies each withdrawal
-#[derive(Clone, Copy, Eq, PartialEq, Hash)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
 pub struct WithdrawalKey {
     /// A transaction in which the withdrawal has happened
     pub tx_hash: H256,
@@ -104,6 +104,11 @@ pub struct WithdrawalParams {
     /// Event index in the transaction.
     pub event_index_in_tx: u32,
 
+    /// ID serial number.
+    ///
+    /// A monotonically increasing counter for every withdrawal.
+    pub id: u64,
+
     /// Block number on l2 withdrawal transaction happened in.
     pub l2_block_number: u64,
 
@@ -333,6 +338,7 @@ impl<P: JsonRpcClient> ZksyncMiddleware for Provider<P> {
         Ok(Some(WithdrawalParams {
             tx_hash: withdrawal_hash,
             event_index_in_tx: index as u32,
+            id: 0,
             l2_block_number: log
                 .block_number
                 .expect("log always has a block number; qed")

finalizer/src/lib.rs

@@ -386,10 +386,17 @@ where
 
         let hash_and_index: Vec<_> = newly_executed_withdrawals
             .iter()
-            .map(|p| (p.0, p.1))
+            .map(|p| (p.key.tx_hash, p.key.event_index_in_tx as u16))
             .collect();
 
-        let params = request_finalize_params(&middleware, &hash_and_index).await?;
+        let mut params = request_finalize_params(&middleware, &hash_and_index).await?;
+
+        for (param, id) in params
+            .iter_mut()
+            .zip(newly_executed_withdrawals.iter().map(|v| v.id))
+        {
+            param.id = id;
+        }
 
         storage::add_withdrawals_data(&pool, &params).await?;
     }

storage/migrations/20230717075048_finalizer.down.sql

@@ -1 +1,2 @@
 DROP TABLE finalization_data;
+ALTER TABLE withdrawals DROP COLUMN id;

storage/migrations/20230717075048_finalizer.up.sql

@@ -1,7 +1,11 @@
+ALTER TABLE withdrawals ADD id BIGSERIAL NOT NULL UNIQUE;
+
 CREATE TABLE finalization_data (
     tx_hash BYTEA NOT NULL,
     event_index_in_tx INT NOT NULL,
 
+    id BIGINT NOT NULL UNIQUE, 
+
     l2_block_number BIGINT NOT NULL,
     l1_batch_number BIGINT NOT NULL,
     l2_message_index INT NOT NULL,
@@ -17,3 +21,4 @@ CREATE TABLE finalization_data (
 
     FOREIGN KEY (tx_hash, event_index_in_tx) REFERENCES withdrawals (tx_hash, event_index_in_tx)
 );
+