Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug for additional Tip #3311

Merged
merged 3 commits into from
Mar 6, 2025
Merged

Fix bug for additional Tip #3311

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc64c22
Fix bug for additional Tip
sunce86 Mar 6, 2025
aa73d01
cr fixes
sunce86 Mar 6, 2025
c2b4503
Merge branch 'main' into adjust-gas-price-additional-tip
sunce86 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions crates/driver/src/infra/blockchain/gas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
/// private submission networks are used.
use {
super::Error,
crate::infra::config::file::GasEstimatorType,
crate::{domain::eth, infra::mempool},
crate::{
domain::eth,
infra::{config::file::GasEstimatorType, mempool},
},
ethcontract::dyns::DynWeb3,
gas_estimation::{GasPriceEstimating, nativegasestimator::NativeGasEstimator},
std::sync::Arc,
Expand All @@ -18,7 +20,7 @@ type AdditionalTip = (MaxAdditionalTip, AdditionalTipPercentage);
pub struct GasPriceEstimator {
//TODO: remove visibility once boundary is removed
pub(super) gas: Arc<dyn GasPriceEstimating>,
additional_tip: Option<AdditionalTip>,
additional_tip: AdditionalTip,
max_fee_per_gas: eth::U256,
min_priority_fee: eth::U256,
}
Expand Down Expand Up @@ -51,7 +53,8 @@ impl GasPriceEstimator {
..
} => (max_additional_tip, additional_tip_percentage),
})
.next();
.next()
.unwrap_or((eth::U256::zero(), 0.));
// Use the lowest max_fee_per_gas of all mempools as the max_fee_per_gas
let max_fee_per_gas = mempools
.iter()
Expand Down Expand Up @@ -81,24 +84,20 @@ impl GasPriceEstimator {
self.gas
.estimate()
.await
.map(|mut estimate| {
let estimate = match self.additional_tip {
Some((max_additional_tip, additional_tip_percentage)) => {
let additional_tip = max_additional_tip
.to_f64_lossy()
.min(estimate.max_fee_per_gas * additional_tip_percentage);
estimate.max_fee_per_gas += additional_tip;
estimate.max_priority_fee_per_gas += additional_tip;
estimate
}
None => estimate,
};
.map(|estimate| {
let (max, percentage) = self.additional_tip;
let additional_tip = max
.to_f64_lossy()
.min(estimate.max_fee_per_gas * percentage);

let tip = std::cmp::max(
self.min_priority_fee + eth::U256::from_f64_lossy(additional_tip),
eth::U256::from_f64_lossy(estimate.max_priority_fee_per_gas + additional_tip),
);

eth::GasPrice::new(
self.max_fee_per_gas.into(),
std::cmp::max(
self.min_priority_fee.into(),
eth::U256::from_f64_lossy(estimate.max_priority_fee_per_gas).into(),
),
tip.into(),
eth::U256::from_f64_lossy(estimate.base_fee_per_gas).into(),
)
})
Expand Down
Loading