cleanup

Author: jayantk

apps/fortuna/src/eth_utils/utils.rs

@@ -3,11 +3,7 @@ use {
     crate::eth_utils::nonce_manager::NonceManaged,
     anyhow::{anyhow, Result},
     backoff::ExponentialBackoff,
-    ethers::{
-        contract::ContractCall,
-        middleware::Middleware,
-        types::TransactionReceipt,
-    },
+    ethers::{contract::ContractCall, middleware::Middleware, types::TransactionReceipt},
     std::sync::{atomic::AtomicU64, Arc},
     tokio::time::{timeout, Duration},
     tracing,
@@ -149,12 +145,7 @@ pub async fn submit_tx_with_backoff<T: Middleware + NonceManaged + 'static>(
             let num_retries = num_retries.load(std::sync::atomic::Ordering::Relaxed);
 
             let fee_multiplier_pct = escalation_policy.get_fee_multiplier_pct(num_retries);
-            submit_tx(
-                middleware.clone(),
-                &call,
-                fee_multiplier_pct,
-            )
-            .await
+            submit_tx(middleware.clone(), &call, fee_multiplier_pct).await
         },
         |e, dur| {
             let retry_number = num_retries.load(std::sync::atomic::Ordering::Relaxed);
@@ -190,7 +181,6 @@ pub async fn submit_tx<T: Middleware + NonceManaged + 'static>(
     // A value of 100 submits the tx with the same fee as the estimate.
     fee_estimate_multiplier_pct: u64,
 ) -> Result<TransactionReceipt, backoff::Error<anyhow::Error>> {
-
     let mut transaction = call.tx.clone();
 
     // manually fill the tx with the gas info, so we can log the details in case of error

apps/fortuna/src/keeper.rs

@@ -79,15 +79,13 @@ pub async fn run_keeper_threads(
     let fulfilled_requests_cache = Arc::new(RwLock::new(HashSet::<u64>::new()));
 
     // Spawn a thread to handle the events from last backlog_range blocks.
-    let gas_limit: U256 = chain_eth_config.gas_limit.into();
     spawn(
         process_backlog(
             BlockRange {
                 from: latest_safe_block.saturating_sub(chain_eth_config.backlog_range),
                 to: latest_safe_block,
             },
             contract.clone(),
-            gas_limit,
             chain_eth_config.escalation_policy.to_policy(),
             chain_state.clone(),
             metrics.clone(),
@@ -107,7 +105,6 @@ pub async fn run_keeper_threads(
             chain_state.clone(),
             rx,
             Arc::clone(&contract),
-            gas_limit,
             chain_eth_config.escalation_policy.to_policy(),
             metrics.clone(),
             fulfilled_requests_cache.clone(),

apps/fortuna/src/keeper/block.rs

@@ -7,7 +7,6 @@ use {
         keeper::process_event::process_event_with_backoff,
     },
     anyhow::Result,
-    ethers::types::U256,
     std::{collections::HashSet, sync::Arc},
     tokio::{
         spawn,
@@ -62,7 +61,6 @@ pub async fn get_latest_safe_block(chain_state: &BlockchainState) -> BlockNumber
 pub async fn process_block_range(
     block_range: BlockRange,
     contract: Arc<InstrumentedSignablePythContract>,
-    gas_limit: U256,
     escalation_policy: EscalationPolicy,
     chain_state: api::BlockchainState,
     metrics: Arc<KeeperMetrics>,
@@ -86,7 +84,6 @@ pub async fn process_block_range(
                 to: to_block,
             },
             contract.clone(),
-            gas_limit,
             escalation_policy.clone(),
             chain_state.clone(),
             metrics.clone(),
@@ -109,7 +106,6 @@ pub async fn process_block_range(
 pub async fn process_single_block_batch(
     block_range: BlockRange,
     contract: Arc<InstrumentedSignablePythContract>,
-    gas_limit: U256,
     escalation_policy: EscalationPolicy,
     chain_state: api::BlockchainState,
     metrics: Arc<KeeperMetrics>,
@@ -140,7 +136,6 @@ pub async fn process_single_block_batch(
                                 event.clone(),
                                 chain_state.clone(),
                                 contract.clone(),
-                                gas_limit,
                                 escalation_policy.clone(),
                                 metrics.clone(),
                             )
@@ -251,7 +246,6 @@ pub async fn process_new_blocks(
     chain_state: BlockchainState,
     mut rx: mpsc::Receiver<BlockRange>,
     contract: Arc<InstrumentedSignablePythContract>,
-    gas_limit: U256,
     escalation_policy: EscalationPolicy,
     metrics: Arc<KeeperMetrics>,
     fulfilled_requests_cache: Arc<RwLock<HashSet<u64>>>,
@@ -264,7 +258,6 @@ pub async fn process_new_blocks(
             process_block_range(
                 block_range.clone(),
                 Arc::clone(&contract),
-                gas_limit,
                 escalation_policy.clone(),
                 chain_state.clone(),
                 metrics.clone(),
@@ -282,7 +275,6 @@ pub async fn process_new_blocks(
                 process_block_range(
                     adjusted_range,
                     Arc::clone(&contract),
-                    gas_limit,
                     escalation_policy.clone(),
                     chain_state.clone(),
                     metrics.clone(),
@@ -302,7 +294,6 @@ pub async fn process_new_blocks(
 pub async fn process_backlog(
     backlog_range: BlockRange,
     contract: Arc<InstrumentedSignablePythContract>,
-    gas_limit: U256,
     escalation_policy: EscalationPolicy,
     chain_state: BlockchainState,
     metrics: Arc<KeeperMetrics>,
@@ -314,7 +305,6 @@ pub async fn process_backlog(
     process_block_range(
         backlog_range.clone(),
         Arc::clone(&contract),
-        gas_limit,
         escalation_policy.clone(),
         chain_state.clone(),
         metrics.clone(),
@@ -332,7 +322,6 @@ pub async fn process_backlog(
         process_block_range(
             adjusted_range,
             Arc::clone(&contract),
-            gas_limit,
             escalation_policy.clone(),
             chain_state.clone(),
             metrics.clone(),

apps/fortuna/src/keeper/process_event.rs

@@ -6,7 +6,6 @@ use {
         eth_utils::utils::{submit_tx_with_backoff, EscalationPolicy},
     },
     anyhow::{anyhow, Result},
-    ethers::types::U256,
     std::sync::Arc,
     tracing,
 };
@@ -19,7 +18,6 @@ pub async fn process_event_with_backoff(
     event: RequestedWithCallbackEvent,
     chain_state: BlockchainState,
     contract: Arc<InstrumentedSignablePythContract>,
-    _gas_limit: U256,
     escalation_policy: EscalationPolicy,
     metrics: Arc<KeeperMetrics>,
 ) -> Result<()> {
@@ -48,12 +46,7 @@ pub async fn process_event_with_backoff(
         provider_revelation,
     );
 
-    let success = submit_tx_with_backoff(
-        contract.client(),
-        contract_call,
-        escalation_policy,
-    )
-    .await;
+    let success = submit_tx_with_backoff(contract.client(), contract_call, escalation_policy).await;
 
     metrics
         .requests_processed