diff --git a/Cargo.lock b/Cargo.lock index 92b089a0eafd..d7540dc437c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a101d4d016f47f13890a74290fdd17b05dd175191d9337bc600791fb96e4dea8" +checksum = "8ba14856660f31807ebb26ce8f667e814c72694e1077e97ef102e326ad580f3f" dependencies = [ "alloy-eips", "alloy-primitives", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60357dda9a3d0f738f18844bd6d0f4a5924cc5cf00bfad2ff1369897966123" +checksum = "28666307e76441e7af37a2b90cde7391c28112121bea59f4e0d804df8b20057e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2869e4fb31331d3b8c58c7db567d1e4e4e94ef64640beda3b6dd9b7045690941" +checksum = "f3510769905590b8991a8e63a5e0ab4aa72cf07a13ab5fbe23f12f4454d161da" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -175,9 +175,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80759b3f57b3b20fa7cd8fef6479930fc95461b58ff8adea6e87e618449c8a1d" +checksum = "41056bde53ae10ffbbf11618efbe1e0290859e5eab0fe9ef82ebdb62f12a866f" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6755b093afef5925f25079dd5a7c8d096398b804ba60cb5275397b06b31689" +checksum = "47e922d558006ba371681d484d12aa73fe673d84884f83747730af7433c0e86d" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeec8e6eab6e52b7c9f918748c9b811e87dbef7312a2e3a2ca1729a92966a6af" +checksum = "5dca170827a7ca156b43588faebf9e9d27c27d0fb07cab82cfd830345e2b24f5" dependencies = [ "alloy-primitives", "alloy-serde", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4b22b3e51cac09fd2adfcc73b55f447b4df669f983c13f7894ec82b607c63f" +checksum = "c357da577dfb56998d01f574d81ad7a1958d248740a7981b205d69d65a7da404" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -267,9 +267,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa077efe0b834bcd89ff4ba547f48fb081e4fdc3673dd7da1b295a2cf2bb7b7" +checksum = "9335278f50b0273e0a187680ee742bb6b154a948adf036f448575bacc5ccb315" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209a1882a08e21aca4aac6e2a674dc6fcf614058ef8cb02947d63782b1899552" +checksum = "ad4e6ad4230df8c4a254c20f8d6a84ab9df151bfca13f463177dbc96571cc1f8" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20219d1ad261da7a6331c16367214ee7ded41d001fabbbd656fbf71898b2773" +checksum = "c4df88a2f8020801e0fefce79471d3946d39ca3311802dbbd0ecfdeee5e972e3" dependencies = [ "alloy-consensus", "alloy-eips", @@ -319,9 +319,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffcf33dd319f21cd6f066d81cbdef0326d4bdaaf7cfe91110bc090707858e9f" +checksum = "2db5cefbc736b2b26a960dcf82279c70a03695dd11a0032a6dc27601eeb29182" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -336,9 +336,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db948902dfbae96a73c2fbf1f7abec62af034ab883e4c777c3fd29702bd6e2c" +checksum = "6259a506ab13e1d658796c31e6e39d2e2ee89243bcc505ddc613b35732e0a430" dependencies = [ "alloy-rlp", "arbitrary", @@ -368,9 +368,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eefa6f4c798ad01f9b4202d02cea75f5ec11fa180502f4701e2b47965a8c0bb" +checksum = "5115c74c037714e1b02a86f742289113afa5d494b5ea58308ba8aa378e739101" dependencies = [ "alloy-chains", "alloy-consensus", @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac9a7210e0812b1d814118f426f57eb7fc260a419224dd1c76d169879c06907" +checksum = "b073afa409698d1b9a30522565815f3bf7010e5b47b997cf399209e6110df097" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -450,9 +450,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed30bf1041e84cabc5900f52978ca345dd9969f2194a945e6fdec25b0620705c" +checksum = "5c6a0bd0ce5660ac48e4f3bb0c7c5c3a94db287a0be94971599d83928476cbcd" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -475,9 +475,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab686b0fa475d2a4f5916c5f07797734a691ec58e44f0f55d4746ea39cbcefb" +checksum = "374ac12e35bb90ebccd86e7c943ddba9590149a6e35cc4d9cd860d6635fd1018" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -488,9 +488,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f0874a976ccdf83a178ad93b64bec5b8c91a47428d714d544ca70258acfa07b" +checksum = "934b3865d0f9695dcc396e853e2197171f443cc46b7d3390c1e53a4d0198232b" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -500,9 +500,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d33bc190844626c08e21897736dbd7956ab323c09e6f141b118d1c8b7aff689e" +checksum = "f0b85a5f5f5d99047544f4ec31330ee15121dcb8ef5af3e791a5207e6b92b05b" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -512,9 +512,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200661999b6e235d9840be5d60a6e8ae2f0af9eb2a256dd378786744660e36ec" +checksum = "ea98f81bcd759dbfa3601565f9d7a02220d8ef1d294ec955948b90aaafbfd857" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -523,9 +523,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc37861dc8cbf5da35d346139fbe6e03ee7823cc21138a2c4a590d3b0b4b24be" +checksum = "6e13e94be8f6f5cb735e604f9db436430bf3773fdd41db7221edaa58c07c4c8a" dependencies = [ "alloy-eips", "alloy-primitives", @@ -538,9 +538,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0294b553785eb3fa7fff2e8aec45e82817258e7e6c9365c034a90cb6baeebc9" +checksum = "4fd14f68a482e67dfba52d404dfff1d3b0d9fc3b4775bd0923f3175d7661c3bd" dependencies = [ "alloy-primitives", "serde", @@ -548,9 +548,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d297268357e3eae834ddd6888b15f764cbc0f4b3be9265f5f6ec239013f3d68" +checksum = "9ca5898f753ff0d15a0dc955c169523d8fee57e05bb5a38a398b3451b0b988be" dependencies = [ "alloy-consensus", "alloy-eips", @@ -569,9 +569,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0600b8b5e2dc0cab12cbf91b5a885c35871789fb7b3a57b434bd4fced5b7a8b" +checksum = "0e518b0a7771e00728f18be0708f828b18a1cfc542a7153bef630966a26388e0" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -591,9 +591,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093d618d5a42808e7ae26062f415a1e816fc27d3d32662c6ed52d0871b154894" +checksum = "e58dc4ff16cda220e28e24287024f68e48d5c205b3804b13adad3f79debf4cb8" dependencies = [ "alloy-eips", "alloy-primitives", @@ -605,9 +605,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e073ab0e67429c60be281e181731132fd07d82e091c10c29ace6935101034bb" +checksum = "cdff93fa38be6982f8613a060e18fa0a37ce440d69ed3b7f37c6c69036ce1c53" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -619,9 +619,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7435f6bfb93912f16d64bb61f4278fa698469e054784f477337ef87ec0b2527b" +checksum = "2d9dc647985db41fd164e807577134da1179b9f5ba0959f8698d6587eaa568f5" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -631,9 +631,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afa753a97002a33b2ccb707d9f15f31c81b8c1b786c95b73cc62bb1d1fd0c3f" +checksum = "ed3dc8d4a08ffc90c1381d39a4afa2227668259a42c97ab6eecf51cbd82a8761" dependencies = [ "alloy-primitives", "arbitrary", @@ -643,9 +643,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2cbff01a673936c2efd7e00d4c0e9a4dbbd6d600e2ce298078d33efbb19cd7" +checksum = "16188684100f6e0f2a2b949968fe3007749c5be431549064a1bce4e7b3a196a9" dependencies = [ "alloy-primitives", "async-trait", @@ -657,9 +657,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6d988cb6cd7d2f428a74476515b1a6e901e08c796767f9f93311ab74005c8b" +checksum = "e2184dab8c9493ab3e1c9f6bd3bdb563ed322b79023d81531935e84a4fdf7cf1" dependencies = [ "alloy-consensus", "alloy-network", @@ -675,9 +675,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bfd7853b65a2b4f49629ec975fee274faf6dff15ab8894c620943398ef283c0" +checksum = "d9d64f851d95619233f74b310f12bcf16e0cbc27ee3762b6115c14a84809280a" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -689,9 +689,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ec42f342d9a9261699f8078e57a7a4fda8aaa73c1a212ed3987080e6a9cd13" +checksum = "6bf7ed1574b699f48bf17caab4e6e54c6d12bc3c006ab33d58b1e227c1c3559f" dependencies = [ "alloy-sol-macro-input", "const-hex", @@ -707,9 +707,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2c50e6a62ee2b4f7ab3c6d0366e5770a21cad426e109c2f40335a1b3aff3df" +checksum = "8c02997ccef5f34f9c099277d4145f183b422938ed5322dc57a089fe9b9ad9ee" dependencies = [ "const-hex", "dunce", @@ -722,9 +722,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac17c6e89a50fb4a758012e4b409d9a0ba575228e69b539fe37d7a1bd507ca4a" +checksum = "ce13ff37285b0870d0a0746992a4ae48efaf34b766ae4c2640fa15e5305f8e73" dependencies = [ "serde", "winnow", @@ -732,9 +732,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9dc0fffe397aa17628160e16b89f704098bf3c9d74d5d369ebc239575936de5" +checksum = "1174cafd6c6d810711b4e00383037bdb458efc4fe3dbafafa16567e0320c54d8" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -745,9 +745,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69d36982b9e46075ae6b792b0f84208c6c2c15ad49f6c500304616ef67b70e0" +checksum = "628be5b9b75e4f4c4f2a71d985bbaca4f23de356dc83f1625454c505f5eef4df" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -765,9 +765,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e02ffd5d93ffc51d72786e607c97de3b60736ca3e636ead0ec1f7dce68ea3fd" +checksum = "4e24412cf72f79c95cd9b1d9482e3a31f9d94c24b43c4b3b710cc8d4341eaab0" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -780,9 +780,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6f8b87cb84bae6d81ae6604b37741c8116f84f9784a0ecc6038c302e679d23" +checksum = "0577a1f67ce70ece3f2b27cf1011da7222ef0a5701f7dcb558e5356278eeb531" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -799,9 +799,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c085c4e1e7680b723ffc558f61a22c061ed3f70eb3436f93f3936779c59cec1" +checksum = "1ca46272d17f9647fdb56080ed26c72b3ea5078416831130f5ed46f3b4be0ed6" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -5408,9 +5408,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f0daa0d0936d436a21b57571b1e27c5663aa2ab62f6edae5ba5be999f9f93e" +checksum = "f9d95d0ec6457ad4d3d7fc0ad41db490b219587ed837ada87a26b28e535db15f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5426,9 +5426,9 @@ dependencies = [ [[package]] name = "op-alloy-genesis" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb0964932faa7050b74689f017aca66ffa3e52501080278a81bb0a43836c8dd" +checksum = "a8692a934265dd0fc68f02e2a1d644a80b76ae07dbc59552aa51d6df06953e9d" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5441,9 +5441,9 @@ dependencies = [ [[package]] name = "op-alloy-network" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9a690fcc404e44c3589dd39cf22895df42f7ef8671a07828b8c376c39be46a" +checksum = "f973f9e396dc53138ef89501875991bb1728ec34bbd9c0e1ab30caa5518abfa3" dependencies = [ "alloy-consensus", "alloy-network", @@ -5456,9 +5456,9 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d8c057c1a5bdf72d1f86c470a4d90f2d2ad1b273caa547c04cd6affe45b466d" +checksum = "29cb147e6f39d34bd8284b1107bcbca2e4c14e95b5bc49e5498ca6c0068a94c2" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -5480,9 +5480,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-jsonrpsee" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98debc5266443e64e03195cd1a3b6cdbe8d8679e9d8c4b76a3670d24b2e267a" +checksum = "1d7e394ccd907c63acc8213c24ebfb1be24f184b75af89cbaa92178b11de34a8" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5493,9 +5493,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73741855ffaa2041b33cb616d7db7180c1149b648c68c23bee9e15501073fb32" +checksum = "eba1b44e2035ec04cc61762cb9b5457d0ecd29d9af631e1a1c107ef571ce2318" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5512,9 +5512,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebedc32e24013c8b3faea62d091bccbb90f871286fe2238c6f7e2ff29974df8e" +checksum = "00bcf8a51980231bbcd250a686c9ef41501c9e7aaa348ffe5808aa61dfe14151" dependencies = [ "alloy-eips", "alloy-primitives", @@ -9674,9 +9674,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7f5f8a2deafb3c76f357bbf9e71b73bddb915c4994bbbe3208fbfbe8fc7f8e" +checksum = "8d056aaa21f36038ab35fe8ce940ee332903a0b4b992b8ca805fb60c85eb2086" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9688,7 +9688,7 @@ dependencies = [ "colorchoice", "revm", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.5", ] [[package]] @@ -10745,9 +10745,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0523f59468a2696391f2a772edc089342aacd53c3caa2ac3264e598edf119b" +checksum = "219389c1ebe89f8333df8bdfb871f6631c552ff399c23cac02480b6088aad8f0" dependencies = [ "paste", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index ab2fba7b99e0..285f0fc6e379 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -343,7 +343,7 @@ reth-ethereum-consensus = { path = "crates/ethereum/consensus" } reth-ethereum-engine-primitives = { path = "crates/ethereum/engine-primitives" } reth-ethereum-forks = { path = "crates/ethereum-forks", default-features = false } reth-ethereum-payload-builder = { path = "crates/ethereum/payload" } -reth-ethereum-primitives = { path = "crates/ethereum/primitives", default-features = false } +reth-ethereum-primitives = { path = "crates/ethereum/primitives", default-features = false } reth-etl = { path = "crates/etl" } reth-evm = { path = "crates/evm" } reth-evm-ethereum = { path = "crates/ethereum/evm" } @@ -427,58 +427,58 @@ reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-feat # revm revm = { version = "18.0.0", features = ["std"], default-features = false } -revm-inspectors = "0.12.0" +revm-inspectors = "0.13.0" revm-primitives = { version = "14.0.0", default-features = false } # eth alloy-chains = { version = "0.1.32", default-features = false } -alloy-dyn-abi = "0.8.11" -alloy-primitives = { version = "0.8.11", default-features = false } +alloy-dyn-abi = "0.8.15" +alloy-primitives = { version = "0.8.15", default-features = false } alloy-rlp = { version = "0.3.10", default-features = false } -alloy-sol-types = "0.8.11" +alloy-sol-types = "0.8.15" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.7.3", default-features = false } -alloy-contract = { version = "0.7.3", default-features = false } -alloy-eips = { version = "0.7.3", default-features = false } -alloy-genesis = { version = "0.7.3", default-features = false } -alloy-json-rpc = { version = "0.7.3", default-features = false } -alloy-network = { version = "0.7.3", default-features = false } -alloy-network-primitives = { version = "0.7.3", default-features = false } -alloy-node-bindings = { version = "0.7.3", default-features = false } -alloy-provider = { version = "0.7.3", features = [ +alloy-consensus = { version = "0.8.0", default-features = false } +alloy-contract = { version = "0.8.0", default-features = false } +alloy-eips = { version = "0.8.0", default-features = false } +alloy-genesis = { version = "0.8.0", default-features = false } +alloy-json-rpc = { version = "0.8.0", default-features = false } +alloy-network = { version = "0.8.0", default-features = false } +alloy-network-primitives = { version = "0.8.0", default-features = false } +alloy-node-bindings = { version = "0.8.0", default-features = false } +alloy-provider = { version = "0.8.0", features = [ "reqwest", ], default-features = false } -alloy-pubsub = { version = "0.7.3", default-features = false } -alloy-rpc-client = { version = "0.7.3", default-features = false } -alloy-rpc-types = { version = "0.7.3", features = [ +alloy-pubsub = { version = "0.8.0", default-features = false } +alloy-rpc-client = { version = "0.8.0", default-features = false } +alloy-rpc-types = { version = "0.8.0", features = [ "eth", ], default-features = false } -alloy-rpc-types-admin = { version = "0.7.3", default-features = false } -alloy-rpc-types-anvil = { version = "0.7.3", default-features = false } -alloy-rpc-types-beacon = { version = "0.7.3", default-features = false } -alloy-rpc-types-debug = { version = "0.7.3", default-features = false } -alloy-rpc-types-engine = { version = "0.7.3", default-features = false } -alloy-rpc-types-eth = { version = "0.7.3", default-features = false } -alloy-rpc-types-mev = { version = "0.7.3", default-features = false } -alloy-rpc-types-trace = { version = "0.7.3", default-features = false } -alloy-rpc-types-txpool = { version = "0.7.3", default-features = false } -alloy-serde = { version = "0.7.3", default-features = false } -alloy-signer = { version = "0.7.3", default-features = false } -alloy-signer-local = { version = "0.7.3", default-features = false } -alloy-transport = { version = "0.7.3" } -alloy-transport-http = { version = "0.7.3", features = [ +alloy-rpc-types-admin = { version = "0.8.0", default-features = false } +alloy-rpc-types-anvil = { version = "0.8.0", default-features = false } +alloy-rpc-types-beacon = { version = "0.8.0", default-features = false } +alloy-rpc-types-debug = { version = "0.8.0", default-features = false } +alloy-rpc-types-engine = { version = "0.8.0", default-features = false } +alloy-rpc-types-eth = { version = "0.8.0", default-features = false } +alloy-rpc-types-mev = { version = "0.8.0", default-features = false } +alloy-rpc-types-trace = { version = "0.8.0", default-features = false } +alloy-rpc-types-txpool = { version = "0.8.0", default-features = false } +alloy-serde = { version = "0.8.0", default-features = false } +alloy-signer = { version = "0.8.0", default-features = false } +alloy-signer-local = { version = "0.8.0", default-features = false } +alloy-transport = { version = "0.8.0" } +alloy-transport-http = { version = "0.8.0", features = [ "reqwest-rustls-tls", ], default-features = false } -alloy-transport-ipc = { version = "0.7.3", default-features = false } -alloy-transport-ws = { version = "0.7.3", default-features = false } +alloy-transport-ipc = { version = "0.8.0", default-features = false } +alloy-transport-ws = { version = "0.8.0", default-features = false } # op -op-alloy-rpc-types = "0.7.3" -op-alloy-rpc-types-engine = "0.7.3" -op-alloy-rpc-jsonrpsee = "0.7.3" -op-alloy-network = "0.7.3" -op-alloy-consensus = "0.7.3" +op-alloy-rpc-types = "0.8.0" +op-alloy-rpc-types-engine = "0.8.0" +op-alloy-rpc-jsonrpsee = "0.8.0" +op-alloy-network = "0.8.0" +op-alloy-consensus = "0.8.0" # misc aquamarine = "0.6" @@ -495,7 +495,7 @@ cfg-if = "1.0" clap = "4" const_format = { version = "0.2.32", features = ["rust_1_64"] } dashmap = "6.0" -derive_more = { version = "1", default-features = false, features = ["full"] } +derive_more = { version = "1", default-features = false, features = ["full"] } dyn-clone = "1.0.17" eyre = "0.6" fdlimit = "0.3.0" diff --git a/crates/consensus/beacon/src/engine/invalid_headers.rs b/crates/consensus/beacon/src/engine/invalid_headers.rs index 2e2bc37a27ee..384820ca9f3f 100644 --- a/crates/consensus/beacon/src/engine/invalid_headers.rs +++ b/crates/consensus/beacon/src/engine/invalid_headers.rs @@ -42,7 +42,7 @@ impl InvalidHeaderCache { let entry = self.headers.get(hash)?; entry.hit_count += 1; if entry.hit_count < INVALID_HEADER_HIT_EVICTION_THRESHOLD { - return Some(entry.header.clone()) + return Some(entry.header) } } // if we get here, the entry has been hit too many times, so we evict it diff --git a/crates/net/eth-wire-types/src/broadcast.rs b/crates/net/eth-wire-types/src/broadcast.rs index 72a1116c3925..e6ea1a3a3759 100644 --- a/crates/net/eth-wire-types/src/broadcast.rs +++ b/crates/net/eth-wire-types/src/broadcast.rs @@ -8,7 +8,7 @@ use alloy_rlp::{ use derive_more::{Constructor, Deref, DerefMut, From, IntoIterator}; use reth_codecs_derive::{add_arbitrary_tests, generate_tests}; use reth_primitives::TransactionSigned; -use reth_primitives_traits::{SignedTransaction, Transaction}; +use reth_primitives_traits::SignedTransaction; use std::{ collections::{HashMap, HashSet}, mem, diff --git a/crates/optimism/primitives/src/transaction/mod.rs b/crates/optimism/primitives/src/transaction/mod.rs index 86ac822c744c..214814dd84c1 100644 --- a/crates/optimism/primitives/src/transaction/mod.rs +++ b/crates/optimism/primitives/src/transaction/mod.rs @@ -7,7 +7,7 @@ use alloy_primitives::{bytes, Bytes, TxKind, Uint, B256}; #[cfg(any(test, feature = "reth-codec"))] use alloy_consensus::constants::EIP7702_TX_TYPE_ID; -use alloy_consensus::{SignableTransaction, TxLegacy}; +use alloy_consensus::{SignableTransaction, TxLegacy, Typed2718}; use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization}; use derive_more::{Constructor, Deref, From}; use op_alloy_consensus::OpTypedTransaction; @@ -157,10 +157,6 @@ impl alloy_consensus::Transaction for OpTransaction { self.0.input() } - fn ty(&self) -> u8 { - self.0.ty() - } - fn access_list(&self) -> Option<&AccessList> { self.0.access_list() } @@ -197,3 +193,9 @@ impl InMemorySize for OpTransaction { } } } + +impl Typed2718 for OpTransaction { + fn ty(&self) -> u8 { + self.0.ty() + } +} diff --git a/crates/optimism/primitives/src/transaction/signed.rs b/crates/optimism/primitives/src/transaction/signed.rs index 26581214e67b..ee72c65eb5ec 100644 --- a/crates/optimism/primitives/src/transaction/signed.rs +++ b/crates/optimism/primitives/src/transaction/signed.rs @@ -4,6 +4,7 @@ use crate::{OpTransaction, OpTxType}; use alloc::vec::Vec; use alloy_consensus::{ transaction::RlpEcdsaTx, SignableTransaction, Transaction, TxEip1559, TxEip2930, TxEip7702, + Typed2718, }; use alloy_eips::{ eip2718::{Decodable2718, Eip2718Error, Eip2718Result, Encodable2718}, @@ -228,7 +229,7 @@ impl alloy_rlp::Encodable for OpTransactionSigned { fn length(&self) -> usize { let mut payload_length = self.encode_2718_len(); - if !self.is_legacy() { + if !Encodable2718::is_legacy(self) { payload_length += Header { list: false, payload_length }.length(); } @@ -377,10 +378,6 @@ impl Transaction for OpTransactionSigned { self.deref().input() } - fn ty(&self) -> u8 { - self.deref().ty() - } - fn access_list(&self) -> Option<&AccessList> { self.deref().access_list() } @@ -406,6 +403,12 @@ impl Transaction for OpTransactionSigned { } } +impl Typed2718 for OpTransactionSigned { + fn ty(&self) -> u8 { + self.deref().ty() + } +} + impl Default for OpTransactionSigned { fn default() -> Self { Self { diff --git a/crates/primitives-traits/src/transaction/mod.rs b/crates/primitives-traits/src/transaction/mod.rs index 3a0871c99a43..b67e51024bf6 100644 --- a/crates/primitives-traits/src/transaction/mod.rs +++ b/crates/primitives-traits/src/transaction/mod.rs @@ -7,11 +7,6 @@ pub mod tx_type; use crate::{InMemorySize, MaybeArbitrary, MaybeCompact, MaybeSerde}; use core::{fmt, hash::Hash}; -use alloy_consensus::constants::{ - EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID, EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID, - LEGACY_TX_TYPE_ID, -}; - /// Helper trait that unifies all behaviour required by transaction to support full node operations. pub trait FullTransaction: Transaction + MaybeCompact {} @@ -32,35 +27,6 @@ pub trait Transaction: + MaybeSerde + MaybeArbitrary { - /// Returns true if the transaction is a legacy transaction. - #[inline] - fn is_legacy(&self) -> bool { - self.ty() == LEGACY_TX_TYPE_ID - } - - /// Returns true if the transaction is an EIP-2930 transaction. - #[inline] - fn is_eip2930(&self) -> bool { - self.ty() == EIP2930_TX_TYPE_ID - } - - /// Returns true if the transaction is an EIP-1559 transaction. - #[inline] - fn is_eip1559(&self) -> bool { - self.ty() == EIP1559_TX_TYPE_ID - } - - /// Returns true if the transaction is an EIP-4844 transaction. - #[inline] - fn is_eip4844(&self) -> bool { - self.ty() == EIP4844_TX_TYPE_ID - } - - /// Returns true if the transaction is an EIP-7702 transaction. - #[inline] - fn is_eip7702(&self) -> bool { - self.ty() == EIP7702_TX_TYPE_ID - } } impl Transaction for T where diff --git a/crates/primitives/src/alloy_compat.rs b/crates/primitives/src/alloy_compat.rs index 06451c30b9e5..e8f6b53c92e0 100644 --- a/crates/primitives/src/alloy_compat.rs +++ b/crates/primitives/src/alloy_compat.rs @@ -127,7 +127,7 @@ impl TryFrom for TransactionSigned { } #[cfg(feature = "optimism")] AnyTxEnvelope::Unknown(alloy_network::UnknownTxEnvelope { hash, inner }) => { - use alloy_consensus::Transaction as _; + use alloy_consensus::{Transaction as _, Typed2718}; if inner.ty() == crate::TxType::Deposit { let fields: op_alloy_rpc_types::OpTransactionFields = inner diff --git a/crates/primitives/src/block.rs b/crates/primitives/src/block.rs index 0ee6f860b58a..767ba30286c7 100644 --- a/crates/primitives/src/block.rs +++ b/crates/primitives/src/block.rs @@ -3,7 +3,7 @@ use crate::{ RecoveredTx, SealedHeader, TransactionSigned, }; use alloc::vec::Vec; -use alloy_consensus::Header; +use alloy_consensus::{Header, Typed2718}; use alloy_eips::{eip2718::Encodable2718, eip4895::Withdrawals}; use alloy_primitives::{Address, Bytes, B256}; use alloy_rlp::{Decodable, Encodable, RlpDecodable, RlpEncodable}; diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs index b64cf094042e..4732ba8024c3 100644 --- a/crates/primitives/src/transaction/mod.rs +++ b/crates/primitives/src/transaction/mod.rs @@ -3,7 +3,7 @@ use alloc::vec::Vec; use alloy_consensus::{ transaction::RlpEcdsaTx, SignableTransaction, Signed, Transaction as _, TxEip1559, TxEip2930, - TxEip4844, TxEip4844Variant, TxEip7702, TxLegacy, TypedTransaction, + TxEip4844, TxEip4844Variant, TxEip7702, TxLegacy, Typed2718, TypedTransaction, }; use alloy_eips::{ eip2718::{Decodable2718, Eip2718Error, Eip2718Result, Encodable2718}, @@ -192,6 +192,20 @@ impl<'a> arbitrary::Arbitrary<'a> for Transaction { } } +impl Typed2718 for Transaction { + fn ty(&self) -> u8 { + match self { + Self::Legacy(tx) => tx.ty(), + Self::Eip2930(tx) => tx.ty(), + Self::Eip1559(tx) => tx.ty(), + Self::Eip4844(tx) => tx.ty(), + Self::Eip7702(tx) => tx.ty(), + #[cfg(feature = "optimism")] + Self::Deposit(tx) => tx.ty(), + } + } +} + // === impl Transaction === impl Transaction { @@ -710,18 +724,6 @@ impl alloy_consensus::Transaction for Transaction { } } - fn ty(&self) -> u8 { - match self { - Self::Legacy(tx) => tx.ty(), - Self::Eip2930(tx) => tx.ty(), - Self::Eip1559(tx) => tx.ty(), - Self::Eip4844(tx) => tx.ty(), - Self::Eip7702(tx) => tx.ty(), - #[cfg(feature = "optimism")] - Self::Deposit(tx) => tx.ty(), - } - } - fn access_list(&self) -> Option<&AccessList> { match self { Self::Legacy(tx) => tx.access_list(), @@ -826,6 +828,12 @@ impl PartialEq for TransactionSigned { } } +impl Typed2718 for TransactionSigned { + fn ty(&self) -> u8 { + self.deref().ty() + } +} + // === impl TransactionSigned === impl TransactionSigned { @@ -1202,10 +1210,6 @@ impl alloy_consensus::Transaction for TransactionSigned { self.deref().input() } - fn ty(&self) -> u8 { - self.deref().ty() - } - fn access_list(&self) -> Option<&AccessList> { self.deref().access_list() } @@ -1240,7 +1244,7 @@ impl Encodable for TransactionSigned { fn length(&self) -> usize { let mut payload_length = self.encode_2718_len(); - if !self.is_legacy() { + if !Encodable2718::is_legacy(self) { payload_length += Header { list: false, payload_length }.length(); } diff --git a/crates/primitives/src/transaction/pooled.rs b/crates/primitives/src/transaction/pooled.rs index eea10d44c9f8..b4790d028290 100644 --- a/crates/primitives/src/transaction/pooled.rs +++ b/crates/primitives/src/transaction/pooled.rs @@ -10,7 +10,7 @@ use alloc::vec::Vec; use alloy_consensus::{ constants::EIP4844_TX_TYPE_ID, transaction::{TxEip1559, TxEip2930, TxEip4844, TxLegacy}, - SignableTransaction, Signed, TxEip4844WithSidecar, + SignableTransaction, Signed, TxEip4844WithSidecar, Typed2718, }; use alloy_eips::{ eip2718::{Decodable2718, Eip2718Result, Encodable2718}, @@ -230,7 +230,7 @@ impl Encodable for PooledTransactionsElement { fn length(&self) -> usize { let mut payload_length = self.encode_2718_len(); - if !self.is_legacy() { + if !Encodable2718::is_legacy(self) { payload_length += Header { list: false, payload_length }.length(); } @@ -383,6 +383,18 @@ impl Decodable2718 for PooledTransactionsElement { } } +impl Typed2718 for PooledTransactionsElement { + fn ty(&self) -> u8 { + match self { + Self::Legacy(tx) => tx.tx().ty(), + Self::Eip2930(tx) => tx.tx().ty(), + Self::Eip1559(tx) => tx.tx().ty(), + Self::BlobTransaction(tx) => tx.tx().ty(), + Self::Eip7702(tx) => tx.tx().ty(), + } + } +} + impl alloy_consensus::Transaction for PooledTransactionsElement { fn chain_id(&self) -> Option { match self { @@ -524,16 +536,6 @@ impl alloy_consensus::Transaction for PooledTransactionsElement { } } - fn ty(&self) -> u8 { - match self { - Self::Legacy(tx) => tx.tx().ty(), - Self::Eip2930(tx) => tx.tx().ty(), - Self::Eip1559(tx) => tx.tx().ty(), - Self::Eip7702(tx) => tx.tx().ty(), - Self::BlobTransaction(tx) => tx.tx().ty(), - } - } - fn access_list(&self) -> Option<&AccessList> { match self { Self::Legacy(tx) => tx.tx().access_list(), diff --git a/crates/rpc/rpc-server-types/src/result.rs b/crates/rpc/rpc-server-types/src/result.rs index 5d1b702e9fca..769f1cd9c02e 100644 --- a/crates/rpc/rpc-server-types/src/result.rs +++ b/crates/rpc/rpc-server-types/src/result.rs @@ -162,7 +162,6 @@ pub fn block_id_to_str(id: BlockId) -> String { format!("hash {}", h.block_hash) } } - BlockId::Number(n) if n.is_number() => format!("number {n}"), BlockId::Number(n) => format!("{n}"), } } diff --git a/crates/rpc/rpc/src/otterscan.rs b/crates/rpc/rpc/src/otterscan.rs index 173a2ff34956..42d8c06e997d 100644 --- a/crates/rpc/rpc/src/otterscan.rs +++ b/crates/rpc/rpc/src/otterscan.rs @@ -1,4 +1,4 @@ -use alloy_consensus::{BlockHeader, Transaction}; +use alloy_consensus::{BlockHeader, Transaction, Typed2718}; use alloy_eips::{BlockId, BlockNumberOrTag}; use alloy_network::{ReceiptResponse, TransactionResponse}; use alloy_primitives::{Address, Bytes, TxHash, B256, U256}; @@ -252,7 +252,7 @@ where let timestamp = Some(block.header.timestamp()); let receipts = receipts .drain(page_start..page_end) - .zip(transactions.iter().map(Transaction::ty)) + .zip(transactions.iter().map(Typed2718::ty)) .map(|(receipt, tx_ty)| { let inner = OtsReceipt { status: receipt.status(), diff --git a/crates/storage/codecs/derive/src/arbitrary.rs b/crates/storage/codecs/derive/src/arbitrary.rs index 753bb1e33a51..91c78923c224 100644 --- a/crates/storage/codecs/derive/src/arbitrary.rs +++ b/crates/storage/codecs/derive/src/arbitrary.rs @@ -67,7 +67,7 @@ pub fn maybe_generate_tests( use rand::RngCore; // get random instance of type - let mut raw = [0u8; 1024]; + let mut raw = vec![0u8; 1024]; rand::thread_rng().fill_bytes(&mut raw); let mut unstructured = arbitrary::Unstructured::new(&raw[..]); let val: Result = arbitrary::Arbitrary::arbitrary(&mut unstructured);