fix: backoff 1 minute after unsuccessful finalization attempts (#231)

fix: backoff 15 seconds after unsuccessful finalization attempts
matter-labs · Oct 13, 2023 · 3fb7e3c · 3fb7e3c
1 parent ea07a58
commit 3fb7e3c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/...431ed581508f3f93df9c28afa441a3ab1404.json → ...cce578fe6c917592a00654294c881dcc609a.json b/...431ed581508f3f93df9c28afa441a3ab1404.json → ...cce578fe6c917592a00654294c881dcc609a.json
diff --git a/storage/.sqlx/query-660e3d86db6ed4255862bc7aa8f345b990f4e95ebfb05a611da57643580922f8.json b/storage/.sqlx/query-660e3d86db6ed4255862bc7aa8f345b990f4e95ebfb05a611da57643580922f8.json
diff --git a/storage/.sqlx/query-9930a0b464fd0cdc81ae5830912b1914354ff4777351ba0494e97a977ddb582f.json b/storage/.sqlx/query-9930a0b464fd0cdc81ae5830912b1914354ff4777351ba0494e97a977ddb582f.json
diff --git a/storage/migrations/20231013101851_finalize_attempts_timestamps.down.sql b/storage/migrations/20231013101851_finalize_attempts_timestamps.down.sql
@@ -0,0 +1 @@
+ALTER TABLE finalization_data DROP COLUMN last_finalization_attempt;
diff --git a/storage/migrations/20231013101851_finalize_attempts_timestamps.up.sql b/storage/migrations/20231013101851_finalize_attempts_timestamps.up.sql
@@ -0,0 +1 @@
+ALTER TABLE finalization_data ADD last_finalization_attempt TIMESTAMP;
diff --git a/storage/src/lib.rs b/storage/src/lib.rs
@@ -749,6 +749,11 @@ pub async fn withdrwals_to_finalize(pool: &PgPool, limit_by: u64) -> Result<Vec<
             ),
             1
           )
+          AND (
+            last_finalization_attempt IS NULL
+          OR
+            last_finalization_attempt < NOW() - INTERVAL '1 minutes'
+          )
         ORDER BY
           finalization_data.l2_block_number
         LIMIT
@@ -843,6 +848,7 @@ pub async fn inc_unsuccessful_finalization_attempts(
         UPDATE
           finalization_data
         SET
+          last_finalization_attempt = NOW(),
           failed_finalization_attempts = failed_finalization_attempts + 1
         FROM
           (
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE finalization_data DROP COLUMN last_finalization_attempt;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE finalization_data ADD last_finalization_attempt TIMESTAMP;