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

refactor: rm re-exports of alloy eip 4844 constants (#12120)

Browse Source
This commit is contained in:
Thomas Coratger
2024-10-28 09:30:06 +01:00
committed by GitHub
parent 1c36b71612
commit 8605d04a09
16 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/rpc/rpc-eth-api/src/helpers/fee.rs
View File

@ -167,7 +167,7 @@ pub trait EthFees: LoadFee {
base_fee_per_blob_gas.push(header.blob_fee().unwrap_or_default());
blob_gas_used_ratio.push(
header.blob_gas_used.unwrap_or_default() as f64
/ reth_primitives::constants::eip4844::MAX_DATA_GAS_PER_BLOCK as f64,
/ alloy_eips::eip4844::MAX_DATA_GAS_PER_BLOCK as f64,
);
// Percentiles were specified, so we need to collect reward percentile ino

5
crates/rpc/rpc-eth-api/src/helpers/pending_block.rs
View File

@ -6,7 +6,9 @@ use std::time::{Duration, Instant};
use crate::{EthApiTypes, FromEthApiError, FromEvmError, RpcNodeCore};
use alloy_consensus::EMPTY_OMMER_ROOT_HASH;
use alloy_eips::{eip7685::EMPTY_REQUESTS_HASH, merge::BEACON_NONCE};
use alloy_eips::{
eip4844::MAX_DATA_GAS_PER_BLOCK, eip7685::EMPTY_REQUESTS_HASH, merge::BEACON_NONCE,
};
use alloy_primitives::{BlockNumber, B256, U256};
use alloy_rpc_types::BlockNumberOrTag;
use futures::Future;
@ -17,7 +19,6 @@ use reth_evm::{
};
use reth_execution_types::ExecutionOutcome;
use reth_primitives::{
constants::eip4844::MAX_DATA_GAS_PER_BLOCK,
proofs::calculate_transaction_root,
revm_primitives::{
BlockEnv, CfgEnv, CfgEnvWithHandlerCfg, EVMError, Env, ExecutionResult, InvalidTransaction,

2
crates/rpc/rpc-eth-types/src/fee_history.rs
View File

@ -366,7 +366,7 @@ impl FeeHistoryEntry {
gas_used_ratio: block.gas_used as f64 / block.gas_limit as f64,
base_fee_per_blob_gas: block.blob_fee(),
blob_gas_used_ratio: block.blob_gas_used() as f64 /
reth_primitives::constants::eip4844::MAX_DATA_GAS_PER_BLOCK as f64,
alloy_eips::eip4844::MAX_DATA_GAS_PER_BLOCK as f64,
excess_blob_gas: block.excess_blob_gas,
blob_gas_used: block.blob_gas_used,
gas_used: block.gas_used,