chore: bump alloy 0.11 (#14122)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Roman Krasiuk
2025-01-31 12:44:20 +01:00
committed by GitHub
parent bd5dde54ef
commit 5322877aed
25 changed files with 256 additions and 270 deletions

179
Cargo.lock generated
View File

@ -121,9 +121,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-consensus" name = "alloy-consensus"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4138dc275554afa6f18c4217262ac9388790b2fc393c2dfe03c51d357abf013" checksum = "ce20c85f6b24a5da40b2350a748e348417f0465dedbb523a4d149143bc4a41ce"
dependencies = [ dependencies = [
"alloy-eips", "alloy-eips",
"alloy-primitives", "alloy-primitives",
@ -141,9 +141,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-consensus-any" name = "alloy-consensus-any"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa04e1882c31288ce1028fdf31b6ea94cfa9eafa2e497f903ded631c8c6a42c" checksum = "8e23af02ccded0031ef2b70df4fe9965b1c742c5d5384c8c767ae0311f7e62b9"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-eips", "alloy-eips",
@ -155,9 +155,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-contract" name = "alloy-contract"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f21886c1fea0626f755a49b2ac653b396fb345233f6170db2da3d0ada31560c" checksum = "71c7a59f261333db00fa10a3de9480f31121bb919ad38487040d7833d5982203"
dependencies = [ dependencies = [
"alloy-dyn-abi", "alloy-dyn-abi",
"alloy-json-abi", "alloy-json-abi",
@ -237,16 +237,18 @@ dependencies = [
[[package]] [[package]]
name = "alloy-eips" name = "alloy-eips"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52dd5869ed09e399003e0e0ec6903d981b2a92e74c5d37e6b40890bad2517526" checksum = "7149e011edbd588f6df6564b369c75f6b538d76db14053d95e0b43b2d92e4266"
dependencies = [ dependencies = [
"alloy-eip2124",
"alloy-eip2930", "alloy-eip2930",
"alloy-eip7702", "alloy-eip7702",
"alloy-primitives", "alloy-primitives",
"alloy-rlp", "alloy-rlp",
"alloy-serde", "alloy-serde",
"arbitrary", "arbitrary",
"auto_impl",
"c-kzg", "c-kzg",
"derive_more", "derive_more",
"ethereum_ssz", "ethereum_ssz",
@ -258,9 +260,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-genesis" name = "alloy-genesis"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7d2a7fe5c1a9bd6793829ea21a636f30fc2b3f5d2e7418ba86d96e41dd1f460" checksum = "acaec0cc4c1489d61d6f33d0c3dd522c750025f4b5c8f59cd546221e4df660e5"
dependencies = [ dependencies = [
"alloy-eips", "alloy-eips",
"alloy-primitives", "alloy-primitives",
@ -283,9 +285,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-json-rpc" name = "alloy-json-rpc"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2008bedb8159a255b46b7c8614516eda06679ea82f620913679afbd8031fea72" checksum = "c0c5c9651fd20a2fd4a57606b6a570d1c17ab86e686b962b2f1ecac68b51e020"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-sol-types", "alloy-sol-types",
@ -297,9 +299,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-network" name = "alloy-network"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4556f01fe41d0677495df10a648ddcf7ce118b0e8aa9642a0e2b6dd1fb7259de" checksum = "b02ed56783fb2c086a4ac8961175dd6d3ad163e6cf6125f0b83f7de03379b607"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-consensus-any", "alloy-consensus-any",
@ -322,9 +324,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-network-primitives" name = "alloy-network-primitives"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f31c3c6b71340a1d076831823f09cb6e02de01de5c6630a9631bdb36f947ff80" checksum = "a0624cfa9311aa8283cd3bf5eed883d0d1e823e2a4d57b30e1b49af4b3678a6b"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-eips", "alloy-eips",
@ -335,9 +337,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-node-bindings" name = "alloy-node-bindings"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4520cd4bc5cec20c32c98e4bc38914c7fb96bf4a712105e44da186a54e65e3ba" checksum = "c96f1a87e3b2842d6a35bbebedf2bd48a49ee757ec63d0cfc1f3cb86338e972c"
dependencies = [ dependencies = [
"alloy-genesis", "alloy-genesis",
"alloy-primitives", "alloy-primitives",
@ -383,9 +385,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-provider" name = "alloy-provider"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a22c4441b3ebe2d77fa9cf629ba68c3f713eb91779cff84275393db97eddd82" checksum = "07c68df5354225da542efeb6d9388b65773b3304309b437416146e9d1e2bc1bd"
dependencies = [ dependencies = [
"alloy-chains", "alloy-chains",
"alloy-consensus", "alloy-consensus",
@ -408,11 +410,10 @@ dependencies = [
"dashmap", "dashmap",
"futures", "futures",
"futures-utils-wasm", "futures-utils-wasm",
"lru", "lru 0.13.0",
"parking_lot", "parking_lot",
"pin-project", "pin-project",
"reqwest", "reqwest",
"schnellru",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 2.0.11", "thiserror 2.0.11",
@ -424,9 +425,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-pubsub" name = "alloy-pubsub"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2269fd635f7b505f27c63a3cb293148cd02301efce4c8bdd9ff54fbfc4a20e23" checksum = "7ef6ef167ea24e7aac569dfd90b668c1f7dca0e48214e70364586d5341a89431"
dependencies = [ dependencies = [
"alloy-json-rpc", "alloy-json-rpc",
"alloy-primitives", "alloy-primitives",
@ -465,9 +466,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-client" name = "alloy-rpc-client"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d06a292b37e182e514903ede6e623b9de96420e8109ce300da288a96d88b7e4b" checksum = "0371aae9b44a35e374c94c7e1df5cbccf0f52b2ef7c782291ed56e86d88ec106"
dependencies = [ dependencies = [
"alloy-json-rpc", "alloy-json-rpc",
"alloy-primitives", "alloy-primitives",
@ -490,9 +491,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types" name = "alloy-rpc-types"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9383845dd924939e7ab0298bbfe231505e20928907d7905aa3bf112287305e06" checksum = "1428d64569961b00373c503a3de306656e94ef1f2a474e93fd41a6daae0d6ac7"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types-engine", "alloy-rpc-types-engine",
@ -503,9 +504,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-admin" name = "alloy-rpc-types-admin"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fcea70b3872c645fa0ee7fb23370d685f98e8c35f47297de619fb2e9f607ff" checksum = "b1d25e16c2be6518be9274ab16fe19190666d4330d0713aa14938f593ddb0098"
dependencies = [ dependencies = [
"alloy-genesis", "alloy-genesis",
"alloy-primitives", "alloy-primitives",
@ -515,9 +516,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-anvil" name = "alloy-rpc-types-anvil"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11495cb8c8d3141fc27556a4c9188b81531ad5ec3076a0394c61a6dcfbce9f34" checksum = "d721727cc493a58bd197a3ebbd42b88c0393c1f30da905bb7a31686c820f4c2d"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types-eth", "alloy-rpc-types-eth",
@ -527,9 +528,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-any" name = "alloy-rpc-types-any"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca445cef0eb6c2cf51cfb4e214fbf1ebd00893ae2e6f3b944c8101b07990f988" checksum = "66e119337400d8b0348e1576ab37ffa56d1a04cbc977a84d4fa0a527d7cb0c21"
dependencies = [ dependencies = [
"alloy-consensus-any", "alloy-consensus-any",
"alloy-rpc-types-eth", "alloy-rpc-types-eth",
@ -538,9 +539,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-beacon" name = "alloy-rpc-types-beacon"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4009405b1d3f5e8c529b8cf353f74e815fd2102549af4172fc721b4b9ea09133" checksum = "9deadb4c8927dc702b58c8fb675f9fb88782c4c9c95096682058c1574141b8b7"
dependencies = [ dependencies = [
"alloy-eips", "alloy-eips",
"alloy-primitives", "alloy-primitives",
@ -554,9 +555,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-debug" name = "alloy-rpc-types-debug"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "358d6a8d7340b9eb1a7589a6c1fb00df2c9b26e90737fa5ed0108724dd8dac2c" checksum = "fea98e1c4ac005ffe5f8691164f5f2ef5ee8dda50b1fdba173d44892141909e2"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"serde", "serde",
@ -564,9 +565,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-engine" name = "alloy-rpc-types-engine"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a5f821f30344862a0b6eb9a1c2eb91dfb2ff44c7489f37152a526cdcab79264" checksum = "b582c59b6f493d9b15bea32f44f662fa6749e5464ef5305d8429a864ace60684"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-eips", "alloy-eips",
@ -585,9 +586,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-eth" name = "alloy-rpc-types-eth"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0938bc615c02421bd86c1733ca7205cc3d99a122d9f9bff05726bd604b76a5c2" checksum = "8a4a43d8b1344e3ef115ed7a2cee934876e4a64d2b9d9bee8738f9806900757e"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-consensus-any", "alloy-consensus-any",
@ -607,9 +608,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-mev" name = "alloy-rpc-types-mev"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06bd42cf54b8a05b596322267f396a7dbdf141a56e93502a2ab4464fb718467a" checksum = "076b5ed023c0b0e025566cfc570b51a6fd975935c982617c130ca98dcb0c1390"
dependencies = [ dependencies = [
"alloy-eips", "alloy-eips",
"alloy-primitives", "alloy-primitives",
@ -621,9 +622,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-trace" name = "alloy-rpc-types-trace"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd38207e056cc7d1372367fbb4560ddf9107cbd20731743f641246bf0dede149" checksum = "ac383c60b09660b7695a4f210cd11ab05887d058dfc669efd814904dbbaead82"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types-eth", "alloy-rpc-types-eth",
@ -635,9 +636,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-rpc-types-txpool" name = "alloy-rpc-types-txpool"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7fd456a3fa9ea732d1c0611c9d52b5326ee29f4d02d01b07dac453ed68d9eb5" checksum = "ac39b1a583bb59dcf7d856604867acf704a7cf70b76a42f895652d566aa6f17c"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types-eth", "alloy-rpc-types-eth",
@ -647,9 +648,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-serde" name = "alloy-serde"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae0465c71d4dced7525f408d84873aeebb71faf807d22d74c4a426430ccd9b55" checksum = "86aa42c36e3c0db5bd9a7314e98aa261a61d5e3d6a0bd7e51fb8b0a3d6438481"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"arbitrary", "arbitrary",
@ -659,9 +660,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-signer" name = "alloy-signer"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bfa395ad5cc952c82358d31e4c68b27bf4a89a5456d9b27e226e77dac50e4ff" checksum = "c613222abd016e03ba548f41db938a2c99108b59c0c66ca105eab1b7a2e6b40a"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"async-trait", "async-trait",
@ -673,9 +674,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-signer-local" name = "alloy-signer-local"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbdc63ce9eda1283fcbaca66ba4a414b841c0e3edbeef9c86a71242fc9e84ccc" checksum = "39163b956c81e8fd9605194d6b5b92dd93b0e0252810e69f9a4cebe3a8614f46"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-network", "alloy-network",
@ -761,13 +762,12 @@ dependencies = [
[[package]] [[package]]
name = "alloy-transport" name = "alloy-transport"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d17722a198f33bbd25337660787aea8b8f57814febb7c746bc30407bdfc39448" checksum = "40e2f34fcd849676c8fe274a6e72f0664dfede7ce06d12daa728d2e72f1b4393"
dependencies = [ dependencies = [
"alloy-json-rpc", "alloy-json-rpc",
"base64 0.22.1", "base64 0.22.1",
"futures-util",
"futures-utils-wasm", "futures-utils-wasm",
"serde", "serde",
"serde_json", "serde_json",
@ -781,9 +781,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-transport-http" name = "alloy-transport-http"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e1509599021330a31c4a6816b655e34bf67acb1cc03c564e09fd8754ff6c5de" checksum = "6e291c97c3c0ebb5d03c34e3a55c0f7c5bfa307536a2efaaa6fae4b3a4d09851"
dependencies = [ dependencies = [
"alloy-json-rpc", "alloy-json-rpc",
"alloy-transport", "alloy-transport",
@ -796,9 +796,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-transport-ipc" name = "alloy-transport-ipc"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa4da44bc9a5155ab599666d26decafcf12204b72a80eeaba7c5e234ee8ac205" checksum = "8d3e991f40d2d81c6ee036a34d81127bfec5fadf7e649791b5225181126c1959"
dependencies = [ dependencies = [
"alloy-json-rpc", "alloy-json-rpc",
"alloy-pubsub", "alloy-pubsub",
@ -807,6 +807,7 @@ dependencies = [
"futures", "futures",
"interprocess", "interprocess",
"pin-project", "pin-project",
"serde",
"serde_json", "serde_json",
"tokio", "tokio",
"tokio-util", "tokio-util",
@ -815,9 +816,9 @@ dependencies = [
[[package]] [[package]]
name = "alloy-transport-ws" name = "alloy-transport-ws"
version = "0.9.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58011745b2f17b334db40df9077d75b181f78360a5bc5c35519e15d4bfce15e2" checksum = "fc8c544f7dc764735664756805f8b8b770020cc295a0b96b09cbefd099c172c7"
dependencies = [ dependencies = [
"alloy-pubsub", "alloy-pubsub",
"alloy-transport", "alloy-transport",
@ -2604,7 +2605,7 @@ dependencies = [
"hkdf", "hkdf",
"lazy_static", "lazy_static",
"libp2p-identity", "libp2p-identity",
"lru", "lru 0.12.5",
"more-asserts", "more-asserts",
"multiaddr", "multiaddr",
"parking_lot", "parking_lot",
@ -4856,6 +4857,15 @@ dependencies = [
"hashbrown 0.15.2", "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]] [[package]]
name = "lz4_flex" name = "lz4_flex"
version = "0.11.3" version = "0.11.3"
@ -5371,9 +5381,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
[[package]] [[package]]
name = "op-alloy-consensus" name = "op-alloy-consensus"
version = "0.9.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28dc4e397dd8969f7f98ea6454a5c531349a58c76e12448b0c2de6581df7b8c" checksum = "36e8e67b41afd338096ca31f24c5e7800797858b963490be2e8971d17d733f49"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-eips", "alloy-eips",
@ -5389,15 +5399,15 @@ dependencies = [
[[package]] [[package]]
name = "op-alloy-flz" name = "op-alloy-flz"
version = "0.9.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76b44f5edbd5293636934a88ec38d683ee2075bfce43658d1033d76191e7aff6" checksum = "f5402b85f0fa22712960498c3a123875d7b53da21928b24a8f8667babb268c4c"
[[package]] [[package]]
name = "op-alloy-network" name = "op-alloy-network"
version = "0.9.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "818a4ea62c0968fbf4e3bee2aa1349ad7ae6504b8aba73889a40160bebaa6818" checksum = "b062f0c57e8b910f9ec1222b6fba2dddd7e33fb7b139a68556a7390d40b03624"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-network", "alloy-network",
@ -5410,9 +5420,9 @@ dependencies = [
[[package]] [[package]]
name = "op-alloy-rpc-jsonrpsee" name = "op-alloy-rpc-jsonrpsee"
version = "0.9.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446c38f9e3e86acac6f2972a4953ffdd8bfef032bec633b0280a95783c0babd" checksum = "31e5288739ee87d1fbf1c7e09e991ead1f86f01aea63bf91e8530cde4faa7713"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"jsonrpsee", "jsonrpsee",
@ -5420,9 +5430,9 @@ dependencies = [
[[package]] [[package]]
name = "op-alloy-rpc-types" name = "op-alloy-rpc-types"
version = "0.9.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b9c83c664b953d474d6b58825800b6ff1d61876a686407e646cbf76891c1f9b" checksum = "06d55acda15bd273d1d9a052536cf46c3520f597ac9884376c9c56241f2f5e9b"
dependencies = [ dependencies = [
"alloy-consensus", "alloy-consensus",
"alloy-eips", "alloy-eips",
@ -5438,9 +5448,9 @@ dependencies = [
[[package]] [[package]]
name = "op-alloy-rpc-types-engine" name = "op-alloy-rpc-types-engine"
version = "0.9.6" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8d05b5b5b3cff7f24eec2bc366f86a7ff0934678b1bda36d0ecaadba9504170" checksum = "26c6735ec88e69917c0cb0a3ee60ad7e5cd14dcb905a6ca55fbc7004b72c5e20"
dependencies = [ dependencies = [
"alloy-eips", "alloy-eips",
"alloy-primitives", "alloy-primitives",
@ -6204,7 +6214,7 @@ dependencies = [
"crossterm", "crossterm",
"instability", "instability",
"itertools 0.13.0", "itertools 0.13.0",
"lru", "lru 0.12.5",
"paste", "paste",
"strum", "strum",
"strum_macros", "strum_macros",
@ -9486,9 +9496,9 @@ dependencies = [
[[package]] [[package]]
name = "revm-inspectors" name = "revm-inspectors"
version = "0.14.1" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc873bc873e12a1723493e1a35804fa79b673a0bfb1c19cfee659d46def8be42" checksum = "6d87cdf1c0d878b48423f8a86232950657abaf72a2d0d14af609467542313b1a"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types-eth", "alloy-rpc-types-eth",
@ -9499,6 +9509,7 @@ dependencies = [
"boa_gc", "boa_gc",
"colorchoice", "colorchoice",
"revm", "revm",
"serde",
"serde_json", "serde_json",
"thiserror 2.0.11", "thiserror 2.0.11",
] ]
@ -10924,9 +10935,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-tungstenite" name = "tokio-tungstenite"
version = "0.24.0" version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"log", "log",
@ -11226,9 +11237,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]] [[package]]
name = "tungstenite" name = "tungstenite"
version = "0.24.0" version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"bytes", "bytes",
@ -11240,7 +11251,7 @@ dependencies = [
"rustls", "rustls",
"rustls-pki-types", "rustls-pki-types",
"sha1", "sha1",
"thiserror 1.0.69", "thiserror 2.0.11",
"utf-8", "utf-8",
] ]

View File

@ -423,7 +423,7 @@ reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-feat
revm = { version = "19.4.0", default-features = false } revm = { version = "19.4.0", default-features = false }
revm-primitives = { version = "15.1.0", default-features = false } revm-primitives = { version = "15.1.0", default-features = false }
revm-interpreter = { version = "15.0.0", default-features = false } revm-interpreter = { version = "15.0.0", default-features = false }
revm-inspectors = "0.14.1" revm-inspectors = "0.15.0"
# eth # eth
alloy-chains = { version = "0.1.32", default-features = false } alloy-chains = { version = "0.1.32", default-features = false }
@ -434,42 +434,42 @@ alloy-rlp = { version = "0.3.10", default-features = false }
alloy-sol-types = "0.8.15" alloy-sol-types = "0.8.15"
alloy-trie = { version = "0.7", default-features = false } alloy-trie = { version = "0.7", default-features = false }
alloy-consensus = { version = "0.9.2", default-features = false } alloy-consensus = { version = "0.11.0", default-features = false }
alloy-contract = { version = "0.9.2", default-features = false } alloy-contract = { version = "0.11.0", default-features = false }
alloy-eips = { version = "0.9.2", default-features = false } alloy-eips = { version = "0.11.0", default-features = false }
alloy-genesis = { version = "0.9.2", default-features = false } alloy-genesis = { version = "0.11.0", default-features = false }
alloy-json-rpc = { version = "0.9.2", default-features = false } alloy-json-rpc = { version = "0.11.0", default-features = false }
alloy-network = { version = "0.9.2", default-features = false } alloy-network = { version = "0.11.0", default-features = false }
alloy-network-primitives = { version = "0.9.2", default-features = false } alloy-network-primitives = { version = "0.11.0", default-features = false }
alloy-node-bindings = { version = "0.9.2", default-features = false } alloy-node-bindings = { version = "0.11.0", default-features = false }
alloy-provider = { version = "0.9.2", features = ["reqwest"], default-features = false } alloy-provider = { version = "0.11.0", features = ["reqwest"], default-features = false }
alloy-pubsub = { version = "0.9.2", default-features = false } alloy-pubsub = { version = "0.11.0", default-features = false }
alloy-rpc-client = { version = "0.9.2", default-features = false } alloy-rpc-client = { version = "0.11.0", default-features = false }
alloy-rpc-types = { version = "0.9.2", features = ["eth"], default-features = false } alloy-rpc-types = { version = "0.11.0", features = ["eth"], default-features = false }
alloy-rpc-types-admin = { version = "0.9.2", default-features = false } alloy-rpc-types-admin = { version = "0.11.0", default-features = false }
alloy-rpc-types-anvil = { version = "0.9.2", default-features = false } alloy-rpc-types-anvil = { version = "0.11.0", default-features = false }
alloy-rpc-types-beacon = { version = "0.9.2", default-features = false } alloy-rpc-types-beacon = { version = "0.11.0", default-features = false }
alloy-rpc-types-debug = { version = "0.9.2", default-features = false } alloy-rpc-types-debug = { version = "0.11.0", default-features = false }
alloy-rpc-types-engine = { version = "0.9.2", default-features = false } alloy-rpc-types-engine = { version = "0.11.0", default-features = false }
alloy-rpc-types-eth = { version = "0.9.2", default-features = false } alloy-rpc-types-eth = { version = "0.11.0", default-features = false }
alloy-rpc-types-mev = { version = "0.9.2", default-features = false } alloy-rpc-types-mev = { version = "0.11.0", default-features = false }
alloy-rpc-types-trace = { version = "0.9.2", default-features = false } alloy-rpc-types-trace = { version = "0.11.0", default-features = false }
alloy-rpc-types-txpool = { version = "0.9.2", default-features = false } alloy-rpc-types-txpool = { version = "0.11.0", default-features = false }
alloy-serde = { version = "0.9.2", default-features = false } alloy-serde = { version = "0.11.0", default-features = false }
alloy-signer = { version = "0.9.2", default-features = false } alloy-signer = { version = "0.11.0", default-features = false }
alloy-signer-local = { version = "0.9.2", default-features = false } alloy-signer-local = { version = "0.11.0", default-features = false }
alloy-transport = { version = "0.9.2" } alloy-transport = { version = "0.11.0" }
alloy-transport-http = { version = "0.9.2", features = ["reqwest-rustls-tls"], default-features = false } alloy-transport-http = { version = "0.11.0", features = ["reqwest-rustls-tls"], default-features = false }
alloy-transport-ipc = { version = "0.9.2", default-features = false } alloy-transport-ipc = { version = "0.11.0", default-features = false }
alloy-transport-ws = { version = "0.9.2", default-features = false } alloy-transport-ws = { version = "0.11.0", default-features = false }
# op # op
op-alloy-rpc-types = { version = "0.9.6", default-features = false } op-alloy-rpc-types = { version = "0.10.0", default-features = false }
op-alloy-rpc-types-engine = { version = "0.9.6", default-features = false } op-alloy-rpc-types-engine = { version = "0.10.0", default-features = false }
op-alloy-network = { version = "0.9.6", default-features = false } op-alloy-network = { version = "0.10.0", default-features = false }
op-alloy-consensus = { version = "0.9.6", default-features = false } op-alloy-consensus = { version = "0.10.0", default-features = false }
op-alloy-flz = { version = "0.9.6", default-features = false } op-alloy-flz = { version = "0.10.0", default-features = false }
op-alloy-rpc-jsonrpsee = { version = "0.9.6", default-features = false } op-alloy-rpc-jsonrpsee = { version = "0.10.0", default-features = false }
# misc # misc
aquamarine = "0.6" aquamarine = "0.6"
@ -603,35 +603,38 @@ snmalloc-rs = { version = "0.3.7", features = ["build_cc"] }
crunchy = "=0.2.2" crunchy = "=0.2.2"
# [patch.crates-io] # [patch.crates-io]
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "5492e40" } # 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 = "debfc29" } #
# op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } # op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
# op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } # op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
# op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } # 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" }

View File

@ -7,7 +7,7 @@ use alloy_json_rpc::{RequestPacket, ResponsePacket};
use alloy_pubsub::{PubSubConnect, PubSubFrontend}; use alloy_pubsub::{PubSubConnect, PubSubFrontend};
use alloy_rpc_types_engine::{Claims, JwtSecret}; use alloy_rpc_types_engine::{Claims, JwtSecret};
use alloy_transport::{ use alloy_transport::{
utils::guess_local_url, Authorization, Pbf, TransportConnect, TransportError, utils::guess_local_url, Authorization, BoxTransport, TransportConnect, TransportError,
TransportErrorKind, TransportFut, TransportErrorKind, TransportFut,
}; };
use alloy_transport_http::{reqwest::Url, Http, ReqwestTransport}; use alloy_transport_http::{reqwest::Url, Http, ReqwestTransport};
@ -175,19 +175,9 @@ impl AuthenticatedTransport {
} }
match inner_and_claims.0 { match inner_and_claims.0 {
InnerTransport::Http(ref http) => { InnerTransport::Http(ref mut http) => http.call(req),
let mut http = http; InnerTransport::Ws(ref mut ws) => ws.call(req),
http.call(req) InnerTransport::Ipc(ref mut ipc) => ipc.call(req),
}
InnerTransport::Ws(ref ws) => {
let mut ws = ws;
ws.call(req)
}
InnerTransport::Ipc(ref ipc) => {
let mut ipc = ipc;
// we don't need to recreate the client for IPC
ipc.call(req)
}
} }
.await .await
}) })
@ -221,21 +211,21 @@ impl AuthenticatedTransportConnect {
} }
impl TransportConnect for AuthenticatedTransportConnect { impl TransportConnect for AuthenticatedTransportConnect {
type Transport = AuthenticatedTransport;
fn is_local(&self) -> bool { fn is_local(&self) -> bool {
guess_local_url(&self.url) guess_local_url(&self.url)
} }
fn get_transport<'a: 'b, 'b>(&'a self) -> Pbf<'b, Self::Transport, TransportError> { async fn get_transport(&self) -> Result<BoxTransport, TransportError> {
AuthenticatedTransport::connect(self.url.clone(), self.jwt) Ok(BoxTransport::new(
.map(|res| match res { AuthenticatedTransport::connect(self.url.clone(), self.jwt)
Ok(transport) => Ok(transport), .map(|res| match res {
Err(err) => { Ok(transport) => Ok(transport),
Err(TransportError::Transport(TransportErrorKind::Custom(Box::new(err)))) Err(err) => {
} Err(TransportError::Transport(TransportErrorKind::Custom(Box::new(err))))
}) }
.boxed() })
.await?,
))
} }
} }

View File

@ -3,12 +3,10 @@
use crate::{authenticated_transport::AuthenticatedTransportConnect, bench_mode::BenchMode}; use crate::{authenticated_transport::AuthenticatedTransportConnect, bench_mode::BenchMode};
use alloy_eips::BlockNumberOrTag; use alloy_eips::BlockNumberOrTag;
use alloy_provider::{network::AnyNetwork, Provider, ProviderBuilder, RootProvider}; use alloy_provider::{network::AnyNetwork, Provider, RootProvider};
use alloy_rpc_client::ClientBuilder; use alloy_rpc_client::ClientBuilder;
use alloy_rpc_types_engine::JwtSecret; use alloy_rpc_types_engine::JwtSecret;
use alloy_transport::BoxTransport; use reqwest::Url;
use alloy_transport_http::Http;
use reqwest::{Client, Url};
use reth_node_core::args::BenchmarkArgs; use reth_node_core::args::BenchmarkArgs;
use tracing::info; use tracing::info;
@ -19,9 +17,9 @@ use tracing::info;
/// range of blocks, and the next block to fetch. /// range of blocks, and the next block to fetch.
pub(crate) struct BenchContext { pub(crate) struct BenchContext {
/// The auth provider is used for engine API queries. /// The auth provider is used for engine API queries.
pub(crate) auth_provider: RootProvider<BoxTransport, AnyNetwork>, pub(crate) auth_provider: RootProvider<AnyNetwork>,
/// The block provider is used for block queries. /// The block provider is used for block queries.
pub(crate) block_provider: RootProvider<Http<Client>, AnyNetwork>, pub(crate) block_provider: RootProvider<AnyNetwork>,
/// The benchmark mode, which defines whether the benchmark should run for a closed or open /// The benchmark mode, which defines whether the benchmark should run for a closed or open
/// range of blocks. /// range of blocks.
pub(crate) benchmark_mode: BenchMode, pub(crate) benchmark_mode: BenchMode,
@ -43,8 +41,8 @@ impl BenchContext {
} }
// set up alloy client for blocks // set up alloy client for blocks
let block_provider = let client = ClientBuilder::default().http(rpc_url.parse()?);
ProviderBuilder::new().network::<AnyNetwork>().on_http(rpc_url.parse()?); let block_provider = RootProvider::<AnyNetwork>::new(client);
// If neither `--from` nor `--to` are provided, we will run the benchmark continuously, // If neither `--from` nor `--to` are provided, we will run the benchmark continuously,
// starting at the latest block. // starting at the latest block.
@ -68,8 +66,8 @@ impl BenchContext {
// construct the authed transport // construct the authed transport
info!("Connecting to Engine RPC at {} for replay", auth_url); info!("Connecting to Engine RPC at {} for replay", auth_url);
let auth_transport = AuthenticatedTransportConnect::new(auth_url, jwt); let auth_transport = AuthenticatedTransportConnect::new(auth_url, jwt);
let client = ClientBuilder::default().connect_boxed(auth_transport).await?; let client = ClientBuilder::default().connect_with(auth_transport).await?;
let auth_provider = RootProvider::<_, AnyNetwork>::new(client); let auth_provider = RootProvider::<AnyNetwork>::new(client);
let first_block = match benchmark_mode { let first_block = match benchmark_mode {
BenchMode::Continuous => { BenchMode::Continuous => {

View File

@ -8,13 +8,13 @@ use alloy_rpc_types_engine::{
ExecutionPayload, ExecutionPayloadInputV2, ExecutionPayloadV1, ExecutionPayloadV3, ExecutionPayload, ExecutionPayloadInputV2, ExecutionPayloadV1, ExecutionPayloadV3,
ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus, ForkchoiceState, ForkchoiceUpdated, PayloadAttributes, PayloadStatus,
}; };
use alloy_transport::{Transport, TransportResult}; use alloy_transport::TransportResult;
use reth_node_api::EngineApiMessageVersion; use reth_node_api::EngineApiMessageVersion;
use tracing::error; use tracing::error;
/// An extension trait for providers that implement the engine API, to wait for a VALID response. /// An extension trait for providers that implement the engine API, to wait for a VALID response.
#[async_trait::async_trait] #[async_trait::async_trait]
pub trait EngineApiValidWaitExt<N, T>: Send + Sync { pub trait EngineApiValidWaitExt<N>: Send + Sync {
/// Calls `engine_newPayloadV1` with the given [ExecutionPayloadV1], and waits until the /// Calls `engine_newPayloadV1` with the given [ExecutionPayloadV1], and waits until the
/// response is VALID. /// response is VALID.
async fn new_payload_v1_wait( async fn new_payload_v1_wait(
@ -64,11 +64,10 @@ pub trait EngineApiValidWaitExt<N, T>: Send + Sync {
} }
#[async_trait::async_trait] #[async_trait::async_trait]
impl<T, N, P> EngineApiValidWaitExt<N, T> for P impl<N, P> EngineApiValidWaitExt<N> for P
where where
N: Network, N: Network,
T: Transport + Clone, P: EngineApi<N>,
P: EngineApi<N, T>,
{ {
async fn new_payload_v1_wait( async fn new_payload_v1_wait(
&self, &self,
@ -208,7 +207,7 @@ where
/// ///
/// # Panics /// # Panics
/// If the given payload is a V3 payload, but a parent beacon block root is provided as `None`. /// If the given payload is a V3 payload, but a parent beacon block root is provided as `None`.
pub(crate) async fn call_new_payload<N, T, P: EngineApiValidWaitExt<N, T>>( pub(crate) async fn call_new_payload<N, P: EngineApiValidWaitExt<N>>(
provider: P, provider: P,
payload: ExecutionPayload, payload: ExecutionPayload,
parent_beacon_block_root: Option<B256>, parent_beacon_block_root: Option<B256>,
@ -246,7 +245,7 @@ pub(crate) async fn call_new_payload<N, T, P: EngineApiValidWaitExt<N, T>>(
/// Calls the correct `engine_forkchoiceUpdated` method depending on the given /// Calls the correct `engine_forkchoiceUpdated` method depending on the given
/// `EngineApiMessageVersion`, using the provided forkchoice state and payload attributes for the /// `EngineApiMessageVersion`, using the provided forkchoice state and payload attributes for the
/// actual engine api message call. /// actual engine api message call.
pub(crate) async fn call_forkchoice_updated<N, T, P: EngineApiValidWaitExt<N, T>>( pub(crate) async fn call_forkchoice_updated<N, P: EngineApiValidWaitExt<N>>(
provider: P, provider: P,
message_version: EngineApiMessageVersion, message_version: EngineApiMessageVersion,
forkchoice_state: ForkchoiceState, forkchoice_state: ForkchoiceState,

View File

@ -11,10 +11,8 @@ use alloy_consensus::{
Header, Header,
}; };
use alloy_eips::{ use alloy_eips::{
eip1559::INITIAL_BASE_FEE, eip1559::INITIAL_BASE_FEE, eip6110::MAINNET_DEPOSIT_CONTRACT_ADDRESS,
eip6110::MAINNET_DEPOSIT_CONTRACT_ADDRESS, eip7685::EMPTY_REQUESTS_HASH, eip7840::BlobParams,
eip7685::EMPTY_REQUESTS_HASH,
eip7840::{BlobParams, BlobScheduleItem},
}; };
use alloy_genesis::Genesis; use alloy_genesis::Genesis;
use alloy_primitives::{address, b256, Address, BlockNumber, B256, U256}; use alloy_primitives::{address, b256, Address, BlockNumber, B256, U256};
@ -174,7 +172,7 @@ pub struct HardforkBlobParams {
impl HardforkBlobParams { impl HardforkBlobParams {
/// Constructs params for chainspec from a provided blob schedule. /// Constructs params for chainspec from a provided blob schedule.
/// Falls back to defaults if the schedule is empty. /// Falls back to defaults if the schedule is empty.
pub fn from_schedule(blob_schedule: &BTreeMap<String, BlobScheduleItem>) -> Self { pub fn from_schedule(blob_schedule: &BTreeMap<String, BlobParams>) -> Self {
let extract = |key: &str, default: fn() -> BlobParams| { let extract = |key: &str, default: fn() -> BlobParams| {
blob_schedule blob_schedule
.get(key) .get(key)

View File

@ -199,7 +199,7 @@ where
let type_name = type_name::<T>(); let type_name = type_name::<T>();
print!("{}", &type_name); print!("{}", &type_name);
let mut bytes = std::iter::repeat(0u8).take(256).collect::<Vec<u8>>(); let mut bytes = std::iter::repeat_n(0u8, 256).collect::<Vec<u8>>();
let mut compact_buffer = vec![]; let mut compact_buffer = vec![];
let mut values = Vec::with_capacity(VECTOR_SIZE); let mut values = Vec::with_capacity(VECTOR_SIZE);
@ -215,7 +215,7 @@ where
Err(err) => { Err(err) => {
if tries < 5 && matches!(err, arbitrary::Error::NotEnoughData) { if tries < 5 && matches!(err, arbitrary::Error::NotEnoughData) {
tries += 1; tries += 1;
bytes.extend(std::iter::repeat(0u8).take(256)); bytes.extend(std::iter::repeat_n(0u8, 256));
} else { } else {
return Err(err)? return Err(err)?
} }

View File

@ -69,13 +69,12 @@ async fn e2e_test_send_transactions() -> eyre::Result<()> {
let (mut nodes, _tasks, _) = let (mut nodes, _tasks, _) =
setup_engine::<EthereumNode>(2, chain_spec.clone(), false, eth_payload_attributes).await?; setup_engine::<EthereumNode>(2, chain_spec.clone(), false, eth_payload_attributes).await?;
let mut node = nodes.pop().unwrap(); let mut node = nodes.pop().unwrap();
let provider = ProviderBuilder::new().with_recommended_fillers().on_http(node.rpc_url()); let provider = ProviderBuilder::new().on_http(node.rpc_url());
advance_with_random_transactions(&mut node, 100, &mut rng, true).await?; advance_with_random_transactions(&mut node, 100, &mut rng, true).await?;
let second_node = nodes.pop().unwrap(); let second_node = nodes.pop().unwrap();
let second_provider = let second_provider = ProviderBuilder::new().on_http(second_node.rpc_url());
ProviderBuilder::new().with_recommended_fillers().on_http(second_node.rpc_url());
assert_eq!(second_provider.get_block_number().await?, 0); assert_eq!(second_provider.get_block_number().await?, 0);

View File

@ -50,7 +50,6 @@ async fn test_fee_history() -> eyre::Result<()> {
setup_engine::<EthereumNode>(1, chain_spec.clone(), false, eth_payload_attributes).await?; setup_engine::<EthereumNode>(1, chain_spec.clone(), false, eth_payload_attributes).await?;
let mut node = nodes.pop().unwrap(); let mut node = nodes.pop().unwrap();
let provider = ProviderBuilder::new() let provider = ProviderBuilder::new()
.with_recommended_fillers()
.wallet(EthereumWallet::new(wallet.gen().swap_remove(0))) .wallet(EthereumWallet::new(wallet.gen().swap_remove(0)))
.on_http(node.rpc_url()); .on_http(node.rpc_url());
@ -133,7 +132,6 @@ async fn test_flashbots_validate_v3() -> eyre::Result<()> {
setup_engine::<EthereumNode>(1, chain_spec.clone(), false, eth_payload_attributes).await?; setup_engine::<EthereumNode>(1, chain_spec.clone(), false, eth_payload_attributes).await?;
let mut node = nodes.pop().unwrap(); let mut node = nodes.pop().unwrap();
let provider = ProviderBuilder::new() let provider = ProviderBuilder::new()
.with_recommended_fillers()
.wallet(EthereumWallet::new(wallet.gen().swap_remove(0))) .wallet(EthereumWallet::new(wallet.gen().swap_remove(0)))
.on_http(node.rpc_url()); .on_http(node.rpc_url());
@ -207,7 +205,6 @@ async fn test_flashbots_validate_v4() -> eyre::Result<()> {
setup_engine::<EthereumNode>(1, chain_spec.clone(), false, eth_payload_attributes).await?; setup_engine::<EthereumNode>(1, chain_spec.clone(), false, eth_payload_attributes).await?;
let mut node = nodes.pop().unwrap(); let mut node = nodes.pop().unwrap();
let provider = ProviderBuilder::new() let provider = ProviderBuilder::new()
.with_recommended_fillers()
.wallet(EthereumWallet::new(wallet.gen().swap_remove(0))) .wallet(EthereumWallet::new(wallet.gen().swap_remove(0)))
.on_http(node.rpc_url()); .on_http(node.rpc_url());

View File

@ -40,7 +40,7 @@ pub(crate) async fn advance_with_random_transactions<Provider>(
where where
Provider: FullProvider<NodeTypesWithDBAdapter<EthereumNode, TmpDB>>, Provider: FullProvider<NodeTypesWithDBAdapter<EthereumNode, TmpDB>>,
{ {
let provider = ProviderBuilder::new().with_recommended_fillers().on_http(node.rpc_url()); let provider = ProviderBuilder::new().on_http(node.rpc_url());
let signers = Wallet::new(1).with_chain_id(provider.get_chain_id().await?).gen(); let signers = Wallet::new(1).with_chain_id(provider.get_chain_id().await?).gen();
// simple contract which writes to storage on any call // simple contract which writes to storage on any call

View File

@ -310,7 +310,7 @@ mod tests {
assert_eq!( assert_eq!(
client.times_requested(), client.times_requested(),
// div_ceild // div_ceild
(headers.into_iter().filter(|h| !h.is_empty()).count() as u64 + 1) / 2 (headers.into_iter().filter(|h| !h.is_empty()).count() as u64).div_ceil(2)
); );
} }
} }

View File

@ -466,7 +466,7 @@ impl ChunkedFileReader {
// read new bytes from file // read new bytes from file
let prev_read_bytes_len = self.chunk.len(); let prev_read_bytes_len = self.chunk.len();
self.chunk.extend(std::iter::repeat(0).take(new_read_bytes_target_len as usize)); self.chunk.extend(std::iter::repeat_n(0, new_read_bytes_target_len as usize));
let reader = &mut self.chunk[prev_read_bytes_len..]; let reader = &mut self.chunk[prev_read_bytes_len..];
// actual bytes that have been read // actual bytes that have been read

View File

@ -5,6 +5,7 @@ use alloy_consensus::{
use alloy_eips::{ use alloy_eips::{
eip2718::{Decodable2718, Eip2718Error, Eip2718Result, Encodable2718}, eip2718::{Decodable2718, Eip2718Error, Eip2718Result, Encodable2718},
eip4895::Withdrawals, eip4895::Withdrawals,
Typed2718,
}; };
use alloy_primitives::{ use alloy_primitives::{
bytes::{Buf, BytesMut}, 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 { impl Encodable2718 for OvmTransactionSigned {
fn type_flag(&self) -> Option<u8> { fn type_flag(&self) -> Option<u8> {
match self.transaction.tx_type() { match self.transaction.tx_type() {

View File

@ -265,7 +265,7 @@ impl alloy_rlp::Encodable for OpTransactionSigned {
fn length(&self) -> usize { fn length(&self) -> usize {
let mut payload_length = self.encode_2718_len(); 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(); payload_length += Header { list: false, payload_length }.length();
} }

View File

@ -127,7 +127,7 @@ where
} else { } else {
base_fee base_fee
.map(|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()) .unwrap_or_else(|| inner.max_fee_per_gas())
}; };

View File

@ -35,7 +35,6 @@ pub type BincodeReprFor<'a, T> = <T as SerdeBincodeCompat>::BincodeRepr<'a>;
mod block_bincode { mod block_bincode {
use crate::serde_bincode_compat::SerdeBincodeCompat; use crate::serde_bincode_compat::SerdeBincodeCompat;
use alloc::{borrow::Cow, vec::Vec}; use alloc::{borrow::Cow, vec::Vec};
use alloy_consensus::serde_bincode_compat::Header;
use alloy_eips::eip4895::Withdrawals; use alloy_eips::eip4895::Withdrawals;
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_with::{DeserializeAs, SerializeAs}; use serde_with::{DeserializeAs, SerializeAs};
@ -60,8 +59,8 @@ mod block_bincode {
#[debug(bound())] #[debug(bound())]
pub struct Block<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> { pub struct Block<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> {
header: H::BincodeRepr<'a>, header: H::BincodeRepr<'a>,
#[serde(bound = "BlockBody<'a, T>: Serialize + serde::de::DeserializeOwned")] #[serde(bound = "BlockBody<'a, T, H>: Serialize + serde::de::DeserializeOwned")]
body: BlockBody<'a, T>, body: BlockBody<'a, T, H>,
} }
impl<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> From<&'a alloy_consensus::Block<T, H>> impl<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> From<&'a alloy_consensus::Block<T, H>>
@ -125,31 +124,35 @@ mod block_bincode {
/// ///
/// #[serde_as] /// #[serde_as]
/// #[derive(Serialize, Deserialize)] /// #[derive(Serialize, Deserialize)]
/// struct Data<T: SerdeBincodeCompat> { /// struct Data<T: SerdeBincodeCompat, H: SerdeBincodeCompat> {
/// #[serde_as(as = "serde_bincode_compat::BlockBody<'_, T>")] /// #[serde_as(as = "serde_bincode_compat::BlockBody<'_, T, H>")]
/// body: alloy_consensus::BlockBody<T>, /// body: alloy_consensus::BlockBody<T, H>,
/// } /// }
/// ``` /// ```
#[derive(derive_more::Debug, Serialize, Deserialize)] #[derive(derive_more::Debug, Serialize, Deserialize)]
#[debug(bound())] #[debug(bound())]
pub struct BlockBody<'a, T: SerdeBincodeCompat> { pub struct BlockBody<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> {
transactions: Vec<T::BincodeRepr<'a>>, transactions: Vec<T::BincodeRepr<'a>>,
ommers: Vec<Header<'a>>, ommers: Vec<H::BincodeRepr<'a>>,
withdrawals: Cow<'a, Option<Withdrawals>>, withdrawals: Cow<'a, Option<Withdrawals>>,
} }
impl<'a, T: SerdeBincodeCompat> From<&'a alloy_consensus::BlockBody<T>> for BlockBody<'a, T> { impl<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat>
fn from(value: &'a alloy_consensus::BlockBody<T>) -> Self { From<&'a alloy_consensus::BlockBody<T, H>> for BlockBody<'a, T, H>
{
fn from(value: &'a alloy_consensus::BlockBody<T, H>) -> Self {
Self { Self {
transactions: value.transactions.iter().map(|tx| tx.as_repr()).collect(), 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), withdrawals: Cow::Borrowed(&value.withdrawals),
} }
} }
} }
impl<'a, T: SerdeBincodeCompat> From<BlockBody<'a, T>> for alloy_consensus::BlockBody<T> { impl<'a, T: SerdeBincodeCompat, H: SerdeBincodeCompat> From<BlockBody<'a, T, H>>
fn from(value: BlockBody<'a, T>) -> Self { for alloy_consensus::BlockBody<T, H>
{
fn from(value: BlockBody<'a, T, H>) -> Self {
Self { Self {
transactions: value.transactions.into_iter().map(Into::into).collect(), transactions: value.transactions.into_iter().map(Into::into).collect(),
ommers: value.ommers.into_iter().map(Into::into).collect(), ommers: value.ommers.into_iter().map(Into::into).collect(),
@ -158,9 +161,11 @@ mod block_bincode {
} }
} }
impl<T: SerdeBincodeCompat> SerializeAs<alloy_consensus::BlockBody<T>> for BlockBody<'_, T> { impl<T: SerdeBincodeCompat, H: SerdeBincodeCompat> SerializeAs<alloy_consensus::BlockBody<T, H>>
for BlockBody<'_, T, H>
{
fn serialize_as<S>( fn serialize_as<S>(
source: &alloy_consensus::BlockBody<T>, source: &alloy_consensus::BlockBody<T, H>,
serializer: S, serializer: S,
) -> Result<S::Ok, S::Error> ) -> Result<S::Ok, S::Error>
where where
@ -170,10 +175,10 @@ mod block_bincode {
} }
} }
impl<'de, T: SerdeBincodeCompat> DeserializeAs<'de, alloy_consensus::BlockBody<T>> impl<'de, T: SerdeBincodeCompat, H: SerdeBincodeCompat>
for BlockBody<'de, T> DeserializeAs<'de, alloy_consensus::BlockBody<T, H>> for BlockBody<'de, T, H>
{ {
fn deserialize_as<D>(deserializer: D) -> Result<alloy_consensus::BlockBody<T>, D::Error> fn deserialize_as<D>(deserializer: D) -> Result<alloy_consensus::BlockBody<T, H>, D::Error>
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
@ -181,8 +186,10 @@ mod block_bincode {
} }
} }
impl<T: SerdeBincodeCompat> SerdeBincodeCompat for alloy_consensus::BlockBody<T> { impl<T: SerdeBincodeCompat, H: SerdeBincodeCompat> SerdeBincodeCompat
type BincodeRepr<'a> = BlockBody<'a, T>; for alloy_consensus::BlockBody<T, H>
{
type BincodeRepr<'a> = BlockBody<'a, T, H>;
fn as_repr(&self) -> Self::BincodeRepr<'_> { fn as_repr(&self) -> Self::BincodeRepr<'_> {
self.into() self.into()

View File

@ -8,7 +8,7 @@ use crate::{
}; };
use alloy_consensus::BlockHeader; use alloy_consensus::BlockHeader;
use alloy_eips::{eip1559::calc_next_block_base_fee, eip2930::AccessListResult}; 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::{ use alloy_rpc_types_eth::{
simulate::{SimBlock, SimulatePayload, SimulatedBlock}, simulate::{SimBlock, SimulatePayload, SimulatedBlock},
state::{EvmOverrides, StateOverride}, state::{EvmOverrides, StateOverride},
@ -31,9 +31,7 @@ use reth_revm::{
use reth_rpc_eth_types::{ use reth_rpc_eth_types::{
cache::db::{StateCacheDbRefMutWrapper, StateProviderTraitObjWrapper}, cache::db::{StateCacheDbRefMutWrapper, StateProviderTraitObjWrapper},
error::{api::FromEvmHalt, ensure_success}, error::{api::FromEvmHalt, ensure_success},
revm_utils::{ revm_utils::{apply_block_overrides, apply_state_overrides, caller_gas_allowance},
apply_block_overrides, apply_state_overrides, caller_gas_allowance, get_precompiles,
},
simulate::{self, EthSimulateError}, simulate::{self, EthSimulateError},
EthApiError, RevertError, RpcInvalidTransactionError, StateCacheDb, 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()); 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 // can consume the list since we're not using the request anymore
let initial = request.access_list.take().unwrap_or_default(); let initial = request.access_list.take().unwrap_or_default();
let precompiles = get_precompiles(evm_env.spec.into()); let mut inspector = AccessListInspector::new(initial);
let mut inspector = AccessListInspector::new(initial, from, to, precompiles);
let (result, (evm_env, mut tx_env)) = let (result, (evm_env, mut tx_env)) =
self.inspect(&mut db, evm_env, tx_env, &mut inspector)?; self.inspect(&mut db, evm_env, tx_env, &mut inspector)?;

View File

@ -307,7 +307,7 @@ pub trait Trace:
let block_hash = block.hash(); let block_hash = block.hash();
let block_number = evm_env.block_env.number.saturating_to::<u64>(); let block_number = evm_env.block_env.number.saturating_to::<u64>();
let base_fee = evm_env.block_env.basefee.saturating_to::<u128>(); let base_fee = evm_env.block_env.basefee.saturating_to::<u64>();
// now get the state // now get the state
let state = this.state_at_block_id(state_at.into())?; let state = this.state_at_block_id(state_at.into())?;

View File

@ -217,7 +217,7 @@ pub trait EthTransactions: LoadTransaction<Provider: BlockReaderIdExt> {
hash: Some(*tx.tx_hash()), hash: Some(*tx.tx_hash()),
block_hash: Some(block_hash), block_hash: Some(block_hash),
block_number: Some(block_number), 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), index: Some(index as u64),
}; };
@ -296,7 +296,7 @@ pub trait EthTransactions: LoadTransaction<Provider: BlockReaderIdExt> {
hash: Some(*tx.tx_hash()), hash: Some(*tx.tx_hash()),
block_hash: Some(block_hash), block_hash: Some(block_hash),
block_number: Some(block_number), 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), index: Some(index as u64),
}; };
self.tx_resp_builder().fill(tx.clone().with_signer(*signer), tx_info) self.tx_resp_builder().fill(tx.clone().with_signer(*signer), tx_info)

View File

@ -87,7 +87,6 @@ where
// EIP-4844 fields // EIP-4844 fields
blob_gas_price, blob_gas_price,
blob_gas_used, blob_gas_used,
authorization_list: transaction.authorization_list().map(|l| l.to_vec()),
}) })
} }

View File

@ -51,7 +51,7 @@ impl<T: SignedTransaction> TransactionSource<T> {
index: Some(index), index: Some(index),
block_hash: Some(block_hash), block_hash: Some(block_hash),
block_number: Some(block_number), block_number: Some(block_number),
base_fee: base_fee.map(u128::from), base_fee,
}; };
resp_builder.fill(transaction, tx_info) resp_builder.fill(transaction, tx_info)
@ -75,7 +75,7 @@ impl<T: SignedTransaction> TransactionSource<T> {
index: Some(index), index: Some(index),
block_hash: Some(block_hash), block_hash: Some(block_hash),
block_number: Some(block_number), block_number: Some(block_number),
base_fee: base_fee.map(u128::from), base_fee,
}, },
) )
} }

View File

@ -82,7 +82,7 @@ where
hash: Some(tx_hash), hash: Some(tx_hash),
block_hash, block_hash,
block_number: Some(block_number), 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), index: Some(idx as u64),
}; };

View File

@ -71,7 +71,7 @@ where
let effective_gas_price = base_fee let effective_gas_price = base_fee
.map(|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()); .unwrap_or_else(|| inner.max_fee_per_gas());

View File

@ -2,7 +2,7 @@
use alloy_eips::BlockNumberOrTag; use alloy_eips::BlockNumberOrTag;
use alloy_primitives::U256; use alloy_primitives::U256;
use alloy_rpc_types_eth::BlockId; use alloy_rpc_types_eth::{BlockId, BlockOverrides};
use alloy_rpc_types_mev::{ use alloy_rpc_types_mev::{
BundleItem, Inclusion, Privacy, RefundConfig, SendBundleRequest, SimBundleLogs, BundleItem, Inclusion, Privacy, RefundConfig, SendBundleRequest, SimBundleLogs,
SimBundleOverrides, SimBundleResponse, Validity, SimBundleOverrides, SimBundleResponse, Validity,
@ -227,15 +227,8 @@ where
overrides: SimBundleOverrides, overrides: SimBundleOverrides,
logs: bool, logs: bool,
) -> Result<SimBundleResponse, Eth::Error> { ) -> Result<SimBundleResponse, Eth::Error> {
let SimBundleOverrides { let SimBundleOverrides { parent_block, block_overrides, .. } = overrides;
parent_block, let BlockOverrides { number, coinbase, time, gas_limit, base_fee, .. } = block_overrides;
block_number,
coinbase,
timestamp,
gas_limit,
base_fee,
..
} = overrides;
// Parse and validate bundle // Parse and validate bundle
// Also, flatten the bundle here so that its easier to process // 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?; let (mut evm_env, current_block) = self.eth_api().evm_env_at(block_id).await?;
// apply overrides // apply overrides
if let Some(block_number) = block_number { if let Some(block_number) = number {
evm_env.block_env.number = U256::from(block_number); evm_env.block_env.number = U256::from(block_number);
} }
@ -253,7 +246,7 @@ where
evm_env.block_env.coinbase = coinbase; evm_env.block_env.coinbase = coinbase;
} }
if let Some(timestamp) = timestamp { if let Some(timestamp) = time {
evm_env.block_env.timestamp = U256::from(timestamp); evm_env.block_env.timestamp = U256::from(timestamp);
} }

View File

@ -23,7 +23,7 @@ use revm_inspectors::{
tracing::{types::CallTraceNode, TracingInspectorConfig}, tracing::{types::CallTraceNode, TracingInspectorConfig},
transfer::{TransferInspector, TransferKind}, transfer::{TransferInspector, TransferKind},
}; };
use revm_primitives::{ExecutionResult, SignedAuthorization}; use revm_primitives::ExecutionResult;
const API_LEVEL: u64 = 8; const API_LEVEL: u64 = 8;
@ -277,9 +277,6 @@ where
from: receipt.from(), from: receipt.from(),
to: receipt.to(), to: receipt.to(),
contract_address: receipt.contract_address(), contract_address: receipt.contract_address(),
authorization_list: receipt
.authorization_list()
.map(<[SignedAuthorization]>::to_vec),
}; };
OtsTransactionReceipt { receipt, timestamp } OtsTransactionReceipt { receipt, timestamp }