Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@klkvr
klkvr committed Sep 11, 2024
1 parent 65fce0e commit bae3095
Show file tree
Hide file tree
Showing 7 changed files with 443 additions and 151 deletions.
55 changes: 28 additions & 27 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 26 additions & 26 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,29 +578,29 @@ test-fuzz = "5"
tikv-jemallocator = { version = "0.5.0" }

[patch.crates-io]
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "073b8b5e"}
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "0930283a"}
9 changes: 5 additions & 4 deletions crates/rpc/rpc-eth-api/src/core.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ use reth_rpc_types::{
serde_helpers::JsonStorageKey,
simulate::{SimulatePayload, SimulatedBlock},
state::{EvmOverrides, StateOverride},
AnyTransactionReceipt, BlockOverrides, Bundle, EIP1186AccountProofResponse, EthCallResponse,
FeeHistory, Header, Index, StateContext, SyncStatus, TransactionRequest, Work,
AnyTransactionReceipt, Block, BlockOverrides, Bundle, EIP1186AccountProofResponse,
EthCallResponse, FeeHistory, Header, Index, StateContext, SyncStatus, TransactionRequest,
WithOtherFields, Work,
};
use tracing::trace;

Expand Down Expand Up @@ -214,7 +215,7 @@ pub trait EthApi<T: RpcObject, B: RpcObject, R: RpcObject> {
&self,
opts: SimulatePayload,
block_number: Option<BlockId>,
) -> RpcResult<Vec<SimulatedBlock>>;
) -> RpcResult<Vec<SimulatedBlock<B>>>;

/// Executes a new message call immediately without creating a transaction on the block chain.
#[method(name = "call")]
Expand Down Expand Up @@ -621,7 +622,7 @@ where
&self,
payload: SimulatePayload,
block_number: Option<BlockId>,
) -> RpcResult<Vec<SimulatedBlock>> {
) -> RpcResult<Vec<SimulatedBlock<Block<WithOtherFields<reth_rpc_types::Transaction>>>>> {
trace!(target: "rpc::eth", ?block_number, "Serving eth_simulateV1");
Ok(EthCall::simulate_v1(self, payload, block_number).await?)
}
Expand Down
Loading

0 comments on commit bae3095

Please sign in to comment.