jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove blocktime handling from maintain pool future (#14210)

Browse Source
This commit is contained in:
Veer Chaurasia
2025-02-04 22:15:51 +05:30
committed by GitHub
parent 1303bb5dc6
commit d85c9001e4
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/transaction-pool/src/maintain.rs
View File

@ -115,13 +115,10 @@ pub async fn maintain_transaction_pool<N, Client, P, St, Tasks>(
last_seen_block_hash: latest.hash(),
last_seen_block_number: latest.number(),
pending_basefee: latest
.next_block_base_fee(
chain_spec.base_fee_params_at_timestamp(latest.timestamp().saturating_add(12)),
)
.next_block_base_fee(chain_spec.base_fee_params_at_timestamp(latest.timestamp()))
.unwrap_or_default(),
pending_blob_fee: latest.maybe_next_block_blob_fee(
chain_spec.blob_params_at_timestamp(latest.timestamp().saturating_add(12)),
),
pending_blob_fee: latest
.maybe_next_block_blob_fee(chain_spec.blob_params_at_timestamp(latest.timestamp())),
};
pool.set_block_info(info);
}
@ -276,12 +273,11 @@ pub async fn maintain_transaction_pool<N, Client, P, St, Tasks>(
let pending_block_base_fee = new_tip
.header()
.next_block_base_fee(
chain_spec
.base_fee_params_at_timestamp(new_tip.timestamp().saturating_add(12)),
chain_spec.base_fee_params_at_timestamp(new_tip.timestamp()),
)
.unwrap_or_default();
let pending_block_blob_fee = new_tip.header().maybe_next_block_blob_fee(
chain_spec.blob_params_at_timestamp(new_tip.timestamp().saturating_add(12)),
chain_spec.blob_params_at_timestamp(new_tip.timestamp()),
);
// we know all changed account in the new chain
@ -382,12 +378,10 @@ pub async fn maintain_transaction_pool<N, Client, P, St, Tasks>(
// fees for the next block: `tip+1`
let pending_block_base_fee = tip
.header()
.next_block_base_fee(
chain_spec.base_fee_params_at_timestamp(tip.timestamp().saturating_add(12)),
)
.next_block_base_fee(chain_spec.base_fee_params_at_timestamp(tip.timestamp()))
.unwrap_or_default();
let pending_block_blob_fee = tip.header().maybe_next_block_blob_fee(
chain_spec.blob_params_at_timestamp(tip.timestamp().saturating_add(12)),
chain_spec.blob_params_at_timestamp(tip.timestamp()),
);
let first_block = blocks.first();