diff --git a/.github/assets/hive/Dockerfile b/.github/assets/hive/Dockerfile index 1a11b9e8..94562995 100644 --- a/.github/assets/hive/Dockerfile +++ b/.github/assets/hive/Dockerfile @@ -5,7 +5,8 @@ # # We'll use cargo-chef to speed up the build # -FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef +# MSRV 1.95 (reth v2.4.0); pinned so stale cached latest-rust-1 digests cannot silently drop below it +FROM lukemathwalker/cargo-chef:latest-rust-1.97 AS chef WORKDIR /app # Install system dependencies diff --git a/.github/assets/hive/build_simulators.sh b/.github/assets/hive/build_simulators.sh index 8d263702..1bad0251 100755 --- a/.github/assets/hive/build_simulators.sh +++ b/.github/assets/hive/build_simulators.sh @@ -1,7 +1,20 @@ #!/usr/bin/env bash -# Synced with reth v1.11.4 +# Synced with reth v2.4.0 set -eo pipefail +fixture_variant="${1:-osaka}" + +case "${fixture_variant}" in + osaka) + eels_fixtures="https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz" + eels_branch="mainnet" + ;; + *) + echo "unknown hive fixture variant: ${fixture_variant}" + exit 1 + ;; +esac + # Create the hive_assets directory mkdir hive_assets/ @@ -12,8 +25,14 @@ go build . # Run each hive command in the background for each simulator and wait echo "Building images" -# TODO: test code has been moved from https://github.com/ethereum/execution-spec-tests to https://github.com/ethereum/execution-specs we need to pin eels branch with `--sim.buildarg branch=` once we have the fusaka release tagged on the new repo -./hive -client bera-reth --sim "ethereum/eels" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz -sim.timelimit 1s || true & +./hive -client bera-reth --sim "ethereum/eels/consume-engine" \ + --sim.buildarg fixtures="${eels_fixtures}" \ + --sim.buildarg branch="${eels_branch}" \ + --sim.timelimit 1s || true & +./hive -client bera-reth --sim "ethereum/eels/consume-rlp" \ + --sim.buildarg fixtures="${eels_fixtures}" \ + --sim.buildarg branch="${eels_branch}" \ + --sim.timelimit 1s || true & ./hive -client bera-reth --sim "ethereum/engine" -sim.timelimit 1s || true & ./hive -client bera-reth --sim "devp2p" -sim.timelimit 1s || true & ./hive -client bera-reth --sim "ethereum/rpc-compat" -sim.timelimit 1s || true & diff --git a/.github/assets/hive/expected_failures.yaml b/.github/assets/hive/expected_failures.yaml index 07dac23b..adee2b62 100644 --- a/.github/assets/hive/expected_failures.yaml +++ b/.github/assets/hive/expected_failures.yaml @@ -1,4 +1,4 @@ -# Synced with reth v1.11.4 +# Last tuned against reth v1.11.4; re-validate via a hive run on the reth v2.4.0 nightly image # tracked by https://github.com/paradigmxyz/reth/issues/13879 rpc-compat: - debug_getRawBlock/get-invalid-number (bera-reth) diff --git a/.github/assets/hive/ignored_tests.yaml b/.github/assets/hive/ignored_tests.yaml index 05da0302..34593af7 100644 --- a/.github/assets/hive/ignored_tests.yaml +++ b/.github/assets/hive/ignored_tests.yaml @@ -1,4 +1,4 @@ -# Synced with reth v1.11.4 +# Last tuned against reth v1.11.4; re-validate via a hive run on the reth v2.4.0 nightly image # Ignored Tests Configuration # # This file contains tests that should be ignored for various reasons (flaky, known issues, etc). diff --git a/.github/assets/hive/parse.py b/.github/assets/hive/parse.py index ce0471a7..10d8ad2c 100644 --- a/.github/assets/hive/parse.py +++ b/.github/assets/hive/parse.py @@ -1,4 +1,4 @@ -# Copied from reth v1.8.1 +# Synced with reth v2.4.0 import json import yaml import sys diff --git a/.github/assets/hive/run_simulator.sh b/.github/assets/hive/run_simulator.sh index 34189a1e..ebd753b5 100755 --- a/.github/assets/hive/run_simulator.sh +++ b/.github/assets/hive/run_simulator.sh @@ -1,18 +1,39 @@ #!/usr/bin/env bash -# Copied from reth v1.8.1 +# Synced with reth v2.5.0 # set -x cd hivetests/ sim="${1}" limit="${2}" +fixture_variant="${3:-osaka}" + +if [[ "${fixture_variant}" == "osaka" && "${sim}" == *"eels"* && "${limit}" == *"tests/amsterdam"* ]]; then + echo "osaka fixtures do not support amsterdam tests" + exit 1 +fi + +log_file="$(mktemp)" +trap 'rm -f "${log_file}"' EXIT + +# Use lower parallelism for eels tests to avoid OOM-killing the runner +parallelism=16 +if [[ "${sim}" == *"eels"* ]]; then + parallelism=4 +fi run_hive() { - hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 8 --client bera-reth 2>&1 | tee /tmp/log || true + hive \ + --sim "${sim}" \ + --sim.limit "${limit}" \ + --sim.limit.exact=false \ + --sim.parallelism "${parallelism}" \ + --client bera-reth \ + 2>&1 | tee "${log_file}" || true } check_log() { - tail -n 1 /tmp/log | sed -r 's/\x1B\[[0-9;]*[mK]//g' + tail -n 1 "${log_file}" | sed -r 's/\x1B\[[0-9;]*[mK]//g' } attempt=0 diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 1d628d39..ad3bea1c 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -84,6 +84,8 @@ jobs: --debug.terminate \ --trusted-peers "$TRUSTED_PEERS" \ -vvv + - name: Show storage settings + run: ./target/maxperf/bera-reth db --datadir ./tmp --chain ./eth-genesis.json settings || true - name: Verify sync progress run: | # Start node with HTTP API enabled diff --git a/CLAUDE.md b/CLAUDE.md index 32e57c80..a581dd96 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -4,10 +4,11 @@ Bera-Reth is a high-performance Rust execution client for Berachain, built on th ## Project Overview -**What**: Rust execution client for Berachain using Reth SDK -**Status**: In development, not production ready +**What**: Rust execution client for Berachain using Reth SDK (git tag `v2.5.0` across all reth-* deps; reth node crates are not on crates.io) +**Status**: Production (runs Berachain mainnet) +**Toolchain**: MSRV 1.95, edition 2024; `make pr` uses nightly for fmt/clippy **Architecture**: Standard Ethereum execution with Berachain-specific chain configuration -**Key Difference**: Prague1 hardfork activated at genesis (time: 0) for 1 gwei minimum base fee +**Key Differences**: Berachain fork ladder (Prague1–4, Osaka1), PoL system transaction (type 0x7E), custom header with `prevProposerPubkey`, 1 gwei minimum base fee from genesis ## Core Architecture @@ -16,21 +17,19 @@ Bera-Reth is a high-performance Rust execution client for Berachain, built on th - **Genesis Configuration**: `src/genesis/mod.rs:53` - Prague1 fork timing - **Hardforks**: `src/hardforks/mod.rs` - Prague1 activation logic - **Node Builder**: `src/node/mod.rs` - Reth SDK integration -- **CLI**: `src/node/cli.rs` - Command-line interface +- **CLI / Entry Point**: `src/main.rs` - Command-line interface wiring ### Reference Implementations Users should clone these repositories alongside bera-reth for development reference: - **Prime Reference**: [Reth](https://github.com/paradigmxyz/reth) - Study `src/main.rs` and node builder patterns -- **Inspiration**: [Reth-BSC](https://github.com/paradigmxyz/reth/tree/main/examples/bsc) - Chain-specific adaptations - **Integration**: [BeaconKit](https://github.com/berachain/beacon-kit) - Required for local testing Recommended directory structure: ``` Code/ ├── bera-reth/ # This repository -├── reth/ # git clone https://github.com/paradigmxyz/reth.git -├── reth-bsc/ # git clone https://github.com/paradigmxyz/reth.git reth-bsc && cd reth-bsc && git checkout examples/bsc +├── reth/ # git clone https://github.com/paradigmxyz/reth.git && cd reth && git checkout v2.5.0 └── beacon-kit/ # git clone https://github.com/berachain/beacon-kit.git ``` @@ -115,6 +114,7 @@ make pr-fix - Monitor both BeaconKit and Reth logs with prefixes - Check genesis file generation: `.tmp/beacond/eth-genesis.json` - Verify port availability: 8545, 8551, 30303, 3500 +- Fresh datadirs use reth Storage V2 (RocksDB + static files alongside MDBX); see docs/storage-v2.md ### Performance Optimization - Focus on Reth SDK optimization patterns diff --git a/Cargo.lock b/Cargo.lock index 5522d89e..702699e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "generic-array", ] @@ -26,7 +26,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -82,9 +82,9 @@ checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] name = "alloc-stdlib" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195" dependencies = [ "alloc-no-stdlib", ] @@ -97,22 +97,22 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-chains" -version = "0.2.30" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f374d3c6d729268bbe2d0e0ff992bb97898b2df756691a62ee1d5f0506bc39" +checksum = "c36ddb69f5e41407e7a93aead3480f7c8ff076e73d01a951ae8f7ea4542c1ca0" dependencies = [ "alloy-primitives", "alloy-rlp", "num_enum", + "phf 0.14.0", "serde", - "strum", ] [[package]] name = "alloy-consensus" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c0dc44157867da82c469c13186015b86abef209bf0e41625e4b68bac61d728" +checksum = "51b9eb70841f76b69b1205bb57b551b7d7afd8407ad57cbda02e833877507c16" dependencies = [ "alloy-eips", "alloy-primitives", @@ -128,7 +128,7 @@ dependencies = [ "either", "k256", "once_cell", - "rand 0.8.6", + "rand 0.8.7", "secp256k1 0.30.0", "serde", "serde_json", @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4cdb42df3871cd6b346d6a938ec2ba69a9a0f49d1f82714bc5c48349268434" +checksum = "f89486e1bd2c5c56522cf18e73460c3fe7b54d50f5e80131466e62b7632edfcb" dependencies = [ "alloy-consensus", "alloy-eips", @@ -153,9 +153,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2db5c583aaef0255aa63a4fe827f826090142528bba48d1bf4119b62780cad" +checksum = "9a04eb4abc2b5074a18e687ee63918f407cc7990083cba9b999445f839796060" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -165,7 +165,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow", + "winnow 1.0.4", ] [[package]] @@ -178,7 +178,7 @@ dependencies = [ "alloy-rlp", "arbitrary", "crc", - "rand 0.8.6", + "rand 0.8.7", "serde", "thiserror 2.0.18", ] @@ -193,7 +193,7 @@ dependencies = [ "alloy-rlp", "arbitrary", "borsh", - "rand 0.8.6", + "rand 0.8.7", "serde", ] @@ -208,7 +208,7 @@ dependencies = [ "arbitrary", "borsh", "k256", - "rand 0.8.6", + "rand 0.8.7", "serde", "serde_with", "thiserror 2.0.18", @@ -216,22 +216,24 @@ dependencies = [ [[package]] name = "alloy-eip7928" -version = "0.3.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3231de68d5d6e75332b7489cfcc7f4dfabeba94d990a10e4b923af0e6623540" +checksum = "b3b12337f74cbfa451cb04dac173974814a6ff463079e1793aa09600ba8813ab" dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", "borsh", + "once_cell", "serde", + "thiserror 2.0.18", ] [[package]] name = "alloy-eips" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f7ef09f21bd1e9cb8a686f168cb4a206646804567f0889eadb8dcc4c9288c8" +checksum = "fddc9c1868d6331b56926de8ab4c4a80d8dcb7bc4f8f7bebc6a89d0548f79af2" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -246,19 +248,18 @@ dependencies = [ "c-kzg", "derive_more", "either", - "ethereum_ssz 0.9.1", - "ethereum_ssz_derive 0.9.1", + "ethereum_ssz", + "ethereum_ssz_derive", "serde", "serde_with", - "sha2", - "thiserror 2.0.18", + "sha2 0.10.9", ] [[package]] name = "alloy-evm" -version = "0.27.3" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b991c370ce44e70a3a9e474087e3d65e42e66f967644ad729dc4cec09a21fd09" +checksum = "6b307a52f91f7f3aad56b5cb4f54e5eb17dd0b3f4b2c82823301499fe1c6fdaf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -269,17 +270,16 @@ dependencies = [ "alloy-sol-types", "auto_impl", "derive_more", - "op-alloy", - "op-revm", "revm", "thiserror 2.0.18", + "tracing", ] [[package]] name = "alloy-genesis" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9cf3b99f46615fbf7dc1add0c96553abb7bf88fc9ec70dfbe7ad0b47ba7fe8" +checksum = "921b3dccecc4e9dd571c9f9a728d913c2fc7a8ecdfce6005ed99751817523d0d" dependencies = [ "alloy-eips", "alloy-primitives", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dbe713da0c737d9e5e387b0ba790eb98b14dd207fe53eef50e19a5a8ec3dac" +checksum = "6cee30dd4c2f4b23f434fdf675e7bf9681b86768141277266c6f548ef25cba0a" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -318,9 +318,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff42cd777eea61f370c0b10f2648a1c81e0b783066cd7269228aa993afd487f7" +checksum = "989d701ece9bccec3294991ce4b4a39dd1cecd0979ea58e86b9878679591b4f5" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -333,9 +333,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbca04f9b410fdc51aaaf88433cbac761213905a65fe832058bcf6690585762" +checksum = "acfca49fbbe3b30de8114b9cfd89029f87cb33ca7e8a5f5f48a809caaf085126" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -359,9 +359,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d6d15e069a8b11f56bef2eccbad2a873c6dd4d4c81d04dda29710f5ea52f04" +checksum = "2af7b76520abc91b9e0f1aa987d42df55a66494f94a1881cdadd9b8f67e0b924" dependencies = [ "alloy-consensus", "alloy-eips", @@ -372,9 +372,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3b431b4e72cd8bd0ec7a50b4be18e73dab74de0dba180eef171055e5d5926e" +checksum = "f007e257069855bdf21d27762fd3f3705a613f805c9a08309bf353503f081d71" dependencies = [ "alloy-rlp", "arbitrary", @@ -384,28 +384,29 @@ dependencies = [ "derive_more", "fixed-cache", "foldhash 0.2.0", - "getrandom 0.4.1", - "hashbrown 0.16.1", - "indexmap 2.13.0", + "getrandom 0.4.3", + "hashbrown 0.17.1", + "indexmap 2.14.0", "itoa", "k256", "keccak-asm", "paste", "proptest", - "proptest-derive", - "rand 0.9.4", + "proptest-derive 0.8.0", + "rand 0.9.5", "rapidhash", "ruint", "rustc-hash", + "secp256k1 0.31.1", "serde", - "sha3", + "sha3 0.11.0", ] [[package]] name = "alloy-provider" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d181c8cc7cf4805d7e589bf4074d56d55064fa1a979f005a45a62b047616d870" +checksum = "3a3fb53b31526b0f97cdbfaf9d8bb72b3e4a9ac7965148d79ecec4c733c8558e" dependencies = [ "alloy-chains", "alloy-consensus", @@ -432,7 +433,7 @@ dependencies = [ "either", "futures", "futures-utils-wasm", - "lru", + "lru 0.16.4", "parking_lot", "pin-project", "reqwest", @@ -447,9 +448,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8bd82953194dec221aa4cbbbb0b1e2df46066fe9d0333ac25b43a311e122d13" +checksum = "197325ef17fcdf5dfa21999a2a33877b82bb5009d5cc9b5c7f5ddb840fa3b6bb" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -469,9 +470,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.13" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93e50f64a77ad9c5470bf2ad0ca02f228da70c792a8f06634801e202579f35e" +checksum = "24671b1f62edcf0f9b62994c7bf72cd621a04a4b99f5020ece1a647b40e2f103" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -480,20 +481,20 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.13" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8849c74c9ca0f5a03da1c865e3eb6f768df816e67dd3721a398a8a7e398011" +checksum = "9d4311c03125e8a18296504560b9de3d75ecbd0dcda7f71e6cf2a196d57e6fba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "alloy-rpc-client" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2792758a93ae32a32e9047c843d536e1448044f78422d71bf7d7c05149e103f" +checksum = "f5274f9ada7f558d2feaba16fadcb96022512566cf424147f9cfa2000bc2e458" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -517,9 +518,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bdcbf9dfd5eea8bfeb078b1d906da8cd3a39c4d4dbe7a628025648e323611f6" +checksum = "12a456d697d4f639d20ac242981de13b94f911c99199e4175e85eaf52b8f785c" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -530,9 +531,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-admin" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42325c117af3a9e49013f881c1474168db57978e02085fc9853a1c89e0562740" +checksum = "7f36ee47a0f4e901b95180fbe86c92fec3ea73f12c88c5ec70d1cb41abb8d911" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -542,9 +543,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a3100b76987c1b1dc81f3abe592b7edc29e92b1242067a69d65e0030b35cf9" +checksum = "7d7e911c628067c406effef5137d0e253d98e117cdb81d47aacfe2816199297e" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -554,27 +555,31 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd720b63f82b457610f2eaaf1f32edf44efffe03ae25d537632e7d23e7929e1a" +checksum = "5493c88bfdd02271de47f28d69481191a2af6b2907901a3a8c7aff79a6b574eb" dependencies = [ "alloy-consensus-any", + "alloy-network-primitives", + "alloy-primitives", "alloy-rpc-types-eth", "alloy-serde", + "serde", + "serde_json", ] [[package]] name = "alloy-rpc-types-beacon" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a22e13215866f5dfd5d3278f4c41f1fad9410dc68ce39022f58593c873c26f8" +checksum = "b8573342cde98a4d40120b7bc0063fbda42cfd87fb305ab834704177b60d8691" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", "derive_more", - "ethereum_ssz 0.9.1", - "ethereum_ssz_derive 0.9.1", + "ethereum_ssz", + "ethereum_ssz_derive", "serde", "serde_json", "serde_with", @@ -585,11 +590,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b21e1ad18ff1b31ff1030e046462ab8168cf8894e6778cd805c8bdfe2bd649" +checksum = "bddf06191e2b12eaaeb3a50ef29a8f3416fb74c61421b80f9d7554c4c1d59a56" dependencies = [ "alloy-primitives", + "alloy-rlp", "derive_more", "serde", "serde_with", @@ -597,9 +603,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ac61f03f1edabccde1c687b5b25fff28f183afee64eaa2e767def3929e4457" +checksum = "866fa880cfd95681c979bf3f8385964c2317ef7423c31c0de53159f01112fedf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -607,19 +613,19 @@ dependencies = [ "alloy-rlp", "alloy-serde", "derive_more", - "ethereum_ssz 0.9.1", - "ethereum_ssz_derive 0.9.1", + "ethereum_ssz", + "ethereum_ssz_derive", "jsonwebtoken", - "rand 0.8.6", + "rand 0.8.7", "serde", - "strum", + "strum 0.27.2", ] [[package]] name = "alloy-rpc-types-eth" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2dc411f13092f237d2bf6918caf80977fc2f51485f9b90cb2a2f956912c8c9" +checksum = "9d3b805bb9cafaf1362c28b377e2035e49fc5ae0a5ee3ea61bafd9a5d33959e1" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -639,9 +645,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe85bf3be739126aa593dca9fb3ab13ca93fa7873e6f2247be64d7f2cb15f34a" +checksum = "2b973745b97a364c0215f681b2fb3cb6f0bbeda4dcdba5f56c50f999719ec96f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -654,9 +660,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad79f1e27e161943b5a4f99fe5534ef0849876214be411e0032c12f38e94daa" +checksum = "2a6fae28f1bda2586b117a5754b49366160770e63e09ac93fc3d872015a5a993" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -668,9 +674,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d459f902a2313737bc66d18ed094c25d2aeb268b74d98c26bbbda2aa44182ab0" +checksum = "4962825b8819e54028cbdaadeba128a613afa55c91b9a88e0b0dc257772a14d7" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -680,9 +686,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ce1e0dbf7720eee747700e300c99aac01b1a95bb93f493a01e78ee28bb1a37" +checksum = "3ad7efdd5e8fe92f5bab87956d6d3f717d1614c4ab6ad0d1f869b16e83b0dff9" dependencies = [ "alloy-primitives", "arbitrary", @@ -692,9 +698,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2425c6f314522c78e8198979c8cbf6769362be4da381d4152ea8eefce383535d" +checksum = "afa150cd076471ef21aa7b181d8186cb86c3239518859a2e5d80fbec74f0ec38" dependencies = [ "alloy-primitives", "async-trait", @@ -707,9 +713,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ecb71ee53d8d9c3fa7bac17542c8116ebc7a9726c91b1bf333ec3d04f5a789" +checksum = "f125bb730d4772538835d4a31e8e5ed5068e2a991619ba32711fd53ad8c93032" dependencies = [ "alloy-consensus", "alloy-network", @@ -719,48 +725,48 @@ dependencies = [ "coins-bip32", "coins-bip39", "k256", - "rand 0.8.6", + "rand 0.8.7", "thiserror 2.0.18", "zeroize", ] [[package]] name = "alloy-sol-macro" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab81bab693da9bb79f7a95b64b394718259fdd7e41dceeced4cad57cb71c4f6a" +checksum = "b5655c38d5f84955bf727b2eeb62fddd91ebb98fd1d7ae6eb77f73ea88f9b9cf" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error2", + "proc-macro-error3", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "alloy-sol-macro-expander" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489f1620bb7e2483fb5819ed01ab6edc1d2f93939dce35a5695085a1afd1d699" +checksum = "6277c780e07b76951e09a59788dde230d1582612324177d11a43a61e21a6bb83" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.13.0", - "proc-macro-error2", + "indexmap 2.14.0", + "proc-macro-error3", "proc-macro2", "quote", - "sha3", - "syn 2.0.114", + "sha3 0.11.0", + "syn 2.0.119", "syn-solidity", ] [[package]] name = "alloy-sol-macro-input" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56cef806ad22d4392c5fc83cf8f2089f988eb99c7067b4e0c6f1971fc1cca318" +checksum = "9762b2ad3e5a0c09886de54fe549ab0056681df843cb082e2df7e1c0eb270d30" dependencies = [ "const-hex", "dunce", @@ -768,25 +774,25 @@ dependencies = [ "macro-string", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6df77fea9d6a2a75c0ef8d2acbdfd92286cc599983d3175ccdc170d3433d249" +checksum = "da4c7130f0f01f4719678bda3db3bc7267fc2f7f9d0565e3bd964cd2bb45050d" dependencies = [ "serde", - "winnow", + "winnow 1.0.4", ] [[package]] name = "alloy-sol-types" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64612d29379782a5dde6f4b6570d9c756d734d760c0c94c254d361e678a6591f" +checksum = "d96e74d6213180f78dbdccddce8af02a639c160c94b0a543fa35c77c58b8a7fc" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -796,9 +802,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa186e560d523d196580c48bf00f1bf62e63041f28ecf276acc22f8b27bb9f53" +checksum = "3cd5dbd32cae5d1bc3afaf455064ebd9bcce70b57de220468908717c225225dd" dependencies = [ "alloy-json-rpc", "auto_impl", @@ -819,9 +825,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa501ad58dd20acddbfebc65b52e60f05ebf97c52fa40d1b35e91f5e2da0ad0e" +checksum = "f0b7b1f0e528ae788d05937f5b351afae3b4c1e08f17a061d868bd28e56aa9e3" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -835,9 +841,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ef85688e5ac2da72afc804e0a1f153a1f309f05a864b1998bbbed7804dbaab" +checksum = "b964b4c048eea647a701a6af07307c64995c4abd42d46ba0b3be9593ae3c333c" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -855,36 +861,37 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f00445db69d63298e2b00a0ea1d859f00e6424a3144ffc5eba9c31da995e16" +checksum = "efecf9efc5d56276e115b13b36ff27311b8cd6f72affc9788a10ff46b55b2616" dependencies = [ "alloy-pubsub", "alloy-transport", "futures", "http", + "rustls", "serde_json", "tokio", - "tokio-tungstenite 0.26.2", + "tokio-tungstenite", "tracing", + "url", "ws_stream_wasm", ] [[package]] name = "alloy-trie" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7fd448ab0a017de542de1dcca7a58e7019fe0e7a34ed3f9543ebddf6aceffa" +checksum = "3f14b5d9b2c2173980202c6ff470d96e7c5e202c65a9f67884ad565226df7fbb" dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", - "arrayvec", "derive_arbitrary", "derive_more", "nybbles", "proptest", - "proptest-derive", + "proptest-derive 0.7.0", "serde", "smallvec", "thiserror 2.0.18", @@ -893,14 +900,14 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.7.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa0c53e8c1e1ef4d01066b01c737fb62fc9397ab52c6e7bb5669f97d281b9bc" +checksum = "b3e2386593cef5b12c7d439dbcf62d7d51c3a50dc943909b42ae34b48f1b69dc" dependencies = [ - "darling 0.21.3", + "darling", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -914,9 +921,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.21" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -929,15 +936,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] @@ -948,7 +955,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -959,7 +966,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -968,6 +975,15 @@ version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "aquamarine" version = "0.6.0" @@ -979,7 +995,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -991,45 +1007,51 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "archery" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e0a5f99dfebb87bb342d0f53bb92c81842e100bbb915223e38349580e5441d" + [[package]] name = "ark-bls12-381" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5" +checksum = "be2ede2c0c96fa37d5d3484e8a59fec566c4a52b8c84bf993eaa6c67d7225a4c" dependencies = [ "ark-ec", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", ] [[package]] name = "ark-bn254" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" +checksum = "6bc66f96ebe2a17a499475b4f94791d379817592ef494171586967ffdc6f95db" dependencies = [ "ark-ec", - "ark-ff 0.5.0", + "ark-ff 0.6.0", "ark-r1cs-std", - "ark-std 0.5.0", + "ark-std 0.6.0", ] [[package]] name = "ark-ec" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" +checksum = "8352a2b2aedf6ba2cc38f7520fc51191d518dde96175c729af19f2d059f191c4" dependencies = [ "ahash", - "ark-ff 0.5.0", + "ark-ff 0.6.0", "ark-poly", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", "educe", "fnv", - "hashbrown 0.15.5", - "itertools 0.13.0", + "hashbrown 0.17.1", + "itertools 0.14.0", "num-bigint", "num-integer", "num-traits", @@ -1094,6 +1116,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ff" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a806ac6c8307b929df4645776290a50ee2aac754ad09d8bdf73391309e43af" +dependencies = [ + "ark-ff-asm 0.6.0", + "ark-ff-macros 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "digest 0.10.7", + "educe", + "num-bigint", + "num-traits", + "zeroize", +] + [[package]] name = "ark-ff-asm" version = "0.3.0" @@ -1121,7 +1160,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.114", + "syn 2.0.119", +] + +[[package]] +name = "ark-ff-asm" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1479009684adc073dff49a1025d3a7065b317a9ead25aaaca38cdc70058ba8a2" +dependencies = [ + "quote", + "syn 2.0.119", ] [[package]] @@ -1159,35 +1208,49 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", +] + +[[package]] +name = "ark-ff-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0691ed21ef00ef89c1e9bda832eba493dda3ec2f8d892fb25b705f73f06bb8" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] name = "ark-poly" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" +checksum = "75f55af10b672002b8d953e230282c51206842e20e5791a94432219b4201de5c" dependencies = [ "ahash", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", "educe", "fnv", - "hashbrown 0.15.5", + "hashbrown 0.17.1", ] [[package]] name = "ark-r1cs-std" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1" +checksum = "291f1c6628bfcac79b0dc2adbe401aa9100e2e96daa971645e0b18fc94de9a98" dependencies = [ "ark-ec", - "ark-ff 0.5.0", + "ark-ff 0.6.0", "ark-relations", - "ark-std 0.5.0", + "ark-std 0.6.0", "educe", + "itertools 0.14.0", "num-bigint", "num-integer", "num-traits", @@ -1196,14 +1259,18 @@ dependencies = [ [[package]] name = "ark-relations" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384" +checksum = "fe4c11c797a64b8a23e22bf4e77bf582ac27bb21395e3183a9a506ba2561e9f9" dependencies = [ - "ark-ff 0.5.0", - "ark-std 0.5.0", + "ark-ff 0.6.0", + "ark-poly", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "foldhash 0.1.5", + "indexmap 2.14.0", "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -1233,22 +1300,34 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" dependencies = [ - "ark-serialize-derive", "ark-std 0.5.0", "arrayvec", "digest 0.10.7", "num-bigint", ] +[[package]] +name = "ark-serialize" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74dd304fd536fb95d0a328e72be759209cc496a9da094c5bc56e5fea4f9e86b" +dependencies = [ + "ark-serialize-derive", + "ark-std 0.6.0", + "digest 0.10.7", + "num-bigint", + "serde_with", +] + [[package]] name = "ark-serialize-derive" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" +checksum = "4f153690697a2b91e5e1251ff98411ee5371500a111a0fd317a70e588eb300f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -1258,7 +1337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand 0.8.6", + "rand 0.8.7", ] [[package]] @@ -1268,7 +1347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.6", + "rand 0.8.7", ] [[package]] @@ -1278,7 +1357,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" dependencies = [ "num-traits", - "rand 0.8.6", + "rand 0.8.7", +] + +[[package]] +name = "ark-std" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "367c9c827ed431bff6868b7aa926e05b16eb46603cc8b6e768e4a5553fa1d155" +dependencies = [ + "num-traits", + "rand 0.8.7", ] [[package]] @@ -1289,24 +1378,24 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" dependencies = [ "serde", ] [[package]] name = "asn1_der" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" +checksum = "4858a9d740c5007a9069007c3b4e91152d0506f13c1b31dd49051fd537656156" [[package]] name = "async-compression" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10e4f991a553474232bc0a31799f6d24b034a84c0971d80d2e2f78b2e576e40" +checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" dependencies = [ "compression-codecs", "compression-core", @@ -1333,7 +1422,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -1344,7 +1433,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -1358,6 +1447,15 @@ dependencies = [ "rustc_version 0.4.1", ] +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -1382,14 +1480,38 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" + +[[package]] +name = "aws-lc-rs" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad" +dependencies = [ + "aws-lc-sys", + "untrusted 0.7.1", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", + "pkg-config", +] [[package]] name = "backon" @@ -1423,6 +1545,12 @@ dependencies = [ "match-lookup", ] +[[package]] +name = "base45" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240e56f4d3c453c36faacb695c535a4d5f8c7d23dac175014f32eb0a71012a03" + [[package]] name = "base64" version = "0.21.7" @@ -1449,7 +1577,7 @@ checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" [[package]] name = "bera-reth" -version = "1.4.4" +version = "1.5.0" dependencies = [ "alloy-consensus", "alloy-eips", @@ -1505,6 +1633,7 @@ dependencies = [ "reth-payload-primitives", "reth-payload-validator", "reth-primitives-traits", + "reth-revm", "reth-rpc", "reth-rpc-builder", "reth-rpc-convert", @@ -1517,7 +1646,8 @@ dependencies = [ "revm-inspectors", "serde", "serde_json", - "sha2", + "sha2 0.10.9", + "tempfile", "test-fuzz", "thiserror 2.0.18", "tokio", @@ -1541,33 +1671,13 @@ dependencies = [ "serde", ] -[[package]] -name = "bincode" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" -dependencies = [ - "bincode_derive", - "serde", - "unty", -] - -[[package]] -name = "bincode_derive" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" -dependencies = [ - "virtue", -] - [[package]] name = "bindgen" version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.10.0", + "bitflags", "cexpr", "clang-sys", "itertools 0.13.0", @@ -1575,8 +1685,8 @@ dependencies = [ "quote", "regex", "rustc-hash", - "shlex", - "syn 2.0.114", + "shlex 1.3.0", + "syn 2.0.119", ] [[package]] @@ -1595,41 +1705,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] -name = "bitcoin-io" -version = "0.1.4" +name = "bitcoin-consensus-encoding" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" +checksum = "207311705279250ba465076a1bac4b1ac982855fff73fc5f67e22158ac58cdc9" +dependencies = [ + "bitcoin-internals", + "hex-conservative 1.2.0", + "serde", +] [[package]] -name = "bitcoin_hashes" -version = "0.14.1" +name = "bitcoin-internals" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d573f4cf32996a8dce612e4348cece65a241f1882ed594047c9ba348e8869fa5" + +[[package]] +name = "bitcoin-io" +version = "0.1.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" +checksum = "bb5de036369d1ac59d3c1819ebc4d850f89466f5401c571a285b6ed564a4cb78" dependencies = [ - "bitcoin-io", - "hex-conservative", + "bitcoin-consensus-encoding", ] [[package]] -name = "bitflags" -version = "1.3.2" +name = "bitcoin_hashes" +version = "0.14.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "bca4c7abb40c8817d77403c880988cfd484f23ab2365726afb2f798363e2c4a2" +dependencies = [ + "bitcoin-io", + "hex-conservative 0.2.2", +] [[package]] name = "bitflags" -version = "2.10.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" dependencies = [ "serde_core", ] +[[package]] +name = "bitmaps" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" + [[package]] name = "bitvec" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837" dependencies = [ "funty", "radium", @@ -1638,6 +1768,20 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake3" +version = "1.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "cpufeatures 0.3.0", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -1648,12 +1792,12 @@ dependencies = [ ] [[package]] -name = "block-padding" -version = "0.3.3" +name = "block-buffer" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ - "generic-array", + "hybrid-array", ] [[package]] @@ -1670,28 +1814,28 @@ dependencies = [ [[package]] name = "boa_ast" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc119a5ad34c3f459062a96907f53358989b173d104258891bb74f95d93747e8" +checksum = "6339a700715bda376f5ea65c76e8fe8fc880930d8b0638cea68e7f3da6538e0a" dependencies = [ - "bitflags 2.10.0", + "bitflags", "boa_interner", "boa_macros", "boa_string", - "indexmap 2.13.0", + "indexmap 2.14.0", "num-bigint", "rustc-hash", ] [[package]] name = "boa_engine" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e637ec52ea66d76b0ca86180c259d6c7bb6e6a6e14b2f36b85099306d8b00cc3" +checksum = "1521be326f8a5c8887e95d4ce7f002917a002a23f7b93b9a6a2bf50ed4157824" dependencies = [ "aligned-vec", "arrayvec", - "bitflags 2.10.0", + "bitflags", "boa_ast", "boa_gc", "boa_interner", @@ -1710,7 +1854,7 @@ dependencies = [ "futures-lite", "hashbrown 0.16.1", "icu_normalizer", - "indexmap 2.13.0", + "indexmap 2.14.0", "intrusive-collections", "itertools 0.14.0", "num-bigint", @@ -1719,7 +1863,7 @@ dependencies = [ "num_enum", "paste", "portable-atomic", - "rand 0.9.4", + "rand 0.9.5", "regress", "rustc-hash", "ryu-js", @@ -1737,9 +1881,9 @@ dependencies = [ [[package]] name = "boa_gc" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1179f690cbfcbe5364cceee5f1cb577265bb6f07b0be6f210aabe270adcf9da" +checksum = "17323a98cf2e631afacf1a6d659c1212c48a68bacfa85afab0a66ade80582e51" dependencies = [ "boa_macros", "boa_string", @@ -1749,41 +1893,41 @@ dependencies = [ [[package]] name = "boa_interner" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9626505d33dc63d349662437297df1d3afd9d5fc4a2b3ad34e5e1ce879a78848" +checksum = "20510b8b02bcde9b0a01cf34c0c308c56156503d1d91cdab4c8cfbd292b747ea" dependencies = [ "boa_gc", "boa_macros", "hashbrown 0.16.1", - "indexmap 2.13.0", + "indexmap 2.14.0", "once_cell", - "phf", + "phf 0.13.1", "rustc-hash", "static_assertions", ] [[package]] name = "boa_macros" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f36418a46544b152632c141b0a0b7a453cd69ca150caeef83aee9e2f4b48b7d" +checksum = "5822cb4f146d243060e588bc5a5f2e709683fdad3d7111f42c48e6b5c921d23d" dependencies = [ "cfg-if", "cow-utils", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", "synstructure", ] [[package]] name = "boa_parser" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f99bf5b684f0de946378fcfe5f38c3a0fbd51cbf83a0f39ff773a0e218541f" +checksum = "35bd957fa9fa93e3a001a8aba5a5cd40c2bbfde486378be4c4b472fd304aaddb" dependencies = [ - "bitflags 2.10.0", + "bitflags", "boa_ast", "boa_interner", "boa_macros", @@ -1797,9 +1941,9 @@ dependencies = [ [[package]] name = "boa_string" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ce9d7aa5563a2e14eab111e2ae1a06a69a812f6c0c3d843196c9d03fbef440" +checksum = "ca2da1d7f4a76fd9040788a122f0d807910800a7b86f5952e9244848c36511de" dependencies = [ "fast-float2", "itoa", @@ -1809,43 +1953,69 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "bon" +version = "3.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a602c73c7b0148ec6d12af6fd5cc7a46e2eacc8878271a999abac56eed12f561" +dependencies = [ + "bon-macros", + "rustversion", +] + +[[package]] +name = "bon-macros" +version = "3.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f" +dependencies = [ + "darling", + "ident_case", + "prettyplease", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.119", +] + [[package]] name = "borsh" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f" +checksum = "a88b7ea17d208c4193f2c1e6de3c35fe71f98c96982d5ced308bdcc749ff6e1f" dependencies = [ "borsh-derive", + "bytes", "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c" +checksum = "d8f347189c62a579b8cd5f80714efa178f52e461dc2e6d701d264f5ff22e566c" dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "boyer-moore-magiclen" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7441b4796eb8a7107d4cd99d829810be75f5573e1081c37faa0e8094169ea0d6" +checksum = "43f0fdabfbc8017645223fd529c6077df2c491277e44e88ed8afd5afe54e715a" dependencies = [ "debug-helper", ] [[package]] name = "brotli" -version = "8.0.2" +version = "8.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +checksum = "5cc91aac060a7a1e25823bdccbfb6af1875b88f17c6daac97894eed8207166b3" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1854,9 +2024,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "5.0.0" +version = "5.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1868,15 +2038,21 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ - "sha2", + "sha2 0.10.9", "tinyvec", ] [[package]] name = "bumpalo" -version = "3.19.1" +version = "3.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + +[[package]] +name = "by_address" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "byte-slice-cast" @@ -1886,22 +2062,22 @@ checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" [[package]] name = "bytemuck" -version = "1.25.0" +version = "1.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" +checksum = "d6aedf8ae72766347502cf3cb4f41cf5e9cc37d28bee90f1fdaaae15f9cf9424" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" +checksum = "f65693059b6b9c588b9f62fed1cedbf0a8b805631457ea162d68f0de186f3de5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -1912,9 +2088,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.11.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" dependencies = [ "serde", ] @@ -1931,9 +2107,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "2.1.5" +version = "2.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00bf4b112b07b505472dbefd19e37e53307e2bfed5a79e0cc161d58ccd0e687" +checksum = "38d04308254695569fdb9bfe3bacc1c91837a670d0806605eb82d63748fbd3a6" dependencies = [ "arbitrary", "blst", @@ -1947,9 +2123,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" +checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0" dependencies = [ "serde_core", ] @@ -1963,16 +2139,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cargo-platform" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0c0e6148f11f01f32650a2ea02d532b2ad4e81d8bd41e6e565b5adc5e6082" -dependencies = [ - "serde", - "serde_core", -] - [[package]] name = "cargo_metadata" version = "0.19.2" @@ -1980,22 +2146,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" dependencies = [ "camino", - "cargo-platform 0.1.9", - "semver 1.0.27", - "serde", - "serde_json", - "thiserror 2.0.18", -] - -[[package]] -name = "cargo_metadata" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef987d17b0a113becdd19d3d0022d04d7ef41f9efe4f3fb63ac44ba61df3ade9" -dependencies = [ - "camino", - "cargo-platform 0.3.2", - "semver 1.0.27", + "cargo-platform", + "semver 1.0.28", "serde", "serde_json", "thiserror 2.0.18", @@ -2012,14 +2164,14 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.55" +version = "1.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" +checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38" dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex", + "shlex 2.0.1", ] [[package]] @@ -2045,15 +2197,26 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" + +[[package]] +name = "chacha20" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.1", +] [[package]] name = "chrono" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "js-sys", @@ -2069,7 +2232,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "inout", ] @@ -2086,9 +2249,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.56" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e" +checksum = "dd059f9da4f5c36b3787f65d38ccaab1cc315f07b01f89abc8359ee6a8205011" dependencies = [ "clap_builder", "clap_derive", @@ -2096,9 +2259,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.56" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0" +checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" dependencies = [ "anstream", "anstyle", @@ -2108,21 +2271,39 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.55" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "clap_lex" -version = "0.7.7" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" + +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + +[[package]] +name = "cobs" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror 2.0.18", +] [[package]] name = "coins-bip32" @@ -2136,7 +2317,7 @@ dependencies = [ "hmac", "k256", "serde", - "sha2", + "sha2 0.10.9", "thiserror 1.0.69", ] @@ -2151,8 +2332,8 @@ dependencies = [ "hmac", "once_cell", "pbkdf2", - "rand 0.8.6", - "sha2", + "rand 0.8.7", + "sha2 0.10.9", "thiserror 1.0.69", ] @@ -2168,18 +2349,18 @@ dependencies = [ "const-hex", "digest 0.10.7", "generic-array", - "ripemd", + "ripemd 0.1.3", "serde", - "sha2", - "sha3", + "sha2 0.10.9", + "sha3 0.10.9", "thiserror 1.0.69", ] [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "combine" @@ -2204,9 +2385,9 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" +checksum = "9dfdd1c2274d9aa354115b09dc9a901d6c5576818cdf70d14cae2bdb47df00ab" dependencies = [ "castaway", "cfg-if", @@ -2218,9 +2399,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.36" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00828ba6fd27b45a448e57dbfe84f1029d4c9f26b368157e9a448a5f49a2ec2a" +checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" dependencies = [ "brotli", "compression-core", @@ -2232,9 +2413,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" +checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" [[package]] name = "concat-kdf" @@ -2247,12 +2428,12 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.17.0" +version = "1.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bb320cac8a0750d7f25280aa97b09c26edfe161164238ecbbb31092b079e735" +checksum = "33e2a781ebdf4467d1428dc4593067825fb646f6871475098d8577421af73558" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "proptest", "serde_core", ] @@ -2271,11 +2452,12 @@ checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3" [[package]] name = "const_format" -version = "0.2.35" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" +checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e" dependencies = [ "const_format_proc_macros", + "konst", ] [[package]] @@ -2289,6 +2471,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "constant_time_eq" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" + [[package]] name = "convert_case" version = "0.10.0" @@ -2324,15 +2512,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - [[package]] name = "cow-utils" version = "0.1.3" @@ -2348,6 +2527,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc" version = "3.4.0" @@ -2359,9 +2547,9 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" [[package]] name = "crc32fast" @@ -2380,18 +2568,18 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" [[package]] name = "crossbeam-channel" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -2406,11 +2594,20 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" [[package]] name = "crossterm" @@ -2418,7 +2615,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ - "bitflags 2.10.0", + "bitflags", "crossterm_winapi", "derive_more", "document-features", @@ -2468,6 +2665,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" +dependencies = [ + "hybrid-array", +] + [[package]] name = "ctr" version = "0.9.2" @@ -2484,7 +2690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", @@ -2501,27 +2707,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", -] - -[[package]] -name = "darling" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" -dependencies = [ - "darling_core 0.20.11", - "darling_macro 0.20.11", -] - -[[package]] -name = "darling" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" -dependencies = [ - "darling_core 0.21.3", - "darling_macro 0.21.3", + "syn 2.0.119", ] [[package]] @@ -2530,37 +2716,8 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" dependencies = [ - "darling_core 0.23.0", - "darling_macro 0.23.0", -] - -[[package]] -name = "darling_core" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.114", -] - -[[package]] -name = "darling_core" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "serde", - "strsim", - "syn 2.0.114", + "darling_core", + "darling_macro", ] [[package]] @@ -2572,30 +2729,9 @@ dependencies = [ "ident_case", "proc-macro2", "quote", + "serde", "strsim", - "syn 2.0.114", -] - -[[package]] -name = "darling_macro" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" -dependencies = [ - "darling_core 0.20.11", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "darling_macro" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" -dependencies = [ - "darling_core 0.21.3", - "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -2604,16 +2740,16 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ - "darling_core 0.23.0", + "darling_core", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "dashmap" -version = "6.1.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" dependencies = [ "arbitrary", "cfg-if", @@ -2627,15 +2763,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" +checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" [[package]] name = "data-encoding-macro" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb" +checksum = "3259c913752a86488b501ed8680446a5ed2d5aeac6e596cb23ba3800768ea32c" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -2643,19 +2779,19 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" +checksum = "ccc2776f0c61eca1ca32528f85548abd1a4be8fb53d1b21c013e4f18da1e7090" dependencies = [ "data-encoding", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "debug-helper" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" +checksum = "80a4af69c60438a1a82af89d362f4729fd38db7b73f305a237636fad31ceb2bf" [[package]] name = "delay_map" @@ -2680,11 +2816,10 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.5" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ - "powerfmt", "serde_core", ] @@ -2701,13 +2836,13 @@ dependencies = [ [[package]] name = "derive-where" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" +checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -2718,38 +2853,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling 0.20.11", - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -2771,7 +2875,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.114", + "syn 2.0.119", "unicode-xid", ] @@ -2796,19 +2900,20 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", + "block-buffer 0.10.4", "const-oid", - "crypto-common", + "crypto-common 0.1.7", "subtle", ] [[package]] -name = "dirs" -version = "6.0.0" +name = "digest" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "dirs-sys", + "block-buffer 0.12.1", + "crypto-common 0.2.2", ] [[package]] @@ -2821,18 +2926,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.5.2", - "windows-sys 0.59.0", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -2840,15 +2933,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.6", + "redox_users", "winapi", ] [[package]] name = "discv5" version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7999df38d0bd8f688212e1a4fae31fd2fea6d218649b9cd7c40bf3ec1318fc" +source = "git+https://github.com/sigp/discv5?rev=7663c00#7663c00ee0837ea98547caaedede95d9d6736f4d" dependencies = [ "aes", "aes-gcm", @@ -2867,9 +2959,9 @@ dependencies = [ "more-asserts", "multiaddr", "parking_lot", - "rand 0.8.6", + "rand 0.8.7", "smallvec", - "socket2 0.6.2", + "socket2", "tokio", "tracing", "uint 0.10.0", @@ -2878,20 +2970,20 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "doctest-file" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" +checksum = "c2db04e74f0a9a93103b50e90b96024c9b2bdca8bce6a632ec71b88736d3d359" [[package]] name = "document-features" @@ -2931,7 +3023,7 @@ checksum = "1ec431cd708430d5029356535259c5d645d60edd3d39c54e5eea9782d46caa7d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -2969,7 +3061,7 @@ dependencies = [ "ed25519", "rand_core 0.6.4", "serde", - "sha2", + "sha2 0.10.9", "subtle", "zeroize", ] @@ -2983,14 +3075,14 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" dependencies = [ "serde", ] @@ -3015,6 +3107,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "enr" version = "0.13.0" @@ -3028,43 +3132,31 @@ dependencies = [ "hex", "k256", "log", - "rand 0.8.6", + "rand 0.8.7", "secp256k1 0.30.0", "serde", - "sha3", + "sha3 0.10.9", "zeroize", ] -[[package]] -name = "enum-as-inner" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.114", -] - [[package]] name = "enum-ordinalize" -version = "4.3.2" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0" +checksum = "07f808d588c10e464ea6f7d3eaed500049eff30aaac103460f61828c2d65b3eb" dependencies = [ "enum-ordinalize-derive", ] [[package]] name = "enum-ordinalize-derive" -version = "4.3.2" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" +checksum = "42e528e2d34ba8a67a1a650b86beae8ef69fc5fdb638016f386b973226590432" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -3084,7 +3176,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -3105,20 +3197,20 @@ dependencies = [ [[package]] name = "ethereum_hashing" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c853bd72c9e5787f8aafc3df2907c2ed03cff3150c3acd94e2e53a98ab70a8ab" +checksum = "5aa93f58bb1eb3d1e556e4f408ef1dac130bad01ac37db4e7ade45de40d1c86a" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", "ring", - "sha2", + "sha2 0.10.9", ] [[package]] name = "ethereum_serde_utils" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc1355dbb41fbbd34ec28d4fb2a57d9a70c67ac3c19f6a5ca4d4a176b9e997a" +checksum = "38df44a7a271ab43835678f9215b53cc2523e4714a215da6643d83dc110245da" dependencies = [ "alloy-primitives", "hex", @@ -3129,24 +3221,9 @@ dependencies = [ [[package]] name = "ethereum_ssz" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dcddb2554d19cde19b099fadddde576929d7a4d0c1cd3512d1fd95cf174375c" -dependencies = [ - "alloy-primitives", - "ethereum_serde_utils", - "itertools 0.13.0", - "serde", - "serde_derive", - "smallvec", - "typenum", -] - -[[package]] -name = "ethereum_ssz" -version = "0.10.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2128a84f7a3850d54ee343334e3392cca61f9f6aa9441eec481b9394b43c238b" +checksum = "e462875ad8693755ea8913d6e905715c76ea4836e2254e18c9cf0f7a8f8c2a13" dependencies = [ "alloy-primitives", "ethereum_serde_utils", @@ -3159,26 +3236,25 @@ dependencies = [ [[package]] name = "ethereum_ssz_derive" -version = "0.9.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a657b6b3b7e153637dc6bdc6566ad9279d9ee11a15b12cfb24a2e04360637e9f" +checksum = "daf022360bdbe9456eda5f35718a50476d5b2a0d51a97ed4eae27420737a6fba" dependencies = [ - "darling 0.20.11", + "darling", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] -name = "ethereum_ssz_derive" -version = "0.10.1" +name = "evmap" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd596f91cff004fc8d02be44c21c0f9b93140a04b66027ae052f5f8e05b48eba" +checksum = "1b8874945f036109c72242964c1174cf99434e30cfa45bf45fedc983f50046f8" dependencies = [ - "darling 0.23.0", - "proc-macro2", - "quote", - "syn 2.0.114", + "hashbag", + "left-right", + "smallvec", ] [[package]] @@ -3197,11 +3273,17 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8eb564c5c7423d25c886fb561d1e4ee69f72354d16918afa32c08811f6b6a55" +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "fastrlp" @@ -3253,13 +3335,12 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.27" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" +checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759" dependencies = [ "cfg-if", "libc", - "libredox", ] [[package]] @@ -3270,9 +3351,9 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fixed-cache" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41c7aa69c00ebccf06c3fa7ffe2a6cf26a58b5fe4deabfe646285ff48136a8f" +checksum = "2fe63500644ef0269fe6b744e7e5dc5c20b5eebf3d881bc2be53f194636f6583" dependencies = [ "equivalent", "rapidhash", @@ -3286,7 +3367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.6", + "rand 0.8.7", "rustc-hex", "static_assertions", ] @@ -3309,7 +3390,7 @@ checksum = "6dc7a9cb3326bafb80642c5ce99b39a2c0702d4bfa8ee8a3e773791a6cbe2407" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -3320,9 +3401,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", @@ -3356,21 +3437,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -3380,6 +3446,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -3397,9 +3469,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -3412,9 +3484,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", @@ -3435,15 +3507,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", @@ -3452,9 +3524,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-lite" @@ -3471,42 +3543,42 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-timer" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" +checksum = "af43fadb8a98512d547e37b4e92e0ced13e205c061b87b4623eff01d918d6968" dependencies = [ "gloo-timers", - "send_wrapper 0.4.0", + "send_wrapper", ] [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -3516,7 +3588,6 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] @@ -3526,6 +3597,21 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" +[[package]] +name = "generator" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3b854b0e584ead1a33f18b2fcad7cf7be18b3875c78816b753639aa501513ae" +dependencies = [ + "cc", + "cfg-if", + "libc", + "log", + "rustversion", + "windows-link", + "windows-result", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -3557,24 +3643,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", - "js-sys", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", - "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", + "js-sys", "libc", - "r-efi", - "wasip2", - "wasip3", + "r-efi 6.0.0", + "rand_core 0.10.1", + "wasm-bindgen", ] [[package]] @@ -3589,15 +3674,14 @@ dependencies = [ [[package]] name = "git2" -version = "0.20.4" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b" +checksum = "ddddbf932745a6be37109b6112d3ee09696106f848449069d3a57bba937ab82e" dependencies = [ - "bitflags 2.10.0", + "bitflags", "libc", "libgit2-sys", "log", - "url", ] [[package]] @@ -3629,9 +3713,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +checksum = "482ce8a491a501da4cd806bd190275363d674f2845005c6ddbd5d3e1dd54495d" dependencies = [ "futures-channel", "futures-core", @@ -3665,9 +3749,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.13" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "a9f37a958b41b3b19ee2707c06439c0e9e547e847223eb791ecb0cb821c65e27" dependencies = [ "atomic-waker", "bytes", @@ -3675,7 +3759,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.13.0", + "indexmap 2.14.0", "slab", "tokio", "tokio-util", @@ -3688,6 +3772,21 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbag" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7040a10f52cba493ddb09926e15d10a9d8a28043708a405931fe4c6f19fac064" + [[package]] name = "hashbrown" version = "0.12.3" @@ -3708,19 +3807,20 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", - "foldhash 0.1.5", + "equivalent", + "foldhash 0.2.0", ] [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ "allocator-api2", "equivalent", @@ -3748,6 +3848,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "heapless" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version 0.4.1", + "serde", + "spin", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.5.0" @@ -3776,48 +3890,81 @@ dependencies = [ ] [[package]] -name = "hickory-proto" -version = "0.25.2" +name = "hex-conservative" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35431185f361ccf3ffc58254628af5f1f5d5f28531da2e02e5d6c82bbc282a10" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "hickory-net" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" +checksum = "e2295ed2f9c31e471e1428a8f88a3f0e1f4b27c15049592138d1eebe9c35b183" dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner", "futures-channel", "futures-io", "futures-util", + "hickory-proto", + "idna", + "ipnet", + "jni 0.22.4", + "rand 0.10.2", + "thiserror 2.0.18", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-proto" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bab31817bfb44672a252e97fe81cd0c18d1b2cf892108922f6818820df8c643" +dependencies = [ + "data-encoding", "idna", "ipnet", + "jni 0.22.4", "once_cell", - "rand 0.9.4", + "prefix-trie", + "rand 0.10.2", "ring", "serde", "thiserror 2.0.18", "tinyvec", - "tokio", "tracing", "url", ] [[package]] name = "hickory-resolver" -version = "0.25.2" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" +checksum = "f0d58d28879ceecde6607729660c2667a081ccdc082e082675042793960f178c" dependencies = [ "cfg-if", "futures-util", + "hickory-net", "hickory-proto", "ipconfig", + "ipnet", + "jni 0.22.4", "moka", + "ndk-context", "once_cell", "parking_lot", - "rand 0.9.4", + "rand 0.10.2", "resolv-conf", "serde", "smallvec", + "system-configuration", "thiserror 2.0.18", "tokio", "tracing", @@ -3843,9 +3990,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", @@ -3853,9 +4000,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" dependencies = [ "bytes", "http", @@ -3863,9 +4010,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" dependencies = [ "bytes", "futures-core", @@ -3900,9 +4047,9 @@ checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" [[package]] name = "humantime" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" +checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15" [[package]] name = "humantime-serde" @@ -3914,11 +4061,20 @@ dependencies = [ "serde", ] +[[package]] +name = "hybrid-array" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c" +dependencies = [ + "typenum", +] + [[package]] name = "hyper" -version = "1.8.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ "atomic-waker", "bytes", @@ -3931,7 +4087,6 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "pin-utils", "smallvec", "tokio", "want", @@ -3939,21 +4094,18 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.7" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ "http", "hyper", "hyper-util", "log", "rustls", - "rustls-native-certs", - "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.5", ] [[package]] @@ -3969,32 +4121,15 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", @@ -4003,7 +4138,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.2", + "socket2", "tokio", "tower-service", "tracing", @@ -4048,9 +4183,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" dependencies = [ "displaydoc", "litemap", @@ -4107,9 +4242,9 @@ checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" dependencies = [ "displaydoc", "icu_locale_core", @@ -4122,12 +4257,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "ident_case" version = "1.0.1" @@ -4165,6 +4294,32 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "imbl" +version = "7.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43ea8d4c37ee560727e824d62804183624d371e632019b0e9e3532bce64a33e5" +dependencies = [ + "archery", + "bitmaps", + "equivalent", + "imbl-sized-chunks", + "rand_core 0.9.5", + "rand_xoshiro", + "serde_core", + "version_check", + "wide", +] + +[[package]] +name = "imbl-sized-chunks" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4241005618a62f8d57b2febd02510fb96e0137304728543dfc5fd6f052c22d" +dependencies = [ + "bitmaps", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -4182,7 +4337,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -4223,13 +4378,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "serde", "serde_core", ] @@ -4245,20 +4400,20 @@ dependencies = [ [[package]] name = "inotify" -version = "0.11.0" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" +checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8" dependencies = [ - "bitflags 2.10.0", + "bitflags", "inotify-sys", "libc", ] [[package]] name = "inotify-sys" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d" dependencies = [ "libc", ] @@ -4269,28 +4424,27 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ - "block-padding", "generic-array", ] [[package]] name = "instability" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357b7205c6cd18dd2c86ed312d1e70add149aea98e7ef72b9fdf0270e555c11d" +checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971" dependencies = [ - "darling 0.23.0", + "darling", "indoc", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "interprocess" -version = "2.2.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d" +checksum = "069323743400cb7ab06a8fe5c1ed911d36b6919ec531661d034c89083629595b" dependencies = [ "doctest-file", "futures-core", @@ -4298,7 +4452,7 @@ dependencies = [ "recvmsg", "tokio", "widestring", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4312,29 +4466,23 @@ dependencies = [ [[package]] name = "ipconfig" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222" dependencies = [ - "socket2 0.5.10", + "socket2", "widestring", - "windows-sys 0.48.0", - "winreg", + "windows-registry", + "windows-result", + "windows-sys 0.61.2", ] [[package]] name = "ipnet" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" - -[[package]] -name = "iri-string" -version = "0.7.10" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" dependencies = [ - "memchr", "serde", ] @@ -4373,9 +4521,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jni" @@ -4386,36 +4534,89 @@ dependencies = [ "cesu8", "cfg-if", "combine", - "jni-sys", + "jni-sys 0.3.1", "log", "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys 0.4.1", + "log", + "simd_cesu8", + "thiserror 2.0.18", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version 0.4.1", + "simd_cesu8", + "syn 2.0.119", +] + [[package]] name = "jni-sys" -version = "0.3.0" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" +dependencies = [ + "jni-sys 0.4.1", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.119", +] [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.85" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" dependencies = [ - "once_cell", + "cfg-if", + "futures-util", "wasm-bindgen", ] @@ -4452,7 +4653,7 @@ dependencies = [ "pin-project", "rustls", "rustls-pki-types", - "rustls-platform-verifier", + "rustls-platform-verifier 0.5.3", "soketto", "thiserror 2.0.18", "tokio", @@ -4478,7 +4679,7 @@ dependencies = [ "jsonrpsee-types", "parking_lot", "pin-project", - "rand 0.9.4", + "rand 0.9.5", "rustc-hash", "serde", "serde_json", @@ -4504,7 +4705,7 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-types", "rustls", - "rustls-platform-verifier", + "rustls-platform-verifier 0.5.3", "serde", "serde_json", "thiserror 2.0.18", @@ -4523,7 +4724,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -4593,17 +4794,20 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.3.1" +version = "10.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" +checksum = "eba32bfb4ffdeaca3e34431072faf01745c9b26d25504aa7a6cf5684334fc4fc" dependencies = [ + "aws-lc-rs", "base64 0.22.1", + "getrandom 0.2.17", "js-sys", "pem", - "ring", "serde", "serde_json", + "signature", "simple_asn1", + "zeroize", ] [[package]] @@ -4617,15 +4821,15 @@ dependencies = [ "elliptic-curve", "once_cell", "serdect", - "sha2", + "sha2 0.10.9", "signature", ] [[package]] name = "kasuari" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe90c1150662e858c7d5f945089b7517b0a80d8bf7ba4b1b5ffc984e7230a5b" +checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899" dependencies = [ "hashbrown 0.16.1", "portable-atomic", @@ -4638,24 +4842,49 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", +] + +[[package]] +name = "keccak" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", ] [[package]] name = "keccak-asm" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b646a74e746cd25045aa0fd42f4f7f78aa6d119380182c7e63a5593c4ab8df6f" +checksum = "dd5dc2c0d691cbf7595cde551ced329cca99c2387c2cbc97754c5d0cd045d3ee" dependencies = [ "digest 0.10.7", "sha3-asm", ] +[[package]] +name = "konst" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb" +dependencies = [ + "konst_macro_rules", +] + +[[package]] +name = "konst_macro_rules" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" + [[package]] name = "kqueue" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" +checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5" dependencies = [ "kqueue-sys", "libc", @@ -4663,11 +4892,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", ] @@ -4678,22 +4907,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] -name = "leb128fmt" -version = "0.1.0" +name = "left-right" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" +checksum = "0f0c21e4c8ff95f487fb34e6f9182875f42c84cef966d29216bf115d9bba835a" +dependencies = [ + "crossbeam-utils", + "loom", + "slab", +] [[package]] name = "libc" -version = "0.2.180" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libgit2-sys" -version = "0.18.3+1.9.2" +version = "0.18.5+1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b3acc4b91781bb0b3386669d325163746af5f6e4f73e6d2d630e09a35f3487" +checksum = "005d6ae6eac1912906073e069f7db60b1fa98e052a68227824afe3e3a1c59ca2" dependencies = [ "cc", "libc", @@ -4719,9 +4953,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libp2p-identity" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c7892c221730ba55f7196e98b0b8ba5e04b4155651736036628e9f73ed6fc3" +checksum = "9525f3831544f7ae497bde79adf114ef127b0fbbb97edbbf692a80408636421c" dependencies = [ "asn1_der", "bs58", @@ -4729,8 +4963,8 @@ dependencies = [ "hkdf", "k256", "multihash", - "quick-protobuf", - "sha2", + "prost", + "sha2 0.10.9", "thiserror 2.0.18", "tracing", "zeroize", @@ -4749,13 +4983,11 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.12" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" +checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" dependencies = [ - "bitflags 2.10.0", "libc", - "redox_syscall 0.7.0", ] [[package]] @@ -4776,9 +5008,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.23" +version = "1.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7" +checksum = "85bc9657773828b90eeb625adff10eeac83cc21bbfd8e23a03eaa8a33c9e28d9" dependencies = [ "cc", "libc", @@ -4788,11 +5020,11 @@ dependencies = [ [[package]] name = "line-clipping" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a" +checksum = "3f50e8f47623268b5407192d26876c4d7f89d686ca130fdc53bced4814cd29f8" dependencies = [ - "bitflags 2.10.0", + "bitflags", ] [[package]] @@ -4813,15 +5045,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" [[package]] name = "litrs" @@ -4841,19 +5073,41 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" + +[[package]] +name = "loom" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] [[package]] name = "lru" -version = "0.16.3" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" +checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39" dependencies = [ "hashbrown 0.16.1", ] +[[package]] +name = "lru" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2f2f9b4ba7e6b24d95e7e899329d35be83bcded72c8540cdd5368932d1d90a" +dependencies = [ + "hashbrown 0.17.1", +] + [[package]] name = "lru-slab" version = "0.1.2" @@ -4881,9 +5135,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c23545df7ecf1b16c303910a69b079e8e251d60f7dd2cc9b4177f2afaf1746" +checksum = "90071f8077f8e40adfc4b7fe9cd495ce316263f19e75c2211eeff3fdf475a3d9" [[package]] name = "mach2" @@ -4894,15 +5148,21 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b" + [[package]] name = "macro-string" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" +checksum = "59a9dbbfc75d2688ed057456ce8a3ee3f48d12eec09229f560f3643b9f275653" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -4913,7 +5173,7 @@ checksum = "757aee279b8bdbb9f9e676796fd459e4207a1f986e87886700abf589f5abf771" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -4927,9 +5187,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memmap2" @@ -4951,12 +5211,12 @@ dependencies = [ [[package]] name = "metrics" -version = "0.24.3" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8" +checksum = "89550ee9f79e88fef3119de263694973a8adb26c21d75322164fb8c493039fe2" dependencies = [ - "ahash", "portable-atomic", + "rapidhash", ] [[package]] @@ -4967,17 +5227,18 @@ checksum = "161ab904c2c62e7bda0f7562bf22f96440ca35ff79e66c800cbac298f2f4f5ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3589659543c04c7dc5526ec858591015b87cd8746583b51b48ef4353f99dbcda" +checksum = "1db0d8f1fc9e62caebd0319e11eaec5822b0186c171568f0480b46a0137f9108" dependencies = [ "base64 0.22.1", - "indexmap 2.13.0", + "evmap", + "indexmap 2.14.0", "metrics", "metrics-util", "quanta", @@ -4986,13 +5247,13 @@ dependencies = [ [[package]] name = "metrics-process" -version = "2.4.2" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f615e08e049bd14a44c4425415782efb9bcd479fc1e19ddeb971509074c060d0" +checksum = "4268d87f64a752f5a651314fc683f04da10be65701ea3e721ba4d74f79163cac" dependencies = [ "libc", "libproc", - "mach2", + "mach2 0.6.0", "metrics", "once_cell", "procfs", @@ -5002,17 +5263,18 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfb1365fea27e6dd9dc1dbc19f570198bc86914533ad639dae939635f096be4" +checksum = "96f8722f8562635f92f8ed992f26df0532266eb03d5202607c20c0d7e9745e13" dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.16.1", "metrics", "quanta", - "rand 0.9.4", + "rand 0.9.5", "rand_xoshiro", + "rapidhash", "sketches-ddsketch", ] @@ -5050,9 +5312,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "log", @@ -5078,14 +5340,14 @@ checksum = "59b43b4fd69e3437618106f7754f34021b831a514f9e1a98ae863cabcd8d8dad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "moka" -version = "0.12.13" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac832c50ced444ef6be0767a008b02c106a909ba79d1d830501e94b96f6b7e" +checksum = "957228ad12042ee839f93c8f257b62b4c0ab5eaae1d4fa60de53b27c9d7c5046" dependencies = [ "crossbeam-channel", "crossbeam-epoch", @@ -5125,42 +5387,31 @@ dependencies = [ [[package]] name = "multibase" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8694bb4835f452b0e3bb06dbebb1d6fc5385b6ca1caf2e55fd165c042390ec77" +checksum = "7e0e4a371cbf1dfd666b658ba137763edb23c45beb43cfe369b5593cd6b437b6" dependencies = [ "base-x", "base256emoji", + "base45", "data-encoding", "data-encoding-macro", ] [[package]] name = "multihash" -version = "0.19.3" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d" +checksum = "577c63b00ad74d57e8c9aa870b5fccebf2fd64a308a5aee9f1bb88e4aea19447" dependencies = [ - "core2", "unsigned-varint", ] [[package]] -name = "native-tls" -version = "0.2.14" +name = "ndk-context" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe 0.1.6", - "openssl-sys", - "schannel", - "security-framework 2.11.1", - "security-framework-sys", - "tempfile", -] +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "nom" @@ -5172,13 +5423,22 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonmax" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" +dependencies = [ + "serde", +] + [[package]] name = "notify" version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ - "bitflags 2.10.0", + "bitflags", "fsevent-sys", "inotify", "kqueue", @@ -5196,14 +5456,14 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" dependencies = [ - "bitflags 2.10.0", + "bitflags", ] [[package]] name = "ntapi" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081" +checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" dependencies = [ "winapi", ] @@ -5214,7 +5474,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -5233,9 +5493,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" dependencies = [ "num-integer", "num-traits", @@ -5253,9 +5513,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-integer" @@ -5268,11 +5528,10 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -5310,9 +5569,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26" dependencies = [ "num_enum_derive", "rustversion", @@ -5320,14 +5579,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -5356,18 +5615,18 @@ dependencies = [ [[package]] name = "objc2-core-foundation" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.10.0", + "bitflags", ] [[package]] name = "objc2-io-kit" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a" +checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15" dependencies = [ "libc", "objc2-core-foundation", @@ -5375,9 +5634,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" dependencies = [ "critical-section", "portable-atomic", @@ -5389,183 +5648,23 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" -[[package]] -name = "op-alloy" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b8fee21003dd4f076563de9b9d26f8c97840157ef78593cd7f262c5ca99848" -dependencies = [ - "op-alloy-consensus", - "op-alloy-network", - "op-alloy-provider", - "op-alloy-rpc-types", - "op-alloy-rpc-types-engine", -] - -[[package]] -name = "op-alloy-consensus" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736381a95471d23e267263cfcee9e1d96d30b9754a94a2819148f83379de8a86" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-eth", - "alloy-serde", - "arbitrary", - "derive_more", - "serde", - "serde_with", - "thiserror 2.0.18", -] - -[[package]] -name = "op-alloy-network" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034183dca6bff6632e7c24c92e75ff5f0eabb58144edb4d8241814851334d47" -dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types-eth", - "alloy-signer", - "op-alloy-consensus", - "op-alloy-rpc-types", -] - -[[package]] -name = "op-alloy-provider" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6753d90efbaa8ea8bcb89c1737408ca85fa60d7adb875049d3f382c063666f86" -dependencies = [ - "alloy-network", - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types-engine", - "alloy-transport", - "async-trait", - "op-alloy-rpc-types-engine", -] - -[[package]] -name = "op-alloy-rpc-types" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd87c6b9e5b6eee8d6b76f41b04368dca0e9f38d83338e5b00e730c282098a4" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "derive_more", - "op-alloy-consensus", - "serde", - "serde_json", - "thiserror 2.0.18", -] - -[[package]] -name = "op-alloy-rpc-types-engine" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77727699310a18cdeed32da3928c709e2704043b6584ed416397d5da65694efc" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-engine", - "alloy-serde", - "derive_more", - "ethereum_ssz 0.9.1", - "ethereum_ssz_derive 0.9.1", - "op-alloy-consensus", - "serde", - "sha2", - "snap", - "thiserror 2.0.18", -] - -[[package]] -name = "op-revm" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c92b75162c2ed1661849fa51683b11254a5b661798360a2c24be918edafd40" -dependencies = [ - "auto_impl", - "revm", - "serde", -] - [[package]] name = "opaque-debug" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openssl" -version = "0.10.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" -dependencies = [ - "bitflags 2.10.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" -[[package]] -name = "openssl-sys" -version = "0.9.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentelemetry" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" +checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682" dependencies = [ "futures-core", "futures-sink", @@ -5577,21 +5676,21 @@ dependencies = [ [[package]] name = "opentelemetry-appender-tracing" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2" +checksum = "2c0080f0dc1d7c786f467cd85a4e395fcab11ee852004f39a29a18ab7c25d837" dependencies = [ "opentelemetry", "tracing", "tracing-core", - "tracing-subscriber 0.3.22", + "tracing-subscriber", ] [[package]] name = "opentelemetry-http" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" +checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331" dependencies = [ "async-trait", "bytes", @@ -5602,9 +5701,9 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2366db2dca4d2ad033cad11e6ee42844fd727007af5ad04a1730f4cb8163bf" +checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35" dependencies = [ "http", "opentelemetry", @@ -5616,14 +5715,14 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tonic", - "tracing", + "tonic-types", ] [[package]] name = "opentelemetry-proto" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" +checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -5634,31 +5733,26 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e62e29dfe041afb8ed2a6c9737ab57db4907285d999ef8ad3a59092a36bdc846" +checksum = "c913ac17a6c451661ee255f4625d143e51647ae78ebd969b75e41c4442f4fe47" [[package]] name = "opentelemetry_sdk" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" +checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9" dependencies = [ "futures-channel", "futures-executor", "futures-util", "opentelemetry", "percent-encoding", - "rand 0.9.4", + "portable-atomic", + "rand 0.9.5", "thiserror 2.0.18", ] -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "p256" version = "0.13.2" @@ -5668,7 +5762,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2", + "sha2 0.10.9", ] [[package]] @@ -5681,13 +5775,36 @@ dependencies = [ "winapi", ] +[[package]] +name = "palette" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" +dependencies = [ + "approx", + "fast-srgb8", + "libm", + "palette_derive", +] + +[[package]] +name = "palette_derive" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" +dependencies = [ + "by_address", + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "parity-scale-codec" version = "3.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa" dependencies = [ - "arbitrary", "arrayvec", "bitvec", "byte-slice-cast", @@ -5708,7 +5825,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -5735,7 +5852,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.18", + "redox_syscall", "smallvec", "windows-link", ] @@ -5774,9 +5891,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.5" +version = "2.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7" +checksum = "47627dd7305c6a2d6c8c6bcd24c5a4c17dbbf425f4f9c5313e724b38fc9782e9" dependencies = [ "memchr", "ucd-trie", @@ -5798,8 +5915,18 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_macros", - "phf_shared", + "phf_macros 0.13.1", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6" +dependencies = [ + "phf_macros 0.14.0", + "phf_shared 0.14.0", "serde", ] @@ -5810,7 +5937,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100" +dependencies = [ + "fastrand", + "phf_shared 0.14.0", ] [[package]] @@ -5819,11 +5956,24 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.13.1", + "phf_shared 0.13.1", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "phf_macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085" +dependencies = [ + "phf_generator 0.14.0", + "phf_shared 0.14.0", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -5835,31 +5985,40 @@ dependencies = [ "siphasher", ] +[[package]] +name = "phf_shared" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" -version = "1.1.10" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.10" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -5879,9 +6038,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "plain_hasher" @@ -5899,7 +6058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "opaque-debug", "universal-hash", ] @@ -5910,11 +6069,24 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +[[package]] +name = "postcard" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" +dependencies = [ + "cobs", + "embedded-io 0.4.0", + "embedded-io 0.6.1", + "heapless", + "serde", +] + [[package]] name = "potential_utf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" dependencies = [ "zerovec", ] @@ -5934,6 +6106,17 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prefix-trie" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cf6e3177f0684016a5c209b00882e15f8bdd3f3bb48f0491df10cd102d0c6e7" +dependencies = [ + "either", + "ipnet", + "num-traits", +] + [[package]] name = "pretty_assertions" version = "1.4.1" @@ -5951,7 +6134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -5976,9 +6159,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ "toml_edit", ] @@ -5993,6 +6176,16 @@ dependencies = [ "quote", ] +[[package]] +name = "proc-macro-error-attr3" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82366fd7d8b7a440d66d13418820c69df9b3908bcb1a0476d7f5ce5d12f5a04d" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "proc-macro-error2" version = "2.0.1" @@ -6002,7 +6195,18 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.114", +] + +[[package]] +name = "proc-macro-error3" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b511283ea8a74b4b39447b128c5d00f03a356b7424554b13e298a5550100d9ac" +dependencies = [ + "proc-macro-error-attr3", + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] @@ -6020,7 +6224,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7" dependencies = [ - "bitflags 2.10.0", + "bitflags", "chrono", "flate2", "procfs-core", @@ -6033,22 +6237,22 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405" dependencies = [ - "bitflags 2.10.0", + "bitflags", "chrono", "hex", ] [[package]] name = "proptest" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40" +checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.10.0", + "bitflags", "num-traits", - "rand 0.9.4", + "rand 0.9.5", "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax", @@ -6075,14 +6279,25 @@ checksum = "fb6dc647500e84a25a85b100e76c85b8ace114c209432dc174f20aac11d4ed6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", +] + +[[package]] +name = "proptest-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c57924a81864dddafba92e1bf92f9bf82f97096c44489548a60e888e1547549b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] name = "prost" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" +checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1" dependencies = [ "bytes", "prost-derive", @@ -6090,15 +6305,24 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" +checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" dependencies = [ "anyhow", "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", +] + +[[package]] +name = "prost-types" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a" +dependencies = [ + "prost", ] [[package]] @@ -6122,20 +6346,11 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-protobuf" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" -dependencies = [ - "byteorder", -] - [[package]] name = "quinn" -version = "0.11.9" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8" dependencies = [ "bytes", "cfg_aliases", @@ -6144,7 +6359,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.2", + "socket2", "thiserror 2.0.18", "tokio", "tracing", @@ -6153,14 +6368,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560" dependencies = [ + "aws-lc-rs", "bytes", - "getrandom 0.3.4", + "getrandom 0.4.3", "lru-slab", - "rand 0.9.4", + "rand 0.10.2", + "rand_pcg", "ring", "rustc-hash", "rustls", @@ -6174,23 +6391,23 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694" dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.2", + "socket2", "tracing", "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.44" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -6201,6 +6418,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "radium" version = "0.7.0" @@ -6209,9 +6432,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -6221,15 +6444,26 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.5", "serde", ] +[[package]] +name = "rand" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" +dependencies = [ + "chacha20", + "getrandom 0.4.3", + "rand_core 0.10.1", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -6269,6 +6503,21 @@ dependencies = [ "serde", ] +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + +[[package]] +name = "rand_pcg" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +dependencies = [ + "rand_core 0.10.1", +] + [[package]] name = "rand_xorshift" version = "0.4.0" @@ -6289,40 +6538,42 @@ dependencies = [ [[package]] name = "rapidhash" -version = "4.2.1" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8b5b858a440a0bc02625b62dd95131b9201aa9f69f411195dd4a7cfb1de3d7" +checksum = "5da7e78a036ce858e8d55b7e7dc8ba3a88b78350fd2155d3591bbd966b58589e" dependencies = [ - "rand 0.9.4", + "getrandom 0.3.4", "rustversion", ] [[package]] name = "ratatui" -version = "0.30.0" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc" +checksum = "3274ba0a2c5e1bcad2a2005d20f4dc59dad26b2eb0940fb094500dba4099d57d" dependencies = [ "instability", "ratatui-core", "ratatui-crossterm", "ratatui-widgets", + "serde", ] [[package]] name = "ratatui-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293" +checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c" dependencies = [ - "bitflags 2.10.0", + "bitflags", "compact_str", - "hashbrown 0.16.1", - "indoc", + "hashbrown 0.17.1", "itertools 0.14.0", "kasuari", - "lru", - "strum", + "lru 0.18.2", + "palette", + "serde", + "strum 0.28.0", "thiserror 2.0.18", "unicode-segmentation", "unicode-truncate", @@ -6331,9 +6582,9 @@ dependencies = [ [[package]] name = "ratatui-crossterm" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577c9b9f652b4c121fb25c6a391dd06406d3b092ba68827e6d2f09550edc54b3" +checksum = "567584a3b0e6a8203c23de40b4861497266725eb5363dbfd18a1edd603cca9f0" dependencies = [ "cfg-if", "crossterm", @@ -6343,18 +6594,19 @@ dependencies = [ [[package]] name = "ratatui-widgets" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db" +checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1" dependencies = [ - "bitflags 2.10.0", - "hashbrown 0.16.1", + "bitflags", + "hashbrown 0.17.1", "indoc", "instability", "itertools 0.14.0", "line-clipping", "ratatui-core", - "strum", + "serde", + "strum 0.28.0", "time", "unicode-segmentation", "unicode-width", @@ -6366,14 +6618,14 @@ version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "bitflags 2.10.0", + "bitflags", ] [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -6401,16 +6653,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.10.0", -] - -[[package]] -name = "redox_syscall" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" -dependencies = [ - "bitflags 2.10.0", + "bitflags", ] [[package]] @@ -6424,17 +6667,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "redox_users" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" -dependencies = [ - "getrandom 0.2.17", - "libredox", - "thiserror 2.0.18", -] - [[package]] name = "ref-cast" version = "1.0.25" @@ -6452,14 +6684,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "regex" -version = "1.12.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -6469,9 +6701,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" dependencies = [ "aho-corasick", "memchr", @@ -6480,9 +6712,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "regress" @@ -6496,9 +6728,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.28" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" dependencies = [ "base64 0.22.1", "bytes", @@ -6510,23 +6742,20 @@ dependencies = [ "http-body-util", "hyper", "hyper-rustls", - "hyper-tls", "hyper-util", "js-sys", "log", - "native-tls", "percent-encoding", "pin-project-lite", "quinn", "rustls", - "rustls-native-certs", "rustls-pki-types", + "rustls-platform-verifier 0.7.0", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-native-tls", "tokio-rustls", "tokio-util", "tower", @@ -6537,7 +6766,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.5", ] [[package]] @@ -6548,8 +6776,8 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -6563,6 +6791,7 @@ dependencies = [ "reth-db", "reth-ethereum-cli", "reth-ethereum-payload-builder", + "reth-ethereum-primitives", "reth-network", "reth-network-api", "reth-node-api", @@ -6572,7 +6801,7 @@ dependencies = [ "reth-node-metrics", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives", + "reth-primitives-traits", "reth-provider", "reth-revm", "reth-rpc", @@ -6588,8 +6817,8 @@ dependencies = [ [[package]] name = "reth-basic-payload-builder" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6598,6 +6827,7 @@ dependencies = [ "futures-util", "metrics", "reth-chain-state", + "reth-execution-cache", "reth-metrics", "reth-payload-builder", "reth-payload-builder-primitives", @@ -6606,14 +6836,16 @@ dependencies = [ "reth-revm", "reth-storage-api", "reth-tasks", + "reth-trie-parallel", + "serde", "tokio", "tracing", ] [[package]] name = "reth-chain-state" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6624,8 +6856,7 @@ dependencies = [ "metrics", "parking_lot", "pin-project", - "rand 0.9.4", - "rayon", + "rand 0.9.5", "reth-chainspec", "reth-errors", "reth-ethereum-primitives", @@ -6634,8 +6865,8 @@ dependencies = [ "reth-primitives-traits", "reth-storage-api", "reth-trie", - "revm-database", - "revm-state", + "reth-trie-sparse", + "revm", "serde", "tokio", "tokio-stream", @@ -6644,8 +6875,8 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6664,8 +6895,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-genesis", "clap", @@ -6673,13 +6904,12 @@ dependencies = [ "reth-cli-runner", "reth-db", "serde_json", - "shellexpand", ] [[package]] name = "reth-cli-commands" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6687,6 +6917,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "backon", + "blake3", "clap", "comfy-table", "crossterm", @@ -6700,6 +6931,7 @@ dependencies = [ "metrics", "parking_lot", "ratatui", + "rayon", "reqwest", "reth-chainspec", "reth-cli", @@ -6735,18 +6967,20 @@ dependencies = [ "reth-primitives-traits", "reth-provider", "reth-prune", + "reth-prune-types", "reth-revm", "reth-stages", + "reth-stages-types", "reth-static-file", "reth-static-file-types", "reth-storage-api", "reth-tasks", "reth-trie", - "reth-trie-common", "reth-trie-db", "secp256k1 0.30.0", "serde", "serde_json", + "socket2", "tar", "tokio", "tokio-stream", @@ -6758,8 +6992,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "reth-tasks", "tokio", @@ -6768,26 +7002,28 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", "cfg-if", "eyre", "libc", - "rand 0.8.6", + "rand 0.8.7", "reth-fs-util", "secp256k1 0.30.0", "serde", "thiserror 2.0.18", + "tikv-jemalloc-sys", "tikv-jemallocator", ] [[package]] name = "reth-codecs" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f0dd7f542fbcae0e490ebe13f3eababcc05547375246ff7f62700b533cf3f01" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6797,7 +7033,7 @@ dependencies = [ "arbitrary", "bytes", "modular-bitfield", - "op-alloy-consensus", + "parity-scale-codec", "reth-codecs-derive", "reth-zstd-compressors", "serde", @@ -6806,21 +7042,23 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e508fcbb8cb775639dbbb56b81b62756d4322f28e76c60a52aa32575f993fe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "reth-config" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "eyre", "humantime-serde", + "reth-network-peers", "reth-network-types", "reth-prune-types", "reth-stages-types", @@ -6832,10 +7070,11 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", + "alloy-eip7928", "alloy-primitives", "auto_impl", "reth-execution-types", @@ -6845,11 +7084,12 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", + "alloy-primitives", "reth-chainspec", "reth-consensus", "reth-primitives-traits", @@ -6857,8 +7097,8 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6873,7 +7113,6 @@ dependencies = [ "futures", "reqwest", "reth-node-api", - "reth-primitives-traits", "reth-tracing", "ringbuffer", "serde", @@ -6883,15 +7122,17 @@ dependencies = [ [[package]] name = "reth-db" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "derive_more", "eyre", + "libc", "metrics", "page_size", "parking_lot", + "quanta", "reth-db-api", "reth-fs-util", "reth-libmdbx", @@ -6901,7 +7142,7 @@ dependencies = [ "reth-storage-errors", "reth-tracing", "rustc-hash", - "strum", + "strum 0.27.2", "sysinfo", "tempfile", "thiserror 2.0.18", @@ -6910,11 +7151,10 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", - "alloy-genesis", "alloy-primitives", "arbitrary", "arrayvec", @@ -6922,8 +7162,6 @@ dependencies = [ "derive_more", "metrics", "modular-bitfield", - "op-alloy-consensus", - "parity-scale-codec", "proptest", "reth-codecs", "reth-db-models", @@ -6939,8 +7177,8 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -6969,8 +7207,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", @@ -6984,8 +7222,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -6993,7 +7231,7 @@ dependencies = [ "enr", "itertools 0.14.0", "parking_lot", - "rand 0.8.6", + "rand 0.8.7", "reth-ethereum-forks", "reth-net-banlist", "reth-net-nat", @@ -7009,8 +7247,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7020,7 +7258,7 @@ dependencies = [ "futures", "itertools 0.14.0", "metrics", - "rand 0.9.4", + "rand 0.9.5", "reth-chainspec", "reth-ethereum-forks", "reth-metrics", @@ -7033,8 +7271,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "dashmap", @@ -7057,8 +7295,8 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7092,8 +7330,8 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7128,7 +7366,6 @@ dependencies = [ "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-rpc-api", @@ -7150,13 +7387,12 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "aes", "alloy-primitives", "alloy-rlp", - "block-padding", "byteorder", "cipher", "concat-kdf", @@ -7165,10 +7401,10 @@ dependencies = [ "futures", "hmac", "pin-project", - "rand 0.8.6", + "rand 0.8.7", "reth-network-peers", "secp256k1 0.30.0", - "sha2", + "sha2 0.10.9", "thiserror 2.0.18", "tokio", "tokio-stream", @@ -7178,8 +7414,8 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7201,8 +7437,8 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7214,42 +7450,22 @@ dependencies = [ "reth-errors", "reth-ethereum-primitives", "reth-evm", + "reth-execution-errors", "reth-execution-types", "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives-traits", + "reth-storage-api", "reth-trie-common", "serde", "thiserror 2.0.18", "tokio", ] -[[package]] -name = "reth-engine-service" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" -dependencies = [ - "futures", - "pin-project", - "reth-chainspec", - "reth-consensus", - "reth-engine-primitives", - "reth-engine-tree", - "reth-evm", - "reth-network-p2p", - "reth-node-types", - "reth-payload-builder", - "reth-provider", - "reth-prune", - "reth-stages-api", - "reth-tasks", - "reth-trie-db", -] - [[package]] name = "reth-engine-tree" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eip7928", @@ -7260,8 +7476,8 @@ dependencies = [ "alloy-rpc-types-engine", "crossbeam-channel", "derive_more", - "fixed-cache", "futures", + "indexmap 2.14.0", "metrics", "moka", "parking_lot", @@ -7274,6 +7490,7 @@ dependencies = [ "reth-errors", "reth-ethereum-primitives", "reth-evm", + "reth-execution-cache", "reth-execution-types", "reth-metrics", "reth-network-p2p", @@ -7287,17 +7504,15 @@ dependencies = [ "reth-stages", "reth-stages-api", "reth-static-file", + "reth-storage-overlay", "reth-tasks", "reth-tracing", "reth-trie", "reth-trie-common", - "reth-trie-db", "reth-trie-parallel", "reth-trie-sparse", "revm", - "revm-primitives", "schnellru", - "smallvec", "thiserror 2.0.18", "tokio", "tracing", @@ -7305,10 +7520,12 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", + "alloy-primitives", + "alloy-rlp", "alloy-rpc-types-engine", "eyre", "futures", @@ -7333,23 +7550,26 @@ dependencies = [ [[package]] name = "reth-era" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-rlp", - "ethereum_ssz 0.10.1", - "ethereum_ssz_derive 0.10.1", + "alloy-rpc-types-beacon", + "alloy-rpc-types-engine", + "ethereum_ssz", + "ethereum_ssz_derive", + "sha2 0.10.9", "snap", "thiserror 2.0.18", ] [[package]] name = "reth-era-downloader" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "bytes", @@ -7358,19 +7578,21 @@ dependencies = [ "reqwest", "reth-era", "reth-fs-util", - "sha2", + "sha2 0.10.9", "tokio", ] [[package]] name = "reth-era-utils" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-primitives", + "alloy-rlp", "eyre", "futures-util", + "reth-codecs", "reth-db-api", "reth-era", "reth-era-downloader", @@ -7386,8 +7608,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -7397,8 +7619,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-chains", "alloy-primitives", @@ -7425,15 +7647,17 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-chains", "alloy-consensus", + "alloy-eip7928", "alloy-eips", "alloy-hardforks", "alloy-primitives", "alloy-rlp", + "alloy-trie", "bytes", "derive_more", "reth-chainspec", @@ -7446,8 +7670,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "clap", "eyre", @@ -7469,8 +7693,8 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7485,26 +7709,24 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", - "alloy-rlp", "alloy-rpc-types-engine", "reth-engine-primitives", "reth-ethereum-primitives", "reth-payload-primitives", "reth-primitives-traits", "serde", - "sha2", "thiserror 2.0.18", ] [[package]] name = "reth-ethereum-forks" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -7516,8 +7738,8 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7531,6 +7753,7 @@ dependencies = [ "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", + "reth-execution-cache", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", @@ -7545,28 +7768,22 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "alloy-rlp", "alloy-rpc-types-eth", - "alloy-serde", - "arbitrary", - "modular-bitfield", "reth-codecs", "reth-primitives-traits", - "reth-zstd-compressors", "serde", - "serde_with", ] [[package]] name = "reth-etl" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "rayon", "reth-db-api", @@ -7575,15 +7792,17 @@ dependencies = [ [[package]] name = "reth-evm" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", + "alloy-eip7928", "alloy-eips", "alloy-evm", "alloy-primitives", "auto_impl", "derive_more", + "fixed-cache", "futures-util", "metrics", "rayon", @@ -7599,16 +7818,14 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-evm", "alloy-primitives", "alloy-rpc-types-engine", - "derive_more", - "parking_lot", "reth-chainspec", "reth-ethereum-forks", "reth-ethereum-primitives", @@ -7619,10 +7836,28 @@ dependencies = [ "revm", ] +[[package]] +name = "reth-execution-cache" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" +dependencies = [ + "alloy-primitives", + "fixed-cache", + "metrics", + "parking_lot", + "reth-errors", + "reth-metrics", + "reth-primitives-traits", + "reth-provider", + "reth-revm", + "reth-trie", + "tracing", +] + [[package]] name = "reth-execution-errors" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-evm", "alloy-primitives", @@ -7634,13 +7869,14 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-evm", "alloy-primitives", + "alloy-rlp", "derive_more", "reth-ethereum-primitives", "reth-primitives-traits", @@ -7652,8 +7888,8 @@ dependencies = [ [[package]] name = "reth-exex" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7690,8 +7926,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7704,8 +7940,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "serde", "serde_json", @@ -7714,8 +7950,8 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7734,16 +7970,14 @@ dependencies = [ "reth-tracing", "reth-trie", "revm", - "revm-bytecode", - "revm-database", "serde", "serde_json", ] [[package]] name = "reth-ipc" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "bytes", "futures", @@ -7762,11 +7996,12 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ - "bitflags 2.10.0", + "bitflags", "byteorder", + "crossbeam-queue", "dashmap", "derive_more", "parking_lot", @@ -7778,8 +8013,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "bindgen", "cc", @@ -7787,20 +8022,22 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "futures", + "libc", "metrics", "metrics-derive", + "reth-primitives-traits", "tokio", "tokio-util", ] [[package]] name = "reth-net-banlist" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "ipnet", @@ -7808,8 +8045,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "futures-util", "if-addrs", @@ -7822,8 +8059,8 @@ dependencies = [ [[package]] name = "reth-network" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7839,8 +8076,8 @@ dependencies = [ "metrics", "parking_lot", "pin-project", - "rand 0.8.6", - "rand 0.9.4", + "rand 0.8.7", + "rand 0.9.5", "rayon", "reth-chainspec", "reth-consensus", @@ -7852,6 +8089,7 @@ dependencies = [ "reth-eth-wire-types", "reth-ethereum-forks", "reth-ethereum-primitives", + "reth-evm", "reth-evm-ethereum", "reth-fs-util", "reth-metrics", @@ -7870,6 +8108,7 @@ dependencies = [ "secp256k1 0.30.0", "serde", "smallvec", + "socket2", "thiserror 2.0.18", "tokio", "tokio-stream", @@ -7879,8 +8118,8 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7904,10 +8143,11 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", + "alloy-eip7928", "alloy-eips", "alloy-primitives", "auto_impl", @@ -7927,8 +8167,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -7942,8 +8182,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -7956,11 +8196,11 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "anyhow", - "bincode 1.3.3", + "bincode", "derive_more", "lz4_flex", "memmap2", @@ -7973,8 +8213,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -7997,8 +8237,8 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8025,7 +8265,6 @@ dependencies = [ "reth-downloaders", "reth-engine-local", "reth-engine-primitives", - "reth-engine-service", "reth-engine-tree", "reth-engine-util", "reth-evm", @@ -8052,11 +8291,11 @@ dependencies = [ "reth-rpc-layer", "reth-stages", "reth-static-file", + "reth-storage-overlay", "reth-tasks", "reth-tokio-util", "reth-tracing", "reth-transaction-pool", - "reth-trie-db", "secp256k1 0.30.0", "serde_json", "tokio", @@ -8066,8 +8305,8 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8080,7 +8319,7 @@ dependencies = [ "futures", "humantime", "ipnet", - "rand 0.9.4", + "rand 0.9.5", "reth-chainspec", "reth-cli-util", "reth-config", @@ -8104,13 +8343,13 @@ dependencies = [ "reth-stages-types", "reth-storage-api", "reth-storage-errors", + "reth-tasks", "reth-tracing", "reth-tracing-otlp", "reth-transaction-pool", "secp256k1 0.30.0", "serde", - "shellexpand", - "strum", + "strum 0.27.2", "thiserror 2.0.18", "toml", "tracing", @@ -8121,14 +8360,20 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ + "alloy-consensus", "alloy-eips", "alloy-network", + "alloy-primitives", "alloy-rpc-types-engine", "alloy-rpc-types-eth", + "ethereum_ssz", + "ethereum_ssz_derive", "eyre", + "http-body-util", + "jsonrpsee", "reth-chainspec", "reth-engine-local", "reth-engine-primitives", @@ -8141,6 +8386,7 @@ dependencies = [ "reth-network", "reth-node-api", "reth-node-builder", + "reth-node-core", "reth-payload-primitives", "reth-primitives-traits", "reth-provider", @@ -8148,19 +8394,23 @@ dependencies = [ "reth-rpc", "reth-rpc-api", "reth-rpc-builder", + "reth-rpc-engine-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", "reth-tracing", "reth-transaction-pool", "revm", + "serde", + "serde_json", "tokio", + "tower", ] [[package]] name = "reth-node-ethstats" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8176,15 +8426,15 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-stream", - "tokio-tungstenite 0.28.0", + "tokio-tungstenite", "tracing", "url", ] [[package]] name = "reth-node-events" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8207,8 +8457,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "bytes", "eyre", @@ -8231,8 +8481,8 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "reth-chainspec", "reth-db-api", @@ -8243,20 +8493,23 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rpc-types", + "derive_more", "futures-util", "metrics", "reth-chain-state", "reth-ethereum-engine-primitives", + "reth-execution-cache", "reth-metrics", "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives-traits", + "reth-trie-parallel", "tokio", "tokio-stream", "tracing", @@ -8264,8 +8517,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "pin-project", "reth-payload-primitives", @@ -8276,55 +8529,42 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", + "alloy-rlp", "alloy-rpc-types-engine", "auto_impl", "either", - "op-alloy-rpc-types-engine", - "reth-chain-state", "reth-chainspec", "reth-errors", "reth-execution-types", "reth-primitives-traits", "reth-trie-common", "serde", + "sha2 0.10.9", "thiserror 2.0.18", "tokio", ] [[package]] name = "reth-payload-validator" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", "reth-primitives-traits", ] -[[package]] -name = "reth-primitives" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" -dependencies = [ - "alloy-consensus", - "alloy-primitives", - "once_cell", - "reth-ethereum-forks", - "reth-ethereum-primitives", - "reth-primitives-traits", - "reth-static-file-types", -] - [[package]] name = "reth-primitives-traits" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4666a8d5b246650b23e6767a45e46334d352557f473e91c2ea7211cc29291cca" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8334,16 +8574,15 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-trie", "arbitrary", - "auto_impl", "byteorder", "bytes", "dashmap", "derive_more", "modular-bitfield", "once_cell", - "op-alloy-consensus", "proptest", "proptest-arbitrary-interop", + "quanta", "rayon", "reth-codecs", "revm-bytecode", @@ -8351,17 +8590,18 @@ dependencies = [ "revm-state", "secp256k1 0.30.0", "serde", - "serde_with", "thiserror 2.0.18", ] [[package]] name = "reth-provider" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", + "alloy-eip7928", "alloy-eips", + "alloy-genesis", "alloy-primitives", "alloy-rpc-types-engine", "eyre", @@ -8389,28 +8629,28 @@ dependencies = [ "reth-static-file-types", "reth-storage-api", "reth-storage-errors", + "reth-storage-overlay", "reth-tasks", + "reth-tokio-util", "reth-trie", "reth-trie-db", - "revm-database", - "revm-state", + "revm", "rocksdb", - "strum", + "smallvec", + "strum 0.27.2", "tokio", "tracing", ] [[package]] name = "reth-prune" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", - "alloy-eips", "alloy-primitives", "itertools 0.14.0", "metrics", - "rayon", "reth-config", "reth-db-api", "reth-errors", @@ -8431,8 +8671,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "arbitrary", @@ -8440,17 +8680,19 @@ dependencies = [ "modular-bitfield", "reth-codecs", "serde", - "strum", + "strum 0.27.2", "thiserror 2.0.18", "tracing", ] [[package]] name = "reth-revm" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-debug", "reth-primitives-traits", "reth-storage-api", "reth-storage-errors", @@ -8460,8 +8702,8 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -8501,7 +8743,6 @@ dependencies = [ "reth-engine-primitives", "reth-errors", "reth-ethereum-engine-primitives", - "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", "reth-execution-types", @@ -8510,6 +8751,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-node-api", + "reth-payload-primitives", "reth-primitives-traits", "reth-revm", "reth-rpc-api", @@ -8524,10 +8766,9 @@ dependencies = [ "reth-trie-common", "revm", "revm-inspectors", - "revm-primitives", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "thiserror 2.0.18", "tokio", "tokio-stream", @@ -8537,10 +8778,9 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ - "alloy-eip7928", "alloy-eips", "alloy-genesis", "alloy-json-rpc", @@ -8562,13 +8802,14 @@ dependencies = [ "reth-network-peers", "reth-rpc-eth-api", "reth-trie-common", + "serde", "serde_json", ] [[package]] name = "reth-rpc-builder" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-network", "alloy-provider", @@ -8586,9 +8827,11 @@ dependencies = [ "reth-metrics", "reth-network-api", "reth-node-core", + "reth-payload-primitives", "reth-primitives-traits", "reth-rpc", "reth-rpc-api", + "reth-rpc-engine-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-layer", @@ -8608,8 +8851,8 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-evm", @@ -8617,23 +8860,23 @@ dependencies = [ "alloy-network", "alloy-primitives", "alloy-rpc-types-eth", - "alloy-signer", "auto_impl", "dyn-clone", "jsonrpsee-types", - "reth-ethereum-primitives", "reth-evm", "reth-primitives-traits", + "reth-rpc-traits", "thiserror 2.0.18", ] [[package]] name = "reth-rpc-engine-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", + "alloy-rlp", "alloy-rpc-types-engine", "async-trait", "jsonrpsee-core", @@ -8659,11 +8902,12 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-dyn-abi", + "alloy-eip7928", "alloy-eips", "alloy-evm", "alloy-json-rpc", @@ -8687,6 +8931,7 @@ dependencies = [ "reth-network-api", "reth-node-api", "reth-primitives-traits", + "reth-prune-types", "reth-revm", "reth-rpc-convert", "reth-rpc-eth-types", @@ -8697,22 +8942,26 @@ dependencies = [ "reth-trie-common", "revm", "revm-inspectors", + "serde_json", "tokio", "tracing", ] [[package]] name = "reth-rpc-eth-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ + "alloy-chains", "alloy-consensus", + "alloy-eip7928", "alloy-eips", "alloy-evm", "alloy-network", "alloy-primitives", "alloy-rpc-client", "alloy-rpc-types-eth", + "alloy-serde", "alloy-sol-types", "alloy-transport", "derive_more", @@ -8721,7 +8970,7 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-types", "metrics", - "rand 0.9.4", + "rand 0.9.5", "reqwest", "reth-chain-state", "reth-chainspec", @@ -8751,8 +9000,8 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-rpc-types-engine", "http", @@ -8765,8 +9014,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8776,22 +9025,37 @@ dependencies = [ "reth-errors", "reth-network-api", "serde", - "strum", + "strum 0.27.2", +] + +[[package]] +name = "reth-rpc-traits" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b417a50d3fa9b58bb1a22e46fb47e0866006f24abffa1fbe75ae60116b5b2efa" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-signer", + "reth-primitives-traits", + "thiserror 2.0.18", ] [[package]] name = "reth-stages" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", - "alloy-eips", "alloy-primitives", - "bincode 1.3.3", + "alloy-rlp", "eyre", "futures-util", "itertools 0.14.0", "num-traits", + "page_size", "rayon", "reqwest", "reth-chainspec", @@ -8809,6 +9073,7 @@ dependencies = [ "reth-execution-types", "reth-exex", "reth-fs-util", + "reth-libmdbx", "reth-network-p2p", "reth-primitives-traits", "reth-provider", @@ -8831,8 +9096,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8840,6 +9105,7 @@ dependencies = [ "auto_impl", "futures-util", "metrics", + "reth-codecs", "reth-consensus", "reth-errors", "reth-metrics", @@ -8858,8 +9124,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "arbitrary", @@ -8872,8 +9138,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "parking_lot", @@ -8892,8 +9158,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", "clap", @@ -8901,16 +9167,17 @@ dependencies = [ "fixed-map", "reth-stages-types", "serde", - "strum", + "strum 0.27.2", "tracing", ] [[package]] name = "reth-storage-api" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", + "alloy-eip7928", "alloy-eips", "alloy-primitives", "alloy-rpc-types-engine", @@ -8924,41 +9191,72 @@ dependencies = [ "reth-prune-types", "reth-stages-types", "reth-storage-errors", + "reth-tokio-util", "reth-trie-common", - "revm-database", + "revm", "serde_json", ] [[package]] name = "reth-storage-errors" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", "derive_more", + "reth-codecs", + "reth-primitives-traits", + "reth-prune-types", + "reth-static-file-types", + "revm", + "thiserror 2.0.18", +] + +[[package]] +name = "reth-storage-overlay" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "metrics", + "parking_lot", + "rayon", + "reth-chain-state", + "reth-db-api", + "reth-errors", + "reth-ethereum-primitives", + "reth-metrics", "reth-primitives-traits", "reth-prune-types", - "reth-static-file-types", - "revm-database-interface", - "revm-state", - "thiserror 2.0.18", + "reth-stages-types", + "reth-storage-api", + "reth-storage-errors", + "reth-tasks", + "reth-trie", + "reth-trie-common", + "reth-trie-db", + "tracing", ] [[package]] name = "reth-tasks" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ - "auto_impl", - "dyn-clone", + "crossbeam-utils", + "dashmap", "futures-util", + "libc", "metrics", + "parking_lot", "pin-project", "rayon", "reth-metrics", "thiserror 2.0.18", + "thread-priority", "tokio", "tracing", "tracing-futures", @@ -8966,15 +9264,15 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-genesis", "alloy-primitives", - "rand 0.8.6", - "rand 0.9.4", + "rand 0.8.7", + "rand 0.9.5", "reth-ethereum-primitives", "reth-primitives-traits", "secp256k1 0.30.0", @@ -8982,8 +9280,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "tokio", "tokio-stream", @@ -8992,8 +9290,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "clap", "eyre", @@ -9001,17 +9299,19 @@ dependencies = [ "rolling-file", "tracing", "tracing-appender", + "tracing-chrome", "tracing-journald", "tracing-logfmt", "tracing-samply", - "tracing-subscriber 0.3.22", + "tracing-subscriber", ] [[package]] name = "reth-tracing-otlp" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ + "base64 0.22.1", "clap", "eyre", "opentelemetry", @@ -9021,14 +9321,14 @@ dependencies = [ "opentelemetry_sdk", "tracing", "tracing-opentelemetry", - "tracing-subscriber 0.3.22", + "tracing-subscriber", "url", ] [[package]] name = "reth-transaction-pool" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9036,13 +9336,14 @@ dependencies = [ "alloy-rlp", "aquamarine", "auto_impl", - "bitflags 2.10.0", + "bitflags", "futures-util", + "imbl", "metrics", "parking_lot", "paste", "pin-project", - "rand 0.9.4", + "rand 0.9.5", "reth-chain-state", "reth-chainspec", "reth-eth-wire-types", @@ -9056,8 +9357,6 @@ dependencies = [ "reth-storage-api", "reth-tasks", "revm", - "revm-interpreter", - "revm-primitives", "rustc-hash", "schnellru", "serde", @@ -9071,8 +9370,8 @@ dependencies = [ [[package]] name = "reth-trie" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9090,15 +9389,15 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "reth-trie-sparse", - "revm-database", + "revm", "tracing", "triehash", ] [[package]] name = "reth-trie-common" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -9117,24 +9416,20 @@ dependencies = [ "rayon", "reth-codecs", "reth-primitives-traits", - "revm-database", + "revm", "serde", "serde_with", ] [[package]] name = "reth-trie-db" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", - "metrics", - "parking_lot", "reth-db-api", "reth-execution-errors", - "reth-metrics", "reth-primitives-traits", - "reth-stages-types", "reth-storage-api", "reth-storage-errors", "reth-trie", @@ -9144,16 +9439,15 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ + "alloy-evm", "alloy-primitives", "alloy-rlp", "crossbeam-channel", - "derive_more", - "itertools 0.14.0", + "crossbeam-utils", "metrics", - "rayon", "reth-execution-errors", "reth-metrics", "reth-primitives-traits", @@ -9161,44 +9455,48 @@ dependencies = [ "reth-storage-errors", "reth-tasks", "reth-trie", - "reth-trie-common", "reth-trie-sparse", + "revm", "thiserror 2.0.18", "tracing", ] [[package]] name = "reth-trie-sparse" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "2.5.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.5.0#189c0df32617afc488e0f091dbface1bd72cceb4" dependencies = [ "alloy-primitives", - "alloy-rlp", "alloy-trie", - "auto_impl", + "either", "metrics", "rayon", "reth-execution-errors", "reth-metrics", "reth-primitives-traits", "reth-trie-common", + "serde", + "serde_json", + "slotmap", "smallvec", + "strum 0.27.2", "tracing", ] [[package]] name = "reth-zstd-compressors" -version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?tag=v1.11.4#2ac58a25f561827e2b816a3c1ed972194f3b2915" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80addacffc5df9398c55919f8993922d2b688f2aa5753708fdd658ca3cc63e39" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "34.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2aabdebaa535b3575231a88d72b642897ae8106cf6b0d12eafc6bfdf50abfc7" +checksum = "b7c7fcd426beab3b91300a6d0d5eb8d583c0fad0fba451126e19fd51443eca62" dependencies = [ "revm-bytecode", "revm-context", @@ -9215,21 +9513,21 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "8.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d1e5c1eaa44d39d537f668bc5c3409dc01e5c8be954da6c83370bbdf006457" +checksum = "537356bdec80dbc04e4e6bb688b3441ff7cf18eecdcf3cac23150633c46467f1" dependencies = [ "bitvec", - "phf", + "phf 0.14.0", "revm-primitives", "serde", ] [[package]] name = "revm-context" -version = "13.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "892ff3e6a566cf8d72ffb627fdced3becebbd9ba64089c25975b9b028af326a5" +checksum = "cc6512f05f83378e29b2b016fa5bd7f5a533e3625548be4113732e1a536c2564" dependencies = [ "bitvec", "cfg-if", @@ -9244,9 +9542,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "14.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57f61cc6d23678c4840af895b19f8acfbbd546142ec8028b6526c53cc1c16c98" +checksum = "103fff818b10311034c0c11ff8760294ee0e3c320daab3c5717990fe8ee2617b" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -9260,11 +9558,13 @@ dependencies = [ [[package]] name = "revm-database" -version = "10.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529528d0b05fe646be86223032c3e77aa8b05caa2a35447d538c55965956a511" +checksum = "df72760eab0852100e748c7cb03ce0221626d60ac14534118c84c5cc894fb4c9" dependencies = [ "alloy-eips", + "derive_more", + "either", "revm-bytecode", "revm-database-interface", "revm-primitives", @@ -9274,9 +9574,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "9.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bf93ac5b91347c057610c0d96e923db8c62807e03f036762d03e981feddc1d" +checksum = "d9286c059a11be1dee814cafdc3a3ade57521c8caa050785a52c19a9d894f400" dependencies = [ "auto_impl", "either", @@ -9288,9 +9588,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "15.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd0e43e815a85eded249df886c4badec869195e70cdd808a13cfca2794622d2" +checksum = "09126175c3fa482e71e80cc28c6bb17e681911e472b94d4f7f73dd6780411798" dependencies = [ "auto_impl", "derive-where", @@ -9307,9 +9607,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "15.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3ccad59db91ef93696536a0dbaf2f6f17cfe20d4d8843ae118edb7e97947ef" +checksum = "4aa55b208b52f0c083ea68147c78866eeecadd7c0071a614f477de316b60648e" dependencies = [ "auto_impl", "either", @@ -9325,9 +9625,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.34.2" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e435414e9de50a1b930da602067c76365fea2fea11e80ceb50783c94ddd127f" +checksum = "90c136a072540987ee442e9824631835520b13e5756f20780a637ba2e11f9c28" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -9345,9 +9645,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "32.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11406408597bc249392d39295831c4b641b3a6f5c471a7c41104a7a1e3564c07" +checksum = "fd310927437752ce4bac6997b385772823b84843f04c82e151993bec1265a5ed" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -9358,48 +9658,50 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "32.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c1285c848d240678bf69cb0f6179ff5a4aee6fc8e921d89708087197a0aff3" +checksum = "f2431091420999795df6a200b9f7933defe3d654710560a895e6bcabbd9954a5" dependencies = [ "ark-bls12-381", "ark-bn254", "ark-ec", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", "arrayref", "aurora-engine-modexp", + "aws-lc-rs", "blst", "c-kzg", "cfg-if", "k256", "p256", + "revm-context-interface", "revm-primitives", - "ripemd", + "ripemd 0.2.0", "secp256k1 0.31.1", - "sha2", + "sha2 0.11.0", ] [[package]] name = "revm-primitives" -version = "22.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba580c56a8ec824a64f8a1683577876c2e1dbe5247044199e9b881421ad5dcf9" +checksum = "2ef5564c1bce219fd08beca43d4f39fdcbc19193fa4f604c0c6b58950a13194a" dependencies = [ "alloy-primitives", - "num_enum", "once_cell", "serde", ] [[package]] name = "revm-state" -version = "9.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311720d4f0f239b041375e7ddafdbd20032a33b7bae718562ea188e188ed9fd3" +checksum = "2c4ae66db3abfcb565854dbfc95513bfa440b3dc390ddf8e50b0363d12a6fa79" dependencies = [ "alloy-eip7928", - "bitflags 2.10.0", + "bitflags", + "nonmax", "revm-bytecode", "revm-primitives", "serde", @@ -9425,7 +9727,7 @@ dependencies = [ "cfg-if", "getrandom 0.2.17", "libc", - "untrusted", + "untrusted 0.9.0", "windows-sys 0.52.0", ] @@ -9444,11 +9746,20 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "ripemd" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd4211456b4172d7e44261920c25acf07367c4f04bb5f5d54fc21b090d9b159" +dependencies = [ + "digest 0.11.3", +] + [[package]] name = "rlimit" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" +checksum = "f35ee2729c56bb610f6dba436bf78135f728b7373bdffae2ec815b2d3eb98cc3" dependencies = [ "libc", ] @@ -9484,9 +9795,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba9ce64a8f45d7fc86358410bb1a82e8c987504c0d4900e9141d69a9f26c885" +checksum = "1dedc5658c6ecb3bdb5ef5f3295bb9253f42dcf3fd1402c03f6b1f7659c3c4a9" dependencies = [ "bytemuck", "byteorder", @@ -9519,15 +9830,16 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" [[package]] name = "ruint" -version = "1.17.2" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c141e807189ad38a07276942c6623032d3753c8859c146104ac2e4d68865945a" +checksum = "f5e99bff0393163bb25029a6af25d3d8d202ba5b5438a74d1bd8789f5c822970" dependencies = [ "alloy-rlp", "arbitrary", "ark-ff 0.3.0", "ark-ff 0.4.2", "ark-ff 0.5.0", + "ark-ff 0.6.0", "bytes", "fastrlp 0.3.1", "fastrlp 0.4.0", @@ -9537,8 +9849,8 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.6", - "rand 0.9.4", + "rand 0.8.7", + "rand 0.9.5", "rlp", "ruint-macro", "serde_core", @@ -9554,11 +9866,11 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] name = "rustc-hash" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" dependencies = [ - "rand 0.8.6", + "rand 0.9.5", ] [[package]] @@ -9591,16 +9903,16 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.27", + "semver 1.0.28", ] [[package]] name = "rustix" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.10.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -9609,10 +9921,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.36" +version = "0.23.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" +checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" dependencies = [ + "aws-lc-rs", "log", "once_cell", "ring", @@ -9624,21 +9937,21 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" dependencies = [ - "openssl-probe 0.2.1", + "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.5.1", + "security-framework", ] [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046" dependencies = [ "web-time", "zeroize", @@ -9652,19 +9965,40 @@ checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" dependencies = [ "core-foundation 0.10.1", "core-foundation-sys", - "jni", + "jni 0.21.1", "log", "once_cell", "rustls", "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.5.1", + "security-framework", "security-framework-sys", "webpki-root-certs 0.26.11", "windows-sys 0.59.0", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni 0.22.4", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs 1.0.8", + "windows-sys 0.59.0", +] + [[package]] name = "rustls-platform-verifier-android" version = "0.1.1" @@ -9677,16 +10011,17 @@ version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", - "untrusted", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "rusty-fork" @@ -9702,15 +10037,24 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "ryu-js" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd29631678d6fb0903b69223673e122c32e9ae559d0960a38d574695ebc0ea15" +checksum = "04d056b875a9d2e6cb9a61d127afee9ac5999b9f87bcb32079d1318e505be714" + +[[package]] +name = "safe_arch" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323" +dependencies = [ + "bytemuck", +] [[package]] name = "same-file" @@ -9723,9 +10067,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" dependencies = [ "windows-sys 0.61.2", ] @@ -9744,9 +10088,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" dependencies = [ "dyn-clone", "ref-cast", @@ -9765,6 +10109,12 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -9793,7 +10143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", - "rand 0.8.6", + "rand 0.8.7", "secp256k1-sys 0.10.1", "serde", ] @@ -9805,7 +10155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" dependencies = [ "bitcoin_hashes", - "rand 0.9.4", + "rand 0.9.5", "secp256k1-sys 0.11.0", ] @@ -9829,24 +10179,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.5.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.10.0", + "bitflags", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -9855,9 +10192,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.15.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -9883,9 +10220,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" dependencies = [ "serde", "serde_core", @@ -9906,12 +10243,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" - [[package]] name = "send_wrapper" version = "0.6.0" @@ -9954,16 +10285,16 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "itoa", "memchr", "serde", @@ -9973,9 +10304,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" dependencies = [ "serde_core", ] @@ -9994,17 +10325,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.16.1" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" +checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c" dependencies = [ "base64 0.22.1", + "bs58", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.13.0", + "indexmap 2.14.0", "schemars 0.9.0", - "schemars 1.2.0", + "schemars 1.2.1", "serde_core", "serde_json", "serde_with_macros", @@ -10013,14 +10345,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.16.1" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" +checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660" dependencies = [ - "darling 0.21.3", + "darling", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -10035,12 +10367,12 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] @@ -10051,25 +10383,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.3", +] + [[package]] name = "sha3" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874" dependencies = [ "digest 0.10.7", - "keccak", + "keccak 0.1.6", +] + +[[package]] +name = "sha3" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be176f1a57ce4e3d31c1a166222d9768de5954f811601fb7ca06fc8203905ce1" +dependencies = [ + "digest 0.11.3", + "keccak 0.2.0", ] [[package]] name = "sha3-asm" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b31139435f327c93c6038ed350ae4588e2c70a13d50599509fee6349967ba35a" +checksum = "a6287fd675f713484342a89cbf0a386abef5f15919cfad607e5e1f19e1e15331" dependencies = [ "cc", "cfg-if", @@ -10085,19 +10438,16 @@ dependencies = [ ] [[package]] -name = "shellexpand" -version = "3.1.1" +name = "shlex" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" -dependencies = [ - "dirs", -] +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "signal-hook" @@ -10142,15 +10492,31 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.8" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" + +[[package]] +name = "simd_cesu8" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +dependencies = [ + "rustc_version 0.4.1", + "simdutf8", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple_asn1" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d" dependencies = [ "num-bigint", "num-traits", @@ -10160,15 +10526,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "sketches-ddsketch" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" +checksum = "0c6f73aeb92d671e0cc4dca167e59b2deb6387c375391bc99ee743f326994a2b" [[package]] name = "slab" @@ -10176,6 +10542,15 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" +[[package]] +name = "slotmap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038" +dependencies = [ + "version_check", +] + [[package]] name = "small_btree" version = "0.1.0" @@ -10187,9 +10562,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" dependencies = [ "arbitrary", "serde", @@ -10197,25 +10572,15 @@ dependencies = [ [[package]] name = "snap" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" - -[[package]] -name = "socket2" -version = "0.5.10" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] +checksum = "199905e6153d6405f9728fe44daace35f8f837bbf830bb6e85fbd5828709a886" [[package]] name = "socket2" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", "windows-sys 0.60.2", @@ -10233,10 +10598,19 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.6", + "rand 0.8.7", "sha1", ] +[[package]] +name = "spin" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" +dependencies = [ + "lock_api", +] + [[package]] name = "spki" version = "0.7.3" @@ -10271,7 +10645,16 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ - "strum_macros", + "strum_macros 0.27.2", +] + +[[package]] +name = "strum" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" +dependencies = [ + "strum_macros 0.28.0", ] [[package]] @@ -10283,7 +10666,19 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", +] + +[[package]] +name = "strum_macros" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] @@ -10292,6 +10687,12 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "symlink" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" + [[package]] name = "syn" version = "1.0.109" @@ -10305,9 +10706,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.114" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", @@ -10316,14 +10717,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.5.7" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53f425ae0b12e2f5ae65542e00898d500d4d318b4baf09f40fd0d410454e9947" +checksum = "083be3061e64d362cbe6ef12cfe1307ba3884326d8856448fe8a120fa2c44ebf" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -10343,14 +10744,14 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "sysinfo" -version = "0.38.3" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03c61d2a49c649a15c407338afe7accafde9dac869995dccb73e5f7ef7d9034" +checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f" dependencies = [ "libc", "memchr", @@ -10360,6 +10761,27 @@ dependencies = [ "windows", ] +[[package]] +name = "system-configuration" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +dependencies = [ + "bitflags", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tag_ptr" version = "0.1.0" @@ -10380,9 +10802,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" dependencies = [ "filetime", "libc", @@ -10391,12 +10813,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.24.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix", "windows-sys 0.59.0", @@ -10404,9 +10826,9 @@ dependencies = [ [[package]] name = "test-fuzz" -version = "7.2.5" +version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e5c77910b1d5b469a342be541cf44933f0ad2c4b8d5acb32ee46697fd60546" +checksum = "bdcc9e8244ec7140f52b55bb67ff77fe5e10f1e7651a9d7ca1187555344a212d" dependencies = [ "serde", "serde_combinators", @@ -10417,35 +10839,35 @@ dependencies = [ [[package]] name = "test-fuzz-internal" -version = "7.2.5" +version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25f2f0ee315b130411a98570dd128dfe344bfaa0a28bf33d38f4a1fe85f39b" +checksum = "b36ec8e4151160eb1b1d42d4691c24b5a6f3891c75d41afb343346801ab60ce5" dependencies = [ - "bincode 2.0.1", - "cargo_metadata 0.19.2", + "cargo_metadata", + "postcard", "serde", ] [[package]] name = "test-fuzz-macro" -version = "7.2.5" +version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c03ba0a9e3e4032f94d71c85e149af147843c6f212e4ca4383542d606b04a6" +checksum = "bd45ef045619b976f1efa036aee72b6a80dc359d800e11f9d636332ebf6655f9" dependencies = [ - "darling 0.21.3", + "darling", "heck", "itertools 0.14.0", "prettyplease", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "test-fuzz-runtime" -version = "7.2.5" +version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a4ac481aa983d386e857a7be0006c2f0ef26e0c5326bbc7262f73c2891b91d" +checksum = "91e243f304ded602493cfd77bee2f627f376bec4ea185cf8e9674b6150ea3837" dependencies = [ "hex", "num-traits", @@ -10456,9 +10878,9 @@ dependencies = [ [[package]] name = "thin-vec" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "259cdf8ed4e4aca6f1e9d011e10bd53f524a2d0637d7b28450f6c64ac298c4c6" +checksum = "b0f7e269b48f0a7dd0146680fa24b50cc67fc0373f086a5b2f99bd084639b482" [[package]] name = "thiserror" @@ -10486,7 +10908,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -10497,14 +10919,28 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", +] + +[[package]] +name = "thread-priority" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d2e834949be5111506bb252643498af1514f600d9e1dceedaa42afae155b67f" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "log", + "rustversion", + "windows", ] [[package]] name = "thread_local" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" dependencies = [ "cfg-if", ] @@ -10551,13 +10987,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.47" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" dependencies = [ "deranged", - "itoa", - "js-sys", "libc", "num-conv", "num_threads", @@ -10569,15 +11003,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.27" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" dependencies = [ "num-conv", "time-core", @@ -10585,9 +11019,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" dependencies = [ "displaydoc", "serde_core", @@ -10596,9 +11030,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" dependencies = [ "tinyvec_macros", ] @@ -10611,9 +11045,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.49.0" +version = "1.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "317fafbbe3f02fc663dad00ea6186197de963cd4190e86a26d8d0fae095539af" dependencies = [ "bytes", "libc", @@ -10621,30 +11055,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.2", + "socket2", "tokio-macros", "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", + "syn 2.0.119", ] [[package]] @@ -10671,32 +11095,21 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.26.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" +checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c" dependencies = [ "futures-util", "log", "rustls", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", - "tungstenite 0.26.2", + "tungstenite", "webpki-roots 0.26.11", ] -[[package]] -name = "tokio-tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.28.0", -] - [[package]] name = "tokio-util" version = "0.7.18" @@ -10714,17 +11127,17 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.11+spec-1.1.0" +version = "0.9.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "serde_core", "serde_spanned", - "toml_datetime", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow", + "winnow 0.7.15", ] [[package]] @@ -10736,38 +11149,47 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_datetime" +version = "1.1.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" +dependencies = [ + "serde_core", +] + [[package]] name = "toml_edit" -version = "0.23.10+spec-1.0.0" +version = "0.25.13+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" dependencies = [ - "indexmap 2.13.0", - "toml_datetime", + "indexmap 2.14.0", + "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", - "winnow", + "winnow 1.0.4", ] [[package]] name = "toml_parser" -version = "1.0.6+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow", + "winnow 1.0.4", ] [[package]] name = "toml_writer" -version = "1.0.6+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" +checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" [[package]] name = "tonic" -version = "0.14.3" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a286e33f82f8a1ee2df63f4fa35c0becf4a85a0cb03091a15fd7bf0b402dc94a" +checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" dependencies = [ "async-trait", "base64 0.22.1", @@ -10791,15 +11213,26 @@ dependencies = [ [[package]] name = "tonic-prost" -version = "0.14.3" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c55a2d6a14174563de34409c9f92ff981d006f56da9c6ecd40d9d4a31500b0" +checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" dependencies = [ "bytes", "prost", "tonic", ] +[[package]] +name = "tonic-types" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab1b02061f83d519bba3caa167f88f261ef05720ab8ebc954ade70de3348e8" +dependencies = [ + "prost", + "prost-types", + "tonic", +] + [[package]] name = "tower" version = "0.5.3" @@ -10809,7 +11242,7 @@ dependencies = [ "futures-core", "futures-util", "hdrhistogram", - "indexmap 2.13.0", + "indexmap 2.14.0", "pin-project-lite", "slab", "sync_wrapper", @@ -10822,13 +11255,13 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "async-compression", "base64 0.22.1", - "bitflags 2.10.0", + "bitflags", "bytes", "futures-core", "futures-util", @@ -10837,7 +11270,6 @@ dependencies = [ "http-body-util", "http-range-header", "httpdate", - "iri-string", "mime", "mime_guess", "percent-encoding", @@ -10848,6 +11280,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", + "url", "uuid", ] @@ -10877,14 +11310,15 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" +checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c" dependencies = [ "crossbeam-channel", + "symlink", "thiserror 2.0.18", "time", - "tracing-subscriber 0.3.22", + "tracing-subscriber", ] [[package]] @@ -10895,7 +11329,18 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", +] + +[[package]] +name = "tracing-chrome" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724" +dependencies = [ + "serde_json", + "tracing-core", + "tracing-subscriber", ] [[package]] @@ -10926,7 +11371,7 @@ checksum = "2d3a81ed245bfb62592b1e2bc153e77656d94ee6a0497683a65a12ccaf2438d0" dependencies = [ "libc", "tracing-core", - "tracing-subscriber 0.3.22", + "tracing-subscriber", ] [[package]] @@ -10942,21 +11387,21 @@ dependencies = [ [[package]] name = "tracing-logfmt" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1f47d22deb79c3f59fcf2a1f00f60cbdc05462bf17d1cd356c1fefa3f444bd" +checksum = "a250055a3518b5efba928a18ffac8d32d42ea607a9affff4532144cd5b2e378e" dependencies = [ "time", "tracing", "tracing-core", - "tracing-subscriber 0.3.22", + "tracing-subscriber", ] [[package]] name = "tracing-opentelemetry" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc" +checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" dependencies = [ "js-sys", "opentelemetry", @@ -10964,7 +11409,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log", - "tracing-subscriber 0.3.22", + "tracing-subscriber", "web-time", ] @@ -10977,11 +11422,11 @@ dependencies = [ "cfg-if", "itoa", "libc", - "mach2", + "mach2 0.5.0", "memmap2", "smallvec", "tracing-core", - "tracing-subscriber 0.3.22", + "tracing-subscriber", ] [[package]] @@ -10996,18 +11441,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", @@ -11016,35 +11452,37 @@ dependencies = [ "serde", "serde_json", "sharded-slab", + "smallvec", "thread_local", "tracing", "tracing-core", + "tracing-log", "tracing-serde", ] [[package]] name = "tree_hash" -version = "0.10.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee44f4cef85f88b4dea21c0b1f58320bdf35715cf56d840969487cff00613321" +checksum = "f7fd51aa83d2eb83b04570808430808b5d24fdbf479a4d5ac5dee4a2e2dd2be4" dependencies = [ "alloy-primitives", "ethereum_hashing", - "ethereum_ssz 0.9.1", + "ethereum_ssz", "smallvec", "typenum", ] [[package]] name = "tree_hash_derive" -version = "0.10.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bee2ea1551f90040ab0e34b6fb7f2fa3bad8acc925837ac654f2c78a13e3089" +checksum = "8840ad4d852e325d3afa7fde8a50b2412f89dce47d7eb291c0cc7f87cd040f38" dependencies = [ - "darling 0.20.11", + "darling", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -11065,38 +11503,20 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.26.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" +checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8" dependencies = [ "bytes", "data-encoding", "http", "httparse", "log", - "rand 0.9.4", + "rand 0.9.5", "rustls", "rustls-pki-types", "sha1", "thiserror 2.0.18", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" -dependencies = [ - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.9.4", - "sha1", - "thiserror 2.0.18", - "utf-8", ] [[package]] @@ -11107,9 +11527,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "ucd-trie" @@ -11155,15 +11575,15 @@ checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-truncate" @@ -11178,9 +11598,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode-xid" @@ -11194,7 +11614,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "subtle", ] @@ -11206,15 +11626,15 @@ checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" [[package]] name = "untrusted" -version = "0.9.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "unty" -version = "0.0.4" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" @@ -11229,12 +11649,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf16_iter" version = "1.0.5" @@ -11255,11 +11669,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.20.0" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" +checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "js-sys", "wasm-bindgen", ] @@ -11278,14 +11692,12 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "9.1.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b849a1f6d8639e8de261e81ee0fc881e3e3620db1af9f2e0da015d4382ceaf75" +checksum = "b5574dd2f922b1a46a06a4b1dc11193a4012108fd54cf725e1816cb8183d8778" dependencies = [ "anyhow", - "cargo_metadata 0.23.1", - "derive_builder", - "regex", + "bon", "rustversion", "time", "vergen-lib", @@ -11293,12 +11705,12 @@ dependencies = [ [[package]] name = "vergen-git2" -version = "9.1.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51ab55ddf1188c8d679f349775362b0fa9e90bd7a4ac69838b2a087623f0d57" +checksum = "410e2f72acce10471037150cd9c585ee7b54560f348bf70cd5fc8e87d3433e45" dependencies = [ "anyhow", - "derive_builder", + "bon", "git2", "rustversion", "time", @@ -11308,12 +11720,12 @@ dependencies = [ [[package]] name = "vergen-lib" -version = "9.1.0" +version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34a29ba7e9c59e62f229ae1932fb1b8fb8a6fdcc99215a641913f5f5a59a569" +checksum = "8cd42fd155c2c2971f6d00face12ec245fbb604fce011ccaf2306d014c2e97ca" dependencies = [ "anyhow", - "derive_builder", + "bon", "rustversion", ] @@ -11323,12 +11735,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "virtue" -version = "0.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" - [[package]] name = "visibility" version = "0.1.1" @@ -11337,7 +11743,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -11376,27 +11782,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +version = "1.0.4+wasi-0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.108" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" dependencies = [ "cfg-if", "once_cell", @@ -11407,23 +11804,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.58" +version = "0.4.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" +checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" dependencies = [ - "cfg-if", - "futures-util", "js-sys", - "once_cell", "wasm-bindgen", - "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.108" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11431,53 +11824,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.108" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.108" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap 2.13.0", - "wasm-encoder", - "wasmparser", -] - [[package]] name = "wasm-streams" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" dependencies = [ "futures-util", "js-sys", @@ -11486,18 +11857,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags 2.10.0", - "hashbrown 0.15.5", - "indexmap 2.13.0", - "semver 1.0.27", -] - [[package]] name = "wasmtimer" version = "0.4.3" @@ -11514,9 +11873,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.85" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" +checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" dependencies = [ "js-sys", "wasm-bindgen", @@ -11538,14 +11897,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" dependencies = [ - "webpki-root-certs 1.0.5", + "webpki-root-certs 1.0.8", ] [[package]] name = "webpki-root-certs" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a29fc0408b113f68cf32637857ab740edfafdf460c326cd2afaa2d84cc05dc" +checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267" dependencies = [ "rustls-pki-types", ] @@ -11556,18 +11915,28 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.5", + "webpki-roots 1.0.8", ] [[package]] name = "webpki-roots" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c" +checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf" dependencies = [ "rustls-pki-types", ] +[[package]] +name = "wide" +version = "0.7.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "widestring" version = "1.2.1" @@ -11596,7 +11965,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -11658,7 +12027,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -11669,7 +12038,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] @@ -11688,6 +12057,17 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result", + "windows-strings", +] + [[package]] name = "windows-result" version = "0.4.1" @@ -11715,15 +12095,6 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -11775,21 +12146,6 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - [[package]] name = "windows-targets" version = "0.52.6" @@ -11838,12 +12194,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -11862,12 +12212,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -11886,12 +12230,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -11922,12 +12260,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -11946,12 +12278,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -11970,12 +12296,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -11994,12 +12314,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -12014,110 +12328,24 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" -dependencies = [ - "memchr", -] +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "memchr", ] [[package]] name = "wit-bindgen" -version = "0.51.0" +version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap 2.13.0", - "prettyplease", - "syn 2.0.114", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.114", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags 2.10.0", - "indexmap 2.13.0", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.13.0", - "log", - "semver 1.0.27", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "write16" @@ -12127,9 +12355,9 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "ws_stream_wasm" @@ -12143,7 +12371,7 @@ dependencies = [ "log", "pharos", "rustc_version 0.4.1", - "send_wrapper 0.6.0", + "send_wrapper", "thiserror 2.0.18", "wasm-bindgen", "wasm-bindgen-futures", @@ -12183,9 +12411,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -12194,93 +12422,94 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.37" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac" +checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.37" +version = "0.8.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0" +checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "zerofrom" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", "synstructure", ] [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "zerotrie" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" dependencies = [ "displaydoc", "yoke", "zerofrom", + "zerovec", ] [[package]] name = "zerovec" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" dependencies = [ "serde", "yoke", @@ -12290,20 +12519,20 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" dependencies = [ "proc-macro2", "quote", - "syn 2.0.114", + "syn 2.0.119", ] [[package]] name = "zmij" -version = "1.0.18" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1966f8ac2c1f76987d69a74d0e0f929241c10e78136434e3be70ff7f58f64214" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zstd" diff --git a/Cargo.toml b/Cargo.toml index d723a31b..42e02bb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,24 @@ [package] name = "bera-reth" -version = "1.4.4" +version = "1.5.0" edition = "2024" license = "MIT OR Apache-2.0" +rust-version = "1.95" [dependencies] -alloy-consensus = "1.6.3" -alloy-eips = "1.6.3" -alloy-evm = "0.27.2" -alloy-genesis = "1.6.3" -alloy-network = "1.6.3" -alloy-primitives = "1.5.6" -alloy-rlp = "0.3.13" -alloy-rpc-types = "1.6.3" -alloy-rpc-types-eth = "1.6.3" -alloy-serde = "1.6.3" -alloy-signer-local = "1.6.3" -alloy-sol-macro = "1.5.6" -alloy-sol-types = "1.5.6" +alloy-consensus = "2.3.0" +alloy-eips = "2.3.0" +alloy-evm = "0.38.0" +alloy-genesis = "2.3.0" +alloy-network = "2.3.0" +alloy-primitives = "1.6.1" +alloy-rlp = "0.3.16" +alloy-rpc-types = "2.3.0" +alloy-rpc-types-eth = "2.3.0" +alloy-serde = "2.3.0" +alloy-signer-local = "2.3.0" +alloy-sol-macro = "1.6.1" +alloy-sol-types = "1.6.1" bytes = "1.10.1" clap = { version = "4.5.40", features = ["derive"] } derive_more = "2.0.1" @@ -32,40 +33,44 @@ jsonrpsee-proc-macros = "0.26.0" async-trait = "0.1.88" metrics = "0.24.3" modular-bitfield = "0.13.1" -reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-codecs = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-payload-validator = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } +# reth v2.5.0 default features add `jit` (revmc, requires system LLVM) and `gmp`; +# opt out and keep the v1.11.4-equivalent feature set. +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0", default-features = false, features = ["otlp", "otlp-logs", "js-tracer", "keccak-cache-global", "asm-keccak", "min-debug-logs"] } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-codecs = "0.6.0" +reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-payload-validator = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-primitives-traits = "0.6.0" +reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0", default-features = false, features = ["portable"] } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } serde = { version = "1.0", features = ["derive"], default-features = false } serde_json = "1.0" thiserror = "2.0" @@ -73,20 +78,21 @@ tokio = "1.46.0" tracing = "0.1.41" [dev-dependencies] -alloy-provider = "1.6.3" -alloy-rpc-client = "1.6.3" -alloy-rpc-types-trace = "1.6.3" +alloy-provider = "2.3.0" +alloy-rpc-client = "2.3.0" +alloy-rpc-types-trace = "2.3.0" eyre = "0.6.12" -reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4", features = ["test-utils"] } -reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.4" } -revm-inspectors = "0.34.2" +reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0", features = ["test-utils"] } +reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.5.0" } +revm-inspectors = "0.42.0" +tempfile = "3" test-fuzz = "7" [build-dependencies] -vergen = { version = "9.1.0", features = ["build", "cargo", "emit_and_set"] } -vergen-git2 = "9.1.0" +vergen = { version = "10.0.1", features = ["build", "cargo", "emit_and_set"] } +vergen-git2 = "10.0.1" [features] default = ["jemalloc"] @@ -95,6 +101,12 @@ asm-keccak = ["reth/asm-keccak"] min-debug-logs = ["reth/min-debug-logs"] client = [] +# Match upstream reth: keep dev/test artifacts small enough to link on +# disk-constrained runners (https://github.com/paradigmxyz/reth Cargo.toml). +[profile.dev] +debug = "line-tables-only" +split-debuginfo = "unpacked" + [profile.maxperf] inherits = "release" lto = "fat" @@ -112,7 +124,7 @@ opt-level = 3 lto = "thin" [package.metadata.cargo-machete] -ignored = ["modular-bitfield"] +ignored = ["modular-bitfield", "reth-revm"] # [patch."https://github.com/paradigmxyz/reth"] # reth = { path = "../reth/bin/reth" } @@ -139,9 +151,9 @@ ignored = ["modular-bitfield"] # reth-payload-validator = { path = "../reth/crates/payload/validator" } # reth-node-ethereum = { path = "../reth/crates/ethereum/node" } # reth-payload-primitives = { path = "../reth/crates/payload/primitives" } -# reth-primitives-traits = { path = "../reth/crates/primitives-traits" } # reth-tracing = { path = "../reth/crates/tracing" } -# reth-codecs = { path = "../reth/crates/storage/codecs" } +# reth-codecs and reth-primitives-traits moved to the reth-core repo (crates.io); +# patch via [patch.crates-io] with a local reth-core checkout if needed. # reth-db-api = { path = "../reth/crates/storage/db-api" } # reth-rpc-engine-api = { path = "../reth/crates/rpc/rpc-engine-api" } # reth-rpc-eth-api = { path = "../reth/crates/rpc/rpc-eth-api" } diff --git a/Cross.toml b/Cross.toml index 5b78b7f2..3c9de388 100644 --- a/Cross.toml +++ b/Cross.toml @@ -16,6 +16,7 @@ pre-build = [ ] # Use Ubuntu 24.04 for both targets to get newer GLIBC that matches current Rust toolchain +# (MSRV is 1.95, inherited from reth v2.5.0) [target.x86_64-unknown-linux-gnu] image = "ubuntu:24.04" pre-build = [ diff --git a/Dockerfile b/Dockerfile index 78d4ca2a..e2a5f82f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ # syntax=docker.io/docker/dockerfile:1.7-labs -FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef +# MSRV 1.95 (reth v2.5.0); pinned so stale cached latest-rust-1 digests cannot silently drop below it +FROM lukemathwalker/cargo-chef:latest-rust-1.97 AS chef WORKDIR /app LABEL org.opencontainers.image.source=https://github.com/berachain/bera-reth diff --git a/Dockerfile.debug b/Dockerfile.debug index a0d0ceee..4d185eb5 100644 --- a/Dockerfile.debug +++ b/Dockerfile.debug @@ -1,6 +1,7 @@ # Fast debug build Dockerfile for bera-reth development # Uses same cargo-chef pattern as production but with debug profile -FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef +# MSRV 1.95 (reth v2.5.0); pinned so stale cached latest-rust-1 digests cannot silently drop below it +FROM lukemathwalker/cargo-chef:latest-rust-1.97 AS chef WORKDIR /app # Install system dependencies diff --git a/README.md b/README.md index cb280313..6af1ef75 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,14 @@ # Bera-Reth -A high-performance Rust execution client for Berachain, built with the Reth SDK. +A high-performance Rust execution client for Berachain, built with the Reth SDK (pinned to reth `v2.5.0`). ## Getting Started ### Prerequisites -- Rust 1.70+ +- Rust 1.95+ (MSRV inherited from reth v2.5.0; current stable works) +- A nightly toolchain for `make pr` (rustfmt/clippy) - Git ### Build and Run @@ -32,12 +33,51 @@ cd bera-reth cargo build --release ``` -### Local Testing with BeaconKit +## Running with BeaconKit + +Bera-reth is the execution layer; [BeaconKit](https://github.com/berachain/beacon-kit) is the consensus layer that drives it over the Engine API. The authoritative version-pairing table per network lives at [docs.berachain.com/nodes/architecture/evm-execution](https://docs.berachain.com/nodes/architecture/evm-execution). + +For local development, clone BeaconKit next to this repository: + +```bash +git clone https://github.com/berachain/beacon-kit.git ../beacon-kit +``` + +Two-terminal flow: + +```bash +# Terminal 1 — consensus client; also generates the EL genesis at +# .tmp/beacond/eth-genesis.json (including EIP-6110 deposit storage) +cd ../beacon-kit && make start + +# Terminal 2 — execution client, built and launched against that genesis +BEACON_KIT=../beacon-kit make start-bera-reth-local +``` + +Or run the one-shot integration test that launches both and monitors block progression: + +```bash +BEACON_KIT_PATH=../beacon-kit ./scripts/test-block-progression.sh +``` + +The flags that matter when pairing with BeaconKit: + +- `--chain ` — must be passed on every start; BeaconKit generates this file. +- `--authrpc.jwtsecret ` — must point at the same file as beacond's `--beacon-kit.engine.jwt-secret-path`. +- `--engine.persistence-threshold 0` and `--engine.memory-block-buffer-target 0` — BeaconKit finalizes every block, so in-memory block buffering must be off. + +Ports: `8545` (HTTP RPC), `8551` (Engine API), `30303` (P2P), and `3500` (beacond node API) must be free. + +## Storage + +Reth v2 introduces a hot/cold storage layout ("Storage V2"): history indices and transaction lookups move to RocksDB, historical changesets move to static files, and hashed state stays on MDBX. Fresh datadirs use V2 automatically; existing V1 datadirs keep working unchanged. To migrate an existing node in place, stop it and run: ```bash -BEACON_KIT_PATH=/path/to/beacon-kit ./scripts/test-block-progression.sh +bera-reth db --datadir migrate-v2 --chain ``` +See [docs/storage-v2.md](docs/storage-v2.md) for the full operator guide. + ## Development ### Prerequisites diff --git a/build.rs b/build.rs index 093a2272..876a828d 100644 --- a/build.rs +++ b/build.rs @@ -6,8 +6,8 @@ use std::{ fs, path::{Path, PathBuf}, }; -use vergen::{BuildBuilder, CargoBuilder, Emitter}; -use vergen_git2::Git2Builder; +use vergen::{Build, Cargo, Emitter}; +use vergen_git2::Git2; const MAINNET_FIXTURE_PATH: &str = "tests/fixtures/mainnet-genesis.json"; const BEPOLIA_FIXTURE_PATH: &str = "tests/fixtures/bepolia-genesis.json"; @@ -17,14 +17,13 @@ const BEPOLIA_BAKED_FILENAME: &str = "bepolia-eth-genesis.json"; fn main() -> Result<(), Box> { let mut emitter = Emitter::default(); - let build_builder = BuildBuilder::default().build_timestamp(true).build()?; + let build_builder = Build::builder().build_timestamp(true).build(); emitter.add_instructions(&build_builder)?; - let cargo_builder = CargoBuilder::default().features(true).target_triple(true).build()?; + let cargo_builder = Cargo::builder().features(true).target_triple(true).build(); emitter.add_instructions(&cargo_builder)?; - let git_builder = - Git2Builder::default().describe(false, true, None).dirty(true).sha(false).build()?; + let git_builder = Git2::builder().describe(false, true, None).dirty(true).sha(false).build(); emitter.add_instructions(&git_builder)?; emitter.emit_and_set()?; diff --git a/deny.toml b/deny.toml index d8bac5e8..dc409221 100644 --- a/deny.toml +++ b/deny.toml @@ -67,22 +67,16 @@ feature-depth = 1 [advisories] yanked = "warn" ignore = [ + # https://rustsec.org/advisories/RUSTSEC-2023-0089 atomic-polyfill is unmaintained; dev-only transitive dep via test-fuzz -> postcard -> heapless 0.7 + "RUSTSEC-2023-0089", # https://rustsec.org/advisories/RUSTSEC-2024-0436 paste! is unmaintained "RUSTSEC-2024-0436", # https://rustsec.org/advisories/RUSTSEC-2025-0141 bincode is unmaintained, need to transition all deps to wincode first "RUSTSEC-2025-0141", - # https://rustsec.org/advisories/RUSTSEC-2026-0105 core2 is unmaintained (all versions yanked), no safe upgrade available; transitive dep via ssz/multiaddr - "RUSTSEC-2026-0105", - # https://rustsec.org/advisories/RUSTSEC-2026-0118 hickory-proto NSEC3 unbounded loop; transitive dep via reth-dns-discovery, awaiting upstream bump to >=0.26.1 - "RUSTSEC-2026-0118", - # https://rustsec.org/advisories/RUSTSEC-2026-0119 hickory-proto O(n^2) name compression; transitive dep via reth-dns-discovery, awaiting upstream bump to >=0.26.1 - "RUSTSEC-2026-0119", # https://rustsec.org/advisories/RUSTSEC-2026-0173 proc-macro-error2 is unmaintained, no safe upgrade available; transitive dep via alloy-sol-macro "RUSTSEC-2026-0173", - # https://rustsec.org/advisories/RUSTSEC-2026-0183 git2 UB in Remote::list(), awaiting reth bump to vergen-git2 10 - "RUSTSEC-2026-0183", - # https://rustsec.org/advisories/RUSTSEC-2026-0184 git2 UB in BlameHunk signatures, awaiting reth bump to vergen-git2 10 - "RUSTSEC-2026-0184", + # https://rustsec.org/advisories/RUSTSEC-2026-0247 bitmaps is unmaintained (repo archived), no safe upgrade available; transitive dep via reth-transaction-pool -> imbl + "RUSTSEC-2026-0247", ] # If this is true, then cargo deny will use the git executable to fetch advisory database. # If this is false, then it uses a built-in git library. diff --git a/docs/storage-v2.md b/docs/storage-v2.md new file mode 100644 index 00000000..c555140c --- /dev/null +++ b/docs/storage-v2.md @@ -0,0 +1,77 @@ +# Storage V2 Operator Guide + +Bera-reth is built on reth `v2.5.0`, which ships reth's new hot/cold storage layout +("Storage V2"). This guide covers what changed and what, if anything, node operators +need to do. + +## What changed + +The V1 layout stored everything in a single MDBX database. V2 splits storage by access +pattern: + +- **RocksDB** — history indices and transaction-hash lookups. +- **Static files** — historical account and storage changesets, receipts. +- **MDBX** — hashed state and everything else, as before. + +Upstream reports roughly 20–30% smaller full-node datadirs and much faster persistence. +Details: [reth.rs/run/storage](https://reth.rs/run/storage/). + +The layout of a datadir is recorded in its database metadata and always takes precedence: +upgrading the bera-reth binary never converts a datadir, and `--storage.v2` only selects +the layout when a **new** datadir is created. + +## What operators need to do + +| Situation | Action | +|---|---| +| Fresh node (new datadir) | Nothing — V2 is the default for new datadirs. | +| Existing node, staying on V1 | Nothing — V1 datadirs keep working on this binary. Note that upstream reth plans to drop V1 support in a future release, so plan a migration window. | +| Existing node, moving to V2 | Stop the node, run `bera-reth db migrate-v2` (below), restart. Or resync from scratch. | + +There are no Berachain snapshots on [snapshots.reth.rs](https://snapshots.reth.rs) +(Ethereum mainnet only), so in-place migration and resync are the only two paths to V2 +for an existing node. + +## In-place migration + +Stop the node first, then: + +```bash +bera-reth db --datadir migrate-v2 --chain +``` + +The command moves changesets and receipts into static files, history indices and +transaction lookups into RocksDB, flips the stored layout to V2, and compacts the +remaining MDBX database. On the next start the pipeline rebuilds anything recomputable. + +Plan for free disk space of at least the current datadir size while the migration runs +(new files are written alongside the old database before compaction); the final +footprint should end up smaller than V1. Upstream's Ethereum mainnet figures are +~30% savings for a full node — no Berachain-specific measurements are published yet. + +## Opting a new datadir back into V1 + +```bash +bera-reth node --storage.v2=false ... +``` + +This only affects datadir creation; it never converts an existing database. Since V1 is +slated for removal upstream, treat it strictly as an escape hatch. + +## Node modes for RPC operators + +Archive remains the default. Two pruned presets exist for lighter RPC nodes: + +- `--full` — keeps recent state plus a bounded history window. +- `--minimal` — maximum pruning, smallest disk footprint. + +Pruning is destructive and irreversible; a pruned node still syncs the full history from +P2P since there are no Berachain snapshots. + +## Related tooling + +- `bera-reth db --datadir settings` — inspect the stored storage settings (layout + version) of a datadir. +- ERA history import (`--era.enable`) exists upstream but there are no published + Berachain ERA files yet, so it is not usable on Berachain today. +- The JIT EVM is not included in this build because reth's `jit` feature is disabled. diff --git a/src/consensus/mod.rs b/src/consensus/mod.rs index d10e30ec..58b72438 100644 --- a/src/consensus/mod.rs +++ b/src/consensus/mod.rs @@ -53,8 +53,8 @@ impl BerachainBeaconConsensus { let transactions: Vec<_> = block.body().transactions().collect(); if transactions.is_empty() { - return Err(ConsensusError::Other( - "Prague1 block must contain at least one PoL transaction".into(), + return Err(ConsensusError::msg( + "Prague1 block must contain at least one PoL transaction", )); } @@ -63,15 +63,15 @@ impl BerachainBeaconConsensus { if let BerachainTxEnvelope::Berachain(pol_tx) = first_tx { self.validate_pol_transaction_shape(pol_tx, block)?; } else { - return Err(ConsensusError::Other( - "First transaction in Prague1 block must be a PoL transaction".into(), + return Err(ConsensusError::msg( + "First transaction in Prague1 block must be a PoL transaction", )); } // Check no other transactions are PoL for (index, tx) in transactions.iter().enumerate().skip(1) { if matches!(tx, BerachainTxEnvelope::Berachain(_)) { - return Err(ConsensusError::Other(format!( + return Err(ConsensusError::msg(format!( "PoL transaction found at invalid position {index}, only first transaction can be PoL" ))); } @@ -88,14 +88,14 @@ impl BerachainBeaconConsensus { let header = block.header(); let expected_pubkey = header.prev_proposer_pubkey.ok_or_else(|| { - ConsensusError::Other( - "Block header missing prev_proposer_pubkey for PoL transaction validation".into(), + ConsensusError::msg( + "Block header missing prev_proposer_pubkey for PoL transaction validation", ) })?; let base_fee = header .base_fee_per_gas - .ok_or_else(|| ConsensusError::Other("Base fee must be present in header".into()))?; + .ok_or_else(|| ConsensusError::msg("Base fee must be present in header"))?; validate_pol_transaction( pol_tx, @@ -113,9 +113,10 @@ impl FullConsensus for BerachainBeaconConsensus { block: &RecoveredBlock, result: &BlockExecutionResult<::Receipt>, receipt_root_bloom: Option, + block_access_list_hash: Option, ) -> Result<(), ConsensusError> { // First run the standard validation - as FullConsensus>::validate_block_post_execution(&self.inner, block, result, receipt_root_bloom)?; + as FullConsensus>::validate_block_post_execution(&self.inner, block, result, receipt_root_bloom, block_access_list_hash)?; // Check for Prague3 blocked address transfers if the hardfork is active let timestamp = block.header().timestamp(); @@ -147,11 +148,10 @@ impl FullConsensus for BerachainBeaconConsensus { if let Some(bex_vault) = bex_vault_address && (from_addr == bex_vault || to_addr == bex_vault) { - return Err(ConsensusError::Other( + return Err(ConsensusError::other( BerachainExecutionError::Prague3BexVaultTransfer { vault_address: bex_vault, - } - .to_string(), + }, )); } @@ -159,22 +159,20 @@ impl FullConsensus for BerachainBeaconConsensus { if blocked_addresses.contains(&from_addr) { // Blocked addresses can only send to rescue address if rescue_address != Some(to_addr) { - return Err(ConsensusError::Other( + return Err(ConsensusError::other( BerachainExecutionError::Prague3BlockedAddressTransfer { blocked_address: from_addr, - } - .to_string(), + }, )); } } // Check if to address is blocked (blocked addresses cannot receive) if blocked_addresses.contains(&to_addr) { - return Err(ConsensusError::Other( + return Err(ConsensusError::other( BerachainExecutionError::Prague3BlockedAddressTransfer { blocked_address: to_addr, - } - .to_string(), + }, )); } } @@ -200,11 +198,10 @@ impl FullConsensus for BerachainBeaconConsensus { if log.address == bex_vault_address && log.topics().first() == Some(&INTERNAL_BALANCE_CHANGED_SIGNATURE) { - return Err(ConsensusError::Other( + return Err(ConsensusError::other( BerachainExecutionError::Prague3BexVaultEvent { vault_address: bex_vault_address, - } - .to_string(), + }, )); } } @@ -244,7 +241,7 @@ impl Consensus for BerachainBeaconConsensus { .transactions() .position(|tx| matches!(tx, BerachainTxEnvelope::Berachain(_))) { - return Err(ConsensusError::Other(format!( + return Err(ConsensusError::msg(format!( "PoL transaction found at position {index} before Prague1 fork activation" ))); } @@ -270,7 +267,7 @@ impl HeaderValidator for BerachainBeaconConsensus { header.timestamp(), header.prev_proposer_pubkey, ) - .map_err(|err| ConsensusError::Other(err.to_string()))?; + .map_err(ConsensusError::other)?; Ok(()) } diff --git a/src/engine/builder.rs b/src/engine/builder.rs index 07013417..81b8d408 100644 --- a/src/engine/builder.rs +++ b/src/engine/builder.rs @@ -1,8 +1,6 @@ use crate::{ chainspec::BerachainChainSpec, - engine::payload::{ - BerachainBuiltPayload, BerachainPayloadAttributes, BerachainPayloadBuilderAttributes, - }, + engine::payload::{BerachainBuiltPayload, BerachainPayloadAttributes}, hardforks::BerachainHardforks, node::evm::config::{BerachainEvmConfig, BerachainNextBlockEnvAttributes}, primitives::{BerachainHeader, BerachainPrimitives}, @@ -12,7 +10,7 @@ use alloy_consensus::Transaction; use alloy_primitives::U256; use alloy_rlp::Encodable; use reth::{ - api::{FullNodeTypes, NodeTypes, PayloadBuilderError, PayloadTypes, TxTy}, + api::{FullNodeTypes, NodeTypes, PayloadAttributes, PayloadBuilderError, PayloadTypes, TxTy}, chainspec::EthereumHardforks, providers::StateProviderFactory, revm::{State, context::Block, database::StateProviderDatabase}, @@ -33,7 +31,6 @@ use reth_evm::{ execute::{BlockBuilder, BlockBuilderOutcome}, }; use reth_node_builder::{BuilderContext, PayloadBuilderConfig, components::PayloadBuilderBuilder}; -use reth_payload_primitives::PayloadBuilderAttributes; use reth_primitives_traits::transaction::error::InvalidTransactionError; use reth_transaction_pool::{ BestTransactions, BestTransactionsAttributes, ValidPoolTransaction, @@ -66,7 +63,6 @@ where Types::Payload: PayloadTypes< BuiltPayload = BerachainBuiltPayload, PayloadAttributes = BerachainPayloadAttributes, - PayloadBuilderAttributes = BerachainPayloadBuilderAttributes, >, { type PayloadBuilder = BerachainPayloadBuilder; @@ -125,7 +121,7 @@ where Client: StateProviderFactory + ChainSpecProvider + Clone, Pool: TransactionPool>, { - type Attributes = BerachainPayloadBuilderAttributes; + type Attributes = BerachainPayloadAttributes; type BuiltPayload = BerachainBuiltPayload; fn try_build( @@ -155,9 +151,10 @@ where fn build_empty_payload( &self, - config: PayloadConfig, + config: PayloadConfig, ) -> Result { - let args = BuildArguments::new(Default::default(), config, Default::default(), None); + let args = + BuildArguments::new(Default::default(), None, None, config, Default::default(), None); default_berachain_payload( self.evm_config.clone(), @@ -183,7 +180,7 @@ pub fn default_berachain_payload( client: Client, pool: Pool, builder_config: EthereumBuilderConfig, - args: BuildArguments, + args: BuildArguments, best_txs: F, ) -> Result, PayloadBuilderError> where @@ -191,8 +188,17 @@ where Pool: TransactionPool>, F: FnOnce(BestTransactionsAttributes) -> BestTransactionsIter, { - let BuildArguments { mut cached_reads, config, cancel, best_payload } = args; - let PayloadConfig { parent_header, attributes } = config; + // The shared execution cache and incremental state-root task are engine-side + // optimizations; Berachain computes the state root synchronously in `finish`. + let BuildArguments { + mut cached_reads, + execution_cache: _, + state_root_handle: _, + config, + cancel, + best_payload, + } = args; + let PayloadConfig { parent_header, attributes, payload_id, .. } = config; let state_provider = client.state_by_block_hash(parent_header.hash())?; let state = StateProviderDatabase::new(&state_provider); @@ -205,11 +211,12 @@ where &parent_header, BerachainNextBlockEnvAttributes { timestamp: attributes.timestamp(), - suggested_fee_recipient: attributes.suggested_fee_recipient(), - prev_randao: attributes.prev_randao(), - gas_limit: builder_config.gas_limit(parent_header.gas_limit), + suggested_fee_recipient: attributes.inner.suggested_fee_recipient, + prev_randao: attributes.inner.prev_randao, + gas_limit: builder_config + .gas_limit_with_target(parent_header.gas_limit, attributes.target_gas_limit()), parent_beacon_block_root: attributes.parent_beacon_block_root(), - withdrawals: Some(attributes.withdrawals().clone()), + withdrawals: attributes.inner.withdrawals.clone().map(Into::into), prev_proposer_pubkey: attributes.prev_proposer_pubkey, extra_data: builder_config.extra_data.clone(), }, @@ -218,7 +225,7 @@ where let chain_spec = client.chain_spec(); - debug!(target: "payload_builder", id=%attributes.id, parent_header = ?parent_header.hash(), parent_number = parent_header.number, "building new payload"); + debug!(target: "payload_builder", id=%payload_id, parent_header = ?parent_header.hash(), parent_number = parent_header.number, "building new payload"); let mut cumulative_gas_used = 0; let block_gas_limit: u64 = builder.evm_mut().block().gas_limit(); let base_fee = builder.evm_mut().block().basefee(); @@ -241,7 +248,7 @@ where let mut block_blob_count = 0; let mut block_transactions_rlp_length = 0; - let blob_params = chain_spec.blob_params_at_timestamp(attributes.timestamp); + let blob_params = chain_spec.blob_params_at_timestamp(attributes.timestamp()); let protocol_max_blob_count = blob_params.as_ref().map(|params| params.max_blob_count).unwrap_or_default(); @@ -252,8 +259,9 @@ where .map(|user_limit| std::cmp::min(user_limit, protocol_max_blob_count).max(1)) .unwrap_or(protocol_max_blob_count); - let is_osaka = chain_spec.is_osaka_active_at_timestamp(attributes.timestamp); - let withdrawals_rlp_length = attributes.withdrawals().length(); + let is_osaka = chain_spec.is_osaka_active_at_timestamp(attributes.timestamp()); + let withdrawals_rlp_length = + attributes.inner.withdrawals.as_ref().map(|withdrawals| withdrawals.length()).unwrap_or(0); let prague3_active = chain_spec.is_prague3_active_at_timestamp(attributes.timestamp()); if prague3_active { @@ -268,7 +276,7 @@ where // continue best_txs.mark_invalid( &pool_tx, - &InvalidPoolTransactionError::ExceedsGasLimit(pool_tx.gas_limit(), block_gas_limit), + InvalidPoolTransactionError::ExceedsGasLimit(pool_tx.gas_limit(), block_gas_limit), ); continue; } @@ -288,7 +296,7 @@ where if is_osaka && estimated_block_size_with_tx > MAX_RLP_BLOCK_SIZE { best_txs.mark_invalid( &pool_tx, - &InvalidPoolTransactionError::OversizedData { + InvalidPoolTransactionError::OversizedData { size: estimated_block_size_with_tx, limit: MAX_RLP_BLOCK_SIZE, }, @@ -310,7 +318,7 @@ where trace!(target: "payload_builder", tx=?tx.hash(), ?block_blob_count, "skipping blob transaction because it would exceed the max blob count per block"); best_txs.mark_invalid( &pool_tx, - &InvalidPoolTransactionError::Eip4844( + InvalidPoolTransactionError::Eip4844( Eip4844PoolTransactionError::TooManyEip4844Blobs { have: block_blob_count + tx_blob_count, permitted: max_blob_count, @@ -339,15 +347,15 @@ where blob_tx_sidecar = match blob_sidecar_result { Ok(sidecar) => Some(sidecar), Err(error) => { - best_txs.mark_invalid(&pool_tx, &InvalidPoolTransactionError::Eip4844(error)); + best_txs.mark_invalid(&pool_tx, InvalidPoolTransactionError::Eip4844(error)); continue; } }; } // Execute the transaction - let gas_used = match builder.execute_transaction(tx.clone()) { - Ok(gas_used) => gas_used, + let gas_output = match builder.execute_transaction(tx.clone()) { + Ok(gas_output) => gas_output, Err(BlockExecutionError::Validation(BlockValidationError::InvalidTx { error, .. })) => { @@ -360,7 +368,7 @@ where trace!(target: "payload_builder", %error, ?tx, "skipping invalid transaction and its descendants"); best_txs.mark_invalid( &pool_tx, - &InvalidPoolTransactionError::Consensus( + InvalidPoolTransactionError::Consensus( InvalidTransactionError::TxTypeNotSupported, ), ); @@ -384,6 +392,7 @@ where block_transactions_rlp_length += tx_rlp_len; // update and add to total fees + let gas_used = gas_output.tx_gas_used(); let miner_fee = tx.effective_tip_per_gas(base_fee).expect("fee is always valid; execution succeeded"); total_fees += U256::from(miner_fee) * U256::from(gas_used); @@ -403,14 +412,15 @@ where return Ok(BuildOutcome::Aborted { fees: total_fees, cached_reads }); } - let BlockBuilderOutcome { execution_result, block, .. } = builder.finish(&state_provider)?; + let BlockBuilderOutcome { execution_result, block, .. } = + builder.finish(&state_provider, None)?; let requests = chain_spec - .is_prague_active_at_timestamp(attributes.timestamp) + .is_prague_active_at_timestamp(attributes.timestamp()) .then_some(execution_result.requests); let sealed_block = Arc::new(block.sealed_block().clone()); - debug!(target: "payload_builder", id=%attributes.id, sealed_block_header = ?sealed_block.sealed_header(), "sealed built block"); + debug!(target: "payload_builder", id=%payload_id, sealed_block_header = ?sealed_block.sealed_header(), "sealed built block"); if is_osaka && sealed_block.rlp_length() > MAX_RLP_BLOCK_SIZE { return Err(PayloadBuilderError::other(ConsensusError::BlockTooLarge { @@ -419,7 +429,7 @@ where })); } - let payload = BerachainBuiltPayload::new(attributes.id, sealed_block, total_fees, requests) + let payload = BerachainBuiltPayload::new(payload_id, sealed_block, total_fees, requests) // add blob sidecars from the executed txs .with_sidecars(blob_sidecars); diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 903144cf..3f129b79 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -17,9 +17,7 @@ pub mod rpc; pub mod validator; use crate::{ - engine::payload::{ - BerachainBuiltPayload, BerachainPayloadAttributes, BerachainPayloadBuilderAttributes, - }, + engine::payload::{BerachainBuiltPayload, BerachainPayloadAttributes}, hardforks::BerachainHardforks, node::evm::error::BerachainExecutionError, primitives::header::BlsPublicKey, @@ -56,12 +54,12 @@ impl PayloadTypes for BerachainEngineTypes { type BuiltPayload = BerachainBuiltPayload; type PayloadAttributes = BerachainPayloadAttributes; - type PayloadBuilderAttributes = BerachainPayloadBuilderAttributes; fn block_to_payload( block: SealedBlock< <::Primitives as NodePrimitives>::Block, >, + _bal: Option, ) -> Self::ExecutionData { let prev_proposer_pubkey = block.prev_proposer_pubkey; let block_hash = block.hash(); @@ -258,6 +256,10 @@ impl ExecutionPayloadTrait for BerachainExecutionData { self.payload.as_v1().gas_used } + fn gas_limit(&self) -> u64 { + self.payload.as_v1().gas_limit + } + fn block_access_list(&self) -> Option<&Bytes> { None } @@ -265,6 +267,10 @@ impl ExecutionPayloadTrait for BerachainExecutionData { fn transaction_count(&self) -> usize { self.payload.as_v1().transactions.len() } + + fn slot_number(&self) -> Option { + None + } } impl From for BerachainExecutionData { diff --git a/src/engine/payload.rs b/src/engine/payload.rs index b70abd4c..9e09e71c 100644 --- a/src/engine/payload.rs +++ b/src/engine/payload.rs @@ -1,23 +1,25 @@ -use super::BerachainExecutionPayloadEnvelopeV4; +use super::{ + BerachainExecutionData, BerachainExecutionPayloadEnvelopeV4, BerachainExecutionPayloadSidecar, +}; use crate::{ chainspec::BerachainChainSpec, primitives::{BerachainBlock, BerachainHeader, BerachainPrimitives, header::BlsPublicKey}, }; use alloy_consensus::BlockHeader; use alloy_eips::{ - eip4895::{Withdrawal, Withdrawals}, - eip7685::Requests, + eip4895::Withdrawal, + eip7685::{Requests, RequestsOrHash}, }; use alloy_primitives::{Address, B256, U256}; use alloy_rlp::Encodable; use alloy_rpc_types::engine::{ - BlobsBundleV1, ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, + BlobsBundleV1, CancunPayloadFields, ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV5, ExecutionPayloadFieldV2, ExecutionPayloadV1, ExecutionPayloadV3, PayloadId, }; use reth::{ - api::PayloadAttributes, - builder::{PayloadAttributesBuilder, PayloadBuilderAttributes}, + api::{PayloadAttributes, PayloadTypes}, + builder::PayloadAttributesBuilder, chainspec::EthereumHardforks, }; use reth_engine_local::LocalPayloadAttributesBuilder; @@ -25,7 +27,7 @@ use reth_ethereum_engine_primitives::{BlobSidecars, BuiltPayloadConversionError} use reth_node_ethereum::engine::EthPayloadAttributes; use reth_payload_primitives::BuiltPayload; use reth_primitives_traits::{NodePrimitives, SealedBlock, SealedHeader}; -use std::{convert::Infallible, sync::Arc}; +use std::sync::Arc; /// Berachain-specific payload attributes #[derive(Clone, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)] @@ -37,6 +39,10 @@ pub struct BerachainPayloadAttributes { } impl PayloadAttributes for BerachainPayloadAttributes { + fn payload_id(&self, parent_hash: &B256) -> PayloadId { + berachain_payload_id(parent_hash, self) + } + fn timestamp(&self) -> u64 { self.inner.timestamp } @@ -47,92 +53,17 @@ impl PayloadAttributes for BerachainPayloadAttributes { fn parent_beacon_block_root(&self) -> Option { self.inner.parent_beacon_block_root } -} - -impl BerachainPayloadAttributes { - pub fn prev_proposer_pubkey(&self) -> Option { - self.prev_proposer_pubkey - } -} - -/// Berachain payload builder attributes -#[derive(Clone, Debug, PartialEq, Eq)] -pub struct BerachainPayloadBuilderAttributes { - /// Id of the payload - pub id: PayloadId, - /// Parent block to build the payload on top - pub parent: B256, - /// Unix timestamp for the generated payload - /// - /// Number of seconds since the Unix epoch. - pub timestamp: u64, - /// Address of the recipient for collecting transaction fee - pub suggested_fee_recipient: Address, - /// Randomness value for the generated payload - pub prev_randao: B256, - /// Withdrawals for the generated payload - pub withdrawals: Withdrawals, - /// Root of the parent beacon block - pub parent_beacon_block_root: Option, - /// Previous proposer public key - pub prev_proposer_pubkey: Option, -} - -impl PayloadBuilderAttributes for BerachainPayloadBuilderAttributes { - type RpcPayloadAttributes = BerachainPayloadAttributes; - type Error = Infallible; - - fn try_new( - parent: B256, - attributes: Self::RpcPayloadAttributes, - _version: u8, - ) -> Result - where - Self: Sized, - { - let payload_id = berachain_payload_id(&parent, &attributes); - Ok(Self { - id: payload_id, - parent, - timestamp: attributes.inner.timestamp, - suggested_fee_recipient: attributes.inner.suggested_fee_recipient, - prev_randao: attributes.inner.prev_randao, - withdrawals: attributes.inner.withdrawals.unwrap_or_default().into(), - parent_beacon_block_root: attributes.inner.parent_beacon_block_root, - prev_proposer_pubkey: attributes.prev_proposer_pubkey, - }) - } - - fn payload_id(&self) -> PayloadId { - self.id - } - - fn parent(&self) -> B256 { - self.parent - } - - fn timestamp(&self) -> u64 { - self.timestamp - } - - fn parent_beacon_block_root(&self) -> Option { - self.parent_beacon_block_root - } - fn suggested_fee_recipient(&self) -> Address { - self.suggested_fee_recipient + fn slot_number(&self) -> Option { + self.inner.slot_number } - fn prev_randao(&self) -> B256 { - self.prev_randao - } - - fn withdrawals(&self) -> &Withdrawals { - &self.withdrawals + fn target_gas_limit(&self) -> Option { + self.inner.target_gas_limit } } -impl BerachainPayloadBuilderAttributes { +impl BerachainPayloadAttributes { pub fn prev_proposer_pubkey(&self) -> Option { self.prev_proposer_pubkey } @@ -163,6 +94,7 @@ impl PayloadAttributesBuilder .chain_spec .is_cancun_active_at_timestamp(timestamp) .then(B256::random), + ..Default::default() }, prev_proposer_pubkey: None, } @@ -323,11 +255,38 @@ impl BuiltPayload for BerachainBuiltPayload { } } +impl From for BerachainExecutionData { + fn from(value: BerachainBuiltPayload) -> Self { + let BerachainBuiltPayload { block, requests, .. } = value; + let mut data = crate::engine::BerachainEngineTypes::block_to_payload( + Arc::unwrap_or_clone(block), + None, + ); + + // The sidecar derived from the block carries only the header's requests hash; + // restore the request list stored on the built payload so downstream + // validation sees the actual request bytes instead of skipping to the hash. + if let Some(requests) = requests && + let Some(parent_beacon_block_root) = data.sidecar.parent_beacon_block_root() + { + let versioned_hashes = data.sidecar.versioned_hashes().cloned().unwrap_or_default(); + let parent_proposer_pub_key = data.sidecar.parent_proposer_pub_key(); + data.sidecar = BerachainExecutionPayloadSidecar::v4( + CancunPayloadFields { parent_beacon_block_root, versioned_hashes }, + RequestsOrHash::Requests(requests), + parent_proposer_pub_key, + ); + } + + data + } +} + /// Generates the payload id for Berachain payloads from the [`BerachainPayloadAttributes`]. /// /// This extends the standard Ethereum payload_id generation by including the -/// optional prev_proposer_pubkey in the hash calculation, ensuring payload IDs -/// are unique when the proposer pubkey differs. +/// optional target_gas_limit and prev_proposer_pubkey in the hash calculation, +/// ensuring payload IDs are unique when either differs. /// /// Returns an 8-byte identifier by hashing the payload components with sha256 hash. pub fn berachain_payload_id(parent: &B256, attributes: &BerachainPayloadAttributes) -> PayloadId { @@ -348,6 +307,15 @@ pub fn berachain_payload_id(parent: &B256, attributes: &BerachainPayloadAttribut hasher.update(parent_beacon_block); } + // The gas limit steers block building, so it must be part of the ID or the + // payload cache could serve a block built with a stale limit. The tag byte + // discriminates presence from other optional fields; hashing nothing when + // absent preserves the legacy IDs. + if let Some(target_gas_limit) = attributes.inner.target_gas_limit { + hasher.update([1u8]); + hasher.update(target_gas_limit.to_be_bytes()); + } + // Include prev_proposer_pubkey in the hash if present if let Some(proposer_pubkey) = attributes.prev_proposer_pubkey { hasher.update(proposer_pubkey); @@ -377,6 +345,7 @@ mod tests { suggested_fee_recipient: Address::from([0x01; 20]), withdrawals: None, parent_beacon_block_root: None, + ..Default::default() }, prev_proposer_pubkey: None, }; @@ -390,18 +359,17 @@ mod tests { suggested_fee_recipient: Address::from([0x01; 20]), withdrawals: None, parent_beacon_block_root: None, + ..Default::default() }, prev_proposer_pubkey: Some(BlsPublicKey::from([0x42; 48])), }; - // Test via BerachainPayloadBuilderAttributes::try_new which calls berachain_payload_id - let builder_no_pubkey = - BerachainPayloadBuilderAttributes::try_new(parent, attributes_no_pubkey, 0).unwrap(); - let builder_with_pubkey = - BerachainPayloadBuilderAttributes::try_new(parent, attributes_with_pubkey, 0).unwrap(); + // Test via PayloadAttributes::payload_id which calls berachain_payload_id + let id_no_pubkey = attributes_no_pubkey.payload_id(&parent); + let id_with_pubkey = attributes_with_pubkey.payload_id(&parent); // Critical test: presence of pubkey should affect payload ID - assert_ne!(builder_no_pubkey.payload_id(), builder_with_pubkey.payload_id()); + assert_ne!(id_no_pubkey, id_with_pubkey); // Test different pubkeys produce different IDs let attributes_different_pubkey = BerachainPayloadAttributes { @@ -413,14 +381,13 @@ mod tests { suggested_fee_recipient: Address::from([0x01; 20]), withdrawals: None, parent_beacon_block_root: None, + ..Default::default() }, prev_proposer_pubkey: Some(BlsPublicKey::from([0x43; 48])), }; - let builder_different_pubkey = - BerachainPayloadBuilderAttributes::try_new(parent, attributes_different_pubkey, 0) - .unwrap(); - assert_ne!(builder_with_pubkey.payload_id(), builder_different_pubkey.payload_id()); + let id_different_pubkey = attributes_different_pubkey.payload_id(&parent); + assert_ne!(id_with_pubkey, id_different_pubkey); } #[test] @@ -436,6 +403,7 @@ mod tests { suggested_fee_recipient: Address::from([0x01; 20]), withdrawals: None, // No withdrawals parent_beacon_block_root: None, + ..Default::default() }, prev_proposer_pubkey: None, }; @@ -449,19 +417,83 @@ mod tests { suggested_fee_recipient: Address::from([0x01; 20]), withdrawals: Some(vec![]), // Empty withdrawals parent_beacon_block_root: None, + ..Default::default() }, prev_proposer_pubkey: None, }; - // Test via BerachainPayloadBuilderAttributes::try_new which calls berachain_payload_id - let builder_none = - BerachainPayloadBuilderAttributes::try_new(parent, attributes_none, 0).unwrap(); - let builder_empty = - BerachainPayloadBuilderAttributes::try_new(parent, attributes_empty, 0).unwrap(); + // Test via PayloadAttributes::payload_id which calls berachain_payload_id + let id_none = attributes_none.payload_id(&parent); + let id_empty = attributes_empty.payload_id(&parent); // Critical test: None vs Some([]) should produce different hashes // This matches geth behavior where None skips encoding, Some([]) encodes empty list - assert_ne!(builder_none.payload_id(), builder_empty.payload_id()); + assert_ne!(id_none, id_empty); + } + + #[test] + fn test_target_gas_limit_affects_payload_id() { + let parent = b256!("0000000000000000000000000000000000000000000000000000000000000001"); + + let base_inner = EthPayloadAttributes { + timestamp: 1000, + prev_randao: b256!("0000000000000000000000000000000000000000000000000000000000000002"), + suggested_fee_recipient: Address::from([0x01; 20]), + withdrawals: None, + parent_beacon_block_root: None, + ..Default::default() + }; + + let attributes_without = + BerachainPayloadAttributes { inner: base_inner.clone(), prev_proposer_pubkey: None }; + let attributes_with = BerachainPayloadAttributes { + inner: EthPayloadAttributes { + target_gas_limit: Some(30_000_000), + ..base_inner.clone() + }, + prev_proposer_pubkey: None, + }; + let attributes_with_other = BerachainPayloadAttributes { + inner: EthPayloadAttributes { target_gas_limit: Some(60_000_000), ..base_inner }, + prev_proposer_pubkey: None, + }; + + let id_without = attributes_without.payload_id(&parent); + let id_with = attributes_with.payload_id(&parent); + let id_with_other = attributes_with_other.payload_id(&parent); + + // Presence of a target gas limit must change the payload ID so the + // cache cannot return a block built without the limit applied. + assert_ne!(id_without, id_with); + + // Different limits must yield different IDs. + assert_ne!(id_with, id_with_other); + } + + #[test] + fn test_payload_id_stable_when_target_gas_limit_absent() { + // Golden value computed with the pre-target-gas-limit derivation: + // sha256(parent ++ timestamp ++ prev_randao ++ fee_recipient)[..8]. + // Attributes without a target gas limit must keep producing legacy IDs. + let parent = b256!("0000000000000000000000000000000000000000000000000000000000000001"); + let attributes = BerachainPayloadAttributes { + inner: EthPayloadAttributes { + timestamp: 1000, + prev_randao: b256!( + "0000000000000000000000000000000000000000000000000000000000000002" + ), + suggested_fee_recipient: Address::from([0x01; 20]), + withdrawals: None, + parent_beacon_block_root: None, + ..Default::default() + }, + prev_proposer_pubkey: None, + }; + + assert_eq!( + attributes.payload_id(&parent), + PayloadId::new([0x4a, 0x85, 0x13, 0xb9, 0x8d, 0xbf, 0xaf, 0x30]) + ); } #[test] @@ -557,6 +589,54 @@ mod tests { ); } + #[test] + fn test_from_built_payload_preserves_requests() { + let pubkey = BlsPublicKey::from([0x42; 48]); + let requests = + Requests::new(vec![alloy_primitives::Bytes::from_static(b"\x00test_request")]); + let parent_beacon_block_root = + b256!("0000000000000000000000000000000000000000000000000000000000000003"); + + let header = BerachainHeader { + prev_proposer_pubkey: Some(pubkey), + blob_gas_used: Some(0), + excess_blob_gas: Some(0), + parent_beacon_block_root: Some(parent_beacon_block_root), + requests_hash: Some(requests.requests_hash()), + ..Default::default() + }; + let block = alloy_consensus::Block { + header, + body: alloy_consensus::BlockBody { + transactions: vec![], + ommers: vec![], + withdrawals: None, + }, + }; + let sealed = SealedBlock::new_unhashed(block); + + let payload = BerachainBuiltPayload::new( + PayloadId::new([4; 8]), + std::sync::Arc::new(sealed), + U256::ZERO, + Some(requests.clone()), + ); + + let data = BerachainExecutionData::from(payload); + + assert_eq!( + data.sidecar.requests(), + Some(&requests), + "converted sidecar must carry the request bytes, not just the requests hash" + ); + assert_eq!(data.sidecar.parent_beacon_block_root(), Some(parent_beacon_block_root)); + assert_eq!( + data.sidecar.parent_proposer_pub_key(), + Some(pubkey), + "proposer pubkey from the block must survive the sidecar rebuild" + ); + } + #[test] fn test_try_into_v5_returns_error_not_panic() { let header = BerachainHeader { diff --git a/src/engine/rpc.rs b/src/engine/rpc.rs index c465504e..cbfe5a88 100644 --- a/src/engine/rpc.rs +++ b/src/engine/rpc.rs @@ -1,3 +1,7 @@ +// The jsonrpsee `rpc` macro (via async_trait) adds `#[must_use]` to generated methods that +// already return `#[must_use]` futures, tripping clippy's `double_must_use` on nightly. +#![allow(clippy::double_must_use)] + use crate::{ engine::{ BerachainExecutionData, BerachainExecutionPayloadSidecar, @@ -25,7 +29,7 @@ use reth::{ api::NodeTypes, chainspec::EthereumHardforks, payload::PayloadStore, - providers::{BlockReader, HeaderProvider, StateProviderFactory}, + providers::{BalProvider, BlockReader, HeaderProvider, StateProviderFactory}, rpc::api::IntoEngineApiRpcModule, }; use reth_engine_primitives::{EngineApiValidator, EngineTypes}; @@ -95,7 +99,7 @@ where ctx.beacon_engine_handle.clone(), PayloadStore::new(ctx.node.payload_builder_handle().clone()), ctx.node.pool().clone(), - Box::new(ctx.node.task_executor().clone()), + ctx.node.task_executor().clone(), client, EngineCapabilities::default(), engine_validator, @@ -397,7 +401,7 @@ where impl BerachainEngineApiServer for BerachainEngineApi where - Provider: HeaderProvider + BlockReader + StateProviderFactory + 'static, + Provider: HeaderProvider + BlockReader + StateProviderFactory + BalProvider + 'static, EngineT: EngineTypes< ExecutionData = BerachainExecutionData, PayloadAttributes = BerachainPayloadAttributes, diff --git a/src/evm/mod.rs b/src/evm/mod.rs index 9eed29a5..f8d00651 100644 --- a/src/evm/mod.rs +++ b/src/evm/mod.rs @@ -1,15 +1,18 @@ use crate::transaction::POL_TX_TYPE; use alloy_primitives::{Address, Bytes, TxKind}; use reth::revm::{ - Context, ExecuteEvm, InspectEvm, InspectSystemCallEvm, Inspector, MainBuilder, MainContext, - SystemCallEvm, + Context, ExecuteEvm, InspectEvm, Inspector, MainBuilder, MainContext, context::{ - BlockEnv, CfgEnv, Evm as RevmEvm, Transaction as TxEnvTransaction, TxEnv, + BlockEnv, CfgEnv, ContextSetters, DBErrorMarker, Evm as RevmEvm, + Transaction as TxEnvTransaction, TxEnv, result::{EVMError, HaltReason, ResultAndState}, }, context_interface::result::ExecutionResult, - handler::{EthFrame, EthPrecompiles, PrecompileProvider, instructions::EthInstructions}, - inspector::NoOpInspector, + handler::{ + EthFrame, EthPrecompiles, Handler, MainnetHandler, PrecompileProvider, SystemCallTx, + instructions::EthInstructions, + }, + inspector::{InspectorHandler, NoOpInspector}, interpreter::{InterpreterResult, interpreter::EthInterpreter}, precompile::{PrecompileSpecId, Precompiles}, primitives::hardfork::SpecId, @@ -19,6 +22,12 @@ use reth_evm::{ }; use std::ops::{Deref, DerefMut}; +/// Gas budget for system calls, including the PoL transaction (BRIP-0004). +/// +/// Fixed at the pre-EIP-8037 value: newer revm adds a state-gas reservoir on top, +/// which would change the gas observable by system contracts via `gasleft()`. +pub const SYSTEM_CALL_GAS_LIMIT: u64 = 30_000_000; + /// Helper builder to construct `BerachainEvm` instances in a unified way. #[derive(Debug)] pub struct BerachainEvmBuilder { @@ -197,6 +206,10 @@ where &self.block } + fn cfg_env(&self) -> &CfgEnv { + &self.cfg + } + fn chain_id(&self) -> u64 { self.cfg.chain_id } @@ -212,13 +225,12 @@ where } TxKind::Call(to) => { let mut result = self.transact_system_call(tx.caller, to, tx.data)?; - // Set gas_used to 0 for POL transactions + // Zero out gas accounting for POL transactions result.result = match result.result { - ExecutionResult::Success { reason, gas_refunded, logs, output, .. } => { + ExecutionResult::Success { reason, logs, output, .. } => { ExecutionResult::Success { reason, - gas_used: 0, - gas_refunded, + gas: reth::revm::context::result::ResultGas::default(), logs, output, } @@ -238,11 +250,22 @@ where contract: Address, data: Bytes, ) -> Result, Self::Error> { - if self.inspect { - self.inner.inspect_system_call_with_caller(caller, contract, data) + // revm 41's default system-call budget adds an EIP-8037 state-gas reservoir + // on top of 30M. That extra headroom is observable on-chain via `gasleft()` + // (e.g. by the PoL distributor), so pin the exact 30M budget system calls + // had before the reth v2.4.0 upgrade. + let mut tx = TxEnv::new_system_tx_with_caller(caller, contract, data); + tx.gas_limit = SYSTEM_CALL_GAS_LIMIT; + self.inner.set_tx(tx); + let result = if self.inspect { + MainnetHandler::<_, Self::Error, EthFrame>::default() + .inspect_run_system_call(&mut self.inner)? } else { - self.inner.system_call_with_caller(caller, contract, data) - } + MainnetHandler::<_, Self::Error, EthFrame>::default() + .run_system_call(&mut self.inner)? + }; + let state = self.inner.finalize(); + Ok(ResultAndState::new(result, state)) } fn finish(self) -> (Self::DB, EvmEnv) { @@ -277,7 +300,7 @@ impl EvmFactory for BerachainEvmFactory { BerachainEvm; type Context = Context; type Tx = TxEnv; - type Error = EVMError; + type Error = EVMError; type HaltReason = HaltReason; type Spec = SpecId; type Precompiles = PrecompilesMap; @@ -411,15 +434,15 @@ mod tests { // Both should have gas_used = 0 if let Ok(result) = &result_with_tracer && - let ExecutionResult::Success { gas_used, .. } = &result.result + let ExecutionResult::Success { gas, .. } = &result.result { - assert_eq!(*gas_used, 0); + assert_eq!(gas.tx_gas_used(), 0); } if let Ok(result) = &result_without_tracer && - let ExecutionResult::Success { gas_used, .. } = &result.result + let ExecutionResult::Success { gas, .. } = &result.result { - assert_eq!(*gas_used, 0); + assert_eq!(gas.tx_gas_used(), 0); } // Verify tracer captured system call details @@ -583,7 +606,7 @@ mod osaka_eip_tests { ); let result = run_tx(osaka_cfg(), db, tx); - let gas_used = result.result.gas_used(); + let gas_used = result.result.tx_gas_used(); // Base tx (21000) + calldata (160 bytes non-zero, roughly 160*16=2560) + // precompile cost (6900) => ~30460 expected. assert!( @@ -681,9 +704,10 @@ mod osaka_eip_tests { ); let result = run_tx(osaka_cfg(), db, tx); - let ExecutionResult::Success { output, gas_used, .. } = result.result else { + let ExecutionResult::Success { output, gas, .. } = result.result else { panic!("MODEXP with small inputs should succeed"); }; + let gas_used = gas.tx_gas_used(); assert_eq!(output.data().last().copied(), Some(3u8), "2^3 mod 5 == 3"); // gas_used covers tx base + calldata + MODEXP. MODEXP alone must cost >= 500. assert!( diff --git a/src/main.rs b/src/main.rs index d07ba485..2d6145c1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,7 +7,7 @@ use bera_reth::{ chainspec::{BerachainChainSpec, BerachainChainSpecParser}, consensus::BerachainBeaconConsensus, evm::BerachainEvmFactory, - node::{BerachainNode, evm::config::BerachainEvmConfig}, + node::{BerachainNode, evm::config::BerachainEvmConfig, init_engine_defaults}, version::init_bera_version, }; use clap::Parser; @@ -18,11 +18,6 @@ use reth_node_builder::NodeHandle; use std::sync::Arc; use tracing::info; -/// Persist every canonical block to disk immediately rather than buffering. -/// Upstream reth defaults to 2, but Berachain's faster block times benefit from -/// eager persistence to keep the in-memory block window minimal. -const BERACHAIN_DEFAULT_PERSISTENCE_THRESHOLD: u64 = 0; - fn main() { // Install signal handler for better crash reporting reth_cli_util::sigsegv_handler::install(); @@ -30,10 +25,7 @@ fn main() { // Initialize Bera-Reth version metadata init_bera_version().expect("Failed to initialize Bera-Reth version metadata"); - reth_node_core::args::DefaultEngineValues::default() - .with_persistence_threshold(BERACHAIN_DEFAULT_PERSISTENCE_THRESHOLD) - .try_init() - .expect("engine defaults must be set before CLI parsing"); + init_engine_defaults(); // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided. if std::env::var_os("RUST_BACKTRACE").is_none() { diff --git a/src/node/evm/builder.rs b/src/node/evm/builder.rs index 228e0553..5349e458 100644 --- a/src/node/evm/builder.rs +++ b/src/node/evm/builder.rs @@ -3,18 +3,16 @@ use crate::{ transaction::BerachainTxEnvelope, }; use alloy_consensus::BlockHeader; -use reth::revm::context::result::ExecutionResult; +use alloy_primitives::B256; use reth_evm::{ - Evm, - block::{BlockExecutionError, BlockExecutor, CommitChanges}, + block::{BlockExecutionError, BlockExecutor, CommitChanges, GasOutput}, execute::{BlockBuilder, BlockBuilderOutcome, ExecutorTx}, }; use reth_primitives_traits::RecoveredBlock; use reth_storage_api::StateProvider; +use reth_trie_common::updates::TrieUpdates; use std::sync::Arc; -type EResult = ExecutionResult<<::Evm as Evm>::HaltReason>; - /// Berachain block builder wrapper that fixes sender/transaction mismatch from PoL injection. /// /// # Problem (see ) @@ -131,8 +129,8 @@ where fn execute_transaction_with_commit_condition( &mut self, tx: impl ExecutorTx, - f: impl FnOnce(&EResult) -> CommitChanges, - ) -> Result, BlockExecutionError> { + f: impl FnOnce(&::Result) -> CommitChanges, + ) -> Result, BlockExecutionError> { self.inner.execute_transaction_with_commit_condition(tx, f) } @@ -146,8 +144,9 @@ where fn finish( self, state_provider: impl StateProvider, + state_root_precomputed: Option<(B256, TrieUpdates)>, ) -> Result, BlockExecutionError> { - let mut outcome = self.inner.finish(state_provider)?; + let mut outcome = self.inner.finish(state_provider, state_root_precomputed)?; fix_pol_senders(&mut outcome, &self.chain_spec)?; Ok(outcome) } @@ -214,6 +213,7 @@ mod tests { hashed_state: HashedPostState::default(), trie_updates: TrieUpdates::default(), block: recovered, + block_access_list: None, } } diff --git a/src/node/evm/config.rs b/src/node/evm/config.rs index 4af2e155..d29cab50 100644 --- a/src/node/evm/config.rs +++ b/src/node/evm/config.rs @@ -156,6 +156,7 @@ impl ConfigureEvm for BerachainEvmConfig { gas_limit: header.gas_limit(), basefee: header.base_fee_per_gas().unwrap_or_default(), blob_excess_gas_and_price, + slot_num: 0, }; Ok(EvmEnv { cfg_env, block_env }) @@ -227,6 +228,7 @@ impl ConfigureEvm for BerachainEvmConfig { basefee: basefee.unwrap_or_default(), // calculate excess gas based on parent block's blob gas usage blob_excess_gas_and_price, + slot_num: 0, }; Ok((cfg, block_env).into()) @@ -266,7 +268,7 @@ impl ConfigureEvm for BerachainEvmConfig { ctx: ::ExecutionCtx<'a>, ) -> impl reth_evm::execute::BlockBuilder< Primitives = Self::Primitives, - Executor: reth_evm::block::BlockExecutorFor<'a, Self::BlockExecutorFactory, DB, I>, + Executor = reth_evm::BlockExecutorForEvm<'a, Self, DB, I>, > where DB: Database, @@ -285,7 +287,10 @@ impl ConfigureEvm for BerachainEvmConfig { } impl BuildPendingEnv for BerachainNextBlockEnvAttributes { - fn build_pending_env(parent: &SealedHeader) -> Self { + fn build_pending_env( + parent: &SealedHeader, + _block_overrides: Option<&alloy_rpc_types_eth::BlockOverrides>, + ) -> Self { Self { timestamp: parent.timestamp().saturating_add(BERACHAIN_BLOCK_TIME_SECONDS), suggested_fee_recipient: parent.beneficiary(), @@ -347,6 +352,7 @@ impl ConfigureEngineEvm for BerachainEvmConfig { gas_limit: payload.payload.gas_limit(), basefee: payload.payload.saturated_base_fee_per_gas(), blob_excess_gas_and_price, + slot_num: 0, }; Ok(EvmEnv { cfg_env, block_env }) diff --git a/src/node/evm/executor.rs b/src/node/evm/executor.rs index 63b28a6c..8484e67b 100644 --- a/src/node/evm/executor.rs +++ b/src/node/evm/executor.rs @@ -11,16 +11,13 @@ use crate::{ }; use alloy_consensus::Transaction; use alloy_eips::{Encodable2718, eip7685::Requests}; -use alloy_evm::{ - RecoveredTx, - block::state_changes::{balance_increment_state, post_block_balance_increments}, -}; +use alloy_evm::{RecoveredTx, block::state_changes::post_block_balance_increments}; use alloy_primitives::Bytes; use reth::{ chainspec::{EthereumHardfork, EthereumHardforks}, providers::BlockExecutionResult, revm::{ - DatabaseCommit, Inspector, State, + DatabaseCommit, Inspector, context::{ Block as _, result::{ExecutionResult, Output, ResultAndState, SuccessReason}, @@ -29,11 +26,10 @@ use reth::{ }, }; use reth_evm::{ - Database, Evm, EvmFactory, FromRecoveredTx, FromTxWithEncoded, OnStateHook, + Evm, EvmFactory, FromRecoveredTx, FromTxWithEncoded, block::{ - BlockExecutionError, BlockExecutor, BlockExecutorFactory, BlockExecutorFor, - BlockValidationError, ExecutableTx, StateChangePostBlockSource, StateChangeSource, - SystemCaller, TxResult, + BlockExecutionError, BlockExecutor, BlockExecutorFactory, BlockValidationError, + ExecutableTx, GasOutput, StateDB, SystemCaller, TxResult, }, eth::{ dao_fork, eip6110, @@ -41,7 +37,7 @@ use reth_evm::{ spec::EthExecutorSpec, }, }; -use std::{borrow::Cow, collections::HashMap, sync::Arc}; +use std::{collections::HashMap, sync::Arc}; #[derive(Debug)] pub struct BerachainTxResult { @@ -50,11 +46,15 @@ pub struct BerachainTxResult { pub tx_type: BerachainTxType, } -impl TxResult for BerachainTxResult { +impl TxResult for BerachainTxResult { type HaltReason = H; fn result(&self) -> &ResultAndState { &self.result } + + fn into_result(self) -> ResultAndState { + self.result + } } #[derive(Debug)] @@ -152,13 +152,6 @@ impl<'a, Evm> BerachainBlockExecutor<'a, Evm> { // Add receipt to block self.receipts.push(receipt); - // Notify system caller of state changes from system call - self.system_caller.on_state( - StateChangeSource::Transaction(0), /* POL is always the first transaction - * (index 0) */ - &result_and_state.state, - ); - // Commit the POL transaction state changes to the database self.evm.db_mut().commit(result_and_state.state); @@ -174,11 +167,10 @@ impl<'a, Evm> BerachainBlockExecutor<'a, Evm> { } } -impl<'db, DB, E> BlockExecutor for BerachainBlockExecutor<'_, E> +impl BlockExecutor for BerachainBlockExecutor<'_, E> where - DB: Database + 'db, E: Evm< - DB = &'db mut State, + DB: StateDB, Tx: FromRecoveredTx + FromTxWithEncoded, >, { @@ -188,11 +180,6 @@ where type Result = BerachainTxResult; fn apply_pre_execution_changes(&mut self) -> Result<(), BlockExecutionError> { - // Set state clear flag if the block is after the Spurious Dragon hardfork. - let state_clear_flag = - self.spec.is_spurious_dragon_active_at_block(self.evm.block().number().saturating_to()); - self.evm.db_mut().set_state_clear_flag(state_clear_flag); - self.system_caller.apply_blockhashes_contract_call(self.ctx.parent_hash, &mut self.evm)?; self.system_caller .apply_beacon_root_contract_call(self.ctx.parent_beacon_block_root, &mut self.evm)?; @@ -216,8 +203,7 @@ where result: ResultAndState { result: ExecutionResult::Success { reason: SuccessReason::Stop, - gas_used: 0, - gas_refunded: 0, + gas: reth::revm::context::result::ResultGas::default(), logs: Vec::new(), output: Output::Call(Bytes::default()), }, @@ -251,19 +237,17 @@ where Ok(BerachainTxResult { result, blob_gas_used, tx_type }) } - fn commit_transaction(&mut self, output: Self::Result) -> Result { + fn commit_transaction(&mut self, output: Self::Result) -> GasOutput { // Skip commit for POL transactions as it's already been applied in // apply_pre_execution_changes if output.tx_type == BerachainTxType::Berachain { - return Ok(0); + return GasOutput::new(0); } let BerachainTxResult { result: ResultAndState { result, state }, blob_gas_used, tx_type } = output; - self.system_caller.on_state(StateChangeSource::Transaction(self.receipts.len()), &state); - - let gas_used = result.gas_used(); + let gas_used = result.tx_gas_used(); // append gas used self.gas_used += gas_used; @@ -285,7 +269,7 @@ where // Commit the state changes. self.evm.db_mut().commit(state); - Ok(gas_used) + GasOutput::new(gas_used) } fn finish( @@ -331,7 +315,7 @@ where &self.spec, self.evm.block(), self.ctx.ommers, - self.ctx.withdrawals.as_deref(), + self.ctx.withdrawals.as_deref().map(|w| w.as_slice()), ); // Irregular state change at Ethereum DAO hardfork @@ -356,19 +340,9 @@ where // increment balances self.evm .db_mut() - .increment_balances(balance_increments.clone()) + .increment_balances(balance_increments) .map_err(|_| BlockValidationError::IncrementBalanceFailed)?; - // call state hook with changes due to balance increments. - self.system_caller.try_on_state_with(|| { - balance_increment_state(&balance_increments, self.evm.db_mut()).map(|state| { - ( - StateChangeSource::PostBlock(StateChangePostBlockSource::BalanceIncrements), - Cow::Owned(state), - ) - }) - })?; - Ok(( self.evm, BlockExecutionResult { @@ -380,10 +354,6 @@ where )) } - fn set_state_hook(&mut self, hook: Option>) { - self.system_caller.with_state_hook(hook); - } - fn evm_mut(&mut self) -> &mut Self::Evm { &mut self.evm } @@ -402,6 +372,9 @@ impl BlockExecutorFactory for BerachainEvmConfig { type ExecutionCtx<'a> = BerachainBlockExecutionCtx<'a>; type Transaction = BerachainTxEnvelope; type Receipt = reth_ethereum_primitives::Receipt; + type TxExecutionResult = BerachainTxResult<::HaltReason>; + type Executor<'a, DB: StateDB, I: Inspector<::Context>> = + BerachainBlockExecutor<'a, ::Evm>; fn evm_factory(&self) -> &Self::EvmFactory { &self.evm_factory @@ -409,12 +382,12 @@ impl BlockExecutorFactory for BerachainEvmConfig { fn create_executor<'a, DB, I>( &'a self, - evm: ::Evm<&'a mut State, I>, + evm: ::Evm, ctx: Self::ExecutionCtx<'a>, - ) -> impl BlockExecutorFor<'a, Self, DB, I> + ) -> Self::Executor<'a, DB, I> where - DB: Database + 'a, - I: Inspector<::Context<&'a mut State>> + 'a, + DB: StateDB, + I: Inspector<::Context>, { BerachainBlockExecutor::new(evm, ctx, self.spec.clone(), self.receipt_builder) } diff --git a/src/node/mod.rs b/src/node/mod.rs index 47c566ce..1c48ed04 100644 --- a/src/node/mod.rs +++ b/src/node/mod.rs @@ -29,10 +29,30 @@ use reth_node_builder::{ DebugNode, Node, NodeAdapter, NodeComponentsBuilder, components::{BasicPayloadServiceBuilder, ComponentsBuilder}, }; +use reth_node_core::args::DefaultEngineValues; use reth_node_ethereum::node::EthereumNetworkBuilder; use reth_payload_primitives::{PayloadAttributesBuilder, PayloadTypes}; use std::sync::Arc; +/// Persist every canonical block to disk immediately rather than buffering. +/// Upstream reth defaults to 7, but Berachain's faster block times benefit from +/// eager persistence to keep the in-memory block window minimal. +const BERACHAIN_DEFAULT_PERSISTENCE_THRESHOLD: u64 = 0; + +/// Keep zero recent blocks in memory by default, preserving pre-v2.5.0 behavior after +/// upstream raised `DEFAULT_MEMORY_BLOCK_BUFFER_TARGET` from 0 to 5 (paradigmxyz/reth#26462). +/// An explicit `--engine.memory-block-buffer-target` flag still overrides this. +const BERACHAIN_DEFAULT_MEMORY_BLOCK_BUFFER_TARGET: u64 = 0; + +/// Installs Berachain-tuned engine CLI defaults. Must be called before CLI parsing. +pub fn init_engine_defaults() { + DefaultEngineValues::default() + .with_persistence_threshold(BERACHAIN_DEFAULT_PERSISTENCE_THRESHOLD) + .with_memory_block_buffer_target(BERACHAIN_DEFAULT_MEMORY_BLOCK_BUFFER_TARGET) + .try_init() + .expect("engine defaults must initialize once"); +} + /// Type configuration for a regular Berachain node. #[derive(Debug, Default, Clone)] @@ -109,3 +129,42 @@ where LocalPayloadAttributesBuilder::new(Arc::new(chain_spec.clone())) } } + +#[cfg(test)] +mod tests { + use super::*; + use clap::Parser; + use reth_node_core::args::EngineArgs; + + #[derive(Parser)] + struct TestParser { + #[command(flatten)] + args: EngineArgs, + } + + /// Single test covering all default assertions: the engine-defaults global can only be + /// initialized once per process. + #[test] + fn engine_defaults_pin_zero_memory_block_buffer_target() { + init_engine_defaults(); + + let parsed = TestParser::parse_from(["bera-reth"]); + assert_eq!(parsed.args.persistence_threshold, 0); + assert_eq!(parsed.args.memory_block_buffer_target(), 0); + let tree = parsed.args.tree_config(); + assert_eq!(tree.persistence_threshold(), 0); + assert_eq!(tree.memory_block_buffer_target(), 0); + + // A raised persistence threshold must not silently re-enable in-memory buffering + // via upstream's `min(persistence_threshold, default)` fallback. + let parsed = TestParser::parse_from(["bera-reth", "--engine.persistence-threshold", "7"]); + assert_eq!(parsed.args.memory_block_buffer_target(), 0); + assert_eq!(parsed.args.tree_config().memory_block_buffer_target(), 0); + + // An explicit flag still wins over the pinned default. + let parsed = + TestParser::parse_from(["bera-reth", "--engine.memory-block-buffer-target", "3"]); + assert_eq!(parsed.args.memory_block_buffer_target(), 3); + assert_eq!(parsed.args.tree_config().memory_block_buffer_target(), 3); + } +} diff --git a/src/pool/transaction.rs b/src/pool/transaction.rs index 7f34c2f2..96b74a49 100644 --- a/src/pool/transaction.rs +++ b/src/pool/transaction.rs @@ -9,7 +9,7 @@ use alloy_eips::{ }; use alloy_primitives::{Address, B256, Bytes, TxHash, TxKind, U256}; use reth_ethereum_primitives::{PooledTransactionVariant, TransactionSigned}; -use reth_primitives_traits::{InMemorySize, SignedTransaction}; +use reth_primitives_traits::{InMemorySize, SignedTransaction, transaction::TxHashRef}; use reth_transaction_pool::{EthBlobTransactionSidecar, EthPoolTransaction, PoolTransaction}; use std::sync::Arc; @@ -26,7 +26,7 @@ use std::sync::Arc; #[derive(Debug, Clone, PartialEq, Eq)] pub struct BerachainPooledTransaction { /// `EcRecovered` transaction, the consensus format. - pub transaction: Recovered, + pub transaction: Recovered, /// For EIP-1559 transactions: `max_fee_per_gas * gas_limit + tx_value`. /// For legacy transactions: `gas_price * gas_limit + tx_value`. @@ -123,7 +123,7 @@ impl BerachainPooledTransaction { /// /// Caution: In case of blob transactions, this marks the blob sidecar as /// [`EthBlobTransactionSidecar::Missing`] - pub fn new(transaction: Recovered, encoded_length: usize) -> Self { + pub fn new(transaction: Recovered, encoded_length: usize) -> Self { let mut blob_sidecar = EthBlobTransactionSidecar::None; let gas_cost = U256::from(transaction.max_fee_per_gas()) @@ -148,7 +148,7 @@ impl BerachainPooledTransaction { } /// Return the reference to the underlying transaction. - pub const fn transaction(&self) -> &Recovered { + pub const fn transaction(&self) -> &Recovered { &self.transaction } } @@ -167,15 +167,15 @@ impl PoolTransaction for BerachainPooledTransaction { type Pooled = PooledTransactionVariant; fn clone_into_consensus(&self) -> Recovered { - let (tx_signed, signer) = self.transaction().clone().into_parts(); - let berachain_tx = BerachainTxEnvelope::from(tx_signed); - Recovered::new_unchecked(berachain_tx, signer) + self.transaction.clone() + } + + fn consensus_ref(&self) -> Recovered<&Self::Consensus> { + Recovered::new_unchecked(&*self.transaction, self.transaction.signer()) } fn into_consensus(self) -> Recovered { - let (tx_signed, signer) = self.transaction.into_parts(); - let berachain_tx = BerachainTxEnvelope::from(tx_signed); - Recovered::new_unchecked(berachain_tx, signer) + self.transaction } fn from_pooled(tx: Recovered) -> Self { @@ -187,15 +187,18 @@ impl PoolTransaction for BerachainPooledTransaction { let (tx, sig, hash) = tx.into_parts(); let (tx, blob) = tx.into_parts(); let tx = Signed::new_unchecked(tx, sig, hash); - let tx = TransactionSigned::from(tx); + let tx = BerachainTxEnvelope::from(TransactionSigned::from(tx)); let tx = Recovered::new_unchecked(tx, signer); let mut pooled = Self::new(tx, encoded_length); - pooled.blob_sidecar = EthBlobTransactionSidecar::Present(blob); + pooled.blob_sidecar = EthBlobTransactionSidecar::Present(blob.into()); pooled } tx => { // no blob sidecar - let tx = Recovered::new_unchecked(tx.into(), signer); + let tx = Recovered::new_unchecked( + BerachainTxEnvelope::from(TransactionSigned::from(tx)), + signer, + ); Self::new(tx, encoded_length) } } @@ -245,7 +248,10 @@ impl EthPoolTransaction for BerachainPooledTransaction { self, sidecar: Arc, ) -> Option> { - let (signed_transaction, signer) = self.into_consensus().into_parts(); + let (envelope, signer) = self.into_consensus().into_parts(); + let BerachainTxEnvelope::Ethereum(signed_transaction) = envelope else { + return None; + }; let pooled_transaction = signed_transaction.try_into_pooled_eip4844(Arc::unwrap_or_clone(sidecar)).ok()?; @@ -256,7 +262,10 @@ impl EthPoolTransaction for BerachainPooledTransaction { tx: Recovered, sidecar: BlobTransactionSidecarVariant, ) -> Option { - let (tx, signer) = tx.into_parts(); + let (envelope, signer) = tx.into_parts(); + let BerachainTxEnvelope::Ethereum(tx) = envelope else { + return None; + }; tx.try_into_pooled_eip4844(sidecar) .ok() .map(|tx| tx.with_signer(signer)) @@ -268,9 +277,14 @@ impl EthPoolTransaction for BerachainPooledTransaction { sidecar: &BlobTransactionSidecarVariant, settings: &KzgSettings, ) -> Result<(), BlobTransactionValidationError> { - match self.transaction.inner().as_eip4844() { - Some(tx) => tx.tx().validate_blob(sidecar, settings), - _ => Err(BlobTransactionValidationError::NotBlobTransaction(self.ty())), + match self.transaction.inner() { + BerachainTxEnvelope::Ethereum(tx) => match tx.as_eip4844() { + Some(tx) => tx.tx().validate_blob(sidecar, settings), + _ => Err(BlobTransactionValidationError::NotBlobTransaction(self.ty())), + }, + BerachainTxEnvelope::Berachain(_) => { + Err(BlobTransactionValidationError::NotBlobTransaction(self.ty())) + } } } } diff --git a/src/primitives/header.rs b/src/primitives/header.rs index ae8965b5..aebd554e 100644 --- a/src/primitives/header.rs +++ b/src/primitives/header.rs @@ -6,9 +6,7 @@ use alloy_rlp::{Decodable, Encodable, length_of_length}; use bytes::BufMut; use reth_codecs::Compact; use reth_db_api::table::{Compress, Decompress}; -use reth_primitives_traits::{ - BlockHeader, InMemorySize, header::HeaderMut, serde_bincode_compat::RlpBincode, -}; +use reth_primitives_traits::{BlockHeader, InMemorySize, header::HeaderMut}; use serde::{Deserialize, Serialize}; /// 48-byte BLS12-381 public key for Berachain consensus @@ -115,6 +113,18 @@ impl HeaderMut for BerachainHeader { fn set_difficulty(&mut self, difficulty: U256) { self.difficulty = difficulty; } + + fn set_mix_hash(&mut self, mix_hash: B256) { + self.mix_hash = mix_hash; + } + + fn set_extra_data(&mut self, extra_data: Bytes) { + self.extra_data = extra_data; + } + + fn set_parent_beacon_block_root(&mut self, parent_beacon_block_root: Option) { + self.parent_beacon_block_root = parent_beacon_block_root; + } } impl BerachainHeader { @@ -298,6 +308,14 @@ impl Decodable for BerachainHeader { } impl alloy_consensus::BlockHeader for BerachainHeader { + fn block_access_list_hash(&self) -> Option { + None + } + + fn slot_number(&self) -> Option { + None + } + fn parent_hash(&self) -> B256 { self.parent_hash } @@ -420,8 +438,6 @@ impl InMemorySize for BerachainHeader { } } -impl RlpBincode for BerachainHeader {} - impl AsRef for BerachainHeader { fn as_ref(&self) -> &Self { self @@ -627,7 +643,7 @@ impl Compress for BerachainHeader { } impl Decompress for BerachainHeader { - fn decompress(value: &[u8]) -> Result { + fn decompress(value: &[u8]) -> Result { let (obj, _) = Compact::from_compact(value, value.len()); Ok(obj) } @@ -669,6 +685,8 @@ mod tests { excess_blob_gas: None, parent_beacon_block_root: None, requests_hash: None, + block_access_list_hash: None, + slot_number: None, }, // Header with EIP-1559 (London fork) Header { @@ -696,6 +714,8 @@ mod tests { excess_blob_gas: None, parent_beacon_block_root: None, requests_hash: None, + block_access_list_hash: None, + slot_number: None, }, // Header with Shanghai fork (withdrawals) Header { @@ -726,6 +746,8 @@ mod tests { excess_blob_gas: None, parent_beacon_block_root: Some(B256::random()), requests_hash: None, + block_access_list_hash: None, + slot_number: None, }, // Header with Cancun fork (blobs) Header { @@ -753,6 +775,8 @@ mod tests { excess_blob_gas: Some(262144), // 256KB parent_beacon_block_root: Some(B256::random()), requests_hash: None, + block_access_list_hash: None, + slot_number: None, }, // Header with Prague fork (requests) Header { @@ -780,6 +804,8 @@ mod tests { excess_blob_gas: Some(1048576), // 1MB parent_beacon_block_root: Some(B256::random()), requests_hash: Some(B256::random()), + block_access_list_hash: None, + slot_number: None, }, ]; @@ -948,3 +974,121 @@ mod tests { ); } } + +#[cfg(test)] +mod db_format { + use super::*; + + /// On-disk Compact encoding of a pre-Prague1 header (no extension fields). + const HEADER_PRE_PRAGUE1_GOLDEN: &str = concat!( + "8020200811111111111111111111111111111111111111111111111111111111", + "1111111100000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000002a01c9c3806553f1", + "0000000000000000000000000000000000000000000000000000000000000000", + "00043b9aca0062657261", + ); + + /// On-disk Compact encoding of a fully-populated post-Prague1 header + /// (requests_hash + prev_proposer_pubkey extension fields set). + const HEADER_V2_4_0_GOLDEN: &str = concat!( + "812121f811111111111111111111111111111111111111111111111111111111", + "1111111122222222222222222222222222222222222222222222222222222222", + "2222222233333333333333333333333333333333333333334444444444444444", + "4444444444444444444444444444444444444444444444445555555555555555", + "5555555555555555555555555555555555555555555555556666666666666666", + "6666666666666666666666666666666666666666666666667777777777777777", + "7777777777777777777777777777777777777777777777778888888888888888", + "8888888888888888888888888888888888888888888888888888888888888888", + "8888888888888888888888888888888888888888888888888888888888888888", + "8888888888888888888888888888888888888888888888888888888888888888", + "8888888888888888888888888888888888888888888888888888888888888888", + "8888888888888888888888888888888888888888888888888888888888888888", + "8888888888888888888888888888888888888888888888888888888888888888", + "8888888888888888888888888888888888888888888888888888888888888888", + "88888888888888888888888888888888888888888888888812d68701c9c38052", + "08687ca840999999999999999999999999999999999999999999999999999999", + "9999999999043b9aca000000aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "aaaaaaaaaaaaaaaaaaaaaaaa5203bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", + "bbbbbbbbbbbbbbbbbbbbbbbbbbbb30cccccccccccccccccccccccccccccccccc", + "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc62", + "657261", + ); + + fn full_header() -> BerachainHeader { + BerachainHeader { + parent_hash: B256::repeat_byte(0x11), + ommers_hash: B256::repeat_byte(0x22), + beneficiary: Address::repeat_byte(0x33), + state_root: B256::repeat_byte(0x44), + transactions_root: B256::repeat_byte(0x55), + receipts_root: B256::repeat_byte(0x66), + withdrawals_root: Some(B256::repeat_byte(0x77)), + logs_bloom: Bloom::repeat_byte(0x88), + difficulty: U256::ZERO, + number: 1_234_567, + gas_limit: 30_000_000, + gas_used: 21_000, + timestamp: 1_753_000_000, + mix_hash: B256::repeat_byte(0x99), + nonce: B64::ZERO, + base_fee_per_gas: Some(1_000_000_000), + blob_gas_used: Some(0), + excess_blob_gas: Some(0), + parent_beacon_block_root: Some(B256::repeat_byte(0xaa)), + requests_hash: Some(B256::repeat_byte(0xbb)), + prev_proposer_pubkey: Some(BlsPublicKey::repeat_byte(0xcc)), + extra_data: Bytes::from_static(b"bera"), + } + } + + /// Databases written by earlier releases must keep decoding: the Compact + /// encoding of [`BerachainHeader`] is consensus-adjacent on-disk format + /// and must never change. If this test fails, the change breaks existing + /// V1 and V2 datadirs and requires a resync or an explicit DB migration. + #[test] + fn test_header_compact_db_format_is_stable() { + let header = full_header(); + let mut buf = Vec::new(); + let len = Compact::to_compact(&header, &mut buf); + + assert_eq!(len, 643, "encoded length changed"); + assert_eq!(alloy_primitives::hex::encode(&buf), HEADER_V2_4_0_GOLDEN); + + let (decoded, _) = BerachainHeader::from_compact(&buf, len); + assert_eq!(decoded, header); + } + + /// Headers written before Prague1 (no extension fields) must decode from + /// their historical encoding as well. + #[test] + fn test_pre_prague1_header_compact_db_format_is_stable() { + let header = BerachainHeader { + parent_hash: B256::repeat_byte(0x11), + number: 42, + gas_limit: 30_000_000, + timestamp: 1_700_000_000, + base_fee_per_gas: Some(1_000_000_000), + extra_data: Bytes::from_static(b"bera"), + ..Default::default() + }; + let mut buf = Vec::new(); + let len = Compact::to_compact(&header, &mut buf); + + assert_eq!(len, 490, "encoded length changed"); + assert_eq!(alloy_primitives::hex::encode(&buf), HEADER_PRE_PRAGUE1_GOLDEN); + + let (decoded, _) = BerachainHeader::from_compact(&buf, len); + assert_eq!(decoded, header); + } +} diff --git a/src/rpc/api.rs b/src/rpc/api.rs index 5afc2ff9..d740d0bd 100644 --- a/src/rpc/api.rs +++ b/src/rpc/api.rs @@ -4,11 +4,7 @@ use crate::{ transaction::{BerachainTxEnvelope, BerachainTxType, POL_TX_TYPE}, }; use alloy_consensus::Transaction; -use alloy_eips::eip2930::AccessList; -use alloy_network::{ - BuildResult, Network, NetworkWallet, TransactionBuilder, TransactionBuilderError, -}; -use alloy_primitives::{Address, B256, Bytes, ChainId, TxKind, U256}; +use alloy_primitives::{B256, U256}; use alloy_rpc_types_eth::{Transaction as RpcTransaction, TransactionRequest}; use core::fmt; use derive_more::Deref; @@ -16,17 +12,18 @@ use reth::{ providers::ProviderHeader, rpc::compat::RpcConvert, tasks::{ - TaskSpawner, + Runtime, pool::{BlockingTaskGuard, BlockingTaskPool}, }, - transaction_pool::{PoolTransaction, TransactionPool}, + transaction_pool::TransactionPool, }; use reth_rpc_eth_api::{ EthApiTypes, RpcNodeCore, RpcNodeCoreExt, helpers::{ - Call, EthApiSpec, EthBlocks, EthCall, EthFees, EthState, EthTransactions, LoadBlock, - LoadFee, LoadPendingBlock, LoadReceipt, LoadState, LoadTransaction, SpawnBlocking, Trace, - estimate::EstimateCall, pending_block::PendingEnvBuilder, spec::SignersForRpc, + Call, EthApiSpec, EthBlocks, EthCall, EthFees, EthState, EthSubscriptions, EthTransactions, + LoadBlock, LoadFee, LoadPendingBlock, LoadReceipt, LoadState, LoadTransaction, + SpawnBlocking, Trace, bal::GetBlockAccessList, estimate::EstimateCall, + pending_block::PendingEnvBuilder, spec::SignersForRpc, }, }; use reth_rpc_eth_types::{ @@ -96,230 +93,17 @@ impl From for TransactionRequest { } } -impl TransactionBuilder for TransactionRequest { - fn chain_id(&self) -> Option { - self.chain_id - } - - fn set_chain_id(&mut self, chain_id: ChainId) { - self.chain_id = Some(chain_id); - } - - fn nonce(&self) -> Option { - self.nonce - } - - fn set_nonce(&mut self, nonce: u64) { - self.nonce = Some(nonce); - } - - fn take_nonce(&mut self) -> Option { - self.nonce.take() - } - - fn input(&self) -> Option<&Bytes> { - self.input.input.as_ref() - } - - fn set_input>(&mut self, input: T) { - self.input.input = Some(input.into()); - } - - fn from(&self) -> Option
{ - self.from - } - - fn set_from(&mut self, from: Address) { - self.from = Some(from); - } - - fn kind(&self) -> Option { - self.to - } - - fn clear_kind(&mut self) { - self.to = None; - } - - fn set_kind(&mut self, kind: TxKind) { - self.to = Some(kind); - } - - fn value(&self) -> Option { - self.value - } - - fn set_value(&mut self, value: U256) { - self.value = Some(value); - } - - fn gas_price(&self) -> Option { - self.gas_price - } - - fn set_gas_price(&mut self, gas_price: u128) { - self.gas_price = Some(gas_price); - } - - fn max_fee_per_gas(&self) -> Option { - self.max_fee_per_gas - } - - fn set_max_fee_per_gas(&mut self, max_fee_per_gas: u128) { - self.max_fee_per_gas = Some(max_fee_per_gas); - } - - fn max_priority_fee_per_gas(&self) -> Option { - self.max_priority_fee_per_gas - } - - fn set_max_priority_fee_per_gas(&mut self, max_priority_fee_per_gas: u128) { - self.max_priority_fee_per_gas = Some(max_priority_fee_per_gas); - } - - fn gas_limit(&self) -> Option { - self.gas - } - - fn set_gas_limit(&mut self, gas_limit: u64) { - self.gas = Some(gas_limit); - } - - fn access_list(&self) -> Option<&AccessList> { - self.access_list.as_ref() - } - - fn set_access_list(&mut self, access_list: AccessList) { - self.access_list = Some(access_list); - } - - fn complete_type( - &self, - ty: ::TxType, - ) -> Result<(), Vec<&'static str>> { - let mut missing = Vec::new(); - - if self.from.is_none() { - missing.push("from"); - } - if self.to.is_none() { - missing.push("to"); - } - if self.gas.is_none() { - missing.push("gas"); - } - - match ty { - BerachainTxType::Ethereum(_) => { - if self.gas_price.is_none() && self.max_fee_per_gas.is_none() { - missing.push("gas_price or max_fee_per_gas"); - } - } - BerachainTxType::Berachain => { - if self.gas_price.is_none() { - missing.push("gas_price"); - } - } - } - - if missing.is_empty() { Ok(()) } else { Err(missing) } - } - - fn can_submit(&self) -> bool { - self.from.is_some() && - self.to.is_some() && - self.gas.is_some() && - (self.gas_price.is_some() || self.max_fee_per_gas.is_some()) - } - - fn can_build(&self) -> bool { - self.to.is_some() && - self.gas.is_some() && - (self.gas_price.is_some() || self.max_fee_per_gas.is_some()) - } - - fn output_tx_type(&self) -> ::TxType { - match self.transaction_type { - Some(POL_TX_TYPE) => BerachainTxType::Berachain, - Some(ty) => BerachainTxType::Ethereum( - alloy_consensus::TxType::try_from(ty).unwrap_or(alloy_consensus::TxType::Legacy), - ), - None => { - if self.max_fee_per_gas.is_some() || self.max_priority_fee_per_gas.is_some() { - BerachainTxType::Ethereum(alloy_consensus::TxType::Eip1559) - } else if self.access_list.is_some() { - BerachainTxType::Ethereum(alloy_consensus::TxType::Eip2930) - } else { - BerachainTxType::Ethereum(alloy_consensus::TxType::Legacy) - } - } - } - } - - fn output_tx_type_checked(&self) -> Option<::TxType> { - if >::can_build(self) { - Some(>::output_tx_type(self)) - } else { - None - } - } - - fn prep_for_submission(&mut self) { - if self.nonce.is_none() { - self.nonce = Some(0); - } - if self.value.is_none() { - self.value = Some(U256::ZERO); - } - if self.input.input.is_none() { - self.input.input = Some(Bytes::new()); - } - } - - fn build_unsigned( - self, - ) -> BuildResult<::UnsignedTx, BerachainNetwork> { - Ok(>::output_tx_type(&self)) - } - - async fn build>( - self, - _wallet: &W, - ) -> Result<::TxEnvelope, TransactionBuilderError> - { - Err(TransactionBuilderError::InvalidTransactionRequest( - >::output_tx_type(&self), - vec!["unsupported"], - )) - } -} - #[derive(Clone, Copy, Debug)] pub struct BerachainNetwork { _private: (), } -impl Network for BerachainNetwork { - type TxType = BerachainTxType; - - type TxEnvelope = BerachainTxEnvelope; - - type UnsignedTx = BerachainTxType; - - type ReceiptEnvelope = BerachainReceiptEnvelope; - - type Header = BerachainHeader; - - type TransactionRequest = TransactionRequest; - +impl reth_rpc_convert::RpcTypes for BerachainNetwork { + type Header = alloy_rpc_types_eth::Header; + type Receipt = alloy_rpc_types_eth::TransactionReceipt; type TransactionResponse = RpcTransaction; - - type ReceiptResponse = alloy_rpc_types_eth::TransactionReceipt; - - type HeaderResponse = alloy_rpc_types_eth::Header; - - type BlockResponse = - alloy_rpc_types_eth::Block; + type TransactionRequest = TransactionRequest; + type Log = alloy_rpc_types_eth::Log; } #[derive(Deref)] @@ -409,7 +193,7 @@ where Rpc: RpcConvert, { #[inline] - fn io_task_spawner(&self) -> impl TaskSpawner { + fn io_task_spawner(&self) -> &Runtime { self.inner.task_spawner() } @@ -444,20 +228,16 @@ where EthTransactions::send_raw_transaction_sync_timeout(&self.inner) } - async fn send_transaction( + async fn send_pool_transaction( &self, origin: TransactionOrigin, - tx: reth_primitives_traits::WithEncoded< - reth_primitives_traits::Recovered>, - >, + tx: reth_primitives_traits::WithEncoded<::Transaction>, ) -> Result { - let (raw_tx, recovered) = tx.split(); + let (raw_tx, pool_transaction) = tx.split(); // broadcast raw transaction to subscribers if there is any. self.broadcast_raw_transaction(raw_tx); - let pool_transaction = ::Transaction::from_pooled(recovered); - let AddedTransactionOutcome { hash, .. } = self.pool().add_transaction(origin, pool_transaction).await?; @@ -481,6 +261,21 @@ where { } +impl GetBlockAccessList for BerachainApi +where + N: RpcNodeCore, + EthApiError: FromEvmError, + Rpc: RpcConvert, +{ +} + +impl EthSubscriptions for BerachainApi +where + N: RpcNodeCore, + Rpc: RpcConvert, +{ +} + impl EthApiSpec for BerachainApi where N: RpcNodeCore, @@ -531,6 +326,11 @@ where self.inner.max_simulate_blocks() } + #[inline] + fn compute_state_root_for_eth_simulate(&self) -> bool { + Call::compute_state_root_for_eth_simulate(&self.inner) + } + #[inline] fn evm_memory_limit(&self) -> u64 { self.inner.evm_memory_limit() diff --git a/src/rpc/mod.rs b/src/rpc/mod.rs index f9b582ab..e7105b9d 100644 --- a/src/rpc/mod.rs +++ b/src/rpc/mod.rs @@ -104,6 +104,7 @@ where BerachainEngineApiBuilder::::default(), BasicEngineValidatorBuilder::new(BerachainEngineValidatorBuilder::default()), Default::default(), + Default::default(), ), } } diff --git a/src/rpc/receipt.rs b/src/rpc/receipt.rs index b8c0a736..4579a215 100644 --- a/src/rpc/receipt.rs +++ b/src/rpc/receipt.rs @@ -1,5 +1,5 @@ use crate::{ - primitives::BerachainPrimitives, + primitives::{BerachainHeader, BerachainPrimitives}, transaction::{BerachainTxType, POL_TX_TYPE}, }; use alloy_consensus::{Eip658Value, Receipt, ReceiptWithBloom, TxReceipt, TxType, Typed2718}; @@ -8,7 +8,7 @@ use alloy_primitives::Bloom; use alloy_rlp::BufMut; use alloy_rpc_types_eth::{Log, TransactionReceipt}; use reth_chainspec::EthChainSpec; -use reth_primitives_traits::InMemorySize; +use reth_primitives_traits::{InMemorySize, SealedHeader}; use reth_rpc_convert::transaction::{ConvertReceiptInput, ReceiptConverter}; use reth_rpc_eth_types::{EthApiError, receipt::build_receipt}; use std::sync::Arc; @@ -38,9 +38,23 @@ impl BerachainReceiptEnvelope { next_log_index: usize, meta: alloy_consensus::transaction::TransactionMeta, ) -> Self { - let rpc_receipt = receipt.into_rpc(next_log_index, meta); + let mut log_index = next_log_index; + let rpc_receipt = receipt.map_logs(|log| { + let idx = log_index; + log_index += 1; + Log { + inner: log, + block_hash: Some(meta.block_hash), + block_number: Some(meta.block_number), + block_timestamp: Some(meta.timestamp), + transaction_hash: Some(meta.tx_hash), + transaction_index: Some(meta.index), + log_index: Some(idx as u64), + removed: false, + } + }); let alloy_receipt = Receipt { - status: Eip658Value::Eip658(rpc_receipt.status()), + status: Eip658Value::Eip658(rpc_receipt.success), cumulative_gas_used: rpc_receipt.cumulative_gas_used, logs: rpc_receipt.logs, }; @@ -191,8 +205,18 @@ where ChainSpec: EthChainSpec + 'static, { type RpcReceipt = TransactionReceipt; + type RpcLog = Log; type Error = EthApiError; + fn convert_log( + &self, + log: Log, + _receipt: &reth_ethereum_primitives::Receipt, + _header: &SealedHeader, + ) -> Result { + Ok(log) + } + fn convert_receipts( &self, inputs: Vec>, diff --git a/src/transaction/mod.rs b/src/transaction/mod.rs index 3387508d..2af21c7a 100644 --- a/src/transaction/mod.rs +++ b/src/transaction/mod.rs @@ -20,7 +20,7 @@ use alloy_primitives::{ }; use alloy_rlp::{Decodable, Encodable}; use alloy_rpc_types_eth::TransactionRequest; -use reth::{providers::errors::db::DatabaseError, revm::context::TxEnv}; +use reth::revm::context::TxEnv; use reth_codecs::{ Compact, alloy::transaction::{CompactEnvelope, Envelope, FromTxCompact, ToTxCompact}, @@ -28,9 +28,7 @@ use reth_codecs::{ use reth_db::table::{Compress, Decompress}; use reth_ethereum_primitives::TransactionSigned; use reth_evm::{FromRecoveredTx, FromTxWithEncoded}; -use reth_primitives_traits::{ - InMemorySize, MaybeSerde, SignedTransaction, serde_bincode_compat::RlpBincode, -}; +use reth_primitives_traits::InMemorySize; use reth_rpc_convert::{SignTxRequestError, SignableTxRequest}; use std::{hash::Hash, mem::size_of}; @@ -262,7 +260,7 @@ impl Compress for BerachainTxEnvelope { } impl Decompress for BerachainTxEnvelope { - fn decompress(value: &[u8]) -> Result { + fn decompress(value: &[u8]) -> Result { let (tx, _) = reth_codecs::Compact::from_compact(value, value.len()); Ok(tx) } @@ -428,14 +426,6 @@ impl TxHashRef for BerachainTxEnvelope { } } -impl SignedTransaction for BerachainTxEnvelope where - Self: Clone + PartialEq + Eq + Decodable + Decodable2718 + MaybeSerde + InMemorySize -{ -} - -impl RlpBincode for BerachainTxEnvelope {} -impl RlpBincode for PoLTx {} - impl reth_codecs::Compact for BerachainTxEnvelope { fn to_compact(&self, buf: &mut B) -> usize where @@ -1227,3 +1217,45 @@ mod pol_tx_rlp_tests { assert!(matches!(result, Err(alloy_rlp::Error::InputTooShort))); } } + +#[cfg(test)] +mod db_format { + use super::*; + + /// On-disk Compact encoding of a PoL transaction envelope. This is the + /// Berachain-specific extended-envelope format (type 0x7e); existing + /// databases must keep decoding it byte-for-byte. + const POL_ENVELOPE_V2_4_0_GOLDEN: &str = concat!( + "0600000000000000000000000000000000000000000000000000000000000000", + "0000000000000000000000000000000000000000000000000000000000000000", + "007e1344000138defefefefefefefefefefefefefefefefefefefefe42424242", + "424242424242424242424242424242422901c9c3803b9aca00deadbeef", + ); + + /// Databases written by earlier releases must keep decoding: the Compact + /// encoding of [`BerachainTxEnvelope`] is on-disk format and must never + /// change. Ethereum-variant byte compatibility with upstream reth is + /// covered separately by the database-compatibility tests above. + #[test] + fn test_pol_envelope_compact_db_format_is_stable() { + let pol = PoLTx { + chain_id: 80094, + from: Address::repeat_byte(0xfe), + to: Address::repeat_byte(0x42), + nonce: 41, + gas_limit: 30_000_000, + gas_price: 1_000_000_000, + input: Bytes::from_static(&[0xde, 0xad, 0xbe, 0xef]), + }; + let envelope = BerachainTxEnvelope::Berachain(Sealed::new(pol)); + + let mut buf = Vec::new(); + let len = Compact::to_compact(&envelope, &mut buf); + + assert_eq!(len, 125, "encoded length changed"); + assert_eq!(alloy_primitives::hex::encode(&buf), POL_ENVELOPE_V2_4_0_GOLDEN); + + let (decoded, _) = ::from_compact(&buf, len); + assert_eq!(decoded, envelope); + } +} diff --git a/src/transaction/pol.rs b/src/transaction/pol.rs index b3fc5e62..38a05c33 100644 --- a/src/transaction/pol.rs +++ b/src/transaction/pol.rs @@ -3,15 +3,16 @@ use crate::{ primitives::header::BlsPublicKey, transaction::{BerachainTxEnvelope, PoLTx}, }; +use alloy_eips::eip7002::SYSTEM_ADDRESS; use alloy_primitives::{Bytes, Sealed, U256}; use alloy_sol_macro::sol; use alloy_sol_types::SolCall; -use reth::{consensus::ConsensusError, revm::handler::SYSTEM_ADDRESS}; +use reth::consensus::ConsensusError; use reth_chainspec::EthChainSpec; use reth_evm::block::{BlockExecutionError, InternalBlockExecutionError}; use std::sync::Arc; -pub const POL_TX_GAS_LIMIT: u64 = 30_000_000; +pub const POL_TX_GAS_LIMIT: u64 = crate::evm::SYSTEM_CALL_GAS_LIMIT; pub fn create_pol_transaction( chain_spec: Arc, @@ -61,16 +62,16 @@ pub fn validate_pol_transaction( ) -> Result<(), ConsensusError> { let expected_tx = create_pol_transaction(chain_spec, expected_pubkey, block_number, base_fee) .map_err(|e| { - ConsensusError::Other(format!("Failed to create expected PoL transaction: {e}")) + ConsensusError::msg(format!("Failed to create expected PoL transaction: {e}")) })?; let expected_sealed_pol_tx = match expected_tx { BerachainTxEnvelope::Berachain(sealed_tx) => sealed_tx, - _ => return Err(ConsensusError::Other("Expected PoL transaction envelope".into())), + _ => return Err(ConsensusError::msg("Expected PoL transaction envelope")), }; if pol_tx.hash() != expected_sealed_pol_tx.hash() { - return Err(ConsensusError::Other(format!( + return Err(ConsensusError::msg(format!( "PoL transaction hash mismatch: expected {}, got {}", expected_sealed_pol_tx.hash(), pol_tx.hash() diff --git a/src/transaction/txtype.rs b/src/transaction/txtype.rs index 94d87e1e..5ca9bd99 100644 --- a/src/transaction/txtype.rs +++ b/src/transaction/txtype.rs @@ -4,7 +4,6 @@ use crate::transaction::{BerachainTxType, POL_TX_TYPE}; use alloy_consensus::TxType; use alloy_eips::eip2718::{EIP4844_TX_TYPE_ID, EIP7702_TX_TYPE_ID}; use bytes::{Buf, BufMut}; -use reth::providers::errors::db::DatabaseError; use reth_codecs::{Compact, txtype::COMPACT_EXTENDED_IDENTIFIER_FLAG}; use reth_db_api::table::{Compress, Decompress}; use reth_primitives_traits::InMemorySize; @@ -62,7 +61,7 @@ impl Compress for BerachainTxType { } impl Decompress for BerachainTxType { - fn decompress(value: &[u8]) -> Result { + fn decompress(value: &[u8]) -> Result { let (tx, _) = reth_codecs::Compact::from_compact(value, value.len()); Ok(tx) } diff --git a/tests/e2e/coinbase_system_state_change_test.rs b/tests/e2e/coinbase_system_state_change_test.rs index 971c1da9..e3b4d404 100644 --- a/tests/e2e/coinbase_system_state_change_test.rs +++ b/tests/e2e/coinbase_system_state_change_test.rs @@ -45,7 +45,7 @@ const CONTRACT_INITIAL_BALANCE: u64 = 100; async fn setup_test_with_state_change_contract() -> eyre::Result<(Runtime, Arc)> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json"); let genesis_json = std::fs::read_to_string(genesis_path)?; diff --git a/tests/e2e/deposit_test.rs b/tests/e2e/deposit_test.rs index 18534fa2..2a2c4a75 100644 --- a/tests/e2e/deposit_test.rs +++ b/tests/e2e/deposit_test.rs @@ -98,7 +98,7 @@ async fn setup_deposit_test() -> eyre::Result<(Runtime, Arc) async fn setup_deposit_test_with_osaka( osaka_time: Option, ) -> eyre::Result<(Runtime, Arc)> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json"); let mut genesis_json: serde_json::Value = serde_json::from_str(&std::fs::read_to_string(genesis_path)?)?; diff --git a/tests/e2e/gas_limit_regression_test.rs b/tests/e2e/gas_limit_regression_test.rs index fc19e07b..8dd51a44 100644 --- a/tests/e2e/gas_limit_regression_test.rs +++ b/tests/e2e/gas_limit_regression_test.rs @@ -40,7 +40,7 @@ sol! { async fn setup_test_with_gas_boundary_pol_contract() -> eyre::Result<(Runtime, Arc)> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json"); let genesis_json = std::fs::read_to_string(genesis_path)?; diff --git a/tests/e2e/mod.rs b/tests/e2e/mod.rs index 8c26a50d..dbed891e 100644 --- a/tests/e2e/mod.rs +++ b/tests/e2e/mod.rs @@ -1,14 +1,12 @@ use alloy_primitives::{Address, B256}; use alloy_signer_local::PrivateKeySigner; use bera_reth::{ - chainspec::BerachainChainSpec, - engine::payload::{BerachainPayloadAttributes, BerachainPayloadBuilderAttributes}, + chainspec::BerachainChainSpec, engine::payload::BerachainPayloadAttributes, primitives::header::BlsPublicKey, }; use reth::tasks::Runtime; use reth_cli::chainspec::parse_genesis; use reth_ethereum_engine_primitives::EthPayloadAttributes; -use reth_payload_primitives::PayloadBuilderAttributes; use std::{str::FromStr, sync::Arc}; pub mod coinbase_system_state_change_test; @@ -18,6 +16,7 @@ pub mod osaka_blob_test; pub mod osaka_engine_api_test; pub mod pol_revert_test; pub mod prague3_empty_block_test; +pub mod storage_v2_test; pub mod transaction_tests; const TEST_PRIVATE_KEY: &str = "0xfffdbb37105441e14b0ee6330d855d8504ff39e705c3afa8f859ac9865f99306"; @@ -27,7 +26,7 @@ pub const POL_DISTRIBUTOR_ADDRESS: &str = "0x42000000000000000000000000000000000 /// Setup test node boilerplate - returns Runtime and chain spec for individual test setup pub async fn setup_test_boilerplate() -> eyre::Result<(Runtime, Arc)> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json"); let genesis_json = std::fs::read_to_string(genesis_path).expect("Failed to read genesis file"); @@ -44,17 +43,17 @@ pub fn test_signer() -> eyre::Result { } /// Create Berachain payload attributes for testing -pub fn berachain_payload_attributes_generator(timestamp: u64) -> BerachainPayloadBuilderAttributes { +pub fn berachain_payload_attributes_generator(timestamp: u64) -> BerachainPayloadAttributes { let eth_attributes = EthPayloadAttributes { timestamp, prev_randao: B256::random(), suggested_fee_recipient: Address::random(), withdrawals: Some(vec![]), parent_beacon_block_root: Some(B256::random()), + ..Default::default() }; - let berachain_attributes = BerachainPayloadAttributes { + BerachainPayloadAttributes { inner: eth_attributes, prev_proposer_pubkey: Some(BlsPublicKey::random()), - }; - BerachainPayloadBuilderAttributes::try_new(B256::ZERO, berachain_attributes, 1).unwrap() + } } diff --git a/tests/e2e/osaka_blob_test.rs b/tests/e2e/osaka_blob_test.rs index 85c494bb..aba9be7a 100644 --- a/tests/e2e/osaka_blob_test.rs +++ b/tests/e2e/osaka_blob_test.rs @@ -13,7 +13,7 @@ use std::sync::Arc; #[tokio::test] async fn test_eip4844_blob_tx_accepted_post_osaka() -> eyre::Result<()> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json"); let genesis_json = std::fs::read_to_string(genesis_path)?; diff --git a/tests/e2e/osaka_engine_api_test.rs b/tests/e2e/osaka_engine_api_test.rs index 8d864fe3..0217ec7b 100644 --- a/tests/e2e/osaka_engine_api_test.rs +++ b/tests/e2e/osaka_engine_api_test.rs @@ -5,20 +5,20 @@ //! override the call returns `-38005 Unsupported fork`. use crate::e2e::berachain_payload_attributes_generator; +use alloy_primitives::B256; use bera_reth::{chainspec::BerachainChainSpec, node::BerachainNode}; use jsonrpsee::{core::client::ClientT, rpc_params}; -use reth::tasks::Runtime; +use reth::{payload::BuildNewPayload, tasks::Runtime}; use reth_cli::chainspec::parse_genesis; use reth_e2e_test_utils::node::NodeTestContext; use reth_node_builder::{NodeBuilder, NodeHandle}; use reth_node_core::{args::RpcServerArgs, node_config::NodeConfig}; -use reth_payload_primitives::PayloadBuilderAttributes; use serde_json::Value; use std::sync::Arc; #[tokio::test] async fn test_get_payload_v4_p11_works_post_osaka() -> eyre::Result<()> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json"); let genesis_json = std::fs::read_to_string(genesis_path)?; @@ -35,11 +35,18 @@ async fn test_get_payload_v4_p11_works_post_osaka() -> eyre::Result<()> { .launch() .await?; + let payload_builder = node.payload_builder_handle.clone(); let mut ctx = NodeTestContext::new(node, berachain_payload_attributes_generator).await?; // Trigger a payload build via the local builder handle so we get a valid payload_id. - let attrs = ctx.payload.new_payload().await?; - let payload_id = attrs.payload_id(); + let attrs = ctx.payload.next_attributes(); + let payload_id = payload_builder + .send_new_payload(BuildNewPayload { + attributes: attrs, + parent_hash: B256::ZERO, + resources: Default::default(), + }) + .await??; ctx.payload.wait_for_built_payload(payload_id).await; // Call engine_getPayloadV4P11 over the auth RPC. Pre-fix this returns diff --git a/tests/e2e/pol_revert_test.rs b/tests/e2e/pol_revert_test.rs index bbb52cc3..0eb42571 100644 --- a/tests/e2e/pol_revert_test.rs +++ b/tests/e2e/pol_revert_test.rs @@ -31,7 +31,7 @@ sol! { async fn setup_test_with_reverting_pol_contract() -> eyre::Result<(Runtime, Arc)> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json"); let genesis_json = std::fs::read_to_string(genesis_path)?; diff --git a/tests/e2e/prague3_empty_block_test.rs b/tests/e2e/prague3_empty_block_test.rs index 617c9886..486a9dad 100644 --- a/tests/e2e/prague3_empty_block_test.rs +++ b/tests/e2e/prague3_empty_block_test.rs @@ -12,7 +12,7 @@ use std::sync::Arc; #[tokio::test] async fn test_prague3_builds_empty_block() -> eyre::Result<()> { - let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current())?; + let runtime = Runtime::test(); let genesis_path = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis-prague3.json"); diff --git a/tests/e2e/storage_v2_test.rs b/tests/e2e/storage_v2_test.rs new file mode 100644 index 00000000..45f85278 --- /dev/null +++ b/tests/e2e/storage_v2_test.rs @@ -0,0 +1,440 @@ +//! Storage V2 migration and V1 backward-compatibility tests. +//! +//! These drive the actual `bera-reth` binary the way an operator would: +//! `init` datadirs in each layout, seed a V1 datadir with real blocks via +//! `import`, migrate it in place with `db migrate-v2`, and confirm both the +//! persisted layout (`db settings get`) and that the migrated data remains +//! queryable (`db get`, `db state`). + +use crate::e2e::{ + POL_DISTRIBUTOR_ADDRESS, berachain_payload_attributes_generator, setup_test_boilerplate, + test_signer, +}; +use alloy_primitives::{Address, B256}; +use alloy_rlp::Encodable; +use bera_reth::node::BerachainNode; +use reth_chainspec::EthChainSpec; +use reth_e2e_test_utils::{node::NodeTestContext, transaction::TransactionTestContext}; +use reth_node_builder::{NodeBuilder, NodeHandle}; +use reth_node_core::{args::RpcServerArgs, node_config::NodeConfig}; +use std::{ + path::Path, + process::{Command, Output}, + sync::Arc, +}; + +const SLOT_ZERO: &str = "0x0000000000000000000000000000000000000000000000000000000000000000"; + +fn genesis_path() -> &'static str { + concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/eth-genesis.json") +} + +fn run_bera_reth(args: &[&str]) -> Output { + Command::new(env!("CARGO_BIN_EXE_bera-reth")) + .args(args) + .output() + .expect("failed to spawn bera-reth binary") +} + +fn init_datadir(datadir: &Path, storage_v2: Option) { + let datadir = datadir.to_str().unwrap(); + let mut args = vec!["init", "--chain", genesis_path(), "--datadir", datadir]; + let flag; + if let Some(v2) = storage_v2 { + flag = format!("--storage.v2={v2}"); + args.push(&flag); + } + let out = run_bera_reth(&args); + assert!( + out.status.success(), + "init failed for {datadir}: {}", + String::from_utf8_lossy(&out.stderr) + ); +} + +fn storage_settings(datadir: &Path) -> String { + let out = run_bera_reth(&[ + "db", + "--chain", + genesis_path(), + "--datadir", + datadir.to_str().unwrap(), + "settings", + "get", + ]); + assert!( + out.status.success(), + "db settings get failed: {}", + String::from_utf8_lossy(&out.stderr) + ); + String::from_utf8_lossy(&out.stdout).into_owned() +} + +fn migrate_v2(datadir: &Path) -> Output { + run_bera_reth(&[ + "db", + "--chain", + genesis_path(), + "--datadir", + datadir.to_str().unwrap(), + "migrate-v2", + ]) +} + +/// Runs a `bera-reth db ` subcommand and returns its trimmed stdout. +/// +/// Logs are silenced (`-q`) so stdout carries only the decoded value that +/// `db get` and `db state` print; nothing is printed for a missing key, so +/// an empty return value signals a miss. +fn db_stdout(datadir: &Path, args: &[&str]) -> String { + let mut full_args = + vec!["db", "-q", "--chain", genesis_path(), "--datadir", datadir.to_str().unwrap()]; + full_args.extend_from_slice(args); + let out = run_bera_reth(&full_args); + assert!(out.status.success(), "db {args:?} failed: {}", String::from_utf8_lossy(&out.stderr)); + String::from_utf8_lossy(&out.stdout).trim().to_owned() +} + +fn parse_json(stdout: &str) -> serde_json::Value { + serde_json::from_str(stdout) + .unwrap_or_else(|err| panic!("expected JSON output, got {stdout:?}: {err}")) +} + +/// Parses a history-index shard (`IntegerList` serializes as a JSON array of +/// block numbers). +fn shard_blocks(stdout: &str) -> Vec { + serde_json::from_str(stdout) + .unwrap_or_else(|err| panic!("expected a JSON block list, got {stdout:?}: {err}")) +} + +/// Chain data produced by [`build_seed_chain`], needed for migration asserts. +struct SeedChain { + /// Blocks 1..=3, RLP-encoded back-to-back for `bera-reth import`. + blocks_rlp: Vec, + /// EOA that sent the transfers in blocks 1 and 2. + sender: Address, + /// Hash of the transfer in block 1 (global transaction number 1). + transfer_in_block1: B256, + /// Hash of the transfer in block 2 (global transaction number 3). + transfer_in_block2: B256, +} + +/// Mines three blocks on an ephemeral in-process node and returns them +/// RLP-encoded, ready for `bera-reth import` into a fresh datadir built from +/// the same genesis fixture. +/// +/// Every block carries the PoL system transaction, which increments storage +/// slot 0 of the PoL distributor — so every block produces receipts, account +/// changesets, storage changesets, history-index entries, and tx-lookup +/// entries. Blocks 1 and 2 additionally carry an EIP-1559 transfer. +async fn build_seed_chain() -> eyre::Result { + let (runtime, chain_spec) = setup_test_boilerplate().await?; + + let node_config = NodeConfig::new(chain_spec.clone()) + .with_unused_ports() + .with_rpc(RpcServerArgs::default().with_unused_ports().with_http()); + + let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(node_config) + .testing_node(runtime.clone()) + .node(BerachainNode::default()) + .launch() + .await?; + + let mut ctx = NodeTestContext::new(node, berachain_payload_attributes_generator).await?; + let signer = test_signer()?; + let sender = signer.address(); + let chain_id = chain_spec.chain_id(); + + let mut blocks_rlp = Vec::new(); + let mut transfer_hashes = Vec::new(); + + // Blocks 1 and 2: PoL system tx + one EIP-1559 transfer each. + for nonce in 0..2 { + let tx = + TransactionTestContext::transfer_tx_bytes_with_nonce(chain_id, signer.clone(), nonce) + .await; + transfer_hashes.push(ctx.rpc.inject_tx(tx).await?); + let payload = ctx.advance_block().await?; + Arc::unwrap_or_clone(payload.block).into_block().encode(&mut blocks_rlp); + } + + // Block 3: PoL system tx only. + let payload = ctx.advance_block().await?; + Arc::unwrap_or_clone(payload.block).into_block().encode(&mut blocks_rlp); + + Ok(SeedChain { + blocks_rlp, + sender, + transfer_in_block1: transfer_hashes[0], + transfer_in_block2: transfer_hashes[1], + }) +} + +/// Writes `blocks_rlp` to a temporary chain file and imports it into +/// `datadir` through the full pipeline (senders, execution, hashing, merkle, +/// history indexing, tx lookup), populating every table migrate-v2 touches. +fn import_blocks(datadir: &Path, blocks_rlp: &[u8]) -> eyre::Result<()> { + let rlp_dir = tempfile::tempdir()?; + let rlp_path = rlp_dir.path().join("seed-blocks.rlp"); + std::fs::write(&rlp_path, blocks_rlp)?; + let out = run_bera_reth(&[ + "import", + "--chain", + genesis_path(), + "--datadir", + datadir.to_str().unwrap(), + "--fail-on-invalid-block", + rlp_path.to_str().unwrap(), + ]); + assert!(out.status.success(), "import failed: {}", String::from_utf8_lossy(&out.stderr)); + Ok(()) +} + +/// Fresh datadirs must default to the V2 (hot/cold) storage layout. +#[test] +fn test_fresh_datadir_defaults_to_storage_v2() { + let dir = tempfile::tempdir().unwrap(); + init_datadir(dir.path(), None); + + let settings = storage_settings(dir.path()); + assert!( + settings.contains("storage_v2: true"), + "fresh datadir should default to V2, got: {settings}" + ); +} + +/// `--storage.v2=false` must still create a V1 datadir (escape hatch while +/// upstream keeps V1 support). +#[test] +fn test_storage_v2_flag_opts_new_datadir_into_v1() { + let dir = tempfile::tempdir().unwrap(); + init_datadir(dir.path(), Some(false)); + + let settings = storage_settings(dir.path()); + assert!( + settings.contains("storage_v2: false"), + "--storage.v2=false datadir should persist V1 settings, got: {settings}" + ); +} + +/// A V1 datadir must remain readable by the v2-based binary: the persisted +/// layout wins over the flag default, and re-running genesis init against it +/// must recognize the existing genesis instead of failing. +#[test] +fn test_v1_datadir_remains_readable() { + let dir = tempfile::tempdir().unwrap(); + init_datadir(dir.path(), Some(false)); + + // Re-init without the flag: the persisted V1 settings must win and the + // stored genesis (custom BerachainHeader codec) must decode and match. + init_datadir(dir.path(), None); + + let settings = storage_settings(dir.path()); + assert!( + settings.contains("storage_v2: false"), + "existing V1 datadir must keep its persisted layout, got: {settings}" + ); +} + +/// `db migrate-v2` must convert a V1 datadir in place and leave it readable. +#[test] +fn test_migrate_v2_converts_v1_datadir_in_place() { + let dir = tempfile::tempdir().unwrap(); + init_datadir(dir.path(), Some(false)); + assert!(storage_settings(dir.path()).contains("storage_v2: false")); + + let out = migrate_v2(dir.path()); + assert!(out.status.success(), "migrate-v2 failed: {}", String::from_utf8_lossy(&out.stderr)); + + let settings = storage_settings(dir.path()); + assert!( + settings.contains("storage_v2: true"), + "migrate-v2 should flip settings to V2, got: {settings}" + ); + + // The migrated datadir must still open and match the stored genesis. + init_datadir(dir.path(), None); +} + +/// `db migrate-v2` on a datadir holding real chain data must move the +/// populated receipt, changeset, history-index, and transaction-lookup +/// tables into the V2 backends (static files + RocksDB) and leave every one +/// of them queryable afterwards. +#[tokio::test] +async fn test_migrate_v2_preserves_seeded_chain_data() -> eyre::Result<()> { + let seed = build_seed_chain().await?; + + // Seed a V1 datadir: `init` it, then `import` the mined blocks through + // the full pipeline, populating every table that migrate-v2 moves. + let dir = tempfile::tempdir()?; + init_datadir(dir.path(), Some(false)); + assert!(storage_settings(dir.path()).contains("storage_v2: false")); + + import_blocks(dir.path(), &seed.blocks_rlp)?; + + let tx1 = seed.transfer_in_block1.to_string(); + let tx2 = seed.transfer_in_block2.to_string(); + let sender = seed.sender.to_string(); + let sender_shard_key = + format!(r#"{{"key":"{sender}","highest_block_number":18446744073709551615}}"#); + + // The V1 layout keeps changesets, history indices, and tx lookups in + // MDBX; receipts of an unpruned V1 node already live in static files. + // The PoL system tx is the first transaction of every block, so the + // transfers are global transactions 1 (block 1) and 3 (block 2). + assert_eq!(db_stdout(dir.path(), &["get", "mdbx", "TransactionHashNumbers", &tx1]), "1"); + assert_eq!(db_stdout(dir.path(), &["get", "mdbx", "TransactionHashNumbers", &tx2]), "3"); + parse_json(&db_stdout(dir.path(), &["get", "static-file", "receipts", "1"])); + assert_eq!( + shard_blocks(&db_stdout( + dir.path(), + &["get", "mdbx", "AccountsHistory", &sender_shard_key] + )), + vec![0, 1, 2], + "sender history must cover the genesis alloc and both transfers" + ); + + let out = migrate_v2(dir.path()); + assert!(out.status.success(), "migrate-v2 failed: {}", String::from_utf8_lossy(&out.stderr)); + assert!(storage_settings(dir.path()).contains("storage_v2: true")); + + // Transaction lookups moved into RocksDB and out of MDBX. + assert_eq!(db_stdout(dir.path(), &["get", "rocksdb", "transaction-hash-numbers", &tx1]), "1"); + assert_eq!(db_stdout(dir.path(), &["get", "rocksdb", "transaction-hash-numbers", &tx2]), "3"); + assert_eq!(db_stdout(dir.path(), &["get", "mdbx", "TransactionHashNumbers", &tx1]), ""); + + // History indices moved into RocksDB and out of MDBX. + assert_eq!( + shard_blocks(&db_stdout(dir.path(), &["get", "rocksdb", "accounts-history", &sender])), + vec![0, 1, 2], + ); + assert_eq!(db_stdout(dir.path(), &["get", "mdbx", "AccountsHistory", &sender_shard_key]), ""); + assert_eq!( + shard_blocks(&db_stdout( + dir.path(), + &[ + "get", + "rocksdb", + "storages-history", + POL_DISTRIBUTOR_ADDRESS, + "--storage-key", + SLOT_ZERO, + ] + )), + vec![1, 2, 3], + "the PoL system tx increments distributor slot 0 in every block" + ); + + // Receipts must remain readable from static files: the EIP-1559 transfer + // (tx 1) and the PoL system receipt of block 3 (tx 4, Berachain-specific + // tx type). + for tx_num in ["1", "4"] { + let receipt = + parse_json(&db_stdout(dir.path(), &["get", "static-file", "receipts", tx_num])); + assert!(receipt["logs"].is_array(), "receipt {tx_num} must decode, got: {receipt}"); + } + + // Changesets moved into static files. + let account_changes = + db_stdout(dir.path(), &["get", "static-file", "account-change-sets", "1"]).to_lowercase(); + assert!( + account_changes.contains(&sender.to_lowercase()), + "block 1 account changeset must contain the transfer sender, got: {account_changes}" + ); + let storage_changes = db_stdout( + dir.path(), + &[ + "get", + "static-file", + "storage-change-sets", + r#"[3,"0x0000000000000000000000000000000000000000"]"#, + ], + ) + .to_lowercase(); + assert!( + storage_changes.contains(POL_DISTRIBUTOR_ADDRESS), + "block 3 storage changeset must contain the PoL distributor, got: {storage_changes}" + ); + + // Historical state queries resolve through the RocksDB history indices + // plus the static-file changesets — the read path RPC uses after the + // migration. Distributor slot 0 counts PoL distributions: 2 after block 2. + let state = parse_json(&db_stdout( + dir.path(), + &["state", POL_DISTRIBUTOR_ADDRESS, "--block", "2", "--format", "json"], + )); + assert_eq!(state["storage"][0]["key"], SLOT_ZERO); + assert_eq!( + state["storage"][0]["value"], + "0x0000000000000000000000000000000000000000000000000000000000000002" + ); + + // The sender's first transfer landed in block 1, so its nonce at block 1 + // must already be 1. + let state = + parse_json(&db_stdout(dir.path(), &["state", &sender, "--block", "1", "--format", "json"])); + assert_eq!(state["account"]["nonce"], 1); + + // The migrated datadir must still open and match the stored genesis. + init_datadir(dir.path(), None); + Ok(()) +} + +/// An unpruned V1 datadir already keeps receipts in static files, but a V1 +/// datadir with receipt pruning configured writes them to MDBX instead — the +/// one layout where `db migrate-v2` must actually copy receipts into static +/// files rather than taking its "already in static files" skip path. +#[tokio::test] +async fn test_migrate_v2_moves_pruned_receipts_to_static_files() -> eyre::Result<()> { + let seed = build_seed_chain().await?; + + let dir = tempfile::tempdir()?; + init_datadir(dir.path(), Some(false)); + + // Distance-based receipt pruning routes receipt writes to MDBX on V1. + // The distance is far larger than the seeded chain, so nothing actually + // gets pruned and every receipt must survive the migration. + std::fs::write( + dir.path().join("reth.toml"), + "[prune.segments]\nreceipts = { distance = 10064 }\n", + )?; + + import_blocks(dir.path(), &seed.blocks_rlp)?; + + // Receipts landed in MDBX and not in static files, so this datadir + // really exercises the receipt-copy phase of migrate-v2. + parse_json(&db_stdout(dir.path(), &["get", "mdbx", "Receipts", "1"])); + assert_eq!( + db_stdout(dir.path(), &["get", "static-file", "receipts", "1"]), + "", + "a receipt-pruned V1 datadir must not have receipts in static files yet" + ); + + let out = migrate_v2(dir.path()); + assert!(out.status.success(), "migrate-v2 failed: {}", String::from_utf8_lossy(&out.stderr)); + assert!(storage_settings(dir.path()).contains("storage_v2: true")); + + // The EIP-1559 transfer receipt (tx 1) and the Berachain PoL system + // receipt (tx 4) were copied into static files and still decode. + for tx_num in ["1", "4"] { + let receipt = + parse_json(&db_stdout(dir.path(), &["get", "static-file", "receipts", tx_num])); + assert!(receipt["logs"].is_array(), "receipt {tx_num} must decode, got: {receipt}"); + } + Ok(()) +} + +/// Running `db migrate-v2` against an already-V2 datadir must be a no-op. +#[test] +fn test_migrate_v2_is_idempotent() { + let dir = tempfile::tempdir().unwrap(); + init_datadir(dir.path(), None); + + let out = migrate_v2(dir.path()); + assert!( + out.status.success(), + "migrate-v2 on a V2 datadir should be a successful no-op: {}", + String::from_utf8_lossy(&out.stderr) + ); + assert!(storage_settings(dir.path()).contains("storage_v2: true")); +}