move file

Author: jayantk

apps/fortuna/src/chain.rs

@@ -1,3 +1,2 @@
 pub(crate) mod ethereum;
 pub(crate) mod reader;
-pub(crate) mod utils;

apps/fortuna/src/chain/ethereum.rs

@@ -16,7 +16,7 @@ use {
     axum::async_trait,
     ethers::{
         abi::RawLog,
-        contract::{abigen, ContractCall, EthLogDecode},
+        contract::{abigen, EthLogDecode},
         core::types::Address,
         middleware::{gas_oracle::GasOracleMiddleware, SignerMiddleware},
         prelude::JsonRpcClient,
@@ -45,8 +45,6 @@ pub type SignablePythContractInner<T> = PythRandom<MiddlewaresWrapper<T>>;
 pub type SignablePythContract = SignablePythContractInner<Http>;
 pub type InstrumentedSignablePythContract = SignablePythContractInner<TracedClient>;
 
-pub type PythContractCall = ContractCall<MiddlewaresWrapper<TracedClient>, ()>;
-
 pub type PythContract = PythRandom<Provider<Http>>;
 pub type InstrumentedPythContract = PythRandom<Provider<TracedClient>>;
 

apps/fortuna/src/eth_utils.rs

@@ -2,3 +2,4 @@ pub mod eth_gas_oracle;
 pub mod legacy_tx_middleware;
 pub mod nonce_manager;
 pub mod traced_client;
+pub mod utils;

apps/fortuna/src/chain/utils.rs renamed to apps/fortuna/src/eth_utils/utils.rs

@@ -1,12 +1,11 @@
 use {
-    crate::chain::ethereum::{InstrumentedSignablePythContract, PythContractCall},
     anyhow::{anyhow, Result},
-    ethers::middleware::Middleware,
+    ethers::{contract::ContractCall, middleware::Middleware},
     std::sync::Arc,
     tracing,
 };
 
-pub async fn send_and_confirm(contract_call: PythContractCall) -> Result<()> {
+pub async fn send_and_confirm<A: Middleware>(contract_call: ContractCall<A, ()>) -> Result<()> {
     let call_name = contract_call.function.name.as_str();
     let pending_tx = contract_call
         .send()
@@ -39,13 +38,11 @@ pub async fn send_and_confirm(contract_call: PythContractCall) -> Result<()> {
 }
 
 /// Estimate the cost (in wei) of a transaction consuming gas_used gas.
-pub async fn estimate_tx_cost(
-    contract: Arc<InstrumentedSignablePythContract>,
+pub async fn estimate_tx_cost<T: Middleware + 'static>(
+    middleware: Arc<T>,
     use_legacy_tx: bool,
     gas_used: u128,
 ) -> Result<u128> {
-    let middleware = contract.client();
-
     let gas_price: u128 = if use_legacy_tx {
         middleware
             .get_gas_price()

apps/fortuna/src/keeper/commitment.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         api::BlockchainState, chain::ethereum::InstrumentedSignablePythContract,
-        chain::utils::send_and_confirm, keeper::block::get_latest_safe_block,
+        eth_utils::utils::send_and_confirm, keeper::block::get_latest_safe_block,
     },
     anyhow::{anyhow, Result},
     std::sync::Arc,

apps/fortuna/src/keeper/fee.rs

@@ -1,8 +1,8 @@
 use {
     crate::{
         api::BlockchainState, chain::ethereum::InstrumentedSignablePythContract,
-        chain::utils::estimate_tx_cost, chain::utils::send_and_confirm, keeper::AccountLabel,
-        keeper::ChainId, keeper::KeeperMetrics,
+        eth_utils::utils::estimate_tx_cost, eth_utils::utils::send_and_confirm,
+        keeper::AccountLabel, keeper::ChainId, keeper::KeeperMetrics,
     },
     anyhow::{anyhow, Result},
     ethers::{
@@ -152,7 +152,8 @@ pub async fn adjust_fee_if_necessary(
     }
 
     // Calculate target window for the on-chain fee.
-    let max_callback_cost: u128 = estimate_tx_cost(contract.clone(), legacy_tx, gas_limit.into())
+    let middleware = contract.client();
+    let max_callback_cost: u128 = estimate_tx_cost(middleware, legacy_tx, gas_limit.into())
         .await
         .map_err(|e| anyhow!("Could not estimate transaction cost. error {:?}", e))?;