Reorg & Escalation testing (#11)

Cargo.toml

@@ -81,7 +81,6 @@ url = "2.4.1"
 uuid = { version = "0.8", features = ["v4"] }
 
 [dev-dependencies]
-fake-rpc = { path = "crates/fake-rpc" }
 indoc = "2.0.3"
 test-case = "3.1.0"
 

src/broadcast_utils.rs

@@ -1,4 +1,4 @@
-use ethers::types::{Eip1559TransactionRequest, U256};
+use ethers::types::U256;
 use eyre::ContextCompat;
 
 use self::gas_estimation::FeesEstimate;
@@ -19,35 +19,6 @@ pub fn calculate_gas_fees_from_estimates(
     (max_fee_per_gas, max_priority_fee_per_gas)
 }
 
-pub fn escalate_priority_fee(
-    max_base_fee_per_gas: U256,
-    max_network_fee_per_gas: U256,
-    current_max_priority_fee_per_gas: U256,
-    escalation_count: usize,
-    tx: &mut Eip1559TransactionRequest,
-) {
-    // Min increase of 20% on the priority fee required for a replacement tx
-    let increased_gas_price_percentage =
-        U256::from(100 + (10 * (1 + escalation_count)));
-
-    let factor = U256::from(100);
-
-    let new_max_priority_fee_per_gas = current_max_priority_fee_per_gas
-        * increased_gas_price_percentage
-        / factor;
-
-    let new_max_priority_fee_per_gas =
-        std::cmp::min(new_max_priority_fee_per_gas, max_network_fee_per_gas);
-
-    let new_max_fee_per_gas =
-        max_base_fee_per_gas + new_max_priority_fee_per_gas;
-    let new_max_fee_per_gas =
-        std::cmp::min(new_max_fee_per_gas, max_network_fee_per_gas);
-
-    tx.max_fee_per_gas = Some(new_max_fee_per_gas);
-    tx.max_priority_fee_per_gas = Some(new_max_priority_fee_per_gas);
-}
-
 pub async fn should_send_transaction(
     app: &App,
     relayer_id: &str,

src/client.rs

@@ -5,7 +5,9 @@ use crate::server::routes::network::NewNetworkInfo;
 use crate::server::routes::relayer::{
     CreateApiKeyResponse, CreateRelayerRequest, CreateRelayerResponse,
 };
-use crate::server::routes::transaction::{SendTxRequest, SendTxResponse};
+use crate::server::routes::transaction::{
+    GetTxResponse, SendTxRequest, SendTxResponse,
+};
 
 pub struct TxSitterClient {
     client: reqwest::Client,
@@ -43,6 +45,17 @@ impl TxSitterClient {
         Ok(response.json().await?)
     }
 
+    async fn json_get<R>(&self, url: &str) -> eyre::Result<R>
+    where
+        R: serde::de::DeserializeOwned,
+    {
+        let response = self.client.get(url).send().await?;
+
+        let response = Self::validate_response(response).await?;
+
+        Ok(response.json().await?)
+    }
+
     async fn validate_response(response: Response) -> eyre::Result<Response> {
         if !response.status().is_success() {
             let body = response.text().await?;
@@ -77,6 +90,20 @@ impl TxSitterClient {
             .await
     }
 
+    pub async fn get_tx(
+        &self,
+        api_key: &ApiKey,
+        tx_id: &str,
+    ) -> eyre::Result<GetTxResponse> {
+        self.json_get(&format!(
+            "{}/1/api/{api_key}/tx/{tx_id}",
+            self.url,
+            api_key = api_key,
+            tx_id = tx_id
+        ))
+        .await
+    }
+
     pub async fn create_network(
         &self,
         chain_id: u64,