feat(fortuna): better parallization for revealing requests (#1636)

Author: m30m

apps/fortuna/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name    = "fortuna"
-version = "6.1.0"
+version = "6.2.0"
 edition = "2021"
 
 [dependencies]
@@ -35,6 +35,7 @@ once_cell = "1.18.0"
 lazy_static = "1.4.0"
 url = "2.5.0"
 chrono = { version = "0.4.38", features = ["clock", "std"] , default-features = false}
+backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 
 
 [dev-dependencies]

apps/fortuna/Cargo.toml

@@ -270,7 +270,7 @@ impl EntropyReader for PythContract {
         sequence_number: u64,
         user_random_number: [u8; 32],
         provider_revelation: [u8; 32],
-    ) -> Result<Option<U256>> {
+    ) -> Result<U256> {
         let result: Result<U256, ContractError<Provider<Http>>> = self
             .reveal_with_callback(
                 provider,
@@ -281,19 +281,6 @@ impl EntropyReader for PythContract {
             .estimate_gas()
             .await;
 
-        match result {
-            Ok(gas) => Ok(Some(gas)),
-            Err(e) => match e {
-                ContractError::ProviderError { e } => Err(anyhow!(e)),
-                _ => {
-                    tracing::info!(
-                        sequence_number = sequence_number,
-                        "Gas estimation failed. error: {:?}",
-                        e
-                    );
-                    Ok(None)
-                }
-            },
-        }
+        result.map_err(|e| e.into())
     }
 }

apps/fortuna/src/chain/ethereum.rs

@@ -57,15 +57,14 @@ pub trait EntropyReader: Send + Sync {
         to_block: BlockNumber,
     ) -> Result<Vec<RequestedWithCallbackEvent>>;
 
-    /// Simulate a reveal with callback. Returns Some(gas) if the estimation was successful.
-    /// Returns None otherwise. Returns an error if the gas could not be estimated.
+    /// Estimate the gas required to reveal a random number with a callback.
     async fn estimate_reveal_with_callback_gas(
         &self,
         provider: Address,
         sequence_number: u64,
         user_random_number: [u8; 32],
         provider_revelation: [u8; 32],
-    ) -> Result<Option<U256>>;
+    ) -> Result<U256>;
 }
 
 /// An in-flight request stored in the contract.
@@ -189,8 +188,8 @@ pub mod mock {
             sequence_number: u64,
             user_random_number: [u8; 32],
             provider_revelation: [u8; 32],
-        ) -> Result<Option<U256>> {
-            Ok(Some(U256::from(5)))
+        ) -> Result<U256> {
+            Ok(U256::from(5))
         }
     }
 }