diff --git a/Cargo.lock b/Cargo.lock index a635e6f3e2..478cba998f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,19 +187,13 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -272,9 +266,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4177d135789e282e925092be8939d421b701c6d92c0a16679faa659d9166289d" +checksum = "40a70d19a83dfee0cd4b16d28d2fc1c822a9a55935c672259dd8165e342c4147" dependencies = [ "alloy-eips", "alloy-primitives", @@ -309,9 +303,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499ee14d296a133d142efd215eb36bf96124829fe91cf8f5d4e5ccdd381eae00" +checksum = "9ecd43a1ce87109f4d64efeff2b6fd0d7ff06afe93c4ffeb4e23bbb34d77ce84" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -327,9 +321,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b85dfc693e4a1193f0372a8f789df12ab51fcbe7be0733baa04939a86dd813b" +checksum = "91d8c017799918fe4c742fcd3d19a7c7b5839aea818f02e15e1bb37292b8a513" dependencies = [ "alloy-primitives", "alloy-serde", @@ -338,9 +332,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4207166c79cfdf7f3bed24bbc84f5c7c5d4db1970f8c82e3fcc76257f16d2166" +checksum = "92fdc402c955dc61b415325c1ff36988bd1d2287146b8123f0f997013343a118" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -352,9 +346,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe2802d5b8c632f18d68c352073378f02a3407c1b6a4487194e7d21ab0f002" +checksum = "7da63445b84f4cd2c5b5b62b7ebf57125e4b9ce233d45db4d2b4a0f329f5fe5a" dependencies = [ "alloy-consensus", "alloy-eips", @@ -373,10 +367,11 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396c07726030fa0f9dab5da8c71ccd69d5eb74a7fe1072b7ae453a67e4fe553e" +checksum = "97fb528a622b49b51c79d4ba61e3ff2567b31bd339571e8e06e36b94494cc49a" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-serde", "serde", @@ -384,9 +379,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c847311cc7386684ef38ab404069d795bee07da945f63d884265436870a17276" +checksum = "cc1a1bf5cd6ec144b38628403565d14b0382d0f543a818e6a45824496ca14a3c" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -400,15 +395,15 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a767e59c86900dd7c3ce3ecef04f3ace5ac9631ee150beb8b7d22f7fa3bbb2d7" +checksum = "ccb865df835f851b367ae439d6c82b117ded971628c8888b24fed411a290e38a" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", - "derive_more 0.99.18", + "derive_more 1.0.0", "hex-literal", "itoa", "k256", @@ -422,9 +417,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1376948df782ffee83a54cac4b2aba14134edd997229a3db97da0a606586eb5c" +checksum = "9b624bfbfa145b64571650ce951eba3ec1d38b781e4fe2b5a8e7410f99f73336" dependencies = [ "alloy-chains", "alloy-consensus", @@ -478,9 +473,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02378418a429f8a14a0ad8ffaa15b2d25ff34914fc4a1e366513c6a3800e03b3" +checksum = "02af2846b186e4ae25eb448dd78aebdb82f55668bdc360a3a7bf4c7754cb8251" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -492,16 +487,16 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-rpc-types" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ae4c4fbd37d9996f501fbc7176405aab97ae3a5772789be06ef0e7c4dad6dd" +checksum = "6f1407e7da4a25fef7d4e6214e887b0b084e8ff02e2c26506ad55c0aa972ca10" dependencies = [ "alloy-rpc-types-eth", "alloy-serde", @@ -510,9 +505,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bb3506ab1cf415d4752778c93e102050399fb8de97b7da405a5bf3e31f5f3b" +checksum = "48cc832ec2ad270ac9859cc5056117890af943686d432a2c478eafef5102e8eb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -529,9 +524,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae417978015f573b4a8c02af17f88558fb22e3fccd12e8a910cf6a2ff331cfcb" +checksum = "da1c4dbeff85bba7bbacb5df2a05e68e426aed994669785017a9d33b4cee32f4" dependencies = [ "alloy-primitives", "serde", @@ -540,9 +535,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750c9b61ac0646f8f4a61231c2732a337b2c829866fc9a191b96b7eedf80ffe" +checksum = "d458fc2eec44beb3c64cb987941e992177390ecd47b291eeb3d1ec264b5f70ff" dependencies = [ "alloy-primitives", "async-trait", @@ -554,13 +549,13 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183bcfc0f3291d9c41a3774172ee582fb2ce6eb6569085471d8f225de7bb86fc" +checksum = "e2dc5201ca0018afb7a3e0cd8bd15f7ca6aca924333b5f3bb87463b41d0c4ef2" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.77", @@ -568,15 +563,15 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c4d842beb7a6686d04125603bc57614d5ed78bf95e4753274db3db4ba95214" +checksum = "155f63dc6945885aa4532601800201fddfaa3b20901fda8e8c2570327242fe0e" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", "indexmap", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.77", @@ -586,9 +581,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1306e8d3c9e6e6ecf7a39ffaf7291e73a5f655a2defd366ee92c2efebcdf7fee" +checksum = "847700aa9cb59d3c7b290b2d05976cd8d76b64d73bb63116a9533132d995586b" dependencies = [ "const-hex", "dunce", @@ -601,9 +596,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577e262966e92112edbd15b1b2c0947cc434d6e8311df96d3329793fe8047da9" +checksum = "83665e5607725a7a1aab3cb0dea708f4a05e70776954ec7f0a9461439175c957" dependencies = [ "alloy-primitives", "alloy-sol-macro", @@ -612,9 +607,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2799749ca692ae145f54968778877afd7c95e788488f176cfdfcf2a8abeb2062" +checksum = "a98b7bf2a9e0671a1e914e89854e74c89e62a549da548184c6d93c2be828a575" dependencies = [ "alloy-json-rpc", "base64", @@ -624,22 +619,22 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-transport-http" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc10c4dd932f66e0db6cc5735241e0c17a6a18564b430bbc1839f7db18587a93" +checksum = "85d928f36065b0f548782ec2acf4b54a5cf8b297a22ca18d2c8fe165af90561f" dependencies = [ "alloy-json-rpc", "alloy-transport", "reqwest", "serde_json", - "tower", + "tower 0.5.1", "tracing", "url", ] @@ -716,9 +711,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "ark-ff" @@ -918,17 +913,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -1148,9 +1143,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", @@ -1688,7 +1683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1846,9 +1841,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -2089,9 +2084,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -2102,7 +2097,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2173,9 +2168,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -2338,7 +2333,7 @@ dependencies = [ "kona-primitives", "lazy_static", "lru", - "miniz_oxide 0.8.0", + "miniz_oxide", "op-alloy-consensus", "prometheus", "proptest", @@ -2629,15 +2624,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2872,9 +2858,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fbb0f5c3754c22c6ea30e100dca6aea73b747e693e27763e23ca92fb02f2f" +checksum = "ad134a77fdfebac469526756b207c7889593657eeaca374200332ec89175e27a" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2888,11 +2874,15 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.2.8" -source = "git+https://github.com/alloy-rs/op-alloy?branch=rf/protocol-fix#e01619c4b2db68ddc0d66e272e83a512fefec7c5" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae2170e65eeef408d336e8f378b8c1341e5f6bbc618839f020b8b1a82786327" dependencies = [ + "alloy-eips", "alloy-primitives", + "alloy-rlp", "hashbrown 0.14.5", + "op-alloy-consensus", "superchain-primitives", ] @@ -3031,9 +3021,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", @@ -3090,9 +3080,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plotters" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits", "plotters-backend", @@ -3103,15 +3093,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] @@ -3183,27 +3173,25 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.77", ] [[package]] @@ -3506,7 +3494,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "system-configuration", "tokio", "tokio-native-tls", @@ -3785,9 +3773,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3829,11 +3817,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3864,9 +3852,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "rand", "secp256k1-sys", @@ -3930,18 +3918,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -4182,9 +4170,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "superchain" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21507261557d79aad65c050fd48138068792c462b769f2dd828ee6fbaca2621b" +checksum = "fc46041e66734c67d9ca020e8cb9af3a84986620c0b50d06208c0230de3d6022" dependencies = [ "superchain-primitives", "superchain-registry", @@ -4192,14 +4180,15 @@ dependencies = [ [[package]] name = "superchain-primitives" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df394e39609f1f5d6b2d0d2fa9cd27aae0058339c992c9a4bf1f47f5f86fec6" +checksum = "91d0cd81318c6ad65932af03168da2095befebef0a851f17391fc773dbf49dbc" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", + "alloy-serde", "alloy-sol-types", "anyhow", "serde", @@ -4208,9 +4197,9 @@ dependencies = [ [[package]] name = "superchain-registry" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e0718465e68383a90ff54a2749ee1ec41609fec359840c1436d17414fdabae" +checksum = "ef9478ce31da9bbe15dad2ed4ff5fa64652ae220c4d5a95681bf09cb5cb39867" dependencies = [ "hashbrown 0.14.5", "lazy_static", @@ -4266,9 +4255,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284c41c2919303438fcf8dede4036fd1e82d4fc0fbb2b279bd2a1442c909ca92" +checksum = "f1e1355d44af21638c8e05d45097db6cb5ec2aa3e970c51cb2901605cf3344fa" dependencies = [ "paste", "proc-macro2", @@ -4276,6 +4265,12 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sync_wrapper" version = "1.0.1" @@ -4534,7 +4529,20 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", +] + +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0d5c7ba58a..195d45acb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,9 +35,6 @@ panic = "abort" codegen-units = 1 lto = "fat" -[patch.crates-io] -op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", branch = "rf/protocol-fix" } - [workspace.dependencies] # Workspace kona-client = { path = "bin/client", version = "0.1.0" } @@ -95,23 +92,23 @@ unsigned-varint = "0.8.0" revm = { version = "14.0", default-features = false } # Superchain -superchain = "0.3" -superchain-primitives = { version = "0.3", default-features = false } +superchain = "0.4" +superchain-primitives = { version = "0.4", default-features = false } # K/V database rocksdb = { version = "0.22", default-features = false, features = ["snappy"] } # Alloy -alloy-rlp = { version = "0.3", default-features = false } +alloy-rlp = { version = "0.3.2", default-features = false } alloy-trie = { version = "0.5", default-features = false } -alloy-provider = { version = "0.3", default-features = false } +alloy-provider = { version = "0.3.2", default-features = false } alloy-primitives = { version = "0.8", default-features = false } -alloy-rpc-types = { version = "0.3", default-features = false } -alloy-consensus = { version = "0.3", default-features = false } -alloy-transport = { version = "0.3", default-features = false } -alloy-transport-http = { version = "0.3", default-features = false } -alloy-eips = { version = "0.3", default-features = false } -alloy-rpc-client = { version = "0.3", default-features = false } -alloy-node-bindings = { version = "0.3", default-features = false } -op-alloy-consensus = { version = "0.2", default-features = false } -op-alloy-protocol = { version = "0.2", default-features = false } +alloy-rpc-types = { version = "0.3.2", default-features = false } +alloy-consensus = { version = "0.3.2", default-features = false } +alloy-transport = { version = "0.3.2", default-features = false } +alloy-transport-http = { version = "0.3.2", default-features = false } +alloy-eips = { version = "0.3.2", default-features = false } +alloy-rpc-client = { version = "0.3.2", default-features = false } +alloy-node-bindings = { version = "0.3.2", default-features = false } +op-alloy-consensus = { version = "0.2.9", default-features = false } +op-alloy-protocol = { version = "0.2.9", default-features = false } diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml index 466bb17188..c427bcc37e 100644 --- a/crates/derive/Cargo.toml +++ b/crates/derive/Cargo.toml @@ -50,6 +50,9 @@ alloy-node-bindings = { workspace = true, optional = true } alloy-transport-http = { workspace = true, optional = true } [dev-dependencies] +spin.workspace = true +alloy-rpc-client.workspace = true +alloy-transport-http.workspace = true tokio.workspace = true proptest.workspace = true tracing-subscriber.workspace = true diff --git a/crates/executor/benches/execution.rs b/crates/executor/benches/execution.rs index 93a89e893f..f61860c8dd 100644 --- a/crates/executor/benches/execution.rs +++ b/crates/executor/benches/execution.rs @@ -71,7 +71,7 @@ fn op_mainnet_exec_bench( delta_time: Some(0), ecotone_time: Some(0), base_fee_params: OP_BASE_FEE_PARAMS, - canyon_base_fee_params: Some(OP_CANYON_BASE_FEE_PARAMS), + canyon_base_fee_params: OP_CANYON_BASE_FEE_PARAMS, ..Default::default() }; diff --git a/crates/executor/src/lib.rs b/crates/executor/src/lib.rs index cceed97f28..699f5b12a0 100644 --- a/crates/executor/src/lib.rs +++ b/crates/executor/src/lib.rs @@ -479,7 +479,7 @@ where // If the payload attribute timestamp is past canyon activation, // use the canyon base fee params from the rollup config. let base_fee_params = if config.is_canyon_active(payload_attrs.timestamp) { - config.canyon_base_fee_params.expect("Canyon base fee params not provided") + config.canyon_base_fee_params } else { config.base_fee_params }; @@ -686,7 +686,7 @@ mod test { delta_time: Some(0), ecotone_time: Some(0), base_fee_params: OP_BASE_FEE_PARAMS, - canyon_base_fee_params: Some(OP_CANYON_BASE_FEE_PARAMS), + canyon_base_fee_params: OP_CANYON_BASE_FEE_PARAMS, ..Default::default() }; @@ -739,7 +739,7 @@ mod test { delta_time: Some(0), ecotone_time: Some(0), base_fee_params: OP_BASE_FEE_PARAMS, - canyon_base_fee_params: Some(OP_CANYON_BASE_FEE_PARAMS), + canyon_base_fee_params: OP_CANYON_BASE_FEE_PARAMS, ..Default::default() }; @@ -796,7 +796,7 @@ mod test { delta_time: Some(0), ecotone_time: Some(0), base_fee_params: OP_BASE_FEE_PARAMS, - canyon_base_fee_params: Some(OP_CANYON_BASE_FEE_PARAMS), + canyon_base_fee_params: OP_CANYON_BASE_FEE_PARAMS, ..Default::default() }; @@ -860,7 +860,7 @@ mod test { delta_time: Some(0), ecotone_time: Some(0), base_fee_params: OP_BASE_FEE_PARAMS, - canyon_base_fee_params: Some(OP_CANYON_BASE_FEE_PARAMS), + canyon_base_fee_params: OP_CANYON_BASE_FEE_PARAMS, ..Default::default() }; @@ -918,7 +918,7 @@ mod test { delta_time: Some(0), ecotone_time: Some(0), base_fee_params: OP_BASE_FEE_PARAMS, - canyon_base_fee_params: Some(OP_CANYON_BASE_FEE_PARAMS), + canyon_base_fee_params: OP_CANYON_BASE_FEE_PARAMS, ..Default::default() }; @@ -985,7 +985,7 @@ mod test { delta_time: Some(0), ecotone_time: Some(0), base_fee_params: OP_BASE_FEE_PARAMS, - canyon_base_fee_params: Some(OP_CANYON_BASE_FEE_PARAMS), + canyon_base_fee_params: OP_CANYON_BASE_FEE_PARAMS, ..Default::default() };