Skip to content

refactor: use TransactionRequest everywhere #7040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Evalir merged 6 commits into from
Feb 9, 2024
Merged

refactor: use TransactionRequest everywhere #7040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bf57a8
refactor: remove EthTransactionRequest and CallRequest for Transactio…
Evalir Feb 7, 2024
47c7ff5
add note about removing transaction_request_to_typed
Evalir Feb 8, 2024
5f767ea
update alloy
Evalir Feb 9, 2024
1f3ce64
Merge branch 'master' into evalir/dedupe-tx-request-anvil
Evalir Feb 9, 2024
001d02a
chore(general): last conversions
Evalir Feb 9, 2024
4ca4c9f
chore: update alloy, fix tests
Evalir Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Cargo.lock
View file
Open in desktop

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

21 changes: 11 additions & 10 deletions crates/anvil/core/src/eth/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
use crate::{
eth::{subscription::SubscriptionId, transaction::EthTransactionRequest},
eth::subscription::SubscriptionId,
types::{EvmMineOptions, Forking, Index},
};
use alloy_primitives::{Address, Bytes, TxHash, B256, B64, U256};
use alloy_rpc_trace_types::geth::{GethDebugTracingOptions, GethDefaultTracingOptions};
use alloy_rpc_types::{
pubsub::{Params as SubscriptionParams, SubscriptionKind},
request::TransactionRequest,
state::StateOverride,
BlockId, BlockNumberOrTag as BlockNumber, CallRequest, Filter,
BlockId, BlockNumberOrTag as BlockNumber, Filter,
};

pub mod block;
Expand Down Expand Up @@ -142,7 +143,7 @@ pub enum EthRequest {
EthSign(Address, Bytes),

#[cfg_attr(feature = "serde", serde(rename = "eth_signTransaction"))]
EthSignTransaction(Box<EthTransactionRequest>),
EthSignTransaction(Box<TransactionRequest>),

/// Signs data via [EIP-712](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-712.md).
#[cfg_attr(feature = "serde", serde(rename = "eth_signTypedData"))]
Expand All @@ -157,27 +158,27 @@ pub enum EthRequest {
EthSignTypedDataV4(Address, alloy_dyn_abi::TypedData),

#[cfg_attr(feature = "serde", serde(rename = "eth_sendTransaction", with = "sequence"))]
EthSendTransaction(Box<EthTransactionRequest>),
EthSendTransaction(Box<TransactionRequest>),

#[cfg_attr(feature = "serde", serde(rename = "eth_sendRawTransaction", with = "sequence"))]
EthSendRawTransaction(Bytes),

#[cfg_attr(feature = "serde", serde(rename = "eth_call"))]
EthCall(
CallRequest,
TransactionRequest,
#[cfg_attr(feature = "serde", serde(default))] Option<BlockId>,
#[cfg_attr(feature = "serde", serde(default))] Option<StateOverride>,
),

#[cfg_attr(feature = "serde", serde(rename = "eth_createAccessList"))]
EthCreateAccessList(
CallRequest,
TransactionRequest,
#[cfg_attr(feature = "serde", serde(default))] Option<BlockId>,
),

#[cfg_attr(feature = "serde", serde(rename = "eth_estimateGas"))]
EthEstimateGas(
CallRequest,
TransactionRequest,
#[cfg_attr(feature = "serde", serde(default))] Option<BlockId>,
#[cfg_attr(feature = "serde", serde(default))] Option<StateOverride>,
),
Expand Down Expand Up @@ -271,7 +272,7 @@ pub enum EthRequest {
/// geth's `debug_traceCall` endpoint
#[cfg_attr(feature = "serde", serde(rename = "debug_traceCall"))]
DebugTraceCall(
CallRequest,
TransactionRequest,
#[cfg_attr(feature = "serde", serde(default))] Option<BlockId>,
#[cfg_attr(feature = "serde", serde(default))] GethDefaultTracingOptions,
),
Expand Down Expand Up @@ -596,7 +597,7 @@ pub enum EthRequest {
feature = "serde",
serde(rename = "eth_sendUnsignedTransaction", with = "sequence")
)]
EthSendUnsignedTransaction(Box<EthTransactionRequest>),
EthSendUnsignedTransaction(Box<TransactionRequest>),

/// Turn on call traces for transactions that are returned to the user when they execute a
/// transaction (instead of just txhash/receipt)
Expand Down Expand Up @@ -1451,7 +1452,7 @@ true}]}"#;
#[test]
fn test_eth_call() {
let req = r#"{"data":"0xcfae3217","from":"0xd84de507f3fada7df80908082d3239466db55a71","to":"0xcbe828fdc46e3b1c351ec90b1a5e7d9742c0398d"}"#;
let _req = serde_json::from_str::<CallRequest>(req).unwrap();
let _req = serde_json::from_str::<TransactionRequest>(req).unwrap();

let s = r#"{"method": "eth_call", "params":[{"data":"0xcfae3217","from":"0xd84de507f3fada7df80908082d3239466db55a71","to":"0xcbe828fdc46e3b1c351ec90b1a5e7d9742c0398d"},"latest"]}"#;
let _req = serde_json::from_str::<EthRequest>(s).unwrap();
Expand Down
Loading