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

Bump gas price based on elapsed blocks for cancelling #3302

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Bump gas price based on elapsed blocks for cancelling #3302

Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1613373
Bump price based on elapsed blocks for cancelling
3shv Mar 3, 2025
ea71173
Merge branch 'main' into bumpGasFeeOnResubmit
3shv Mar 3, 2025
a999a6f
Revert "Bump price based on elapsed blocks for cancelling"
3shv Mar 4, 2025
59f16ce
Bump gas price based on blocks elapsed
3shv Mar 4, 2025
b2b47a1
max
3shv Mar 4, 2025
7013cc6
Multiply gas price with blocks_elapsed
3shv Mar 5, 2025
e93f51f
Use powi
3shv Mar 6, 2025
f4ebc81
Merge branch 'main' into bumpGasFeeOnResubmit
3shv Mar 6, 2025
2ac7a5d
Merge branch 'main' into bumpGasFeeOnResubmit
MartinquaXD Mar 7, 2025
4de5adf
Introduce a new variable for new_gas_price
3shv Mar 7, 2025
9d687bc
refactor
3shv Mar 7, 2025
2c34707
Update crates/driver/src/domain/mempools.rs
3shv Mar 7, 2025
6537b95
Merge branch 'main' into bumpGasFeeOnResubmit
3shv Mar 7, 2025
3457ffc
remove unused import
3shv Mar 8, 2025
2c48228
format
3shv Mar 8, 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
20 changes: 17 additions & 3 deletions crates/driver/src/domain/mempools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ use {
anyhow::Context,
ethrpc::block_stream::into_stream,
futures::{FutureExt, StreamExt, future::select_ok},
std::ops::Sub,
thiserror::Error,
tracing::Instrument,
web3::types::BlockNumber,
};

/// Factor by how much a transaction fee needs to be increased to override a
Expand Down Expand Up @@ -150,10 +152,12 @@ impl Mempools {
})
}
TxStatus::Pending => {
let blocks_elapsed = block.number.sub(submitted_at_block);

// Check if the current block reached the submission deadline block number
if block.number >= submission_deadline {
let cancellation_tx_hash = self
.cancel(mempool, settlement.gas.price, solver)
.cancel(mempool, settlement.gas.price, solver, blocks_elapsed)
.await
.context("cancellation tx due to deadline failed")?;
tracing::info!(
Expand All @@ -173,7 +177,7 @@ impl Mempools {
if let Err(err) = self.ethereum.estimate_gas(tx).await {
if err.is_revert() {
let cancellation_tx_hash = self
.cancel(mempool, settlement.gas.price, solver)
.cancel(mempool, settlement.gas.price, solver, blocks_elapsed)
.await
.context("cancellation tx due to revert failed")?;
tracing::info!(
Expand Down Expand Up @@ -214,7 +218,9 @@ impl Mempools {
mempool: &infra::mempool::Mempool,
pending: eth::GasPrice,
solver: &Solver,
blocks_elapsed: u64,
) -> Result<TxId, Error> {
let gas_price_bump_factor = GAS_PRICE_BUMP.powf(blocks_elapsed.max(1) as f64);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the issue #3241 description I think we need to just multiply the GAS_PRICE_BUMP by blocks_elapsed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, yeah 😅

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.. Fixed it!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3shv your original version was actually correct (with the exception of using .powf() instead of powi()). Perhaps the issue was worded unfortunately.
The reason is that according to EIP-1559 the base fee can increase at most 12.5% from block n to n+1. So if we want to get the highest possible gas price after 3 blocks we would compute:
originalGasPrice * 1.125 * 1.125 * 1.125 or originalGasPrice * 1.125.powi(3).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, that's interesting.
Thanks for the clarification. Learning new stuff everyday 😇

let cancellation = eth::Tx {
from: solver.address(),
to: solver.address(),
Expand All @@ -225,8 +231,16 @@ impl Mempools {
let gas = competition::solution::settlement::Gas {
estimate: CANCELLATION_GAS_AMOUNT.into(),
limit: CANCELLATION_GAS_AMOUNT.into(),
price: pending * GAS_PRICE_BUMP,
price: pending * gas_price_bump_factor,
};
tracing::debug!(
blocks_elapsed = ?blocks_elapsed,
original_gas_price = ?pending,
new_gas_price = ?(pending * gas_price_bump_factor),
bump_factor = ?gas_price_bump_factor,
"Cancelling transaction with adjusted gas price"
);

mempool.submit(cancellation, gas, solver).await
}
}
Expand Down