diff --git a/Cargo.lock b/Cargo.lock index 6f40bff4f..f6cabc36b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,14 +133,14 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2179ba839ac532f50279f5da2a6c5047f791f03f6f808b4dfab11327b97902f" +checksum = "94ee204a7795e56b8e78013f5824d6ea6e4da457a4aaf6c72e4800c4d4987fce" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "alloy-trie 0.8.1", "arbitrary", "auto_impl", @@ -171,15 +171,15 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec6f67bdc62aa277e0ec13c1b1fb396c8a62b65c8e9bd8c1d3583cc6d1a8dd3" +checksum = "a16df75c656be4465ab411b88c5ec6bae4931ce806834efbf375ca85b8db6f9a" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "arbitrary", "serde", ] @@ -314,6 +314,26 @@ dependencies = [ "alloy-primitives 1.0.0", "alloy-rlp", "alloy-serde 0.14.0", + "auto_impl", + "c-kzg", + "derive_more 2.0.1", + "either", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-eips" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd8ce6197b2cc38968c80c676372f383ed46051fb8600a421b5259f3f2d13a15" +dependencies = [ + "alloy-eip2124 0.2.0", + "alloy-eip2930 0.2.0", + "alloy-eip7702 0.6.0", + "alloy-primitives 1.0.0", + "alloy-rlp", + "alloy-serde 0.15.6", "arbitrary", "auto_impl", "c-kzg", @@ -327,12 +347,12 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caabd28657614cecc14d77fde0a630c5c177bfe432ce4ad99db0ad41d9219856" +checksum = "bb232f8e0e6bac6e28da4e4813331be06b7519949c043ba6c58b9228bab89983" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-hardforks", "alloy-primitives 1.0.0", "alloy-sol-types 1.0.0", @@ -346,13 +366,13 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfec8348d97bd624901c6a4b22bb4c24df8a3128fc3d5e42d24f7b79dfa8588" +checksum = "bc13f76f34587a9d5efd1d141dd6a596983be715922ccc488209e58dc643ec65" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "alloy-trie 0.8.1", "serde", ] @@ -411,9 +431,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3994ab6ff6bdeb5aebe65381a8f6a47534789817570111555e8ac413e242ce06" +checksum = "3593ce03c82601517eee458f67bb5dc642b9baff7016063f03a4ccbcfb52a387" dependencies = [ "alloy-primitives 1.0.0", "alloy-sol-types 1.0.0", @@ -425,19 +445,19 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be3aa020a6d3aa7601185b4c1a7d6f3a5228cb5424352db63064b29a455c891" +checksum = "36be8015a205bf2e6784b0367c0f29e87f901f5f9b80b0a9bb4e1411c65242fd" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-consensus-any 0.14.0", - "alloy-eips 0.14.0", - "alloy-json-rpc 0.14.0", - "alloy-network-primitives 0.14.0", + "alloy-consensus 0.15.6", + "alloy-consensus-any 0.15.6", + "alloy-eips 0.15.6", + "alloy-json-rpc 0.15.6", + "alloy-network-primitives 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-any", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "alloy-signer", "alloy-sol-types 1.0.0", "async-trait", @@ -464,22 +484,22 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498f2ee2eef38a6db0fc810c7bf7daebdf5f2fa8d04adb8bd53e54e91ddbdea3" +checksum = "3449fdd0908f50fb68eef8c43201d73d4ff51882b36e2adaadab277a7539ce4f" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "serde", ] [[package]] name = "alloy-node-bindings" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60dd250ffe9514728daf5e84cac7193e221b85feffe3bea7d45f2b9fcbe6b885" +checksum = "42972e4e6e05dd21d4e35b33c2cbacacb3ed9c678c944e8fdb303fda91751a5b" dependencies = [ "alloy-genesis", "alloy-hardforks", @@ -498,12 +518,12 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360e7f865a76106d9fe976fda85da52b380ae2a9ffcb09d2d81953c979503c7f" +checksum = "4b65600baa6f3638a8ca71460ef008a8dae45d941e93ec17ce9c33b469ab38fc" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", "alloy-op-hardforks", "alloy-primitives 1.0.0", @@ -605,20 +625,21 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6ba76d476f475668925f858cc4db51781f12abdaa4e0274eb57a09f574e869" +checksum = "16db7e6c225828a4540b1cce6047f06777c057df58386db9641827a2d1afb4f5" dependencies = [ "alloy-chains", - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", - "alloy-json-rpc 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", + "alloy-json-rpc 0.15.6", "alloy-network", - "alloy-network-primitives 0.14.0", + "alloy-network-primitives 0.15.6", "alloy-primitives 1.0.0", "alloy-pubsub", "alloy-rpc-client", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-rpc-types-txpool", "alloy-signer", "alloy-sol-types 1.0.0", "alloy-transport", @@ -647,11 +668,11 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04135d2fd7fa1fba3afe9f79ec2967259dbc0948e02fa0cd0e33a4a812e2cb0a" +checksum = "2fbf7f3b22f7d34eb9aedf637bcdc5d4f47f5e028d3f7520f6ecc7fc75a7a027" dependencies = [ - "alloy-json-rpc 0.14.0", + "alloy-json-rpc 0.15.6", "alloy-primitives 1.0.0", "alloy-transport", "bimap", @@ -690,11 +711,11 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6a6985b48a536b47aa0aece56e6a0f49240ce5d33a7f0c94f1b312eda79aa1" +checksum = "821fca097f02720cd2a53e785776e265f36288f8210aa9177c9de05e2c2724c3" dependencies = [ - "alloy-json-rpc 0.14.0", + "alloy-json-rpc 0.15.6", "alloy-primitives 1.0.0", "alloy-pubsub", "alloy-transport", @@ -718,22 +739,22 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf27873220877cb15125eb6eec2f86c6e9b41473aca85844bd3d9d755bfc0a0" +checksum = "30890a9856721a376e989283a17b2698acc3e1a612415abbca980aa4d29d7367" dependencies = [ "alloy-primitives 1.0.0", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564fbba310fbfdadf16512c973315d0fa8eaf8fd2c442f1265bfc24e51f41ddf" +checksum = "a16667b4e732de727f3d25fdbc442ae0902c675d4a92b6f084f61a626d31a657" dependencies = [ "alloy-genesis", "alloy-primitives 1.0.0", @@ -743,34 +764,34 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c349f7339476f13e23308111dfeb67d136c11e7b2a6b1d162f6a124ad4ffb9b" +checksum = "8702ccf7d241cb52fc6730561f7429c15158dacffe68c9127d2ab79d1657b862" dependencies = [ "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "serde", ] [[package]] name = "alloy-rpc-types-any" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a40595b927dfb07218459037837dbc8de8500a26024bb6ff0548dd2ccc13e0" +checksum = "93017fb350fe2c0cccda41f9be45352012696a5fbd08c5fef4be0df838999bfa" dependencies = [ - "alloy-consensus-any 0.14.0", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-consensus-any 0.15.6", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", ] [[package]] name = "alloy-rpc-types-beacon" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c08a6f2593a8b6401e579996a887b22794543e0ff5976c5c21ddd361755dec" +checksum = "d77f86139dd3789a3b43201377844f40654f0038fcf34b5f167def6fa6f4c64f" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "ethereum_ssz", @@ -784,9 +805,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05525519bd7f37f98875354f0b3693d3ad3c7a7f067e3b8946777920be15cb5b" +checksum = "ec0b7976ba2e770e085389c8f9ffa81812700254c36e5cc35bca496e9491d1e3" dependencies = [ "alloy-primitives 1.0.0", "serde", @@ -794,15 +815,15 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4235d79af20fe5583ca26096258fe9307571a345745c433cfd8c91b41aa2611e" +checksum = "4f09bac3a6651e3e9e292e946a1fc393128aa1a572254e2ff641e9911f024f61" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "derive_more 2.0.1", "ethereum_ssz", "ethereum_ssz_derive", @@ -835,17 +856,17 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a9f64e0f69cfb6029e2a044519a1bdd44ce9fc334d5315a7b9837f7a6748e5" +checksum = "d9f96bc409dee49f68d70bf1303c3b34d7153e185dda75caa8b72919a28cd6ac" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-consensus-any 0.14.0", - "alloy-eips 0.14.0", - "alloy-network-primitives 0.14.0", + "alloy-consensus 0.15.6", + "alloy-consensus-any 0.15.6", + "alloy-eips 0.15.6", + "alloy-network-primitives 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "alloy-sol-types 1.0.0", "arbitrary", "itertools 0.14.0", @@ -857,27 +878,27 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b38fc4f5a198a14b1411c27c530c95fd05800613175a4c98ae61475c41b7c5" +checksum = "ef398cb02fd269ebae6bf39c2393d8fee1c2c43a2b78cec360b51c63c6a1ac87" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "serde", "serde_json", ] [[package]] name = "alloy-rpc-types-trace" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bccbe4594eaa2d69d21fa0b558c44e36202e599eb209da70b405415cb37a354" +checksum = "1c24a733a999bbfa706d03f54332ad03697e745ed27c25bdeebac39586f184d8" dependencies = [ "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "serde", "serde_json", "thiserror 2.0.12", @@ -885,13 +906,13 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b8de4afea88d9ca1504b9dee40ffae69a2364aed82ab6e88e4348b41f57f6b" +checksum = "ac6d62259b6e1469042a21807d5f24002a7a0f30f69e945ded82ed6009fd1e50" dependencies = [ "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "serde", ] @@ -911,6 +932,17 @@ name = "alloy-serde" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4dba6ff08916bc0a9cbba121ce21f67c0b554c39cf174bc7b9df6c651bd3c3b" +dependencies = [ + "alloy-primitives 1.0.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa2fc7f82a9884ff1632d2a2137d35fef4db9270c85668634a603be5948fcdc" dependencies = [ "alloy-primitives 1.0.0", "arbitrary", @@ -920,9 +952,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c580da7f00f3999e44e327223044d6732358627f93043e22d92c583f6583556" +checksum = "44eaf520bbb527ba90a3dd963aadf0c339595932169fb10f7330fe779336436e" dependencies = [ "alloy-primitives 1.0.0", "async-trait", @@ -935,11 +967,11 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00f0f07862bd8f6bc66c953660693c5903062c2c9d308485b2a6eee411089e7" +checksum = "1f8d1f2edc446b52985a5af71cdbce86e8646865b889e38410594eea97804380" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-network", "alloy-primitives 1.0.0", "alloy-signer", @@ -1093,11 +1125,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1f1a55f9ff9a48aa0b4a8c616803754620010fbb266edae2f4548f4304373b" +checksum = "609f69c9153df716e7e6ef002cba69f94b7635eb2c603fff69b664aa6acea93a" dependencies = [ - "alloy-json-rpc 0.14.0", + "alloy-json-rpc 0.15.6", "base64 0.22.1", "derive_more 2.0.1", "futures", @@ -1115,11 +1147,11 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171b3d8824b6697d6c8325373ec410d230b6c59ce552edfbfabe4e7b8a26aac3" +checksum = "c2e60987afbc49b8719578355726059579a1a197741a2adae52f860d5d7464cc" dependencies = [ - "alloy-json-rpc 0.14.0", + "alloy-json-rpc 0.15.6", "alloy-transport", "reqwest 0.12.15", "serde_json", @@ -1130,11 +1162,11 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a71043836f2144e1fe30f874eb2e9d71d2632d530e35b09fadbf787232f3f4" +checksum = "0a0cad5f19f718b83d4a52ebc12f3b691b245111e50403d2adfd46674bc73da8" dependencies = [ - "alloy-json-rpc 0.14.0", + "alloy-json-rpc 0.15.6", "alloy-pubsub", "alloy-transport", "bytes", @@ -1150,9 +1182,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5b241745076bcbf2fcad818f2c42203bd2c5f4b50ea43b628ccbd2147ad6" +checksum = "f48cc4f88d59463992251b89381760be901c4789a4721c657b832994331aff05" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -2048,7 +2080,7 @@ dependencies = [ "bitflags 2.9.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "lazycell", "log", @@ -7354,15 +7386,15 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "op-alloy-consensus" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f400404e37862bb974fbc3ad2d8ca2a2df286b718e762446496d04267ee912" +checksum = "74b855fc3db9e68b474d07aff91bbb8fec68a6d40816951dab1a311cfa45bc21" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "arbitrary", "derive_more 2.0.1", "serde", @@ -7378,14 +7410,14 @@ checksum = "4ef71f23a8caf6f2a2d5cafbdc44956d44e6014dcb9aa58abf7e4e6481c6ec34" [[package]] name = "op-alloy-network" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755dd4bac11264c082a46f928488f2be5efca629a09859890fea94631ab9ae37" +checksum = "24e2c02869c4d6f88c3092ac1c5005a790f73c800155e154acd7df67367764a5" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-network", "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-signer", "op-alloy-consensus", "op-alloy-rpc-types", @@ -7393,9 +7425,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6934aff7ad07f363d5cb1dbd553f64ce75fde80ea888c4097660fb8592566202" +checksum = "aff90f956e9fb44ea3c5a5d9ad825158cc47f2120a961096a5f27f55696906fb" dependencies = [ "alloy-primitives 1.0.0", "jsonrpsee 0.24.9", @@ -7403,16 +7435,16 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9c3d02ca72f67039ff8f1cdaa0792aea339dd35f504c28be7cad3b63af2534" +checksum = "c40c3922c70604dbd13bc96d97e2a7164b3dfaba5890d384c7f2d52e5650e142" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", - "alloy-network-primitives 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", + "alloy-network-primitives 0.15.6", "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "derive_more 2.0.1", "op-alloy-consensus", "serde", @@ -7421,16 +7453,16 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e614936d3f113b8e3dd2724382bd8db6700bd48fcd1f4d62bef537f3be8f710e" +checksum = "342ec2f01eaef60728e358f44325d53e157256557a08cff0157c5a506014224a" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "derive_more 2.0.1", "ethereum_ssz", "op-alloy-consensus", @@ -7443,8 +7475,8 @@ dependencies = [ name = "op-rbuilder" version = "0.1.0" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-network", "alloy-op-evm", "alloy-primitives 1.0.0", @@ -7452,8 +7484,8 @@ dependencies = [ "alloy-rpc-client", "alloy-rpc-types-beacon", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "alloy-transport", "alloy-transport-http", "async-trait", @@ -8646,7 +8678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.100", @@ -8984,12 +9016,12 @@ version = "0.1.0" dependencies = [ "ahash", "alloy-chains", - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", - "alloy-json-rpc 0.14.0", + "alloy-json-rpc 0.15.6", "alloy-network", - "alloy-network-primitives 0.14.0", + "alloy-network-primitives 0.15.6", "alloy-node-bindings", "alloy-primitives 1.0.0", "alloy-provider", @@ -8997,7 +9029,7 @@ dependencies = [ "alloy-rpc-types", "alloy-rpc-types-beacon", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-signer-local", "assert_matches", "async-trait", @@ -9273,11 +9305,13 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls 0.26.2", + "tokio-util", "tower 0.5.2", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots 0.26.8", "windows-registry", @@ -9295,53 +9329,33 @@ dependencies = [ [[package]] name = "reth" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", - "alloy-primitives 1.0.0", - "alloy-rlp", "alloy-rpc-types", "aquamarine", - "backon", "clap 4.5.36", "eyre", - "futures", - "reth-basic-payload-builder", "reth-chainspec", - "reth-cli", - "reth-cli-commands", "reth-cli-runner", "reth-cli-util", - "reth-config", "reth-consensus", "reth-consensus-common", "reth-db", - "reth-db-api", - "reth-downloaders", - "reth-errors", "reth-ethereum-cli", "reth-ethereum-payload-builder", "reth-ethereum-primitives", "reth-evm", - "reth-execution-types", - "reth-exex", - "reth-fs-util", "reth-network", "reth-network-api", - "reth-network-p2p", "reth-node-api", "reth-node-builder", "reth-node-core", "reth-node-ethereum", - "reth-node-events", "reth-node-metrics", "reth-payload-builder", "reth-payload-primitives", "reth-primitives", - "reth-primitives-traits", "reth-provider", - "reth-prune", "reth-ress-protocol", "reth-ress-provider", "reth-revm", @@ -9351,16 +9365,9 @@ dependencies = [ "reth-rpc-eth-types", "reth-rpc-server-types", "reth-rpc-types-compat", - "reth-stages", - "reth-static-file", "reth-tasks", "reth-tokio-util", - "reth-tracing", "reth-transaction-pool", - "reth-trie", - "reth-trie-db", - "serde_json", - "similar-asserts", "tokio", "tracing", ] @@ -9368,10 +9375,10 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "futures-core", "futures-util", @@ -9392,10 +9399,10 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-signer", "alloy-signer-local", @@ -9422,11 +9429,11 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-chains", - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", "alloy-genesis", "alloy-primitives 1.0.0", @@ -9442,7 +9449,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-genesis", "clap 4.5.36", @@ -9456,11 +9463,12 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "ahash", - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-chains", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "backon", @@ -9473,6 +9481,7 @@ dependencies = [ "human_bytes", "itertools 0.14.0", "ratatui", + "reqwest 0.12.15", "reth-chainspec", "reth-cli", "reth-cli-runner", @@ -9483,12 +9492,18 @@ dependencies = [ "reth-db", "reth-db-api", "reth-db-common", + "reth-discv4", + "reth-discv5", "reth-downloaders", "reth-ecies", + "reth-era-downloader", + "reth-era-utils", "reth-eth-wire", + "reth-etl", "reth-evm", "reth-exex", "reth-fs-util", + "reth-net-nat", "reth-network", "reth-network-p2p", "reth-network-peers", @@ -9509,6 +9524,7 @@ dependencies = [ "serde", "serde_json", "tokio", + "tokio-stream", "toml 0.8.20", "tracing", ] @@ -9516,7 +9532,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "reth-tasks", "tokio", @@ -9526,9 +9542,9 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "cfg-if", "eyre", @@ -9544,10 +9560,10 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-genesis", "alloy-primitives 1.0.0", "alloy-trie 0.8.1", @@ -9564,7 +9580,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "convert_case 0.7.1", "proc-macro2", @@ -9575,7 +9591,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "eyre", "humantime-serde", @@ -9589,9 +9605,9 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "auto_impl", "reth-execution-types", @@ -9602,10 +9618,10 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "reth-chainspec", "reth-consensus", "reth-primitives-traits", @@ -9614,10 +9630,11 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", + "alloy-json-rpc 0.15.6", "alloy-primitives 1.0.0", "alloy-provider", "alloy-rpc-types-engine", @@ -9637,7 +9654,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "derive_more 2.0.1", @@ -9663,9 +9680,9 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-genesis", "alloy-primitives 1.0.0", "arbitrary", @@ -9691,9 +9708,9 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-genesis", "alloy-primitives 1.0.0", "boyer-moore-magiclen", @@ -9720,9 +9737,9 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "arbitrary", "bytes", @@ -9735,7 +9752,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "alloy-rlp", @@ -9761,7 +9778,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "alloy-rlp", @@ -9785,7 +9802,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "data-encoding", @@ -9809,10 +9826,10 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "futures", @@ -9839,7 +9856,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "aes", "alloy-primitives 1.0.0", @@ -9870,9 +9887,9 @@ dependencies = [ [[package]] name = "reth-engine-local" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "eyre", @@ -9901,9 +9918,9 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "auto_impl", @@ -9925,7 +9942,7 @@ dependencies = [ [[package]] name = "reth-engine-service" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "futures", "pin-project", @@ -9948,10 +9965,10 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", "alloy-primitives 1.0.0", "alloy-rlp", @@ -9994,9 +10011,9 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-rpc-types-engine", "eyre", "futures", @@ -10018,10 +10035,61 @@ dependencies = [ "tracing", ] +[[package]] +name = "reth-era" +version = "1.3.12" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" +dependencies = [ + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", + "alloy-primitives 1.0.0", + "alloy-rlp", + "ethereum_ssz", + "ethereum_ssz_derive", + "reth-ethereum-primitives", + "snap", + "thiserror 2.0.12", +] + +[[package]] +name = "reth-era-downloader" +version = "1.3.12" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" +dependencies = [ + "alloy-primitives 1.0.0", + "bytes", + "eyre", + "futures-util", + "reqwest 0.12.15", + "reth-fs-util", + "sha2 0.10.8", + "tokio", +] + +[[package]] +name = "reth-era-utils" +version = "1.3.12" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" +dependencies = [ + "alloy-primitives 1.0.0", + "eyre", + "futures-util", + "reth-db-api", + "reth-era", + "reth-era-downloader", + "reth-etl", + "reth-fs-util", + "reth-primitives-traits", + "reth-provider", + "reth-storage-api", + "tokio", + "tracing", +] + [[package]] name = "reth-errors" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -10032,7 +10100,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-chains", "alloy-primitives 1.0.0", @@ -10060,11 +10128,11 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-chains", - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-hardforks", "alloy-primitives 1.0.0", "alloy-rlp", @@ -10081,20 +10149,69 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", + "alloy-primitives 1.0.0", + "alloy-rlp", + "alloy-rpc-types", + "backon", + "clap 4.5.36", "eyre", + "futures", + "reth-basic-payload-builder", "reth-chainspec", "reth-cli", + "reth-cli-commands", + "reth-cli-runner", + "reth-cli-util", + "reth-config", + "reth-consensus", + "reth-db", + "reth-db-api", + "reth-downloaders", + "reth-errors", + "reth-ethereum-payload-builder", + "reth-ethereum-primitives", + "reth-evm", + "reth-execution-types", + "reth-exex", + "reth-fs-util", + "reth-network", + "reth-network-api", + "reth-network-p2p", + "reth-node-api", + "reth-node-builder", + "reth-node-core", + "reth-node-ethereum", + "reth-node-events", + "reth-node-metrics", + "reth-payload-builder", + "reth-primitives-traits", + "reth-provider", + "reth-prune", + "reth-revm", + "reth-stages", + "reth-static-file", + "reth-tasks", + "reth-tracing", + "reth-transaction-pool", + "reth-trie", + "reth-trie-db", + "serde_json", + "similar-asserts", + "tokio", + "tracing", ] [[package]] name = "reth-ethereum-consensus" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "reth-chainspec", "reth-consensus", @@ -10107,9 +10224,9 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "alloy-rpc-types-engine", @@ -10124,7 +10241,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-eip2124 0.2.0", "alloy-hardforks", @@ -10137,10 +10254,10 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "reth-basic-payload-builder", @@ -10164,24 +10281,17 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", - "alloy-evm", - "alloy-network", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-rpc-types-eth 0.14.0", "arbitrary", - "derive_more 2.0.1", "modular-bitfield", - "rand 0.8.5", "reth-codecs", "reth-primitives-traits", "reth-zstd-compressors", - "revm-context", - "secp256k1", "serde", "serde_with", ] @@ -10189,7 +10299,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "rayon", "reth-db-api", @@ -10199,10 +10309,10 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", "alloy-primitives 1.0.0", "auto_impl", @@ -10225,10 +10335,10 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", "alloy-primitives 1.0.0", "reth-chainspec", @@ -10243,7 +10353,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-evm", "alloy-primitives 1.0.0", @@ -10256,10 +10366,10 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", "alloy-primitives 1.0.0", "derive_more 2.0.1", @@ -10274,10 +10384,10 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "eyre", "futures", @@ -10312,9 +10422,9 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "reth-chain-state", "reth-execution-types", @@ -10326,7 +10436,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "serde", "serde_json", @@ -10336,9 +10446,9 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "alloy-rpc-types-debug", @@ -10355,6 +10465,8 @@ dependencies = [ "reth-rpc-api", "reth-tracing", "reth-trie", + "revm-bytecode", + "revm-database", "serde", "serde_json", ] @@ -10362,7 +10474,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "async-trait", "bytes", @@ -10383,7 +10495,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "bitflags 2.9.0", "byteorder", @@ -10400,7 +10512,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "bindgen 0.70.1", "cc", @@ -10409,7 +10521,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "futures", "metrics", @@ -10421,7 +10533,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", ] @@ -10429,7 +10541,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "futures-util", "if-addrs", @@ -10443,10 +10555,10 @@ dependencies = [ [[package]] name = "reth-network" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "aquamarine", @@ -10498,7 +10610,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "alloy-rpc-types-admin", @@ -10521,15 +10633,14 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "auto_impl", "derive_more 2.0.1", "futures", - "parking_lot", "reth-consensus", "reth-eth-wire-types", "reth-ethereum-primitives", @@ -10544,7 +10655,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "alloy-rlp", @@ -10559,7 +10670,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-eip2124 0.2.0", "humantime-serde", @@ -10573,7 +10684,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "anyhow", "bincode", @@ -10590,7 +10701,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -10614,11 +10725,12 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", + "alloy-provider", "alloy-rpc-types", "alloy-rpc-types-engine", "aquamarine", @@ -10669,6 +10781,7 @@ dependencies = [ "reth-tracing", "reth-transaction-pool", "secp256k1", + "serde_json", "tokio", "tokio-stream", "tracing", @@ -10677,10 +10790,10 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "clap 4.5.36", @@ -10727,11 +10840,11 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "eyre", "reth-chainspec", "reth-consensus", @@ -10763,10 +10876,10 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "derive_more 2.0.1", @@ -10787,7 +10900,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "eyre", "http 1.3.1", @@ -10808,7 +10921,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "reth-chainspec", "reth-db-api", @@ -10821,32 +10934,37 @@ dependencies = [ [[package]] name = "reth-optimism-chainspec" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-chains", - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-genesis", "alloy-hardforks", "alloy-primitives 1.0.0", "derive_more 2.0.1", + "miniz_oxide", "op-alloy-rpc-types", + "paste", "reth-chainspec", "reth-ethereum-forks", "reth-network-peers", "reth-optimism-forks", "reth-optimism-primitives", "reth-primitives-traits", + "serde", "serde_json", + "tar-no-std", + "thiserror 2.0.12", ] [[package]] name = "reth-optimism-cli" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "clap 4.5.36", @@ -10890,10 +11008,10 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-trie 0.8.1", "op-alloy-consensus", @@ -10915,10 +11033,10 @@ dependencies = [ [[package]] name = "reth-optimism-evm" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-evm", "alloy-op-evm", "alloy-primitives 1.0.0", @@ -10940,7 +11058,7 @@ dependencies = [ [[package]] name = "reth-optimism-forks" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-op-hardforks", "alloy-primitives 1.0.0", @@ -10951,12 +11069,12 @@ dependencies = [ [[package]] name = "reth-optimism-node" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "clap 4.5.36", "eyre", "op-alloy-consensus", @@ -10996,10 +11114,10 @@ dependencies = [ [[package]] name = "reth-optimism-payload-builder" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "alloy-rpc-types-debug", @@ -11034,9 +11152,10 @@ dependencies = [ [[package]] name = "reth-optimism-primitives" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "arbitrary", @@ -11053,16 +11172,16 @@ dependencies = [ [[package]] name = "reth-optimism-rpc" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", - "alloy-json-rpc 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", + "alloy-json-rpc 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-client", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-transport", "alloy-transport-http", "async-trait", @@ -11110,15 +11229,15 @@ dependencies = [ [[package]] name = "reth-optimism-txpool" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", - "alloy-json-rpc 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", + "alloy-json-rpc 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-client", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "c-kzg", "derive_more 2.0.1", "futures-util", @@ -11145,9 +11264,9 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-rpc-types", "futures-util", "metrics", @@ -11165,7 +11284,7 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "pin-project", "reth-payload-primitives", @@ -11177,9 +11296,9 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "auto_impl", @@ -11196,9 +11315,9 @@ dependencies = [ [[package]] name = "reth-payload-util" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "reth-transaction-pool", ] @@ -11206,9 +11325,9 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-rpc-types-engine", "reth-primitives-traits", ] @@ -11216,9 +11335,9 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "c-kzg", "once_cell", "reth-ethereum-forks", @@ -11230,10 +11349,10 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-genesis", "alloy-primitives 1.0.0", "alloy-rlp", @@ -11263,13 +11382,12 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", - "auto_impl", "dashmap 6.1.0", "eyre", "itertools 0.14.0", @@ -11289,7 +11407,6 @@ dependencies = [ "reth-execution-types", "reth-fs-util", "reth-metrics", - "reth-network-p2p", "reth-nippy-jar", "reth-node-types", "reth-primitives-traits", @@ -11310,10 +11427,10 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "itertools 0.14.0", "metrics", @@ -11338,7 +11455,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "arbitrary", @@ -11371,9 +11488,9 @@ dependencies = [ [[package]] name = "reth-ress-protocol" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "futures", @@ -11390,9 +11507,9 @@ dependencies = [ [[package]] name = "reth-ress-provider" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "eyre", "futures", @@ -11416,7 +11533,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "reth-primitives-traits", @@ -11429,11 +11546,11 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-dyn-abi", - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-evm", "alloy-genesis", "alloy-network", @@ -11444,11 +11561,11 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "alloy-signer", "alloy-signer-local", "async-trait", @@ -11458,6 +11575,7 @@ dependencies = [ "http-body 1.0.1", "hyper 1.6.0", "jsonrpsee 0.24.9", + "jsonrpsee-types 0.24.9", "jsonwebtoken", "parking_lot", "pin-project", @@ -11501,11 +11619,11 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-genesis", - "alloy-json-rpc 0.14.0", + "alloy-json-rpc 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types", "alloy-rpc-types-admin", @@ -11513,11 +11631,11 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "jsonrpsee 0.24.9", "reth-engine-primitives", "reth-network-peers", @@ -11527,7 +11645,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-network", "alloy-provider", @@ -11564,9 +11682,9 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "async-trait", @@ -11595,18 +11713,18 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-dyn-abi", - "alloy-eips 0.14.0", - "alloy-json-rpc 0.14.0", + "alloy-eips 0.15.6", + "alloy-json-rpc 0.15.6", "alloy-network", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-rpc-types-mev", - "alloy-serde 0.14.0", + "alloy-serde 0.15.6", "async-trait", "auto_impl", "dyn-clone", @@ -11638,12 +11756,12 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-sol-types 1.0.0", "derive_more 2.0.1", "futures", @@ -11680,7 +11798,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-rpc-types-engine", "http 1.3.1", @@ -11694,9 +11812,9 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "jsonrpsee-core 0.24.9", @@ -11710,11 +11828,11 @@ dependencies = [ [[package]] name = "reth-rpc-types-compat" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "jsonrpsee-types 0.24.9", "reth-primitives-traits", "serde", @@ -11723,10 +11841,10 @@ dependencies = [ [[package]] name = "reth-stages" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "bincode", "blake3", @@ -11765,9 +11883,9 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "aquamarine", "auto_impl", @@ -11792,7 +11910,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "arbitrary", @@ -11806,7 +11924,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "parking_lot", @@ -11826,7 +11944,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "clap 4.5.36", @@ -11838,10 +11956,10 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rpc-types-engine", "auto_impl", @@ -11862,9 +11980,9 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-eips 0.14.0", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "derive_more 2.0.1", @@ -11878,7 +11996,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "auto_impl", "dyn-clone", @@ -11896,10 +12014,10 @@ dependencies = [ [[package]] name = "reth-testing-utils" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-genesis", "alloy-primitives 1.0.0", "rand 0.8.5", @@ -11912,7 +12030,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "tokio", "tokio-stream", @@ -11922,7 +12040,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "clap 4.5.36", "eyre", @@ -11937,10 +12055,10 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "aquamarine", @@ -11975,10 +12093,10 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", - "alloy-eips 0.14.0", + "alloy-consensus 0.15.6", + "alloy-eips 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", "alloy-trie 0.8.1", @@ -12000,13 +12118,13 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ - "alloy-consensus 0.14.0", + "alloy-consensus 0.15.6", "alloy-primitives 1.0.0", "alloy-rlp", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "alloy-trie 0.8.1", "arbitrary", "bytes", @@ -12026,7 +12144,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "reth-db-api", @@ -12039,7 +12157,7 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "alloy-rlp", @@ -12064,7 +12182,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "alloy-primitives 1.0.0", "alloy-rlp", @@ -12073,15 +12191,15 @@ dependencies = [ "reth-execution-errors", "reth-metrics", "reth-primitives-traits", - "reth-tracing", "reth-trie-common", "smallvec", + "tracing", ] [[package]] name = "reth-zstd-compressors" version = "1.3.12" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.3.12#6f8e7258f4733279080e4bd8345ce50538a40d6e" +source = "git+https://github.com/paradigmxyz/reth?rev=b93f4c6080e19d49af503fad15a19806647fde01#b93f4c6080e19d49af503fad15a19806647fde01" dependencies = [ "zstd 0.13.3", ] @@ -12211,12 +12329,12 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859fdfb2ef545140a68f44d02cfe5524964f9478896cd0c793f5948959818640" +checksum = "2a46e0edeec681bd33f8dc64d03e1bff1e331e7984459ffa6a2fa08675717469" dependencies = [ "alloy-primitives 1.0.0", - "alloy-rpc-types-eth 0.14.0", + "alloy-rpc-types-eth 0.15.6", "alloy-rpc-types-trace", "alloy-sol-types 1.0.0", "anstyle", @@ -12414,12 +12532,12 @@ dependencies = [ [[package]] name = "rollup-boost" version = "0.1.0" -source = "git+http://github.com/flashbots/rollup-boost?rev=60885346d4cf7f241de82790478195747433d472#60885346d4cf7f241de82790478195747433d472" +source = "git+http://github.com/flashbots/rollup-boost?rev=7a184c37f2a0ad1b3e24ab35687d57ead04d11ff#7a184c37f2a0ad1b3e24ab35687d57ead04d11ff" dependencies = [ "alloy-primitives 1.0.0", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.14.0", - "alloy-serde 0.14.0", + "alloy-rpc-types-eth 0.15.6", + "alloy-serde 0.15.6", "clap 4.5.36", "dotenv", "eyre", @@ -14020,6 +14138,18 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar-no-std" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b86f35512dae48782f49a15538f9af3e7ef3ea8226ee073c88f081958583924" +dependencies = [ + "bitflags 2.9.0", + "log", + "memchr", + "num-traits", +] + [[package]] name = "target-features" version = "0.1.6" @@ -14061,8 +14191,8 @@ name = "test-relay" version = "0.1.0" dependencies = [ "ahash", - "alloy-consensus 0.14.0", - "alloy-json-rpc 0.14.0", + "alloy-consensus 0.15.6", + "alloy-json-rpc 0.15.6", "alloy-primitives 1.0.0", "alloy-provider", "clap 4.5.36", diff --git a/Cargo.toml b/Cargo.toml index be0287c59..c42c295f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace.package] version = "0.1.0" edition = "2021" -rust-version = "1.85" +rust-version = "1.86" license = "MIT OR Apache-2.0" homepage = "https://github.com/flashbots/rbuilder" repository = "https://github.com/flashbots/rbuilder" @@ -48,50 +48,50 @@ codegen-units = 1 incremental = false [workspace.dependencies] -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12", features = [ +reth = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-db-common = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01", features = [ "test-utils", ] } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-payload-util = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } # reth optimism -reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } -reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" } +reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } +reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" } # compatible with reth "v1.3.12 dependencies revm = { version = "22.0.1", features = [ @@ -99,7 +99,7 @@ revm = { version = "22.0.1", features = [ "secp256k1", "optional_balance_check", ], default-features = false } -revm-inspectors = { version = "0.19.0", default-features = false } +revm-inspectors = { version = "0.20.0", default-features = false } op-revm = { version = "3.0.2", default-features = false } ethereum_ssz_derive = "0.9.0" @@ -108,34 +108,34 @@ ethereum_ssz = "0.9.0" alloy-primitives = { version = "1.0.0", default-features = false } alloy-rlp = "0.3.10" alloy-chains = "0.2.0" -alloy-evm = { version = "0.5.0", default-features = false } -alloy-provider = { version = "0.14.0", features = ["ipc", "pubsub"] } -alloy-pubsub = { version = "0.14.0" } -alloy-eips = { version = "0.14.0" } -alloy-rpc-types = { version = "0.14.0" } -alloy-json-rpc = { version = "0.14.0" } -alloy-transport-http = { version = "0.14.0" } -alloy-network = { version = "0.14.0" } -alloy-network-primitives = { version = "0.14.0" } -alloy-transport = { version = "0.14.0" } -alloy-node-bindings = { version = "0.14.0" } -alloy-consensus = { version = "0.14.0", features = ["kzg"] } -alloy-serde = { version = "0.14.0" } -alloy-rpc-types-beacon = { version = "0.14.0", features = ["ssz"] } -alloy-rpc-types-engine = { version = "0.14.0", features = ["ssz"] } -alloy-rpc-types-eth = { version = "0.14.0" } -alloy-signer-local = { version = "0.14.0" } -alloy-rpc-client = { version = "0.14.0" } -alloy-genesis = { version = "0.14.0" } +alloy-evm = { version = "0.6.0", default-features = false } +alloy-provider = { version = "0.15.5", features = ["ipc", "pubsub"] } +alloy-pubsub = { version = "0.15.5" } +alloy-eips = { version = "0.15.5" } +alloy-rpc-types = { version = "0.15.5" } +alloy-json-rpc = { version = "0.15.5" } +alloy-transport-http = { version = "0.15.5" } +alloy-network = { version = "0.15.5" } +alloy-network-primitives = { version = "0.15.5" } +alloy-transport = { version = "0.15.5" } +alloy-node-bindings = { version = "0.15.5" } +alloy-consensus = { version = "0.15.5", features = ["kzg"] } +alloy-serde = { version = "0.15.5" } +alloy-rpc-types-beacon = { version = "0.15.5", features = ["ssz"] } +alloy-rpc-types-engine = { version = "0.15.5", features = ["ssz"] } +alloy-rpc-types-eth = { version = "0.15.5" } +alloy-signer-local = { version = "0.15.5" } +alloy-rpc-client = { version = "0.15.5" } +alloy-genesis = { version = "0.15.5" } alloy-trie = { version = "0.8.1" } # optimism -alloy-op-evm = { version = "0.5.0", default-features = false } -op-alloy-rpc-types = { version = "0.14.1", default-features = false } -op-alloy-rpc-types-engine = { version = "0.14.1", default-features = false } -op-alloy-rpc-jsonrpsee = { version = "0.14.1", default-features = false } -op-alloy-network = { version = "0.14.1", default-features = false } -op-alloy-consensus = { version = "0.14.1", default-features = false } +alloy-op-evm = { version = "0.6.0", default-features = false } +op-alloy-rpc-types = { version = "0.15.0", default-features = false } +op-alloy-rpc-types-engine = { version = "0.15.0", default-features = false } +op-alloy-rpc-jsonrpsee = { version = "0.15.0", default-features = false } +op-alloy-network = { version = "0.15.0", default-features = false } +op-alloy-consensus = { version = "0.15.0", default-features = false } async-trait = { version = "0.1.83" } clap = { version = "4.4.3", features = ["derive", "env"] } diff --git a/Dockerfile b/Dockerfile index 131a69526..a87c7ca20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG FEATURES ARG RBUILDER_BIN="rbuilder" -FROM rust:1.85 AS base +FROM rust:1.86 AS base ARG TARGETPLATFORM RUN apt-get update \ diff --git a/Dockerfile.op-rbuilder b/Dockerfile.op-rbuilder index e907708b0..2280277e2 100644 --- a/Dockerfile.op-rbuilder +++ b/Dockerfile.op-rbuilder @@ -9,7 +9,7 @@ ARG FEATURES ARG RBUILDER_BIN="op-rbuilder" -FROM rust:1.85 AS base +FROM rust:1.86 AS base ARG TARGETPLATFORM RUN apt-get update \ diff --git a/crates/op-rbuilder/Cargo.toml b/crates/op-rbuilder/Cargo.toml index 2159c04ea..e5e61924f 100644 --- a/crates/op-rbuilder/Cargo.toml +++ b/crates/op-rbuilder/Cargo.toml @@ -89,7 +89,7 @@ rand = "0.9.0" tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] } # `flashblocks` branch -rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "60885346d4cf7f241de82790478195747433d472" } +rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "7a184c37f2a0ad1b3e24ab35687d57ead04d11ff" } [target.'cfg(unix)'.dependencies] tikv-jemallocator = { version = "0.6", optional = true } @@ -115,7 +115,9 @@ min-info-logs = ["tracing/release_max_level_info"] min-debug-logs = ["tracing/release_max_level_debug"] min-trace-logs = ["tracing/release_max_level_trace"] -integration = [] +integration = [ + "alloy-provider/txpool-api" +] flashblocks = [] [[bin]] diff --git a/crates/op-rbuilder/src/integration/integration_test.rs b/crates/op-rbuilder/src/integration/integration_test.rs index 187d49a21..b5caac0bd 100644 --- a/crates/op-rbuilder/src/integration/integration_test.rs +++ b/crates/op-rbuilder/src/integration/integration_test.rs @@ -8,11 +8,11 @@ mod tests { use alloy_consensus::{Transaction, TxEip1559}; use alloy_eips::{eip1559::MIN_PROTOCOL_BASE_FEE, eip2718::Encodable2718}; use alloy_primitives::hex; - use alloy_provider::{Identity, Provider, ProviderBuilder}; + use alloy_provider::{ext::TxPoolApi, Identity, Provider, ProviderBuilder}; use alloy_rpc_types_eth::BlockTransactionsKind; use futures_util::StreamExt; use op_alloy_consensus::OpTypedTransaction; - use op_alloy_network::Optimism; + use op_alloy_network::{Optimism, TransactionResponse}; use std::{ cmp::max, path::PathBuf, @@ -22,9 +22,14 @@ mod tests { use tokio_tungstenite::connect_async; use uuid::Uuid; + /// Key used by builder const BUILDER_PRIVATE_KEY: &str = "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"; + /// Key used in tests, so builder txs won't affect them + const CUSTOM_PRIVATE_KEY: &str = + "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"; + #[tokio::test] #[cfg(not(feature = "flashblocks"))] async fn integration_test_chain_produces_blocks() -> eyre::Result<()> { @@ -70,7 +75,7 @@ mod tests { generator.init().await?; let provider = ProviderBuilder::::default() - .on_http("http://localhost:1238".parse()?); + .connect_http("http://localhost:1238".parse()?); for _ in 0..10 { let block_hash = generator.generate_block().await?; @@ -97,6 +102,7 @@ mod tests { Ok(()) } + /// Caution: this test could be brittle to change because of queued pool checks #[tokio::test] #[cfg(not(feature = "flashblocks"))] async fn integration_test_revert_protection() -> eyre::Result<()> { @@ -142,68 +148,135 @@ mod tests { let latest_block = generator.init().await?; let provider = ProviderBuilder::::default() - .on_http("http://localhost:1248".parse()?); + .connect_http("http://localhost:1248".parse()?); let mut base_fee = max( latest_block.header.base_fee_per_gas.unwrap(), MIN_PROTOCOL_BASE_FEE, ); for _ in 0..10 { + // We check queued pool to see if it already has tx we sent earlier + // We do this in the beginning, because once we insert valid tx the queued tx would move + // to pending pool, because nonce gap would be fixed. + let mut queued_hash = None; + let mut pool_content = provider.txpool_content().await?; + if !pool_content.queued.is_empty() { + // We are on the non-first, so we have 1 tx in queue pool + assert_eq!( + pool_content.queued.len(), + 1, + "Queued pool should contain only 1 transaction" + ); + queued_hash = Some( + pool_content + .queued + .pop_first() + .unwrap() + .1 + .pop_first() + .unwrap() + .1 + .tx_hash(), + ); + } + + let known_wallet = Signer::try_from_secret(CUSTOM_PRIVATE_KEY.parse()?)?; // Get builder's address - let known_wallet = Signer::try_from_secret(BUILDER_PRIVATE_KEY.parse()?)?; - let builder_address = known_wallet.address; + let custom_address = known_wallet.address; // Get current nonce from chain - let nonce = provider.get_transaction_count(builder_address).await?; - // Transaction from builder should succeed - let tx_request = OpTypedTransaction::Eip1559(TxEip1559 { - chain_id: 901, - nonce, - gas_limit: 210000, - max_fee_per_gas: base_fee.into(), - ..Default::default() - }); - let signed_tx = known_wallet.sign_tx(tx_request)?; - let known_tx = provider - .send_raw_transaction(signed_tx.encoded_2718().as_slice()) - .await?; - - // Create a reverting transaction - let tx_request = OpTypedTransaction::Eip1559(TxEip1559 { - chain_id: 901, - nonce: nonce + 1, - gas_limit: 300000, - max_fee_per_gas: base_fee.into(), - input: hex!("60006000fd").into(), // PUSH1 0x00 PUSH1 0x00 REVERT - ..Default::default() - }); - let signed_tx = known_wallet.sign_tx(tx_request)?; - let reverting_tx = provider - .send_raw_transaction(signed_tx.encoded_2718().as_slice()) - .await?; + let nonce = provider.get_transaction_count(custom_address).await?; + + // Send valid tx that must be included in the block + let valid_tx = { + let tx_request = OpTypedTransaction::Eip1559(TxEip1559 { + chain_id: 901, + nonce, + gas_limit: 210000, + max_fee_per_gas: base_fee.into(), + ..Default::default() + }); + let signed_tx = known_wallet.sign_tx(tx_request)?; + let known_tx = provider + .send_raw_transaction(signed_tx.encoded_2718().as_slice()) + .await?; + known_tx.tx_hash().to_owned() + }; + + // If we don't have reverting tx in the queued pool we send one. This send occurs only + // on first cycle iteration + let revert_tx_1 = if queued_hash.is_none() { + // Reverting tx that would be removed + let tx_request = OpTypedTransaction::Eip1559(TxEip1559 { + chain_id: 901, + nonce: nonce + 1, + gas_limit: 300000, + max_fee_per_gas: base_fee.into(), + input: hex!("60006000fd").into(), // PUSH1 0x00 PUSH1 0x00 REVERT + ..Default::default() + }); + let signed_tx = known_wallet.sign_tx(tx_request)?; + let reverting_tx = provider + .send_raw_transaction(signed_tx.encoded_2718().as_slice()) + .await?; + reverting_tx.tx_hash().to_owned() + } else { + queued_hash.unwrap() + }; + + // We send second reverting tx + let revert_tx_2 = { + // Reverting tx that would be places in queue pool, then it would be placed in the + // pending pool in the next interation (after the nonce gap is fixed be sending + // valid tx) and removed + let tx_request = OpTypedTransaction::Eip1559(TxEip1559 { + chain_id: 901, + nonce: nonce + 2, + gas_limit: 300000, + max_fee_per_gas: base_fee.into(), + input: hex!("60006000fd").into(), // PUSH1 0x00 PUSH1 0x00 REVERT + ..Default::default() + }); + let signed_tx = known_wallet.sign_tx(tx_request)?; + let reverting_tx_2 = provider + .send_raw_transaction(signed_tx.encoded_2718().as_slice()) + .await?; + reverting_tx_2.tx_hash().to_owned() + }; + + // All txs should be in pending pool. + // 2 cases: + // - we sent all 3 txs + // - we sent 2 txs and one got promoted from queue pool + let pool = provider.txpool_status().await?; + assert_eq!(pool.pending, 3, "all txs should be in pending pool"); + assert_eq!(pool.queued, 0, "queued pool should be empty"); let block_hash = generator.generate_block().await?; + // After block is produced we will remove one of the reverting txs and place another + // in queue pool because we have nonce gap + let pool = provider.txpool_status().await?; + assert_eq!(pool.pending, 0, "pending pool should be empty"); + assert_eq!(pool.queued, 1, "queued pool should contain 1 tx"); + // query the block and the transactions inside the block let block = provider .get_block_by_hash(block_hash) .await? .expect("block"); - // Verify known transaction is included + // Verify valid transaction is included assert!( - block - .transactions - .hashes() - .any(|hash| hash == *known_tx.tx_hash()), + block.transactions.hashes().any(|hash| hash == *valid_tx), "successful transaction missing from block" ); - // Verify reverted transaction is NOT included + // Verify reverting transactions are NOT included assert!( !block .transactions .hashes() - .any(|hash| hash == *reverting_tx.tx_hash()), + .any(|hash| hash == *revert_tx_1 || hash == *revert_tx_2), "reverted transaction unexpectedly included in block" ); for hash in block.transactions.hashes() { @@ -267,7 +340,7 @@ mod tests { let latest_block = generator.init().await?; let provider = ProviderBuilder::::default() - .on_http("http://localhost:1268".parse()?); + .connect_http("http://localhost:1268".parse()?); let base_fee = max( latest_block.header.base_fee_per_gas.unwrap(), @@ -414,7 +487,7 @@ mod tests { generator.init().await?; let provider = ProviderBuilder::::default() - .on_http("http://localhost:1238".parse()?); + .connect_http("http://localhost:1238".parse()?); for _ in 0..10 { let block_hash = generator.generate_block().await?; diff --git a/crates/op-rbuilder/src/integration/op_rbuilder.rs b/crates/op-rbuilder/src/integration/op_rbuilder.rs index 28f9532da..3a9526ca0 100644 --- a/crates/op-rbuilder/src/integration/op_rbuilder.rs +++ b/crates/op-rbuilder/src/integration/op_rbuilder.rs @@ -122,7 +122,9 @@ impl Service for OpRbuilderConfig { if let Some(http_port) = self.http_port { cmd.arg("--http") .arg("--http.port") - .arg(http_port.to_string()); + .arg(http_port.to_string()) + .arg("--http.api") + .arg("txpool,eth,debug,admin"); } if let Some(flashblocks_ws_url) = &self.flashblocks_ws_url { diff --git a/crates/op-rbuilder/src/payload_builder.rs b/crates/op-rbuilder/src/payload_builder.rs index a0ba9cfef..10af74705 100644 --- a/crates/op-rbuilder/src/payload_builder.rs +++ b/crates/op-rbuilder/src/payload_builder.rs @@ -31,7 +31,7 @@ use reth_evm::{ Database, Evm, EvmError, InvalidTxError, }; use reth_execution_types::ExecutionOutcome; -use reth_node_api::{NodePrimitives, NodeTypes, TxTy}; +use reth_node_api::{NodePrimitives, NodeTypes, PrimitivesTy, TxTy}; use reth_optimism_chainspec::OpChainSpec; use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus}; use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes}; @@ -117,7 +117,7 @@ impl CustomOpPayloadBuilder { } } -impl PayloadBuilderBuilder for CustomOpPayloadBuilder +impl PayloadBuilderBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -129,6 +129,10 @@ where Pool: TransactionPool>> + Unpin + 'static, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { type PayloadBuilder = OpPayloadBuilder; @@ -136,6 +140,7 @@ where self, ctx: &BuilderContext, pool: Pool, + _evm_config: Evm, ) -> eyre::Result { Ok(OpPayloadBuilder::new( OpEvmConfig::optimism(ctx.chain_spec()), @@ -148,7 +153,7 @@ where } } -impl PayloadServiceBuilder for CustomOpPayloadBuilder +impl PayloadServiceBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -161,14 +166,19 @@ where + Unpin + 'static, ::Transaction: OpPooledTx, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { async fn spawn_payload_builder_service( self, ctx: &BuilderContext, pool: Pool, + evm_config: Evm, ) -> eyre::Result::Payload>> { tracing::info!("Spawning a custom payload builder"); - let payload_builder = self.build_payload_builder(ctx, pool).await?; + let payload_builder = self.build_payload_builder(ctx, pool, evm_config).await?; let payload_job_config = BasicPayloadJobGeneratorConfig::default(); let payload_generator = BlockPayloadJobGenerator::with_builder( diff --git a/crates/op-rbuilder/src/payload_builder_vanilla.rs b/crates/op-rbuilder/src/payload_builder_vanilla.rs index 3dcb0c17f..dcdae0ccf 100644 --- a/crates/op-rbuilder/src/payload_builder_vanilla.rs +++ b/crates/op-rbuilder/src/payload_builder_vanilla.rs @@ -34,7 +34,7 @@ use reth_evm::{ Database, Evm, EvmError, InvalidTxError, }; use reth_execution_types::ExecutionOutcome; -use reth_node_api::{NodePrimitives, NodeTypes, TxTy}; +use reth_node_api::{NodePrimitives, NodeTypes, PrimitivesTy, TxTy}; use reth_optimism_chainspec::OpChainSpec; use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus}; use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes}; @@ -111,7 +111,7 @@ impl CustomOpPayloadBuilder { } } -impl PayloadBuilderBuilder for CustomOpPayloadBuilder +impl PayloadBuilderBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -124,6 +124,10 @@ where + Unpin + 'static, ::Transaction: OpPooledTx, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { type PayloadBuilder = OpPayloadBuilderVanilla; @@ -131,6 +135,7 @@ where self, ctx: &BuilderContext, pool: Pool, + _evm_config: Evm, ) -> eyre::Result { Ok(OpPayloadBuilderVanilla::new( OpEvmConfig::optimism(ctx.chain_spec()), @@ -141,7 +146,7 @@ where } } -impl PayloadServiceBuilder for CustomOpPayloadBuilder +impl PayloadServiceBuilder for CustomOpPayloadBuilder where Node: FullNodeTypes< Types: NodeTypes< @@ -154,14 +159,19 @@ where + Unpin + 'static, ::Transaction: OpPooledTx, + Evm: ConfigureEvm< + Primitives = PrimitivesTy, + NextBlockEnvCtx = OpNextBlockEnvAttributes, + > + 'static, { async fn spawn_payload_builder_service( self, ctx: &BuilderContext, pool: Pool, + evm_config: Evm, ) -> eyre::Result::Payload>> { tracing::info!("Spawning a custom payload builder"); - let payload_builder = self.build_payload_builder(ctx, pool).await?; + let payload_builder = self.build_payload_builder(ctx, pool, evm_config).await?; let payload_job_config = BasicPayloadJobGeneratorConfig::default(); let payload_generator = BlockPayloadJobGenerator::with_builder( diff --git a/crates/rbuilder/benches/benchmarks/txpool_fetcher.rs b/crates/rbuilder/benches/benchmarks/txpool_fetcher.rs index ab5559fcf..cdff5e6ca 100644 --- a/crates/rbuilder/benches/benchmarks/txpool_fetcher.rs +++ b/crates/rbuilder/benches/benchmarks/txpool_fetcher.rs @@ -32,7 +32,7 @@ async fn txpool_receive_util(count: u32) { let provider = ProviderBuilder::new() .wallet(wallet) - .on_http(anvil.endpoint().parse().unwrap()); + .connect_http(anvil.endpoint().parse().unwrap()); let alice = anvil.addresses()[0]; let eip1559_est = provider.estimate_eip1559_fees().await.unwrap(); diff --git a/crates/rbuilder/src/building/block_orders/prioritized_order_store.rs b/crates/rbuilder/src/building/block_orders/prioritized_order_store.rs index 91c5e45a6..4950f3028 100644 --- a/crates/rbuilder/src/building/block_orders/prioritized_order_store.rs +++ b/crates/rbuilder/src/building/block_orders/prioritized_order_store.rs @@ -16,11 +16,11 @@ use super::{OrderPriority, SimulatedOrderSink}; /// Order must implement BlockOrdersOrder which has priority(). This priority is used to sort the simulated orders. /// Usage: /// - Add new order (a little bit complex): -/// ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order -/// call insert_order +/// ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order +/// call insert_order /// - Get best order to execute -/// call pop_order to get the best order -/// if the order is executed call update_onchain_nonces to update all the changed nonces. +/// call pop_order to get the best order +/// if the order is executed call update_onchain_nonces to update all the changed nonces. /// - Remove orders: remove_orders. This is useful if we think this orders are no really good (failed to execute to often) #[derive(Debug, Clone)] pub struct PrioritizedOrderStore { diff --git a/crates/rbuilder/src/building/builders/block_building_helper.rs b/crates/rbuilder/src/building/builders/block_building_helper.rs index 294a14fa1..09ed8d431 100644 --- a/crates/rbuilder/src/building/builders/block_building_helper.rs +++ b/crates/rbuilder/src/building/builders/block_building_helper.rs @@ -59,7 +59,7 @@ pub trait BlockBuildingHelper: Send + Sync { /// Eats the BlockBuildingHelper since once it's finished you should not use it anymore. /// payout_tx_value: If Some, added at the end of the block from coinbase to the final fee recipient. - /// This only works if can_add_payout_tx. + /// This only works if can_add_payout_tx. fn finalize_block( self: Box, local_ctx: &mut ThreadBlockBuildingContext, diff --git a/crates/rbuilder/src/building/builders/ordering_builder.rs b/crates/rbuilder/src/building/builders/ordering_builder.rs index 0867a51c6..957877900 100644 --- a/crates/rbuilder/src/building/builders/ordering_builder.rs +++ b/crates/rbuilder/src/building/builders/ordering_builder.rs @@ -222,7 +222,7 @@ impl OrderingBuilderContext { } /// use_suggested_fee_recipient_as_coinbase: all the mev profit goes directly to the slot suggested_fee_recipient so we avoid the payout tx. - /// This mode disables mev-share orders since the builder has to receive the mev profit to give some portion back to the mev-share user. + /// This mode disables mev-share orders since the builder has to receive the mev profit to give some portion back to the mev-share user. /// !use_suggested_fee_recipient_as_coinbase: all the mev profit goes to the builder and at the end of the block we pay to the suggested_fee_recipient. pub fn build_block( &mut self, diff --git a/crates/rbuilder/src/building/builders/parallel_builder/conflict_resolvers.rs b/crates/rbuilder/src/building/builders/parallel_builder/conflict_resolvers.rs index c912f0321..5104d8bb7 100644 --- a/crates/rbuilder/src/building/builders/parallel_builder/conflict_resolvers.rs +++ b/crates/rbuilder/src/building/builders/parallel_builder/conflict_resolvers.rs @@ -491,7 +491,7 @@ mod tests { ..Default::default() }; Recovered::new_unchecked( - TransactionSigned::new( + TransactionSigned::new_unchecked( Transaction::Legacy(tx_legacy), alloy_primitives::Signature::test_signature(), self.create_hash(), diff --git a/crates/rbuilder/src/building/builders/parallel_builder/conflict_task_generator.rs b/crates/rbuilder/src/building/builders/parallel_builder/conflict_task_generator.rs index 982021069..1d7c9fc35 100644 --- a/crates/rbuilder/src/building/builders/parallel_builder/conflict_task_generator.rs +++ b/crates/rbuilder/src/building/builders/parallel_builder/conflict_task_generator.rs @@ -65,7 +65,7 @@ impl ConflictTaskGenerator { self.add_processed_groups(&new_group, &mut processed_groups); // Remove all subset groups - if new_group.conflicting_group_ids.len() > 0 { + if !new_group.conflicting_group_ids.is_empty() { self.remove_conflicting_subset_groups(&new_group); } } @@ -437,7 +437,7 @@ mod tests { pub fn create_tx(&mut self) -> Recovered { Recovered::new_unchecked( - TransactionSigned::new( + TransactionSigned::new_unchecked( Transaction::Legacy(TxLegacy::default()), alloy_primitives::Signature::test_signature(), self.create_hash(), diff --git a/crates/rbuilder/src/building/builders/parallel_builder/groups.rs b/crates/rbuilder/src/building/builders/parallel_builder/groups.rs index 40272d3bc..2782ce226 100644 --- a/crates/rbuilder/src/building/builders/parallel_builder/groups.rs +++ b/crates/rbuilder/src/building/builders/parallel_builder/groups.rs @@ -428,7 +428,7 @@ mod tests { pub fn create_tx(&mut self) -> Recovered { Recovered::new_unchecked( - TransactionSigned::new( + TransactionSigned::new_unchecked( Transaction::Legacy(TxLegacy::default()), alloy_primitives::Signature::test_signature(), self.create_hash(), diff --git a/crates/rbuilder/src/building/mod.rs b/crates/rbuilder/src/building/mod.rs index b199e08b4..d8162f832 100644 --- a/crates/rbuilder/src/building/mod.rs +++ b/crates/rbuilder/src/building/mod.rs @@ -536,8 +536,8 @@ impl PartialBlock { } /// result_filter: little hack to allow "cancel" the execution depending no the SimValue result. Ideally it would be nicer to split commit_order - /// in 2 parts, one that executes but does not apply (returns state changes) and then another one that applies the changes. - /// You can always pass &|_| Ok(()) if you don't need the filter. + /// in 2 parts, one that executes but does not apply (returns state changes) and then another one that applies the changes. + /// You can always pass &|_| Ok(()) if you don't need the filter. pub fn commit_order( &mut self, order: &SimulatedOrder, diff --git a/crates/rbuilder/src/integration/simple.rs b/crates/rbuilder/src/integration/simple.rs index b9a11ec55..f2029bf85 100644 --- a/crates/rbuilder/src/integration/simple.rs +++ b/crates/rbuilder/src/integration/simple.rs @@ -19,11 +19,11 @@ mod tests { to: Option, ) -> eyre::Result { let rbuilder_provider = - ProviderBuilder::new().on_http(Url::parse(srv.rbuilder_rpc_url()).unwrap()); + ProviderBuilder::new().connect_http(Url::parse(srv.rbuilder_rpc_url()).unwrap()); let provider = ProviderBuilder::new() .wallet(private_key) - .on_http(Url::parse(srv.el_url()).unwrap()); + .connect_http(Url::parse(srv.el_url()).unwrap()); let gas_price = provider.get_gas_price().await?; @@ -59,7 +59,7 @@ mod tests { .unwrap(); // Wait for receipt - let binding = ProviderBuilder::new().on_http(Url::parse(srv.el_url()).unwrap()); + let binding = ProviderBuilder::new().connect_http(Url::parse(srv.el_url()).unwrap()); let pending_tx = PendingTransactionBuilder::new(binding.root().clone(), tx_hash) .with_timeout(Some(std::time::Duration::from_secs(60))); diff --git a/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs b/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs index 78d2711dd..255c4ead7 100644 --- a/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs +++ b/crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs @@ -31,11 +31,11 @@ pub async fn subscribe_to_txpool_with_blobs( let provider = match mempool { MempoolSource::Ipc(path) => { let ipc = IpcConnect::new(path); - ProviderBuilder::new().on_ipc(ipc).await? + ProviderBuilder::new().connect_ipc(ipc).await? } MempoolSource::Ws(url) => { let ws_conn = alloy_provider::WsConnect::new(url); - ProviderBuilder::new().on_ws(ws_conn).await? + ProviderBuilder::new().connect_ws(ws_conn).await? } }; @@ -150,7 +150,7 @@ mod test { let provider = ProviderBuilder::new() .wallet(wallet) - .on_http(anvil.endpoint().parse().unwrap()); + .connect_http(anvil.endpoint().parse().unwrap()); let alice = anvil.addresses()[0]; diff --git a/crates/rbuilder/src/primitives/mod.rs b/crates/rbuilder/src/primitives/mod.rs index 2ab3fa9bb..8fe4bfc02 100644 --- a/crates/rbuilder/src/primitives/mod.rs +++ b/crates/rbuilder/src/primitives/mod.rs @@ -702,10 +702,10 @@ impl TransactionSignedEcRecoveredWithBlobs { metadata: Option, ) -> Result { // Check for an eip4844 tx passed without blobs - if tx.transaction().blob_versioned_hashes().is_some() && blob_sidecar.is_none() { + if tx.inner().blob_versioned_hashes().is_some() && blob_sidecar.is_none() { Err(TxWithBlobsCreateError::Eip4844MissingBlobSidecar) // Check for a non-eip4844 tx passed with blobs - } else if blob_sidecar.is_some() && tx.transaction().blob_versioned_hashes().is_none() { + } else if blob_sidecar.is_some() && tx.inner().blob_versioned_hashes().is_none() { Err(TxWithBlobsCreateError::BlobsMissingEip4844) // Groovy! } else { @@ -812,8 +812,11 @@ impl TransactionSignedEcRecoveredWithBlobs { PooledTransaction::Eip4844(blob_tx) => { let (blob_tx, signature, hash) = blob_tx.into_parts(); let (blob_tx, sidecar) = blob_tx.into_parts(); - let tx_signed = - TransactionSigned::new(Transaction::Eip4844(blob_tx), signature, hash); + let tx_signed = TransactionSigned::new_unchecked( + Transaction::Eip4844(blob_tx), + signature, + hash, + ); Ok(TransactionSignedEcRecoveredWithBlobs { tx: tx_signed.with_signer(signer), blobs_sidecar: Arc::new(sidecar), @@ -1239,7 +1242,7 @@ mod tests { fn can_execute_single_optional_tx() { let needed_base_gas: u128 = 100000; let tx = Recovered::new_unchecked( - TransactionSigned::new( + TransactionSigned::new_unchecked( Transaction::Legacy(TxLegacy { gas_price: needed_base_gas, ..Default::default() diff --git a/crates/rbuilder/src/primitives/test_data_generator.rs b/crates/rbuilder/src/primitives/test_data_generator.rs index fbc6bc3b9..21ecc0517 100644 --- a/crates/rbuilder/src/primitives/test_data_generator.rs +++ b/crates/rbuilder/src/primitives/test_data_generator.rs @@ -22,7 +22,7 @@ impl TestDataGenerator { pub fn create_tx_nonce(&mut self, sender_nonce: AccountNonce) -> Recovered { Recovered::new_unchecked( - TransactionSigned::new( + TransactionSigned::new_unchecked( Transaction::Legacy(TxLegacy { nonce: sender_nonce.nonce, ..TxLegacy::default() diff --git a/crates/rbuilder/src/telemetry/servers/mod.rs b/crates/rbuilder/src/telemetry/servers/mod.rs index 94665cfda..16ed23a2a 100644 --- a/crates/rbuilder/src/telemetry/servers/mod.rs +++ b/crates/rbuilder/src/telemetry/servers/mod.rs @@ -1,9 +1,9 @@ //! Telemetry contains two servers. //! //! - [full]: verbose server exposing detailed operational information about the -//! builder. +//! builder. //! - [redacted]: deliberately redacted server serves information suitable for -//! tdx builders to expose in real-time. +//! tdx builders to expose in real-time. //! //! The redacted server is seperate from the debug server because it may be desirable //! to expose debug and redacted data differently in tdx builders. e.g. redacted data diff --git a/crates/rbuilder/src/utils/test_utils.rs b/crates/rbuilder/src/utils/test_utils.rs index 5cf3e7880..06d019292 100644 --- a/crates/rbuilder/src/utils/test_utils.rs +++ b/crates/rbuilder/src/utils/test_utils.rs @@ -24,7 +24,7 @@ pub fn i256(i: i64) -> I256 { pub fn tx(tx_hash: u64) -> TransactionSignedEcRecoveredWithBlobs { TransactionSignedEcRecoveredWithBlobs::new_for_testing(Recovered::new_unchecked( - TransactionSigned::new( + TransactionSigned::new_unchecked( Transaction::Legacy(Default::default()), Signature::test_signature(), hash(tx_hash), diff --git a/crates/rbuilder/src/utils/tx_signer.rs b/crates/rbuilder/src/utils/tx_signer.rs index 7e1cbd0e5..ea11eed59 100644 --- a/crates/rbuilder/src/utils/tx_signer.rs +++ b/crates/rbuilder/src/utils/tx_signer.rs @@ -52,7 +52,7 @@ mod test { use super::*; use alloy_consensus::TxEip1559; use alloy_primitives::{address, fixed_bytes, TxKind as TransactionKind}; - use reth_node_core::primitives::SignedTransaction; + #[test] fn test_sign_transaction() { let secret = diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b475f2f91..d09294494 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.85.0" +channel = "1.86.0" components = ["rustfmt", "clippy"]