From 07a7c04da8cfd852073f4ead8b08bde87f25d349 Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Fri, 31 Jan 2025 09:19:20 +0100 Subject: [PATCH] deps: bump alloy next --- Cargo.lock | 196 ++++++++---------- Cargo.toml | 125 +++++------ crates/chainspec/src/spec.rs | 8 +- crates/optimism/cli/src/ovm_file_codec.rs | 7 + .../primitives/src/transaction/signed.rs | 2 +- crates/optimism/rpc/src/eth/transaction.rs | 2 +- .../src/serde_bincode_compat.rs | 47 +++-- crates/rpc/rpc-eth-api/src/helpers/call.rs | 18 +- crates/rpc/rpc-eth-api/src/helpers/trace.rs | 2 +- .../rpc-eth-api/src/helpers/transaction.rs | 4 +- crates/rpc/rpc-eth-types/src/receipt.rs | 1 - crates/rpc/rpc-eth-types/src/transaction.rs | 4 +- crates/rpc/rpc-types-compat/src/block.rs | 2 +- crates/rpc/rpc/src/eth/helpers/types.rs | 2 +- crates/rpc/rpc/src/eth/sim_bundle.rs | 17 +- crates/rpc/rpc/src/otterscan.rs | 5 +- 16 files changed, 205 insertions(+), 237 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 978517f83ce8..e50c03e5d109 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,8 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4138dc275554afa6f18c4217262ac9388790b2fc393c2dfe03c51d357abf013" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-eips", "alloy-primitives", @@ -141,9 +140,8 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa04e1882c31288ce1028fdf31b6ea94cfa9eafa2e497f903ded631c8c6a42c" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-consensus", "alloy-eips", @@ -155,9 +153,8 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f21886c1fea0626f755a49b2ac653b396fb345233f6170db2da3d0ada31560c" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -237,16 +234,17 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dd5869ed09e399003e0e0ec6903d981b2a92e74c5d37e6b40890bad2517526" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ + "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", "alloy-primitives", "alloy-rlp", "alloy-serde", "arbitrary", + "auto_impl", "c-kzg", "derive_more", "ethereum_ssz", @@ -258,9 +256,8 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d2a7fe5c1a9bd6793829ea21a636f30fc2b3f5d2e7418ba86d96e41dd1f460" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-eips", "alloy-primitives", @@ -283,9 +280,8 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2008bedb8159a255b46b7c8614516eda06679ea82f620913679afbd8031fea72" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -297,9 +293,8 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4556f01fe41d0677495df10a648ddcf7ce118b0e8aa9642a0e2b6dd1fb7259de" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -322,9 +317,8 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31c3c6b71340a1d076831823f09cb6e02de01de5c6630a9631bdb36f947ff80" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-consensus", "alloy-eips", @@ -335,9 +329,8 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4520cd4bc5cec20c32c98e4bc38914c7fb96bf4a712105e44da186a54e65e3ba" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -383,9 +376,8 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22c4441b3ebe2d77fa9cf629ba68c3f713eb91779cff84275393db97eddd82" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-chains", "alloy-consensus", @@ -408,11 +400,10 @@ dependencies = [ "dashmap", "futures", "futures-utils-wasm", - "lru", + "lru 0.13.0", "parking_lot", "pin-project", "reqwest", - "schnellru", "serde", "serde_json", "thiserror 2.0.11", @@ -424,9 +415,8 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2269fd635f7b505f27c63a3cb293148cd02301efce4c8bdd9ff54fbfc4a20e23" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -465,9 +455,8 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06a292b37e182e514903ede6e623b9de96420e8109ce300da288a96d88b7e4b" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -490,9 +479,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9383845dd924939e7ab0298bbfe231505e20928907d7905aa3bf112287305e06" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -503,9 +491,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fcea70b3872c645fa0ee7fb23370d685f98e8c35f47297de619fb2e9f607ff" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -515,9 +502,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11495cb8c8d3141fc27556a4c9188b81531ad5ec3076a0394c61a6dcfbce9f34" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -527,9 +513,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca445cef0eb6c2cf51cfb4e214fbf1ebd00893ae2e6f3b944c8101b07990f988" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -538,9 +523,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4009405b1d3f5e8c529b8cf353f74e815fd2102549af4172fc721b4b9ea09133" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-eips", "alloy-primitives", @@ -554,9 +538,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358d6a8d7340b9eb1a7589a6c1fb00df2c9b26e90737fa5ed0108724dd8dac2c" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "serde", @@ -564,9 +547,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f821f30344862a0b6eb9a1c2eb91dfb2ff44c7489f37152a526cdcab79264" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-consensus", "alloy-eips", @@ -585,9 +567,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0938bc615c02421bd86c1733ca7205cc3d99a122d9f9bff05726bd604b76a5c2" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -607,9 +588,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bd42cf54b8a05b596322267f396a7dbdf141a56e93502a2ab4464fb718467a" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-eips", "alloy-primitives", @@ -621,9 +601,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd38207e056cc7d1372367fbb4560ddf9107cbd20731743f641246bf0dede149" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -635,9 +614,8 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7fd456a3fa9ea732d1c0611c9d52b5326ee29f4d02d01b07dac453ed68d9eb5" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -647,9 +625,8 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0465c71d4dced7525f408d84873aeebb71faf807d22d74c4a426430ccd9b55" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "arbitrary", @@ -659,9 +636,8 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfa395ad5cc952c82358d31e4c68b27bf4a89a5456d9b27e226e77dac50e4ff" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-primitives", "async-trait", @@ -673,9 +649,8 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdc63ce9eda1283fcbaca66ba4a414b841c0e3edbeef9c86a71242fc9e84ccc" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-consensus", "alloy-network", @@ -761,13 +736,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17722a198f33bbd25337660787aea8b8f57814febb7c746bc30407bdfc39448" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-json-rpc", "base64 0.22.1", - "futures-util", "futures-utils-wasm", "serde", "serde_json", @@ -781,9 +754,8 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1509599021330a31c4a6816b655e34bf67acb1cc03c564e09fd8754ff6c5de" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -796,9 +768,8 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4da44bc9a5155ab599666d26decafcf12204b72a80eeaba7c5e234ee8ac205" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -807,6 +778,7 @@ dependencies = [ "futures", "interprocess", "pin-project", + "serde", "serde_json", "tokio", "tokio-util", @@ -815,9 +787,8 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58011745b2f17b334db40df9077d75b181f78360a5bc5c35519e15d4bfce15e2" +version = "0.10.0" +source = "git+https://github.com/alloy-rs/alloy?rev=cfb13aa#cfb13aae29f9aef9a33a82bc5915b509984d51fc" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -2604,7 +2575,7 @@ dependencies = [ "hkdf", "lazy_static", "libp2p-identity", - "lru", + "lru 0.12.5", "more-asserts", "multiaddr", "parking_lot", @@ -4856,6 +4827,15 @@ dependencies = [ "hashbrown 0.15.2", ] +[[package]] +name = "lru" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" +dependencies = [ + "hashbrown 0.15.2", +] + [[package]] name = "lz4_flex" version = "0.11.3" @@ -5372,8 +5352,7 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28dc4e397dd8969f7f98ea6454a5c531349a58c76e12448b0c2de6581df7b8c" +source = "git+https://github.com/alloy-rs/op-alloy?rev=ad607c1#ad607c1f888efcac59806e8a964d35c97f960fc6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5396,8 +5375,7 @@ checksum = "76b44f5edbd5293636934a88ec38d683ee2075bfce43658d1033d76191e7aff6" [[package]] name = "op-alloy-network" version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "818a4ea62c0968fbf4e3bee2aa1349ad7ae6504b8aba73889a40160bebaa6818" +source = "git+https://github.com/alloy-rs/op-alloy?rev=ad607c1#ad607c1f888efcac59806e8a964d35c97f960fc6" dependencies = [ "alloy-consensus", "alloy-network", @@ -5421,8 +5399,7 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9c83c664b953d474d6b58825800b6ff1d61876a686407e646cbf76891c1f9b" +source = "git+https://github.com/alloy-rs/op-alloy?rev=ad607c1#ad607c1f888efcac59806e8a964d35c97f960fc6" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5439,8 +5416,7 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d05b5b5b3cff7f24eec2bc366f86a7ff0934678b1bda36d0ecaadba9504170" +source = "git+https://github.com/alloy-rs/op-alloy?rev=ad607c1#ad607c1f888efcac59806e8a964d35c97f960fc6" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6204,7 +6180,7 @@ dependencies = [ "crossterm", "instability", "itertools 0.13.0", - "lru", + "lru 0.12.5", "paste", "strum", "strum_macros", @@ -9487,8 +9463,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc873bc873e12a1723493e1a35804fa79b673a0bfb1c19cfee659d46def8be42" +source = "git+https://github.com/paradigmxyz/revm-inspectors?rev=1207e33#1207e336e6a35354cd3a2f5411f8dc908e7f89f5" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9499,6 +9474,7 @@ dependencies = [ "boa_gc", "colorchoice", "revm", + "serde", "serde_json", "thiserror 2.0.11", ] @@ -10924,9 +10900,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.24.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a" dependencies = [ "futures-util", "log", @@ -11226,9 +11202,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.24.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24" dependencies = [ "byteorder", "bytes", @@ -11240,7 +11216,7 @@ dependencies = [ "rustls", "rustls-pki-types", "sha1", - "thiserror 1.0.69", + "thiserror 2.0.11", "utf-8", ] diff --git a/Cargo.toml b/Cargo.toml index 3b02b4230a59..5c8400655b49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -434,34 +434,34 @@ alloy-rlp = { version = "0.3.10", default-features = false } alloy-sol-types = "0.8.15" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.9.2", default-features = false } -alloy-contract = { version = "0.9.2", default-features = false } -alloy-eips = { version = "0.9.2", default-features = false } -alloy-genesis = { version = "0.9.2", default-features = false } -alloy-json-rpc = { version = "0.9.2", default-features = false } -alloy-network = { version = "0.9.2", default-features = false } -alloy-network-primitives = { version = "0.9.2", default-features = false } -alloy-node-bindings = { version = "0.9.2", default-features = false } -alloy-provider = { version = "0.9.2", features = ["reqwest"], default-features = false } -alloy-pubsub = { version = "0.9.2", default-features = false } -alloy-rpc-client = { version = "0.9.2", default-features = false } -alloy-rpc-types = { version = "0.9.2", features = ["eth"], default-features = false } -alloy-rpc-types-admin = { version = "0.9.2", default-features = false } -alloy-rpc-types-anvil = { version = "0.9.2", default-features = false } -alloy-rpc-types-beacon = { version = "0.9.2", default-features = false } -alloy-rpc-types-debug = { version = "0.9.2", default-features = false } -alloy-rpc-types-engine = { version = "0.9.2", default-features = false } -alloy-rpc-types-eth = { version = "0.9.2", default-features = false } -alloy-rpc-types-mev = { version = "0.9.2", default-features = false } -alloy-rpc-types-trace = { version = "0.9.2", default-features = false } -alloy-rpc-types-txpool = { version = "0.9.2", default-features = false } -alloy-serde = { version = "0.9.2", default-features = false } -alloy-signer = { version = "0.9.2", default-features = false } -alloy-signer-local = { version = "0.9.2", default-features = false } -alloy-transport = { version = "0.9.2" } -alloy-transport-http = { version = "0.9.2", features = ["reqwest-rustls-tls"], default-features = false } -alloy-transport-ipc = { version = "0.9.2", default-features = false } -alloy-transport-ws = { version = "0.9.2", default-features = false } +alloy-consensus = { version = "0.10", default-features = false } +alloy-contract = { version = "0.10", default-features = false } +alloy-eips = { version = "0.10", default-features = false } +alloy-genesis = { version = "0.10", default-features = false } +alloy-json-rpc = { version = "0.10", default-features = false } +alloy-network = { version = "0.10", default-features = false } +alloy-network-primitives = { version = "0.10", default-features = false } +alloy-node-bindings = { version = "0.10", default-features = false } +alloy-provider = { version = "0.10", features = ["reqwest"], default-features = false } +alloy-pubsub = { version = "0.10", default-features = false } +alloy-rpc-client = { version = "0.10", default-features = false } +alloy-rpc-types = { version = "0.10", features = ["eth"], default-features = false } +alloy-rpc-types-admin = { version = "0.10", default-features = false } +alloy-rpc-types-anvil = { version = "0.10", default-features = false } +alloy-rpc-types-beacon = { version = "0.10", default-features = false } +alloy-rpc-types-debug = { version = "0.10", default-features = false } +alloy-rpc-types-engine = { version = "0.10", default-features = false } +alloy-rpc-types-eth = { version = "0.10", default-features = false } +alloy-rpc-types-mev = { version = "0.10", default-features = false } +alloy-rpc-types-trace = { version = "0.10", default-features = false } +alloy-rpc-types-txpool = { version = "0.10", default-features = false } +alloy-serde = { version = "0.10", default-features = false } +alloy-signer = { version = "0.10", default-features = false } +alloy-signer-local = { version = "0.10", default-features = false } +alloy-transport = { version = "0.10" } +alloy-transport-http = { version = "0.10", features = ["reqwest-rustls-tls"], default-features = false } +alloy-transport-ipc = { version = "0.10", default-features = false } +alloy-transport-ws = { version = "0.10", default-features = false } # op op-alloy-rpc-types = { version = "0.9.6", default-features = false } @@ -602,36 +602,39 @@ snmalloc-rs = { version = "0.3.7", features = ["build_cc"] } # See: https://github.com/eira-fransham/crunchy/issues/13 crunchy = "=0.2.2" -# [patch.crates-io] -# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } -# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } - -# op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } -# op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } -# op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } -# op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } +[patch.crates-io] +alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } +alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" } + +op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" } +op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" } +op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" } +op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" } + +revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "1207e33" } \ No newline at end of file diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs index b0d6e1eff83e..7bf509d80e47 100644 --- a/crates/chainspec/src/spec.rs +++ b/crates/chainspec/src/spec.rs @@ -11,10 +11,8 @@ use alloy_consensus::{ Header, }; use alloy_eips::{ - eip1559::INITIAL_BASE_FEE, - eip6110::MAINNET_DEPOSIT_CONTRACT_ADDRESS, - eip7685::EMPTY_REQUESTS_HASH, - eip7840::{BlobParams, BlobScheduleItem}, + eip1559::INITIAL_BASE_FEE, eip6110::MAINNET_DEPOSIT_CONTRACT_ADDRESS, + eip7685::EMPTY_REQUESTS_HASH, eip7840::BlobParams, }; use alloy_genesis::Genesis; use alloy_primitives::{address, b256, Address, BlockNumber, B256, U256}; @@ -174,7 +172,7 @@ pub struct HardforkBlobParams { impl HardforkBlobParams { /// Constructs params for chainspec from a provided blob schedule. /// Falls back to defaults if the schedule is empty. - pub fn from_schedule(blob_schedule: &BTreeMap) -> Self { + pub fn from_schedule(blob_schedule: &BTreeMap) -> Self { let extract = |key: &str, default: fn() -> BlobParams| { blob_schedule .get(key) diff --git a/crates/optimism/cli/src/ovm_file_codec.rs b/crates/optimism/cli/src/ovm_file_codec.rs index 829539b7f640..7aee616ba942 100644 --- a/crates/optimism/cli/src/ovm_file_codec.rs +++ b/crates/optimism/cli/src/ovm_file_codec.rs @@ -5,6 +5,7 @@ use alloy_consensus::{ use alloy_eips::{ eip2718::{Decodable2718, Eip2718Error, Eip2718Result, Encodable2718}, eip4895::Withdrawals, + Typed2718, }; use alloy_primitives::{ bytes::{Buf, BytesMut}, @@ -217,6 +218,12 @@ impl Decodable for OvmTransactionSigned { } } +impl Typed2718 for OvmTransactionSigned { + fn ty(&self) -> u8 { + self.transaction.tx_type() as u8 + } +} + impl Encodable2718 for OvmTransactionSigned { fn type_flag(&self) -> Option { match self.transaction.tx_type() { diff --git a/crates/optimism/primitives/src/transaction/signed.rs b/crates/optimism/primitives/src/transaction/signed.rs index e42e08079625..bd59772c11dd 100644 --- a/crates/optimism/primitives/src/transaction/signed.rs +++ b/crates/optimism/primitives/src/transaction/signed.rs @@ -265,7 +265,7 @@ impl alloy_rlp::Encodable for OpTransactionSigned { fn length(&self) -> usize { let mut payload_length = self.encode_2718_len(); - if !Encodable2718::is_legacy(self) { + if !self.is_legacy() { payload_length += Header { list: false, payload_length }.length(); } diff --git a/crates/optimism/rpc/src/eth/transaction.rs b/crates/optimism/rpc/src/eth/transaction.rs index 14b7706c5440..96ae2f9b07b4 100644 --- a/crates/optimism/rpc/src/eth/transaction.rs +++ b/crates/optimism/rpc/src/eth/transaction.rs @@ -127,7 +127,7 @@ where } else { base_fee .map(|base_fee| { - inner.effective_tip_per_gas(base_fee as u64).unwrap_or_default() + base_fee + inner.effective_tip_per_gas(base_fee).unwrap_or_default() + base_fee as u128 }) .unwrap_or_else(|| inner.max_fee_per_gas()) }; diff --git a/crates/primitives-traits/src/serde_bincode_compat.rs b/crates/primitives-traits/src/serde_bincode_compat.rs index 1c323f2b2968..8e5e8936bf0c 100644 --- a/crates/primitives-traits/src/serde_bincode_compat.rs +++ b/crates/primitives-traits/src/serde_bincode_compat.rs @@ -35,7 +35,6 @@ pub type BincodeReprFor<'a, T> = ::BincodeRepr<'a>; mod block_bincode { use crate::serde_bincode_compat::SerdeBincodeCompat; use alloc::{borrow::Cow, vec::Vec}; - use alloy_consensus::serde_bincode_compat::Header; use alloy_eips::eip4895::Withdrawals; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde_with::{DeserializeAs, SerializeAs}; @@ -60,8 +59,8 @@ mod block_bincode { #[debug(bound())] pub struct Block<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> { header: H::BincodeRepr<'a>, - #[serde(bound = "BlockBody<'a, T>: Serialize + serde::de::DeserializeOwned")] - body: BlockBody<'a, T>, + #[serde(bound = "BlockBody<'a, T, H>: Serialize + serde::de::DeserializeOwned")] + body: BlockBody<'a, T, H>, } impl<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> From<&'a alloy_consensus::Block> @@ -125,31 +124,35 @@ mod block_bincode { /// /// #[serde_as] /// #[derive(Serialize, Deserialize)] - /// struct Data { - /// #[serde_as(as = "serde_bincode_compat::BlockBody<'_, T>")] - /// body: alloy_consensus::BlockBody, + /// struct Data { + /// #[serde_as(as = "serde_bincode_compat::BlockBody<'_, T, H>")] + /// body: alloy_consensus::BlockBody, /// } /// ``` #[derive(derive_more::Debug, Serialize, Deserialize)] #[debug(bound())] - pub struct BlockBody<'a, T: SerdeBincodeCompat> { + pub struct BlockBody<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> { transactions: Vec>, - ommers: Vec>, + ommers: Vec>, withdrawals: Cow<'a, Option>, } - impl<'a, T: SerdeBincodeCompat> From<&'a alloy_consensus::BlockBody> for BlockBody<'a, T> { - fn from(value: &'a alloy_consensus::BlockBody) -> Self { + impl<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> + From<&'a alloy_consensus::BlockBody> for BlockBody<'a, T, H> + { + fn from(value: &'a alloy_consensus::BlockBody) -> Self { Self { transactions: value.transactions.iter().map(|tx| tx.as_repr()).collect(), - ommers: value.ommers.iter().map(Into::into).collect(), + ommers: value.ommers.iter().map(|h| h.as_repr()).collect(), withdrawals: Cow::Borrowed(&value.withdrawals), } } } - impl<'a, T: SerdeBincodeCompat> From> for alloy_consensus::BlockBody { - fn from(value: BlockBody<'a, T>) -> Self { + impl<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> From> + for alloy_consensus::BlockBody + { + fn from(value: BlockBody<'a, T, H>) -> Self { Self { transactions: value.transactions.into_iter().map(Into::into).collect(), ommers: value.ommers.into_iter().map(Into::into).collect(), @@ -158,9 +161,11 @@ mod block_bincode { } } - impl SerializeAs> for BlockBody<'_, T> { + impl SerializeAs> + for BlockBody<'_, T, H> + { fn serialize_as( - source: &alloy_consensus::BlockBody, + source: &alloy_consensus::BlockBody, serializer: S, ) -> Result where @@ -170,10 +175,10 @@ mod block_bincode { } } - impl<'de, T: SerdeBincodeCompat> DeserializeAs<'de, alloy_consensus::BlockBody> - for BlockBody<'de, T> + impl<'de, T: SerdeBincodeCompat, H: SerdeBincodeCompat> + DeserializeAs<'de, alloy_consensus::BlockBody> for BlockBody<'de, T, H> { - fn deserialize_as(deserializer: D) -> Result, D::Error> + fn deserialize_as(deserializer: D) -> Result, D::Error> where D: Deserializer<'de>, { @@ -181,8 +186,10 @@ mod block_bincode { } } - impl SerdeBincodeCompat for alloy_consensus::BlockBody { - type BincodeRepr<'a> = BlockBody<'a, T>; + impl SerdeBincodeCompat + for alloy_consensus::BlockBody + { + type BincodeRepr<'a> = BlockBody<'a, T, H>; fn as_repr(&self) -> Self::BincodeRepr<'_> { self.into() diff --git a/crates/rpc/rpc-eth-api/src/helpers/call.rs b/crates/rpc/rpc-eth-api/src/helpers/call.rs index c0bc0a8e9923..a28ba704d755 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/call.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/call.rs @@ -8,7 +8,7 @@ use crate::{ }; use alloy_consensus::BlockHeader; use alloy_eips::{eip1559::calc_next_block_base_fee, eip2930::AccessListResult}; -use alloy_primitives::{Address, Bytes, TxKind, B256, U256}; +use alloy_primitives::{Address, Bytes, B256, U256}; use alloy_rpc_types_eth::{ simulate::{SimBlock, SimulatePayload, SimulatedBlock}, state::{EvmOverrides, StateOverride}, @@ -31,9 +31,7 @@ use reth_revm::{ use reth_rpc_eth_types::{ cache::db::{StateCacheDbRefMutWrapper, StateProviderTraitObjWrapper}, error::{api::FromEvmHalt, ensure_success}, - revm_utils::{ - apply_block_overrides, apply_state_overrides, caller_gas_allowance, get_precompiles, - }, + revm_utils::{apply_block_overrides, apply_state_overrides, caller_gas_allowance}, simulate::{self, EthSimulateError}, EthApiError, RevertError, RpcInvalidTransactionError, StateCacheDb, }; @@ -419,20 +417,10 @@ pub trait EthCall: EstimateCall + Call + LoadPendingBlock + LoadBlock + FullEthA tx_env.set_gas_limit(cap.min(evm_env.block_env.gas_limit).saturating_to()); } - let from = request.from.unwrap_or_default(); - let to = if let Some(TxKind::Call(to)) = request.to { - to - } else { - let nonce = - db.basic_ref(from).map_err(Self::Error::from_eth_err)?.unwrap_or_default().nonce; - from.create(nonce) - }; - // can consume the list since we're not using the request anymore let initial = request.access_list.take().unwrap_or_default(); - let precompiles = get_precompiles(evm_env.spec.into()); - let mut inspector = AccessListInspector::new(initial, from, to, precompiles); + let mut inspector = AccessListInspector::new(initial); let (result, (evm_env, mut tx_env)) = self.inspect(&mut db, evm_env, tx_env, &mut inspector)?; diff --git a/crates/rpc/rpc-eth-api/src/helpers/trace.rs b/crates/rpc/rpc-eth-api/src/helpers/trace.rs index 5e08d81d850e..b01a6482f18d 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/trace.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/trace.rs @@ -307,7 +307,7 @@ pub trait Trace: let block_hash = block.hash(); let block_number = evm_env.block_env.number.saturating_to::(); - let base_fee = evm_env.block_env.basefee.saturating_to::(); + let base_fee = evm_env.block_env.basefee.saturating_to::(); // now get the state let state = this.state_at_block_id(state_at.into())?; diff --git a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs index 5c855cb8f5e9..1c2113729810 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/transaction.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/transaction.rs @@ -217,7 +217,7 @@ pub trait EthTransactions: LoadTransaction { hash: Some(*tx.tx_hash()), block_hash: Some(block_hash), block_number: Some(block_number), - base_fee: base_fee_per_gas.map(u128::from), + base_fee: base_fee_per_gas, index: Some(index as u64), }; @@ -296,7 +296,7 @@ pub trait EthTransactions: LoadTransaction { hash: Some(*tx.tx_hash()), block_hash: Some(block_hash), block_number: Some(block_number), - base_fee: base_fee_per_gas.map(u128::from), + base_fee: base_fee_per_gas, index: Some(index as u64), }; self.tx_resp_builder().fill(tx.clone().with_signer(*signer), tx_info) diff --git a/crates/rpc/rpc-eth-types/src/receipt.rs b/crates/rpc/rpc-eth-types/src/receipt.rs index 60d92acd3489..3b914516ad03 100644 --- a/crates/rpc/rpc-eth-types/src/receipt.rs +++ b/crates/rpc/rpc-eth-types/src/receipt.rs @@ -87,7 +87,6 @@ where // EIP-4844 fields blob_gas_price, blob_gas_used, - authorization_list: transaction.authorization_list().map(|l| l.to_vec()), }) } diff --git a/crates/rpc/rpc-eth-types/src/transaction.rs b/crates/rpc/rpc-eth-types/src/transaction.rs index c9a2196bfc69..fa24de905b7b 100644 --- a/crates/rpc/rpc-eth-types/src/transaction.rs +++ b/crates/rpc/rpc-eth-types/src/transaction.rs @@ -51,7 +51,7 @@ impl TransactionSource { index: Some(index), block_hash: Some(block_hash), block_number: Some(block_number), - base_fee: base_fee.map(u128::from), + base_fee, }; resp_builder.fill(transaction, tx_info) @@ -75,7 +75,7 @@ impl TransactionSource { index: Some(index), block_hash: Some(block_hash), block_number: Some(block_number), - base_fee: base_fee.map(u128::from), + base_fee, }, ) } diff --git a/crates/rpc/rpc-types-compat/src/block.rs b/crates/rpc/rpc-types-compat/src/block.rs index 752bf154145a..f16034ab37ea 100644 --- a/crates/rpc/rpc-types-compat/src/block.rs +++ b/crates/rpc/rpc-types-compat/src/block.rs @@ -82,7 +82,7 @@ where hash: Some(tx_hash), block_hash, block_number: Some(block_number), - base_fee: base_fee_per_gas.map(u128::from), + base_fee: base_fee_per_gas, index: Some(idx as u64), }; diff --git a/crates/rpc/rpc/src/eth/helpers/types.rs b/crates/rpc/rpc/src/eth/helpers/types.rs index 45ba0962b8f3..cb6c956eb070 100644 --- a/crates/rpc/rpc/src/eth/helpers/types.rs +++ b/crates/rpc/rpc/src/eth/helpers/types.rs @@ -71,7 +71,7 @@ where let effective_gas_price = base_fee .map(|base_fee| { - inner.effective_tip_per_gas(base_fee as u64).unwrap_or_default() + base_fee + inner.effective_tip_per_gas(base_fee as u64).unwrap_or_default() + base_fee as u128 }) .unwrap_or_else(|| inner.max_fee_per_gas()); diff --git a/crates/rpc/rpc/src/eth/sim_bundle.rs b/crates/rpc/rpc/src/eth/sim_bundle.rs index 103bfeafd007..7e00b8fb658a 100644 --- a/crates/rpc/rpc/src/eth/sim_bundle.rs +++ b/crates/rpc/rpc/src/eth/sim_bundle.rs @@ -2,7 +2,7 @@ use alloy_eips::BlockNumberOrTag; use alloy_primitives::U256; -use alloy_rpc_types_eth::BlockId; +use alloy_rpc_types_eth::{BlockId, BlockOverrides}; use alloy_rpc_types_mev::{ BundleItem, Inclusion, Privacy, RefundConfig, SendBundleRequest, SimBundleLogs, SimBundleOverrides, SimBundleResponse, Validity, @@ -227,15 +227,8 @@ where overrides: SimBundleOverrides, logs: bool, ) -> Result { - let SimBundleOverrides { - parent_block, - block_number, - coinbase, - timestamp, - gas_limit, - base_fee, - .. - } = overrides; + let SimBundleOverrides { parent_block, block_overrides, .. } = overrides; + let BlockOverrides { number, coinbase, time, gas_limit, base_fee, .. } = block_overrides; // Parse and validate bundle // Also, flatten the bundle here so that its easier to process @@ -245,7 +238,7 @@ where let (mut evm_env, current_block) = self.eth_api().evm_env_at(block_id).await?; // apply overrides - if let Some(block_number) = block_number { + if let Some(block_number) = number { evm_env.block_env.number = U256::from(block_number); } @@ -253,7 +246,7 @@ where evm_env.block_env.coinbase = coinbase; } - if let Some(timestamp) = timestamp { + if let Some(timestamp) = time { evm_env.block_env.timestamp = U256::from(timestamp); } diff --git a/crates/rpc/rpc/src/otterscan.rs b/crates/rpc/rpc/src/otterscan.rs index 63c37ee3d3cd..b8e1f92a79b9 100644 --- a/crates/rpc/rpc/src/otterscan.rs +++ b/crates/rpc/rpc/src/otterscan.rs @@ -23,7 +23,7 @@ use revm_inspectors::{ tracing::{types::CallTraceNode, TracingInspectorConfig}, transfer::{TransferInspector, TransferKind}, }; -use revm_primitives::{ExecutionResult, SignedAuthorization}; +use revm_primitives::ExecutionResult; const API_LEVEL: u64 = 8; @@ -277,9 +277,6 @@ where from: receipt.from(), to: receipt.to(), contract_address: receipt.contract_address(), - authorization_list: receipt - .authorization_list() - .map(<[SignedAuthorization]>::to_vec), }; OtsTransactionReceipt { receipt, timestamp }