refactor(fortuna): Move more utilities into evm_utils (#2376)

* mostly fixed

* submit tx with retry

* move escalation policy

* stuff

* cleanup

* hm

Author: jayantk

apps/fortuna/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "fortuna"
-version = "7.4.1"
+version = "7.4.2"
 edition = "2021"
 
 [lib]

apps/fortuna/Cargo.toml

@@ -41,6 +41,7 @@ pub type MiddlewaresWrapper<T> = LegacyTxMiddleware<
         EthProviderOracle<Provider<T>>,
     >,
 >;
+
 pub type SignablePythContractInner<T> = PythRandom<MiddlewaresWrapper<T>>;
 pub type SignablePythContract = SignablePythContractInner<Http>;
 pub type InstrumentedSignablePythContract = SignablePythContractInner<TracedClient>;

apps/fortuna/src/chain/ethereum.rs

@@ -2,6 +2,7 @@ use {
     crate::{
         api::ChainId,
         chain::reader::{BlockNumber, BlockStatus},
+        eth_utils::utils::EscalationPolicy,
     },
     anyhow::{anyhow, Result},
     clap::{crate_authors, crate_description, crate_name, crate_version, Args, Parser},
@@ -259,39 +260,15 @@ impl Default for EscalationPolicyConfig {
 }
 
 impl EscalationPolicyConfig {
-    pub fn get_gas_multiplier_pct(&self, num_retries: u64) -> u64 {
-        self.apply_escalation_policy(
-            num_retries,
-            self.initial_gas_multiplier_pct,
-            self.gas_multiplier_pct,
-            self.gas_multiplier_cap_pct,
-        )
-    }
-
-    pub fn get_fee_multiplier_pct(&self, num_retries: u64) -> u64 {
-        self.apply_escalation_policy(
-            num_retries,
-            100,
-            self.fee_multiplier_pct,
-            self.fee_multiplier_cap_pct,
-        )
-    }
-
-    fn apply_escalation_policy(
-        &self,
-        num_retries: u64,
-        initial: u64,
-        multiplier: u64,
-        cap: u64,
-    ) -> u64 {
-        let mut current = initial;
-        let mut i = 0;
-        while i < num_retries && current < cap {
-            current = current.saturating_mul(multiplier) / 100;
-            i += 1;
+    pub fn to_policy(&self) -> EscalationPolicy {
+        EscalationPolicy {
+            gas_limit_tolerance_pct: self.gas_limit_tolerance_pct,
+            initial_gas_multiplier_pct: self.initial_gas_multiplier_pct,
+            gas_multiplier_pct: self.gas_multiplier_pct,
+            gas_multiplier_cap_pct: self.gas_multiplier_cap_pct,
+            fee_multiplier_pct: self.fee_multiplier_pct,
+            fee_multiplier_cap_pct: self.fee_multiplier_cap_pct,
         }
-
-        current.min(cap)
     }
 }
 

apps/fortuna/src/config.rs

@@ -2,8 +2,11 @@
 // Copied from: https://github.com/gakonst/ethers-rs/blob/34ed9e372e66235aed7074bc3f5c14922b139242/ethers-middleware/src/nonce_manager.rs
 
 use {
+    super::legacy_tx_middleware::LegacyTxMiddleware,
     axum::async_trait,
+    ethers::prelude::GasOracle,
     ethers::{
+        middleware::gas_oracle::GasOracleMiddleware,
         providers::{Middleware, MiddlewareError, PendingTransaction},
         types::{transaction::eip2718::TypedTransaction, *},
     },
@@ -72,15 +75,6 @@ where
         Ok(nonce)
     } // guard dropped here
 
-    /// Resets the initialized flag so the next usage of the manager will reinitialize the nonce
-    /// based on the chain state.
-    /// This is useful when the RPC does not return an error if the transaction is submitted with
-    /// an incorrect nonce.
-    /// This is the only new method compared to the original NonceManagerMiddleware.
-    pub fn reset(&self) {
-        self.initialized.store(false, Ordering::SeqCst);
-    }
-
     async fn get_transaction_count_with_manager(
         &self,
         block: Option<BlockId>,
@@ -100,6 +94,33 @@ where
     }
 }
 
+pub trait NonceManaged {
+    fn reset(&self);
+}
+
+impl<M: Middleware> NonceManaged for NonceManagerMiddleware<M> {
+    /// Resets the initialized flag so the next usage of the manager will reinitialize the nonce
+    /// based on the chain state.
+    /// This is useful when the RPC does not return an error if the transaction is submitted with
+    /// an incorrect nonce.
+    /// This is the only new method compared to the original NonceManagerMiddleware.
+    fn reset(&self) {
+        self.initialized.store(false, Ordering::SeqCst);
+    }
+}
+
+impl<M: NonceManaged + Middleware, G: GasOracle> NonceManaged for GasOracleMiddleware<M, G> {
+    fn reset(&self) {
+        self.inner().reset();
+    }
+}
+
+impl<T: NonceManaged + Middleware> NonceManaged for LegacyTxMiddleware<T> {
+    fn reset(&self) {
+        self.inner().reset();
+    }
+}
+
 #[derive(Error, Debug)]
 /// Thrown when an error happens at the Nonce Manager
 pub enum NonceManagerError<M: Middleware> {