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

chore: bump revm (#4884)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: rakita <rakita@users.noreply.github.com>
This commit is contained in:
Dan Cline
2023-10-03 09:45:53 -04:00
committed by GitHub
parent 2cddd0f63e
commit b1a7a871cd
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/payload/builder/src/payload.rs
View File

@ -184,7 +184,7 @@ impl PayloadBuilderAttributes {
// if the parent block did not have excess blob gas (i.e. it was pre-cancun), but it is
// cancun now, we need to set the excess blob gas to the default value
let blob_excess_gas_and_price = parent
.next_block_blob_fee()
.next_block_excess_blob_gas()
.map_or_else(
|| {
if cfg.spec_id == SpecId::CANCUN {

2
crates/primitives/src/constants/eip4844.rs
View File

@ -29,7 +29,7 @@ pub const TARGET_BLOBS_PER_BLOCK: u64 = TARGET_DATA_GAS_PER_BLOCK / DATA_GAS_PER
pub const BLOB_GASPRICE_UPDATE_FRACTION: u64 = 3_338_477u64; // 3338477
/// Minimum gas price for a data blob
pub const BLOB_TX_MIN_BLOB_GASPRICE: u64 = 1u64;
pub const BLOB_TX_MIN_BLOB_GASPRICE: u128 = 1u128;
/// Commitment version of a KZG commitment
pub const VERSIONED_HASH_VERSION_KZG: u8 = 0x01;

4
crates/primitives/src/header.rs
View File

@ -185,7 +185,7 @@ impl Header {
/// Returns the blob fee for _this_ block according to the EIP-4844 spec.
///
/// Returns `None` if `excess_blob_gas` is None
pub fn blob_fee(&self) -> Option<u64> {
pub fn blob_fee(&self) -> Option<u128> {
self.excess_blob_gas.map(calc_blob_gasprice)
}
@ -194,7 +194,7 @@ impl Header {
/// Returns `None` if `excess_blob_gas` is None.
///
/// See also [Self::next_block_excess_blob_gas]
pub fn next_block_blob_fee(&self) -> Option<u64> {
pub fn next_block_blob_fee(&self) -> Option<u128> {
self.next_block_excess_blob_gas().map(calc_blob_gasprice)
}

4
crates/transaction-pool/src/pool/txpool.rs
View File

@ -815,7 +815,7 @@ pub(crate) struct AllTransactions<T: PoolTransaction> {
/// Expected base fee for the pending block.
pending_basefee: u64,
/// Expected blob fee for the pending block.
pending_blob_fee: u64,
pending_blob_fee: u128,
/// Configured price bump settings for replacements
price_bumps: PriceBumpConfig,
}
@ -1366,7 +1366,7 @@ impl<T: PoolTransaction> AllTransactions<T> {
transaction =
self.ensure_valid_blob_transaction(transaction, on_chain_balance, ancestor)?;
let blob_fee_cap = transaction.transaction.max_fee_per_blob_gas().unwrap_or_default();
if blob_fee_cap >= self.pending_blob_fee as u128 {
if blob_fee_cap >= self.pending_blob_fee {
state.insert(TxState::ENOUGH_BLOB_FEE_CAP_BLOCK);
}
} else {

4
crates/transaction-pool/src/traits.rs
View File

@ -520,7 +520,7 @@ pub struct CanonicalStateUpdate<'a> {
/// EIP-4844 blob fee of the _next_ (pending) block
///
/// Only after Cancun
pub pending_block_blob_fee: Option<u64>,
pub pending_block_blob_fee: Option<u128>,
/// A set of changed accounts across a range of blocks.
pub changed_accounts: Vec<ChangedAccount>,
/// All mined transactions in the block range.
@ -1040,7 +1040,7 @@ pub struct BlockInfo {
///
/// Note: this is the derived blob fee of the _next_ block that builds on the block the pool is
/// currently tracking
pub pending_blob_fee: Option<u64>,
pub pending_blob_fee: Option<u128>,
}
/// The limit to enforce for [TransactionPool::get_pooled_transaction_elements].