From e2ef7a4a6bda97632775148de7b5c77f6e5eb839 Mon Sep 17 00:00:00 2001
From: Amin Moghaddam <amin@dourolabs.xyz>
Date: Wed, 6 Nov 2024 17:17:17 +0100
Subject: [PATCH] fix: timeout for tx confirmation (#2098)

---
 apps/fortuna/Cargo.lock    |  2 +-
 apps/fortuna/Cargo.toml    |  2 +-
 apps/fortuna/src/keeper.rs | 32 +++++++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/apps/fortuna/Cargo.lock b/apps/fortuna/Cargo.lock
index 99fb6a930..6742b7998 100644
--- a/apps/fortuna/Cargo.lock
+++ b/apps/fortuna/Cargo.lock
@@ -1503,7 +1503,7 @@ dependencies = [
 
 [[package]]
 name = "fortuna"
-version = "6.5.4"
+version = "6.5.5"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/apps/fortuna/Cargo.toml b/apps/fortuna/Cargo.toml
index 23ea70579..ab898b486 100644
--- a/apps/fortuna/Cargo.toml
+++ b/apps/fortuna/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name    = "fortuna"
-version = "6.5.4"
+version = "6.5.5"
 edition = "2021"
 
 [dependencies]
diff --git a/apps/fortuna/src/keeper.rs b/apps/fortuna/src/keeper.rs
index 9f17c91af..4d50cab12 100644
--- a/apps/fortuna/src/keeper.rs
+++ b/apps/fortuna/src/keeper.rs
@@ -65,6 +65,7 @@ use {
         },
         time::{
             self,
+            timeout,
             Duration,
         },
     },
@@ -421,6 +422,8 @@ pub async fn process_event_with_backoff(
 }
 
 
+const TX_CONFIRMATION_TIMEOUT_SECS: u64 = 30;
+
 /// Process a callback on a chain. It estimates the gas for the reveal with callback and
 /// submits the transaction if the gas estimate is below the gas limit.
 /// It will return a permanent or transient error depending on the error type and whether
@@ -501,8 +504,28 @@ pub async fn process_event(
             ))
         })?;
 
-    let receipt = pending_tx
-        .await
+    let reset_nonce = || {
+        let nonce_manager = contract.client_ref().inner().inner();
+        nonce_manager.reset();
+    };
+
+    let pending_receipt = timeout(
+        Duration::from_secs(TX_CONFIRMATION_TIMEOUT_SECS),
+        pending_tx,
+    )
+    .await
+    .map_err(|_| {
+        // Tx can get stuck in mempool without any progress if the nonce is too high
+        // in this case ethers internal polling will not reduce the number of retries
+        // and keep retrying indefinitely. So we set a manual timeout here and reset the nonce.
+        reset_nonce();
+        backoff::Error::transient(anyhow!(
+            "Tx stuck in mempool. Resetting nonce. Tx:{:?}",
+            transaction
+        ))
+    })?;
+
+    let receipt = pending_receipt
         .map_err(|e| {
             backoff::Error::transient(anyhow!(
                 "Error waiting for transaction receipt. Tx:{:?} Error:{:?}",
@@ -513,10 +536,9 @@ pub async fn process_event(
         .ok_or_else(|| {
             // RPC may not return an error on tx submission if the nonce is too high.
             // But we will never get a receipt. So we reset the nonce manager to get the correct nonce.
-            let nonce_manager = contract.client_ref().inner().inner();
-            nonce_manager.reset();
+            reset_nonce();
             backoff::Error::transient(anyhow!(
-                "Can't verify the reveal, probably dropped from mempool Tx:{:?}",
+                "Can't verify the reveal, probably dropped from mempool. Resetting nonce. Tx:{:?}",
                 transaction
             ))
         })?;