fix: Add 100% percentile to fee history request and avoid resubmit if no gas price change (#7218)

Co-authored-by: Danil Nemirovsky <[email protected]>

Author: ameten

rust/main/lander/src/adapter/chains/ethereum.rs

@@ -3,6 +3,7 @@ pub use metrics::EthereumAdapterMetrics;
 pub use precursor::EthereumTxPrecursor;
 
 mod adapter;
+mod gas_price;
 mod metrics;
 mod nonce;
 mod payload;

rust/main/lander/src/adapter/chains/ethereum/adapter.rs

@@ -42,12 +42,10 @@ use crate::{
 };
 
 use super::{
-    metrics::EthereumAdapterMetrics, nonce::NonceManager, transaction::Precursor,
-    EthereumTxPrecursor,
+    gas_price::GasPrice, metrics::EthereumAdapterMetrics, nonce::NonceManager,
+    transaction::Precursor, EthereumTxPrecursor,
 };
 
-use gas_price::GasPrice;
-
 mod gas_limit_estimator;
 mod gas_price;
 mod tx_status_checker;
@@ -135,7 +133,7 @@ impl EthereumAdapter {
         // to be resilient to gas spikes
         let old_tx_precursor = tx.precursor();
 
-        let old_gas_price = gas_price::extract_gas_price(old_tx_precursor);
+        let old_gas_price = old_tx_precursor.extract_gas_price();
 
         // first, estimate the gas price
         let estimated_gas_price = gas_price::estimate_gas_price(
@@ -162,6 +160,29 @@ impl EthereumAdapter {
         Ok(new_gas_price)
     }
 
+    fn check_if_resubmission_makes_sense(
+        tx: &Transaction,
+        gas_price: &GasPrice,
+    ) -> Result<(), LanderError> {
+        let precursor = tx.precursor();
+        let tx_gas_price = precursor.extract_gas_price();
+
+        if tx_gas_price == GasPrice::None {
+            // If transaction has no gas price set, it is the first submission
+            return Ok(());
+        }
+
+        // Transaction has been submitted before, check if the new gas price has not
+        // reached limit yet
+
+        if gas_price == &tx_gas_price {
+            // If new gas price is the same as the old one, no point in resubmitting
+            return Err(LanderError::TxAlreadyExists);
+        }
+
+        Ok(())
+    }
+
     fn update_tx(&self, tx: &mut Transaction, nonce: U256, gas_price: GasPrice) {
         let precursor = tx.precursor_mut();
 
@@ -579,6 +600,8 @@ impl AdaptsChain for EthereumAdapter {
             self.estimate_gas_price(&tx_for_gas_price)
         )?;
 
+        Self::check_if_resubmission_makes_sense(tx, &gas_price)?;
+
         self.update_tx(tx, nonce, gas_price);
 
         info!(?tx, "submitting transaction");

rust/main/lander/src/adapter/chains/ethereum/adapter/gas_price.rs

@@ -1,7 +1,5 @@
 pub use escalator::escalate_gas_price_if_needed;
 pub use estimator::estimate_gas_price;
-pub use price::{extract_gas_price, GasPrice};
 
 mod escalator;
 mod estimator;
-mod price;

rust/main/lander/src/adapter/chains/ethereum/adapter/gas_price/escalator.rs

@@ -7,7 +7,7 @@ use hyperlane_ethereum::TransactionOverrides;
 
 use crate::adapter::EthereumTxPrecursor;
 
-use super::price::GasPrice;
+use super::super::super::gas_price::GasPrice;
 
 const ESCALATION_MULTIPLIER_NUMERATOR: u32 = 110;
 const ESCALATION_MULTIPLIER_DENOMINATOR: u32 = 100;
@@ -153,7 +153,6 @@ fn apply_escalation_multiplier(gas_price: &U256) -> U256 {
 mod tests {
     use hyperlane_core::U256;
 
-    use crate::adapter::chains::ethereum::adapter::gas_price::GasPrice;
     use hyperlane_ethereum::TransactionOverrides;
 
     use super::*;

rust/main/lander/src/adapter/chains/ethereum/adapter/gas_price/estimator.rs

@@ -1,42 +1,42 @@
-use std::{str::FromStr, sync::Arc};
+use std::{iter::once, str::FromStr, sync::Arc};
 
-use ethers::contract::Lazy;
 use ethers::{
     abi::Detokenize,
-    contract::builders::ContractCall,
+    contract::{builders::ContractCall, Lazy},
     providers::{Middleware, ProviderError},
     types::{
         transaction::eip2718::TypedTransaction, Block, Eip1559TransactionRequest, H160,
         H256 as TxHash,
     },
 };
-use futures_util::try_join;
-use hyperlane_core::{ChainCommunicationError, ChainResult, HyperlaneDomain, U256};
-use hyperlane_ethereum::{EvmProviderForLander, TransactionOverrides, ZksyncEstimateFeeResponse};
-use tracing::{debug, warn};
-
-use crate::{adapter::EthereumTxPrecursor, LanderError};
-use ethers_core::types::FeeHistory;
 use ethers_core::{
-    types::{BlockNumber, U256 as EthersU256},
+    types::{BlockNumber, FeeHistory, U256 as EthersU256},
     utils::{
         eip1559_default_estimator, EIP1559_FEE_ESTIMATION_PAST_BLOCKS,
         EIP1559_FEE_ESTIMATION_REWARD_PERCENTILE,
     },
 };
-use futures_util::future::join_all;
+use futures_util::{future::join_all, try_join};
+use tracing::{debug, warn};
+
+use hyperlane_core::{ChainCommunicationError, ChainResult, HyperlaneDomain, U256};
+use hyperlane_ethereum::{EvmProviderForLander, TransactionOverrides, ZksyncEstimateFeeResponse};
+
+use crate::{adapter::EthereumTxPrecursor, LanderError};
 
-use super::price::GasPrice;
+use super::super::super::gas_price::GasPrice;
 
 type FeeEstimator = fn(EthersU256, Vec<Vec<EthersU256>>) -> (EthersU256, EthersU256);
 
 const EVM_RELAYER_ADDRESS: &str = "0x74cae0ecc47b02ed9b9d32e000fd70b9417970c5";
 
 // We have 2 to 4 multiples of the default percentile, and we limit it to 100% percentile.
+// We add 100% percentile so that we increase the chance to get fee history with non-zero rewards.
 static PERCENTILES: Lazy<Vec<f64>> = Lazy::new(|| {
     (2..5)
         .map(|m| EIP1559_FEE_ESTIMATION_REWARD_PERCENTILE * m as f64)
-        .filter(|p| *p <= 100.0)
+        .filter(|p| *p < 100.0)
+        .chain(once(100.0))
         .collect::<Vec<_>>()
 });