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: rm fqs for NodeCore (#12418)

Browse Source
This commit is contained in:
Matthias Seitz
2024-11-09 08:29:41 +01:00
committed by GitHub
parent f86efcc800
commit 7a65cce1e1
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/rpc/rpc/src/debug.rs
View File

@ -27,7 +27,7 @@ use reth_revm::database::StateProviderDatabase;
use reth_rpc_api::DebugApiServer;
use reth_rpc_eth_api::{
helpers::{EthApiSpec, EthTransactions, TraceExt},
EthApiTypes, FromEthApiError, RpcNodeCore,
EthApiTypes, FromEthApiError,
};
use reth_rpc_eth_types::{EthApiError, StateCacheDb};
use reth_rpc_server_types::{result::internal_rpc_err, ToRpcResult};
@ -115,7 +115,7 @@ where
env: Env::boxed(
cfg.cfg_env.clone(),
block_env.clone(),
RpcNodeCore::evm_config(this.eth_api()).tx_env(tx, *signer),
this.eth_api().evm_config().tx_env(tx, *signer),
),
handler_cfg: cfg.handler_cfg,
};
@ -264,7 +264,7 @@ where
env: Env::boxed(
cfg.cfg_env.clone(),
block_env,
RpcNodeCore::evm_config(this.eth_api()).tx_env(tx.as_signed(), tx.signer()),
this.eth_api().evm_config().tx_env(tx.as_signed(), tx.signer()),
),
handler_cfg: cfg.handler_cfg,
};
@ -533,7 +533,7 @@ where
env: Env::boxed(
cfg.cfg_env.clone(),
block_env.clone(),
RpcNodeCore::evm_config(this.eth_api()).tx_env(tx, *signer),
this.eth_api().evm_config().tx_env(tx, *signer),
),
handler_cfg: cfg.handler_cfg,
};

4
crates/rpc/rpc/src/eth/bundle.rs
View File

@ -167,7 +167,7 @@ where
let mut total_gas_fess = U256::ZERO;
let mut hasher = Keccak256::new();
let mut evm = RpcNodeCore::evm_config(&eth_api).evm_with_env(db, env);
let mut evm = eth_api.evm_config().evm_with_env(db, env);
let mut results = Vec::with_capacity(transactions.len());
let mut transactions = transactions.into_iter().peekable();
@ -188,7 +188,7 @@ where
.effective_tip_per_gas(basefee)
.ok_or_else(|| RpcInvalidTransactionError::FeeCapTooLow)
.map_err(Eth::Error::from_eth_err)?;
RpcNodeCore::evm_config(&eth_api).fill_tx_env(evm.tx_mut(), &tx, signer);
eth_api.evm_config().fill_tx_env(evm.tx_mut(), &tx, signer);
let ResultAndState { result, state } =
evm.transact().map_err(Eth::Error::from_evm_err)?;

8
crates/rpc/rpc/src/eth/sim_bundle.rs
View File

@ -307,7 +307,7 @@ where
let mut refundable_value = U256::ZERO;
let mut body_logs: Vec<SimBundleLogs> = Vec::new();
let mut evm = RpcNodeCore::evm_config(&eth_api).evm_with_env(db, env);
let mut evm = eth_api.evm_config().evm_with_env(db, env);
for item in &flattened_bundle {
// Check inclusion constraints
@ -323,11 +323,7 @@ where
)
.into());
}
RpcNodeCore::evm_config(&eth_api).fill_tx_env(
evm.tx_mut(),
&item.tx,
item.signer,
);
eth_api.evm_config().fill_tx_env(evm.tx_mut(), &item.tx, item.signer);
let ResultAndState { result, state } =
evm.transact().map_err(EthApiError::from_eth_err)?;

4
crates/rpc/rpc/src/trace.rs
View File

@ -22,7 +22,7 @@ use reth_primitives::Header;
use reth_provider::{BlockReader, ChainSpecProvider, EvmEnvProvider, StateProviderFactory};
use reth_revm::database::StateProviderDatabase;
use reth_rpc_api::TraceApiServer;
use reth_rpc_eth_api::{helpers::TraceExt, FromEthApiError, RpcNodeCore};
use reth_rpc_eth_api::{helpers::TraceExt, FromEthApiError};
use reth_rpc_eth_types::{error::EthApiError, utils::recover_raw_transaction};
use reth_tasks::pool::BlockingTaskGuard;
use revm::{
@ -122,7 +122,7 @@ where
let env = EnvWithHandlerCfg::new_with_cfg_env(
cfg,
block,
RpcNodeCore::evm_config(self.eth_api()).tx_env(tx.as_signed(), tx.signer()),
self.eth_api().evm_config().tx_env(tx.as_signed(), tx.signer()),
);
let config = TracingInspectorConfig::from_parity_config(&trace_types);