Remove fake-rpc

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;
@@ -12,40 +12,20 @@ pub fn calculate_gas_fees_from_estimates(
     tx_priority_index: usize,
     max_base_fee_per_gas: U256,
 ) -> (U256, U256) {
+    println!("estimates = {estimates:#?}");
+
     let max_priority_fee_per_gas = estimates.percentile_fees[tx_priority_index];
 
     let max_fee_per_gas = max_base_fee_per_gas + max_priority_fee_per_gas;
 
-    (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);
+    println!(
+        "max_base_fee_per_gas = {max_base_fee_per_gas}, max_priority_fee_per_gas = {max_priority_fee_per_gas}, max_fee_per_gas = {max_fee_per_gas}",
+        max_base_fee_per_gas = max_base_fee_per_gas,
+        max_priority_fee_per_gas = max_priority_fee_per_gas,
+        max_fee_per_gas = max_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);
+    (max_fee_per_gas, max_priority_fee_per_gas)
 }
 
 pub async fn should_send_transaction(

src/tasks/broadcast.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use ethers::providers::Middleware;
 use ethers::types::transaction::eip2718::TypedTransaction;
 use ethers::types::transaction::eip2930::AccessList;
-use ethers::types::{Address, Eip1559TransactionRequest, NameOrAddress, H256};
+use ethers::types::{Address, Eip1559TransactionRequest, NameOrAddress, H256, U256};
 use eyre::ContextCompat;
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;

src/tasks/escalate.rs

@@ -39,7 +39,7 @@ pub async fn escalate_txs(app: Arc<App>) -> eyre::Result<()> {
             // Min increase of 20% on the priority fee required for a replacement tx
             let factor = U256::from(100);
             let increased_gas_price_percentage =
-                factor + U256::from(10 * (1 + escalation));
+                factor + U256::from(20 * (1 + escalation));
 
             let max_fee_per_gas_increase = tx.initial_max_fee_per_gas.0
                 * increased_gas_price_percentage
@@ -51,6 +51,13 @@ pub async fn escalate_txs(app: Arc<App>) -> eyre::Result<()> {
             let max_priority_fee_per_gas =
                 max_fee_per_gas - fees.fee_estimates.base_fee_per_gas;
 
+            tracing::warn!(
+                "Initial tx fees are max = {}, priority = {}",
+                tx.initial_max_fee_per_gas.0,
+                tx.initial_max_priority_fee_per_gas.0
+            );
+            tracing::warn!("Escalating with max fee = {max_fee_per_gas} and max priority = {max_priority_fee_per_gas}");
+
             let eip1559_tx = Eip1559TransactionRequest {
                 from: None,
                 to: Some(NameOrAddress::from(Address::from(tx.tx_to.0))),