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

rpc: replace reth-primitive imports with alloy-eips (#10834)

Browse Source
This commit is contained in:
Håvard Anda Estensen
2024-09-11 13:25:07 +02:00
committed by GitHub
parent a5be445ef9
commit 5b3c115704
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -8241,6 +8241,7 @@ name = "reth-rpc"
version = "1.0.6" version = "1.0.6"
dependencies = [ dependencies = [
"alloy-dyn-abi", "alloy-dyn-abi",
"alloy-eips",
"alloy-genesis", "alloy-genesis",
"alloy-network", "alloy-network",
"alloy-primitives", "alloy-primitives",
@ -8298,6 +8299,7 @@ dependencies = [
name = "reth-rpc-api" name = "reth-rpc-api"
version = "1.0.6" version = "1.0.6"
dependencies = [ dependencies = [
"alloy-eips",
"alloy-json-rpc", "alloy-json-rpc",
"alloy-primitives", "alloy-primitives",
"jsonrpsee", "jsonrpsee",

1
crates/rpc/rpc-api/Cargo.toml
View File

@ -21,6 +21,7 @@ reth-network-peers.workspace = true
# ethereum # ethereum
alloy-json-rpc.workspace = true alloy-json-rpc.workspace = true
alloy-eips.workspace = true
alloy-primitives.workspace = true alloy-primitives.workspace = true
# misc # misc

2
crates/rpc/rpc-api/src/debug.rs
View File

@ -1,6 +1,6 @@
use alloy_eips::{BlockId, BlockNumberOrTag};
use alloy_primitives::{Address, Bytes, B256}; use alloy_primitives::{Address, Bytes, B256};
use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use jsonrpsee::{core::RpcResult, proc_macros::rpc};
use reth_primitives::{BlockId, BlockNumberOrTag};
use reth_rpc_types::{ use reth_rpc_types::{
debug::ExecutionWitness, debug::ExecutionWitness,
trace::geth::{ trace::geth::{

2
crates/rpc/rpc-api/src/engine.rs
View File

@ -3,11 +3,11 @@
//! This contains the `engine_` namespace and the subset of the `eth_` namespace that is exposed to //! This contains the `engine_` namespace and the subset of the `eth_` namespace that is exposed to
//! the consensus client. //! the consensus client.
use alloy_eips::{BlockId, BlockNumberOrTag};
use alloy_json_rpc::RpcObject; use alloy_json_rpc::RpcObject;
use alloy_primitives::{Address, BlockHash, Bytes, B256, U256, U64}; use alloy_primitives::{Address, BlockHash, Bytes, B256, U256, U64};
use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use jsonrpsee::{core::RpcResult, proc_macros::rpc};
use reth_engine_primitives::EngineTypes; use reth_engine_primitives::EngineTypes;
use reth_primitives::{BlockId, BlockNumberOrTag};
use reth_rpc_types::{ use reth_rpc_types::{
engine::{ engine::{
ClientVersionV1, ExecutionPayloadBodiesV1, ExecutionPayloadBodiesV2, ClientVersionV1, ExecutionPayloadBodiesV1, ExecutionPayloadBodiesV2,

5
crates/rpc/rpc/Cargo.toml
View File

@ -38,10 +38,11 @@ reth-trie.workspace = true
# ethereum # ethereum
alloy-dyn-abi.workspace = true alloy-dyn-abi.workspace = true
alloy-rlp.workspace = true alloy-eips.workspace = true
alloy-primitives.workspace = true
alloy-genesis.workspace = true alloy-genesis.workspace = true
alloy-network.workspace = true alloy-network.workspace = true
alloy-primitives.workspace = true
alloy-rlp.workspace = true
revm = { workspace = true, features = [ revm = { workspace = true, features = [
"optional_block_gas_limit", "optional_block_gas_limit",
"optional_eip3607", "optional_eip3607",

2
crates/rpc/rpc/src/engine.rs
View File

@ -1,7 +1,7 @@
use alloy_eips::{BlockId, BlockNumberOrTag};
use alloy_network::Network; use alloy_network::Network;
use alloy_primitives::{Address, Bytes, B256, U256, U64}; use alloy_primitives::{Address, Bytes, B256, U256, U64};
use jsonrpsee::core::RpcResult as Result; use jsonrpsee::core::RpcResult as Result;
use reth_primitives::{BlockId, BlockNumberOrTag};
use reth_rpc_api::{EngineEthApiServer, EthApiServer, EthFilterApiServer}; use reth_rpc_api::{EngineEthApiServer, EthApiServer, EthFilterApiServer};
/// Re-export for convenience /// Re-export for convenience
pub use reth_rpc_engine_api::EngineApi; pub use reth_rpc_engine_api::EngineApi;

2
crates/rpc/rpc/src/otterscan.rs
View File

@ -1,8 +1,8 @@
use alloy_eips::{BlockId, BlockNumberOrTag};
use alloy_network::Network; use alloy_network::Network;
use alloy_primitives::{Address, Bytes, TxHash, B256, U256}; use alloy_primitives::{Address, Bytes, TxHash, B256, U256};
use async_trait::async_trait; use async_trait::async_trait;
use jsonrpsee::{core::RpcResult, types::ErrorObjectOwned}; use jsonrpsee::{core::RpcResult, types::ErrorObjectOwned};
use reth_primitives::{BlockId, BlockNumberOrTag};
use reth_rpc_api::{EthApiServer, OtterscanServer}; use reth_rpc_api::{EthApiServer, OtterscanServer};
use reth_rpc_eth_api::{ use reth_rpc_eth_api::{
helpers::{EthTransactions, TraceExt}, helpers::{EthTransactions, TraceExt},