diff --git a/.github/workflows/nextest.yml b/.github/workflows/nextest.yml index 6e4910056..48f3b0b79 100644 --- a/.github/workflows/nextest.yml +++ b/.github/workflows/nextest.yml @@ -83,6 +83,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: cache-on-failure: true + - name: Setup Git config run: | git config --global user.name "GitHub Actions Bot" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a7cf342f7..605f06d22 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ concurrency: env: CARGO_TERM_COLOR: always - TARGET_RUST_VERSION: "nightly-2024-09-05" + TARGET_RUST_VERSION: "stable" jobs: nextest: @@ -60,18 +60,16 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly with: - toolchain: ${{ env.TARGET_RUST_VERSION }} + toolchain: nightly-2024-09-05 # Required for unstable features in rustfmt components: rustfmt - - run: cargo fmt --all --check + - run: cargo +nightly-2024-09-05 fmt --all --check forge-fmt: runs-on: ubuntu-22.04 timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@nightly - with: - toolchain: ${{ env.TARGET_RUST_VERSION }} + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 with: cache-on-failure: true diff --git a/Cargo.lock b/Cargo.lock index d1af35aae..07277bf37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,17 +12,6 @@ dependencies = [ "regex", ] -[[package]] -name = "addchain" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2e69442aa5628ea6951fa33e24efe8313f4321a91bd729fc2f75bdfc858570" -dependencies = [ - "num-bigint 0.3.3", - "num-integer", - "num-traits", -] - [[package]] name = "addr2line" version = "0.21.0" @@ -50,30 +39,19 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.15", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.2.15", + "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -100,19 +78,19 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e1758e5d759c0114140152ae72032eafcfdd7b599e995ebbc8eeafa2b4c977" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-contract", "alloy-core", - "alloy-eips", + "alloy-eips 0.8.0", "alloy-genesis", - "alloy-network", + "alloy-network 0.8.0", "alloy-provider", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types", - "alloy-serde", - "alloy-signer", - "alloy-signer-local", + "alloy-serde 0.8.0", + "alloy-signer 0.8.0", + "alloy-signer-local 0.8.0", "alloy-transport", "alloy-transport-http", "alloy-transport-ipc", @@ -131,20 +109,36 @@ dependencies = [ "strum", ] +[[package]] +name = "alloy-consensus" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed961a48297c732a5d97ee321aa8bb5009ecadbcb077d8bec90cb54e651629" +dependencies = [ + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "auto_impl", + "c-kzg", + "derive_more", + "serde", +] + [[package]] name = "alloy-consensus" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba14856660f31807ebb26ce8f667e814c72694e1077e97ef102e326ad580f3f" dependencies = [ - "alloy-eips", + "alloy-eips 0.8.0", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.8.0", "alloy-trie", "auto_impl", "c-kzg", - "derive_more 1.0.0", + "derive_more", "k256 0.13.4", "serde", ] @@ -155,11 +149,11 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28666307e76441e7af37a2b90cde7391c28112121bea59f4e0d804df8b20057e" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.8.0", + "alloy-eips 0.8.0", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.8.0", "serde", ] @@ -171,12 +165,12 @@ checksum = "f3510769905590b8991a8e63a5e0ab4aa72cf07a13ab5fbe23f12f4454d161da" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network", - "alloy-network-primitives", + "alloy-network 0.8.0", + "alloy-network-primitives 0.8.0", "alloy-primitives", "alloy-provider", "alloy-pubsub", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.8.0", "alloy-sol-types", "alloy-transport", "futures 0.3.31", @@ -210,7 +204,7 @@ dependencies = [ "arbitrary", "const-hex", "derive_arbitrary", - "derive_more 1.0.0", + "derive_more", "itoa", "proptest", "serde", @@ -231,6 +225,18 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-eip7702" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more", + "serde", +] + [[package]] name = "alloy-eip7702" version = "0.4.2" @@ -240,12 +246,30 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "arbitrary", - "derive_more 1.0.0", + "derive_more", "k256 0.13.4", "rand 0.8.5", "serde", ] +[[package]] +name = "alloy-eips" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69e06cf9c37be824b9d26d6d101114fdde6af0c87de2828b414c05c4b3daa71" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702 0.3.2", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "c-kzg", + "derive_more", + "once_cell", + "serde", + "sha2", +] + [[package]] name = "alloy-eips" version = "0.8.0" @@ -253,15 +277,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e922d558006ba371681d484d12aa73fe673d84884f83747730af7433c0e86d" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.8.0", "c-kzg", - "derive_more 1.0.0", + "derive_more", "once_cell", "serde", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -271,7 +295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dca170827a7ca156b43588faebf9e9d27c27d0fb07cab82cfd830345e2b24f5" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.8.0", "alloy-trie", "serde", ] @@ -288,6 +312,20 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-json-rpc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af5979e0d5a7bf9c7eb79749121e8256e59021af611322aee56e77e20776b4b3" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror 1.0.69", + "tracing", +] + [[package]] name = "alloy-json-rpc" version = "0.8.0" @@ -302,22 +340,43 @@ dependencies = [ "tracing", ] +[[package]] +name = "alloy-network" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "204237129086ce5dc17a58025e93739b01b45313841f98fa339eb1d780511e57" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-json-rpc 0.5.4", + "alloy-network-primitives 0.5.4", + "alloy-primitives", + "alloy-rpc-types-eth 0.5.4", + "alloy-serde 0.5.4", + "alloy-signer 0.5.4", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror 1.0.69", +] + [[package]] name = "alloy-network" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad4e6ad4230df8c4a254c20f8d6a84ab9df151bfca13f463177dbc96571cc1f8" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-consensus-any", - "alloy-eips", - "alloy-json-rpc", - "alloy-network-primitives", + "alloy-eips 0.8.0", + "alloy-json-rpc 0.8.0", + "alloy-network-primitives 0.8.0", "alloy-primitives", "alloy-rpc-types-any", - "alloy-rpc-types-eth", - "alloy-serde", - "alloy-signer", + "alloy-rpc-types-eth 0.8.0", + "alloy-serde 0.8.0", + "alloy-signer 0.8.0", "alloy-sol-types", "async-trait", "auto_impl", @@ -327,16 +386,29 @@ dependencies = [ "thiserror 2.0.6", ] +[[package]] +name = "alloy-network-primitives" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514f70ee2a953db21631cd817b13a1571474ec77ddc03d47616d5e8203489fde" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-primitives", + "alloy-serde 0.5.4", + "serde", +] + [[package]] name = "alloy-network-primitives" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4df88a2f8020801e0fefce79471d3946d39ca3311802dbbd0ecfdeee5e972e3" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.8.0", + "alloy-eips 0.8.0", "alloy-primitives", - "alloy-serde", + "alloy-serde 0.8.0", "serde", ] @@ -366,12 +438,12 @@ dependencies = [ "alloy-rlp", "arbitrary", "bytes", - "cfg-if 1.0.0", + "cfg-if", "const-hex", "derive_arbitrary", - "derive_more 1.0.0", + "derive_more", "foldhash", - "getrandom 0.2.15", + "getrandom", "hashbrown 0.15.2", "hex-literal", "indexmap 2.7.0", @@ -396,16 +468,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5115c74c037714e1b02a86f742289113afa5d494b5ea58308ba8aa378e739101" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-network-primitives", + "alloy-consensus 0.8.0", + "alloy-eips 0.8.0", + "alloy-json-rpc 0.8.0", + "alloy-network 0.8.0", + "alloy-network-primitives 0.8.0", "alloy-primitives", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-debug", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.8.0", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", "alloy-transport", @@ -415,11 +487,11 @@ dependencies = [ "async-stream", "async-trait", "auto_impl", - "dashmap 6.1.0", + "dashmap", "futures 0.3.31", "futures-utils-wasm", "lru", - "parking_lot 0.12.3", + "parking_lot", "pin-project 1.1.7", "reqwest 0.12.9", "schnellru", @@ -438,7 +510,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b073afa409698d1b9a30522565815f3bf7010e5b47b997cf399209e6110df097" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.8.0", "alloy-primitives", "alloy-transport", "bimap", @@ -468,8 +540,8 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a833d97bf8a5f0f878daf2c8451fff7de7f9de38baa5a45d936ec718d81255a" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -479,7 +551,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6a0bd0ce5660ac48e4f3bb0c7c5c3a94db287a0be94971599d83928476cbcd" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.8.0", "alloy-primitives", "alloy-pubsub", "alloy-transport", @@ -508,10 +580,10 @@ dependencies = [ "alloy-primitives", "alloy-rpc-types-anvil", "alloy-rpc-types-engine", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.8.0", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde", + "alloy-serde 0.8.0", "serde", ] @@ -522,8 +594,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0b85a5f5f5d99047544f4ec31330ee15121dcb8ef5af3e791a5207e6b92b05b" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.8.0", + "alloy-serde 0.8.0", "serde", ] @@ -534,8 +606,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea98f81bcd759dbfa3601565f9d7a02220d8ef1d294ec955948b90aaafbfd857" dependencies = [ "alloy-consensus-any", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.8.0", + "alloy-serde 0.8.0", ] [[package]] @@ -554,33 +626,52 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ca5898f753ff0d15a0dc955c169523d8fee57e05bb5a38a398b3451b0b988be" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.8.0", + "alloy-eips 0.8.0", "alloy-primitives", "alloy-rlp", - "alloy-serde", - "derive_more 1.0.0", + "alloy-serde 0.8.0", + "derive_more", "jsonwebtoken", "rand 0.8.5", "serde", "strum", ] +[[package]] +name = "alloy-rpc-types-eth" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b034779a4850b4b03f5be5ea674a1cf7d746b2da762b34d1860ab45e48ca27" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-eips 0.5.4", + "alloy-network-primitives 0.5.4", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.4", + "alloy-sol-types", + "derive_more", + "itertools 0.13.0", + "serde", + "serde_json", +] + [[package]] name = "alloy-rpc-types-eth" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e518b0a7771e00728f18be0708f828b18a1cfc542a7153bef630966a26388e0" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-consensus-any", - "alloy-eips", - "alloy-network-primitives", + "alloy-eips 0.8.0", + "alloy-network-primitives 0.8.0", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.8.0", "alloy-sol-types", - "derive_more 1.0.0", + "derive_more", "itertools 0.13.0", "serde", "serde_json", @@ -593,8 +684,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdff93fa38be6982f8613a060e18fa0a37ce440d69ed3b7f37c6c69036ce1c53" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.8.0", + "alloy-serde 0.8.0", "serde", "serde_json", "thiserror 2.0.6", @@ -607,9 +698,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9dc647985db41fd164e807577134da1179b9f5ba0959f8698d6587eaa568f5" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-eth 0.8.0", + "alloy-serde 0.8.0", + "serde", +] + +[[package]] +name = "alloy-serde" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028e72eaa9703e4882344983cfe7636ce06d8cce104a78ea62fd19b46659efc4" +dependencies = [ + "alloy-primitives", "serde", + "serde_json", ] [[package]] @@ -623,6 +725,20 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-signer" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "592c185d7100258c041afac51877660c7bf6213447999787197db4842f0e938e" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "elliptic-curve 0.13.8", + "k256 0.13.4", + "thiserror 1.0.69", +] + [[package]] name = "alloy-signer" version = "0.8.0" @@ -645,10 +761,10 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe06d524ac84fefce1184f2d1273704e62faade7ff1f29c17ac9d493d3ffbdbf" dependencies = [ - "alloy-consensus", - "alloy-network", + "alloy-consensus 0.8.0", + "alloy-network 0.8.0", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.8.0", "async-trait", "aws-sdk-kms", "k256 0.13.4", @@ -663,10 +779,10 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "492cedcb4819a588aaef8d59edd5d65291f485d25f64b2aa0806dd86feeafd18" dependencies = [ - "alloy-consensus", - "alloy-network", + "alloy-consensus 0.8.0", + "alloy-network 0.8.0", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.8.0", "async-trait", "gcloud-sdk", "k256 0.13.4", @@ -681,11 +797,11 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "426409a02587b98e118d2fd32dda3f423805e264a32f9e247a65164163bc0e9b" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.8.0", "alloy-sol-types", "async-trait", "coins-ledger", @@ -695,16 +811,34 @@ dependencies = [ "tracing", ] +[[package]] +name = "alloy-signer-local" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6614f02fc1d5b079b2a4a5320018317b506fd0a6d67c1fd5542a71201724986c" +dependencies = [ + "alloy-consensus 0.5.4", + "alloy-network 0.5.4", + "alloy-primitives", + "alloy-signer 0.5.4", + "async-trait", + "coins-bip32", + "coins-bip39", + "k256 0.13.4", + "rand 0.8.5", + "thiserror 1.0.69", +] + [[package]] name = "alloy-signer-local" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2184dab8c9493ab3e1c9f6bd3bdb563ed322b79023d81531935e84a4fdf7cf1" dependencies = [ - "alloy-consensus", - "alloy-network", + "alloy-consensus 0.8.0", + "alloy-network 0.8.0", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.8.0", "async-trait", "coins-bip32", "coins-bip39", @@ -720,10 +854,10 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290ead62e020b751761de95f60056340faba341b20493ae929013d1357b9ba5b" dependencies = [ - "alloy-consensus", - "alloy-network", + "alloy-consensus 0.8.0", + "alloy-network 0.8.0", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.8.0", "async-trait", "semver 1.0.23", "thiserror 2.0.6", @@ -740,8 +874,8 @@ dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -757,8 +891,8 @@ dependencies = [ "heck", "indexmap 2.7.0", "proc-macro-error2", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", "syn-solidity", "tiny-keccak 2.0.2", @@ -774,8 +908,8 @@ dependencies = [ "const-hex", "dunce", "heck", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "serde_json", "syn 2.0.90", "syn-solidity", @@ -810,7 +944,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628be5b9b75e4f4c4f2a71d985bbaca4f23de356dc83f1625454c505f5eef4df" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.8.0", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -830,7 +964,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e24412cf72f79c95cd9b1d9482e3a31f9d94c24b43c4b3b710cc8d4341eaab0" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.8.0", "alloy-transport", "reqwest 0.12.9", "serde_json", @@ -845,7 +979,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0577a1f67ce70ece3f2b27cf1011da7222ef0a5701f7dcb558e5356278eeb531" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.8.0", "alloy-pubsub", "alloy-transport", "bytes", @@ -856,7 +990,7 @@ dependencies = [ "serde_json", "tempfile", "tokio", - "tokio-util 0.7.13", + "tokio-util", "tracing", ] @@ -887,7 +1021,7 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "arrayvec 0.7.6", - "derive_more 1.0.0", + "derive_more", "nybbles", "serde", "smallvec", @@ -1015,23 +1149,23 @@ name = "anvil" version = "0.0.2" dependencies = [ "alloy-chains", - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-contract", "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 0.8.0", "alloy-genesis", "alloy-json-abi", - "alloy-json-rpc", - "alloy-network", + "alloy-json-rpc 0.8.0", + "alloy-network 0.8.0", "alloy-primitives", "alloy-provider", "alloy-pubsub", "alloy-rlp", "alloy-rpc-client", "alloy-rpc-types", - "alloy-serde", - "alloy-signer", - "alloy-signer-local", + "alloy-serde 0.8.0", + "alloy-signer 0.8.0", + "alloy-signer-local 0.8.0", "alloy-sol-types", "alloy-transport", "alloy-transport-ipc", @@ -1062,7 +1196,7 @@ dependencies = [ "k256 0.13.4", "op-alloy-consensus", "op-alloy-rpc-types", - "parking_lot 0.12.3", + "parking_lot", "rand 0.8.5", "revm", "serde", @@ -1084,14 +1218,14 @@ dependencies = [ name = "anvil-core" version = "0.0.2" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", - "alloy-eips", - "alloy-network", + "alloy-eips 0.8.0", + "alloy-network 0.8.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types", - "alloy-serde", + "alloy-serde 0.8.0", "alloy-trie", "bytes", "foundry-common", @@ -1123,14 +1257,109 @@ dependencies = [ "clap", "futures 0.3.31", "interprocess", - "parking_lot 0.12.3", + "parking_lot", "pin-project 1.1.7", "serde", "serde_json", "thiserror 2.0.6", - "tokio-util 0.7.13", - "tower-http", + "tokio-util", + "tower-http 0.5.2", + "tracing", +] + +[[package]] +name = "anvil_zksync_api_decl" +version = "0.2.1" +source = "git+https://github.com/matter-labs/anvil-zksync.git?rev=b21c4898d44e3b775423b8d698d425fc43a85981#b21c4898d44e3b775423b8d698d425fc43a85981" +dependencies = [ + "anvil_zksync_types", + "jsonrpsee", + "zksync_types", + "zksync_web3_decl", +] + +[[package]] +name = "anvil_zksync_api_server" +version = "0.2.1" +source = "git+https://github.com/matter-labs/anvil-zksync.git?rev=b21c4898d44e3b775423b8d698d425fc43a85981#b21c4898d44e3b775423b8d698d425fc43a85981" +dependencies = [ + "anvil_zksync_api_decl", + "anvil_zksync_core", + "anvil_zksync_types", + "anyhow", + "hex", + "http 1.2.0", + "jsonrpsee", + "thiserror 1.0.69", + "tower 0.4.13", + "tower-http 0.6.2", + "tracing", + "zksync_types", + "zksync_web3_decl", +] + +[[package]] +name = "anvil_zksync_config" +version = "0.2.1" +source = "git+https://github.com/matter-labs/anvil-zksync.git?rev=b21c4898d44e3b775423b8d698d425fc43a85981#b21c4898d44e3b775423b8d698d425fc43a85981" +dependencies = [ + "alloy-signer 0.5.4", + "alloy-signer-local 0.5.4", + "anvil_zksync_types", + "clap", + "colored", + "hex", + "rand 0.8.5", + "serde", + "serde_json", + "tracing", + "zksync_types", + "zksync_vm_interface", +] + +[[package]] +name = "anvil_zksync_core" +version = "0.2.1" +source = "git+https://github.com/matter-labs/anvil-zksync.git?rev=b21c4898d44e3b775423b8d698d425fc43a85981#b21c4898d44e3b775423b8d698d425fc43a85981" +dependencies = [ + "anvil_zksync_config", + "anvil_zksync_types", + "anyhow", + "chrono", + "colored", + "ethabi 16.0.0", + "eyre", + "flate2", + "futures 0.3.31", + "hex", + "indexmap 2.7.0", + "itertools 0.13.0", + "lazy_static", + "once_cell", + "reqwest 0.11.27", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "thiserror 1.0.69", + "time", + "tokio", + "tracing", + "tracing-subscriber", + "zksync_contracts", + "zksync_multivm", + "zksync_types", + "zksync_web3_decl", +] + +[[package]] +name = "anvil_zksync_types" +version = "0.2.1" +source = "git+https://github.com/matter-labs/anvil-zksync.git?rev=b21c4898d44e3b775423b8d698d425fc43a85981#b21c4898d44e3b775423b8d698d425fc43a85981" +dependencies = [ + "clap", + "serde", "tracing", + "zksync_types", ] [[package]] @@ -1169,7 +1398,7 @@ dependencies = [ "ark-serialize 0.3.0", "ark-std 0.3.0", "derivative", - "num-bigint 0.4.6", + "num-bigint", "num-traits", "paste", "rustc_version 0.3.3", @@ -1189,7 +1418,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint 0.4.6", + "num-bigint", "num-traits", "paste", "rustc_version 0.4.1", @@ -1202,7 +1431,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" dependencies = [ - "quote 1.0.37", + "quote", "syn 1.0.109", ] @@ -1212,7 +1441,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote 1.0.37", + "quote", "syn 1.0.109", ] @@ -1222,9 +1451,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ - "num-bigint 0.4.6", + "num-bigint", "num-traits", - "quote 1.0.37", + "quote", "syn 1.0.109", ] @@ -1234,10 +1463,10 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.6", + "num-bigint", "num-traits", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1259,7 +1488,7 @@ checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-std 0.4.0", "digest 0.10.7", - "num-bigint 0.4.6", + "num-bigint", ] [[package]] @@ -1282,42 +1511,12 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "arr_macro" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a105bfda48707cf19220129e78fca01e9639433ffaef4163546ed8fb04120a5" -dependencies = [ - "arr_macro_impl", - "proc-macro-hack", -] - -[[package]] -name = "arr_macro_impl" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1" -dependencies = [ - "proc-macro-hack", - "quote 1.0.37", - "syn 1.0.109", -] - [[package]] name = "arrayref" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - [[package]] name = "arrayvec" version = "0.5.2" @@ -1361,7 +1560,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acde96f444d31031f760c5c43dc786b97d3e1cb2ee49dd06898383fe9a999758" dependencies = [ - "event-listener 4.0.3", + "event-listener", ] [[package]] @@ -1370,8 +1569,8 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -1392,8 +1591,8 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -1403,8 +1602,8 @@ version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -1419,15 +1618,6 @@ dependencies = [ "rustc_version 0.4.1", ] -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - [[package]] name = "atomic" version = "0.6.0" @@ -1465,8 +1655,8 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -1536,7 +1726,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" dependencies = [ - "bindgen 0.69.5", + "bindgen", "cc", "cmake", "dunce", @@ -1677,7 +1867,7 @@ dependencies = [ "http 1.2.0", "once_cell", "percent-encoding", - "sha2 0.10.8", + "sha2", "time", "tracing", ] @@ -1889,18 +2079,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "backon" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" -dependencies = [ - "fastrand", - "futures-core", - "pin-project 1.1.7", - "tokio", -] - [[package]] name = "backtrace" version = "0.3.71" @@ -1909,7 +2087,7 @@ checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide 0.7.4", "object", @@ -1928,12 +2106,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -1977,18 +2149,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bigdecimal" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" -dependencies = [ - "num-bigint 0.4.6", - "num-integer", - "num-traits", - "serde", -] - [[package]] name = "bigdecimal" version = "0.4.5" @@ -1997,7 +2157,7 @@ checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ "autocfg", "libm", - "num-bigint 0.4.6", + "num-bigint", "num-integer", "num-traits", ] @@ -2008,36 +2168,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "prettyplease", - "proc-macro2 1.0.92", - "quote 1.0.37", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.90", -] - [[package]] name = "bindgen" version = "0.69.5" @@ -2052,8 +2182,8 @@ dependencies = [ "lazycell", "log", "prettyplease", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "regex", "rustc-hash 1.1.0", "shlex", @@ -2120,17 +2250,6 @@ dependencies = [ "wyz 0.5.1", ] -[[package]] -name = "blake2" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" -dependencies = [ - "crypto-mac", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "blake2" version = "0.10.6" @@ -2140,17 +2259,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "blake2-rfc_bellman_edition" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc60350286c7c3db13b98e91dbe5c8b6830a6821bc20af5b0c310ce94d74915" -dependencies = [ - "arrayvec 0.4.12", - "byteorder", - "constant_time_eq", -] - [[package]] name = "blake2_ce" version = "0.10.6" @@ -2227,74 +2335,19 @@ dependencies = [ "darling 0.20.10", "ident_case", "prettyplease", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "rustversion", "syn 2.0.90", ] -[[package]] -name = "boojum" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ec2f007ff8f90cc459f03e9f30ca1065440170f013c868823646e2e48d0234" -dependencies = [ - "arrayvec 0.7.6", - "bincode", - "blake2 0.10.6", - "const_format", - "convert_case 0.6.0", - "crossbeam", - "crypto-bigint 0.5.5", - "derivative", - "ethereum-types 0.14.1", - "firestorm", - "itertools 0.10.5", - "lazy_static", - "num-modular 0.5.1", - "num_cpus", - "rand 0.8.5", - "rayon", - "serde", - "sha2 0.10.8", - "sha3_ce", - "smallvec", - "unroll", - "zksync_cs_derive", - "zksync_pairing", -] - -[[package]] -name = "borsh" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" -dependencies = [ - "borsh-derive", - "cfg_aliases 0.2.1", -] - -[[package]] -name = "borsh-derive" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" -dependencies = [ - "once_cell", - "proc-macro-crate 3.2.0", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.90", - "syn_derive", -] - [[package]] name = "bs58" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ - "sha2 0.10.8", + "sha2", "tinyvec", ] @@ -2327,34 +2380,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 1.0.109", -] - -[[package]] -name = "bytecount" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" - [[package]] name = "bytemuck" version = "1.20.0" @@ -2440,19 +2465,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.23", - "serde", - "serde_json", -] - [[package]] name = "cargo_metadata" version = "0.18.1" @@ -2478,20 +2490,20 @@ name = "cast" version = "0.0.2" dependencies = [ "alloy-chains", - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-contract", "alloy-dyn-abi", "alloy-json-abi", - "alloy-json-rpc", - "alloy-network", + "alloy-json-rpc 0.8.0", + "alloy-network 0.8.0", "alloy-node-bindings", "alloy-primitives", "alloy-provider", "alloy-rlp", "alloy-rpc-types", - "alloy-serde", - "alloy-signer", - "alloy-signer-local", + "alloy-serde 0.8.0", + "alloy-signer 0.8.0", + "alloy-signer-local 0.8.0", "alloy-sol-types", "alloy-transport", "alloy-zksync", @@ -2571,12 +2583,6 @@ dependencies = [ "nom", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -2686,119 +2692,16 @@ dependencies = [ "inout", ] -[[package]] -name = "circuit_encodings" -version = "0.140.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6b7cc842eadb4c250cdc6a8bc1dd97624d9f08bbe54db3e11fb23c3a72be07" -dependencies = [ - "derivative", - "serde", - "zk_evm 0.140.0", - "zkevm_circuits 0.140.3", -] - -[[package]] -name = "circuit_encodings" -version = "0.141.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7898ffbf3cd413576b4b674fe1545a35488c67eb16bd5a4148425e42c2a2b65b" -dependencies = [ - "derivative", - "serde", - "zk_evm 0.141.0", - "zkevm_circuits 0.141.2", -] - -[[package]] -name = "circuit_encodings" -version = "0.142.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8364ecafcc4b2c896023f8d3af952c52a500aa55f14fd268bb5d9ab07f837369" -dependencies = [ - "derivative", - "serde", - "zk_evm 0.141.0", - "zkevm_circuits 0.141.2", -] - -[[package]] -name = "circuit_encodings" -version = "0.150.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2501cc688ef391013019495ae7035cfd54f86987e36d10f73976ce4c5d413c5a" -dependencies = [ - "derivative", - "serde", - "zk_evm 0.150.7", - "zkevm_circuits 0.150.7", -] - -[[package]] -name = "circuit_sequencer_api" -version = "0.133.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb959b1f8c6bbd8be711994d182e85452a26a5d2213a709290b71c8262af1331" -dependencies = [ - "derivative", - "rayon", - "serde", - "zk_evm 0.133.0", - "zksync_bellman", -] - -[[package]] -name = "circuit_sequencer_api" -version = "0.140.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5f22311ce609d852d7d9f4943535ea4610aeb785129ae6ff83d5201c4fb387" -dependencies = [ - "circuit_encodings 0.140.3", - "derivative", - "rayon", - "serde", - "zk_evm 0.140.0", - "zksync_bellman", -] - -[[package]] -name = "circuit_sequencer_api" -version = "0.141.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c47c71d6ba83a8beb0af13af70beffd627f5497caf3d44c6f96363e788b07ea" -dependencies = [ - "circuit_encodings 0.141.2", - "derivative", - "rayon", - "serde", - "zk_evm 0.141.0", - "zksync_bellman", -] - -[[package]] -name = "circuit_sequencer_api" -version = "0.142.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e264723359e6a1aad98110bdccf1ae3ad596e93e7d31da9e40f6adc07e4add54" -dependencies = [ - "circuit_encodings 0.142.2", - "derivative", - "rayon", - "serde", - "zk_evm 0.141.0", - "zksync_bellman", -] - [[package]] name = "circuit_sequencer_api" -version = "0.150.7" +version = "0.150.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917d27db531fdd98a51e42ea465bc097f48cc849e7fad68d7856087d15125be1" +checksum = "d13ed70909e8390a4f2599d5a76d9ac4189e5bbbf16146d11b7999788740f291" dependencies = [ - "circuit_encodings 0.150.7", "derivative", "rayon", "serde", + "zk_evm 0.150.18", "zksync_bellman", ] @@ -2864,8 +2767,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -2932,7 +2835,7 @@ dependencies = [ "hmac", "k256 0.13.4", "serde", - "sha2 0.10.8", + "sha2", "thiserror 1.0.69", ] @@ -2948,7 +2851,7 @@ dependencies = [ "once_cell", "pbkdf2 0.12.2", "rand 0.8.5", - "sha2 0.10.8", + "sha2", "thiserror 1.0.69", ] @@ -2966,7 +2869,7 @@ dependencies = [ "generic-array", "ripemd", "serde", - "sha2 0.10.8", + "sha2", "sha3 0.10.8", "thiserror 1.0.69", ] @@ -2979,9 +2882,9 @@ checksum = "ab9bc0994d0aa0f4ade5f3a9baf4a8d936f250278c85a1124b401860454246ab" dependencies = [ "async-trait", "byteorder", - "cfg-if 1.0.0", + "cfg-if", "const-hex", - "getrandom 0.2.15", + "getrandom", "hidapi-rusb", "js-sys", "log", @@ -3066,7 +2969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" dependencies = [ "castaway", - "cfg-if 1.0.0", + "cfg-if", "itoa", "rustversion", "ryu", @@ -3113,17 +3016,26 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen", ] +[[package]] +name = "const-decoder" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b381abde2cdc1bc3817e394b24e05667a2dc89f37570cbd34d9c397d99e56e3f" +dependencies = [ + "compile-fmt", +] + [[package]] name = "const-hex" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "hex", "proptest", @@ -3136,38 +3048,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const_format" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" -dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "unicode-xid 0.2.6", -] - [[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "convert_case" version = "0.6.0" @@ -3212,28 +3098,13 @@ dependencies = [ "libc", ] -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc32fast" version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3301,7 +3172,7 @@ dependencies = [ "bitflags 2.6.0", "crossterm_winapi", "mio 1.0.3", - "parking_lot 0.12.3", + "parking_lot", "rustix", "signal-hook", "signal-hook-mio", @@ -3357,23 +3228,13 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "ctor" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ - "quote 1.0.37", + "quote", "syn 2.0.90", ] @@ -3396,33 +3257,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "rustc_version 0.4.1", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.90", -] - [[package]] name = "darling" version = "0.13.4" @@ -3451,8 +3285,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "strsim 0.10.0", "syn 1.0.109", ] @@ -3465,8 +3299,8 @@ checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "strsim 0.11.1", "syn 2.0.90", ] @@ -3478,7 +3312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.37", + "quote", "syn 1.0.109", ] @@ -3489,35 +3323,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", - "quote 1.0.37", + "quote", "syn 2.0.90", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core 0.9.10", -] - [[package]] name = "dashmap" version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -3575,7 +3396,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", ] [[package]] @@ -3584,8 +3404,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -3595,8 +3415,8 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -3616,8 +3436,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling 0.20.10", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -3631,19 +3451,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2 1.0.92", - "quote 1.0.37", - "rustc_version 0.4.1", - "syn 2.0.90", -] - [[package]] name = "derive_more" version = "1.0.0" @@ -3659,11 +3466,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ - "convert_case 0.6.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "convert_case", + "proc-macro2", + "quote", "syn 2.0.90", - "unicode-xid 0.2.6", + "unicode-xid", ] [[package]] @@ -3730,7 +3537,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -3774,8 +3581,8 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -3785,7 +3592,7 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0583193020b29b03682d8d33bb53a5b0f50df6daacece12ca99b904cfdcb8c4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "clap", "condtype", "divan-macros", @@ -3799,8 +3606,8 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dc51d98e636f5e3b0759a39257458b22619cac7e96d932da6eeb052891bb67c" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -3866,39 +3673,11 @@ dependencies = [ "spki 0.7.3", ] -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core 0.6.4", - "serde", - "sha2 0.10.8", - "subtle", - "zeroize", -] - [[package]] name = "either" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -dependencies = [ - "serde", -] [[package]] name = "elasticlunr-rs" @@ -3995,7 +3774,7 @@ version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -4011,8 +3790,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -4022,8 +3801,8 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -4065,46 +3844,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "era_test_node" -version = "0.1.0-alpha.31" -source = "git+https://github.com/matter-labs/era-test-node.git?rev=94503847b402f0161c3372d5f357a4cb16a2d66d#94503847b402f0161c3372d5f357a4cb16a2d66d" -dependencies = [ - "anyhow", - "bigdecimal 0.3.1", - "chrono", - "clap", - "colored", - "ethabi 16.0.0", - "eyre", - "futures 0.3.31", - "hex", - "indexmap 2.7.0", - "itertools 0.10.5", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-http-server", - "lazy_static", - "once_cell", - "openssl-sys", - "reqwest 0.11.27", - "rustc-hash 1.1.0", - "serde", - "serde_json", - "sha3 0.10.8", - "time", - "tokio", - "toml 0.8.19", - "tracing", - "tracing-subscriber", - "zksync_contracts", - "zksync_multivm", - "zksync_types", - "zksync_utils", - "zksync_web3_decl", -] - [[package]] name = "errno" version = "0.3.10" @@ -4115,32 +3854,12 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", -] - [[package]] name = "error-code" version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if 1.0.0", - "home", - "windows-sys 0.48.0", -] - [[package]] name = "eth-keystore" version = "0.5.0" @@ -4157,7 +3876,7 @@ dependencies = [ "scrypt", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "sha3 0.10.8", "thiserror 1.0.69", "uuid 0.8.2", @@ -4265,8 +3984,8 @@ dependencies = [ "ethers-core", "eyre", "prettyplease", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "regex", "serde", "serde_json", @@ -4283,7 +4002,7 @@ checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ "arrayvec 0.7.6", "bytes", - "cargo_metadata 0.18.1", + "cargo_metadata", "chrono", "const-hex", "elliptic-curve 0.13.8", @@ -4302,7 +4021,7 @@ dependencies = [ "tempfile", "thiserror 1.0.69", "tiny-keccak 2.0.2", - "unicode-xid 0.2.6", + "unicode-xid", ] [[package]] @@ -4316,17 +4035,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "evm-disassembler" version = "0.5.0" @@ -4386,7 +4094,7 @@ version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "rustix", "windows-sys 0.52.0", ] @@ -4421,12 +4129,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "figment" version = "0.10.19" @@ -4434,7 +4136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" dependencies = [ "atomic", - "parking_lot 0.12.3", + "parking_lot", "pear", "serde", "tempfile", @@ -4449,7 +4151,7 @@ version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "libredox", "windows-sys 0.59.0", @@ -4467,12 +4169,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "firestorm" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f6c2c942da57e2aaaa84b8a521489486f14e75e7fa91dab70aba913975f98" - [[package]] name = "fixed-hash" version = "0.7.0" @@ -4513,17 +4209,6 @@ dependencies = [ "miniz_oxide 0.8.0", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin", -] - [[package]] name = "fnv" version = "1.0.7" @@ -4556,16 +4241,16 @@ name = "forge" version = "0.0.2" dependencies = [ "alloy-chains", - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", "alloy-json-abi", - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types", - "alloy-serde", - "alloy-signer", - "alloy-signer-local", + "alloy-serde 0.8.0", + "alloy-signer 0.8.0", + "alloy-signer-local 0.8.0", "alloy-sol-macro-expander", "alloy-sol-macro-input", "alloy-transport", @@ -4612,7 +4297,7 @@ dependencies = [ "itertools 0.13.0", "mockall", "opener", - "parking_lot 0.12.3", + "parking_lot", "paste", "path-slash", "proptest", @@ -4639,7 +4324,7 @@ dependencies = [ "tokio", "toml 0.8.19", "toml_edit 0.22.22", - "tower-http", + "tower-http 0.5.2", "tracing", "tracing-subscriber", "vergen", @@ -4655,7 +4340,7 @@ name = "forge-doc" version = "0.0.2" dependencies = [ "alloy-primitives", - "derive_more 1.0.0", + "derive_more", "eyre", "forge-fmt", "foundry-common", @@ -4694,16 +4379,16 @@ name = "forge-script" version = "0.0.2" dependencies = [ "alloy-chains", - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 0.8.0", "alloy-json-abi", - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types", - "alloy-serde", - "alloy-signer", + "alloy-serde 0.8.0", + "alloy-signer 0.8.0", "alloy-transport", "alloy-zksync", "clap", @@ -4727,7 +4412,7 @@ dependencies = [ "futures 0.3.31", "indicatif", "itertools 0.13.0", - "parking_lot 0.12.3", + "parking_lot", "revm-inspectors", "semver 1.0.23", "serde", @@ -4742,7 +4427,7 @@ dependencies = [ name = "forge-script-sequence" version = "0.0.2" dependencies = [ - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", "alloy-rpc-types", "eyre", @@ -4767,8 +4452,8 @@ dependencies = [ "eyre", "foundry-common", "prettyplease", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "serde_json", "syn 2.0.90", ] @@ -4839,17 +4524,17 @@ dependencies = [ name = "foundry-cheatcodes" version = "0.0.2" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", "alloy-genesis", "alloy-json-abi", - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", "alloy-provider", "alloy-rlp", "alloy-rpc-types", - "alloy-signer", - "alloy-signer-local", + "alloy-signer 0.8.0", + "alloy-signer-local 0.8.0", "alloy-sol-types", "base64 0.22.1", "chrono", @@ -4872,7 +4557,7 @@ dependencies = [ "k256 0.13.4", "memchr", "p256", - "parking_lot 0.12.3", + "parking_lot", "proptest", "rand 0.8.5", "revm", @@ -4912,7 +4597,7 @@ version = "0.0.2" dependencies = [ "alloy-chains", "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 0.8.0", "alloy-json-abi", "alloy-primitives", "alloy-provider", @@ -4952,19 +4637,19 @@ dependencies = [ name = "foundry-common" version = "0.0.2" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-contract", "alloy-dyn-abi", - "alloy-eips", + "alloy-eips 0.8.0", "alloy-json-abi", - "alloy-json-rpc", - "alloy-network", + "alloy-json-rpc 0.8.0", + "alloy-network 0.8.0", "alloy-primitives", "alloy-provider", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types", - "alloy-serde", + "alloy-serde 0.8.0", "alloy-sol-types", "alloy-transport", "alloy-transport-http", @@ -5004,12 +4689,12 @@ dependencies = [ name = "foundry-common-fmt" version = "0.0.2" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", "alloy-rpc-types", - "alloy-serde", + "alloy-serde 0.8.0", "chrono", "comfy-table", "foundry-macros", @@ -5045,7 +4730,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "solar-parse", "svm-rs", "svm-rs-builds", @@ -5113,7 +4798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac5247875b96dfb99da12d0cd0f6ce98954116d1cf8a9188d613b2a35cd6937b" dependencies = [ "alloy-primitives", - "cfg-if 1.0.0", + "cfg-if", "dunce", "fs_extra", "path-slash", @@ -5191,7 +4876,7 @@ dependencies = [ "alloy-dyn-abi", "alloy-json-abi", "alloy-primitives", - "alloy-serde", + "alloy-serde 0.8.0", "alloy-sol-types", "eyre", "foundry-cheatcodes", @@ -5206,7 +4891,7 @@ dependencies = [ "foundry-zksync-core", "foundry-zksync-inspectors", "indicatif", - "parking_lot 0.12.3", + "parking_lot", "proptest", "revm", "revm-inspectors", @@ -5221,7 +4906,7 @@ version = "0.0.2" dependencies = [ "alloy-primitives", "alloy-sol-types", - "derive_more 1.0.0", + "derive_more", "foundry-common-fmt", "foundry-macros", "foundry-test-utils", @@ -5232,11 +4917,11 @@ dependencies = [ name = "foundry-evm-core" version = "0.0.2" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", "alloy-genesis", "alloy-json-abi", - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types", @@ -5253,7 +4938,7 @@ dependencies = [ "foundry-zksync-core", "futures 0.3.31", "itertools 0.13.0", - "parking_lot 0.12.3", + "parking_lot", "revm", "revm-inspectors", "serde", @@ -5283,7 +4968,7 @@ dependencies = [ name = "foundry-evm-fuzz" version = "0.0.2" dependencies = [ - "ahash 0.8.11", + "ahash", "alloy-dyn-abi", "alloy-json-abi", "alloy-primitives", @@ -5297,7 +4982,7 @@ dependencies = [ "foundry-zksync-core", "indexmap 2.7.0", "itertools 0.13.0", - "parking_lot 0.12.3", + "parking_lot", "proptest", "rand 0.8.5", "revm", @@ -5341,15 +5026,15 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "491e9f9f138086b3627a8c406730dfbb6afcdcf688e6da0eb15df52f0c8ed163" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types", - "alloy-serde", + "alloy-serde 0.8.0", "alloy-transport", "eyre", "futures 0.3.31", - "parking_lot 0.12.3", + "parking_lot", "revm", "serde", "serde_json", @@ -5374,8 +5059,8 @@ name = "foundry-macros" version = "0.0.2" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -5412,22 +5097,23 @@ version = "0.0.2" dependencies = [ "alloy-primitives", "alloy-provider", - "era_test_node", + "anvil_zksync_api_server", + "anvil_zksync_config", + "anvil_zksync_core", "eyre", "fd-lock", "foundry-block-explorers", "foundry-common", "foundry-compilers", "foundry-config", - "jsonrpc-core", - "jsonrpc-http-server", - "parking_lot 0.12.3", + "parking_lot", "rand 0.8.5", "regex", "serde_json", "snapbox", "tempfile", "tokio", + "tower-http 0.6.2", "tracing", "tracing-subscriber", "zksync_types", @@ -5437,15 +5123,15 @@ dependencies = [ name = "foundry-wallets" version = "0.0.2" dependencies = [ - "alloy-consensus", + "alloy-consensus 0.8.0", "alloy-dyn-abi", - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.8.0", "alloy-signer-aws", "alloy-signer-gcp", "alloy-signer-ledger", - "alloy-signer-local", + "alloy-signer-local 0.8.0", "alloy-signer-trezor", "alloy-sol-types", "async-trait", @@ -5495,13 +5181,15 @@ dependencies = [ name = "foundry-zksync-core" version = "0.0.2" dependencies = [ - "alloy-network", + "alloy-network 0.8.0", "alloy-primitives", "alloy-sol-types", "alloy-transport", "alloy-zksync", "ansiterm", - "era_test_node", + "anvil_zksync_config", + "anvil_zksync_core", + "anvil_zksync_types", "eyre", "foundry-cheatcodes-common", "foundry-common", @@ -5514,9 +5202,8 @@ dependencies = [ "zksync_basic_types", "zksync_contracts", "zksync_multivm", - "zksync_state", "zksync_types", - "zksync_utils", + "zksync_vm_interface", ] [[package]] @@ -5536,39 +5223,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" -[[package]] -name = "franklin-crypto" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "971289216ea5c91872e5e0bb6989214b537bbce375d09fabea5c3ccfe031b204" -dependencies = [ - "arr_macro", - "bit-vec", - "blake2 0.9.2", - "blake2-rfc_bellman_edition", - "blake2s_simd", - "boojum", - "byteorder", - "derivative", - "digest 0.9.0", - "hex", - "indexmap 1.9.3", - "itertools 0.10.5", - "lazy_static", - "num-bigint 0.4.6", - "num-derive", - "num-integer", - "num-traits", - "rand 0.4.6", - "serde", - "sha2 0.9.9", - "sha3 0.9.1", - "smallvec", - "splitmut", - "tiny-keccak 1.5.0", - "zksync_bellman", -] - [[package]] name = "fs4" version = "0.8.4" @@ -5681,17 +5335,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.12.3", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -5704,8 +5347,8 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -5790,7 +5433,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "log", "rustversion", @@ -5808,27 +5451,16 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -6031,7 +5663,7 @@ dependencies = [ "gix-fs", "libc", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "tempfile", ] @@ -6126,81 +5758,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "google-cloud-auth" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1112c453c2e155b3e683204ffff52bcc6d6495d04b68d9e90cd24161270c5058" -dependencies = [ - "async-trait", - "base64 0.21.7", - "google-cloud-metadata", - "google-cloud-token", - "home", - "jsonwebtoken", - "reqwest 0.12.9", - "serde", - "serde_json", - "thiserror 1.0.69", - "time", - "tokio", - "tracing", - "urlencoding", -] - -[[package]] -name = "google-cloud-metadata" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" -dependencies = [ - "reqwest 0.12.9", - "thiserror 1.0.69", - "tokio", -] - -[[package]] -name = "google-cloud-storage" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0c5b7469142d91bd77959e69375bede324a5def07c7f29aa0d582586cba305" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "base64 0.21.7", - "bytes", - "futures-util", - "google-cloud-auth", - "google-cloud-metadata", - "google-cloud-token", - "hex", - "once_cell", - "percent-encoding", - "pkcs8 0.10.2", - "regex", - "reqwest 0.12.9", - "reqwest-middleware", - "ring", - "serde", - "serde_json", - "sha2 0.10.8", - "thiserror 1.0.69", - "time", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "google-cloud-token" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c12ba8b21d128a2ce8585955246977fbce4415f680ebf9199b6f9d6d725f" -dependencies = [ - "async-trait", -] - [[package]] name = "group" version = "0.12.1" @@ -6238,7 +5795,7 @@ dependencies = [ "indexmap 2.7.0", "slab", "tokio", - "tokio-util 0.7.13", + "tokio-util", "tracing", ] @@ -6257,7 +5814,7 @@ dependencies = [ "indexmap 2.7.0", "slab", "tokio", - "tokio-util 0.7.13", + "tokio-util", "tracing", ] @@ -6267,24 +5824,10 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crunchy", ] -[[package]] -name = "handlebars" -version = "3.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" -dependencies = [ - "log", - "pest", - "pest_derive", - "quick-error 2.0.1", - "serde", - "serde_json", -] - [[package]] name = "handlebars" version = "6.2.0" @@ -6305,9 +5848,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -6321,7 +5861,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", ] @@ -6337,15 +5877,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" -dependencies = [ - "hashbrown 0.14.5", -] - [[package]] name = "heck" version = "0.5.0" @@ -6391,15 +5922,6 @@ dependencies = [ "rusb", ] -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" version = "0.12.1" @@ -6438,8 +5960,8 @@ dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -6811,8 +6333,8 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -6929,8 +6451,8 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -6993,7 +6515,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75a5d75fee4d36809e6b021e4b96b686e763d365ffdb03af2bd00786353f84fe" dependencies = [ - "ahash 0.8.11", + "ahash", "itoa", "log", "num-format", @@ -7047,20 +6569,11 @@ dependencies = [ "darling 0.20.10", "indoc", "pretty_assertions", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "interprocess" version = "2.2.2" @@ -7082,15 +6595,6 @@ version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" -[[package]] -name = "ipnetwork" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" -dependencies = [ - "serde", -] - [[package]] name = "is-terminal" version = "0.4.13" @@ -7217,125 +6721,31 @@ dependencies = [ ] [[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540" +name = "jsonrpsee" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" dependencies = [ - "derive_more 0.99.18", - "futures 0.3.31", - "jsonrpc-core", - "jsonrpc-pubsub", - "log", - "serde", - "serde_json", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-http-client", + "jsonrpsee-proc-macros", + "jsonrpsee-server", + "jsonrpsee-types", + "jsonrpsee-wasm-client", + "jsonrpsee-ws-client", + "tokio", + "tracing", ] [[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540" +name = "jsonrpsee-client-transport" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" dependencies = [ - "futures 0.3.31", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540" -dependencies = [ - "futures 0.3.31", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540" -dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 1.0.109", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540" -dependencies = [ - "futures 0.3.31", - "hyper 0.14.31", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.11.2", - "unicase", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540" -dependencies = [ - "futures 0.3.31", - "jsonrpc-core", - "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "git+https://github.com/matter-labs/jsonrpc.git?branch=master#12c53e3e20c09c2fb9966a4ef1b0ea63de172540" -dependencies = [ - "bytes", - "futures 0.3.31", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-stream", - "tokio-util 0.6.10", - "unicase", -] - -[[package]] -name = "jsonrpsee" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" -dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-http-client", - "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types", - "jsonrpsee-wasm-client", - "jsonrpsee-ws-client", - "tokio", - "tracing", -] - -[[package]] -name = "jsonrpsee-client-transport" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" -dependencies = [ - "base64 0.22.1", - "futures-channel", + "base64 0.22.1", + "futures-channel", "futures-util", "gloo-net", "http 1.2.0", @@ -7348,7 +6758,7 @@ dependencies = [ "thiserror 1.0.69", "tokio", "tokio-rustls 0.26.1", - "tokio-util 0.7.13", + "tokio-util", "tracing", "url", ] @@ -7369,7 +6779,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "jsonrpsee-types", - "parking_lot 0.12.3", + "parking_lot", "pin-project 1.1.7", "rand 0.8.5", "rustc-hash 1.1.0", @@ -7415,8 +6825,8 @@ checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4" dependencies = [ "heck", "proc-macro-crate 3.2.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -7443,7 +6853,7 @@ dependencies = [ "thiserror 1.0.69", "tokio", "tokio-stream", - "tokio-util 0.7.13", + "tokio-util", "tower 0.4.13", "tracing", ] @@ -7506,10 +6916,10 @@ version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -7518,11 +6928,11 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa 0.16.9", "elliptic-curve 0.13.8", "once_cell", - "sha2 0.10.8", + "sha2", "signature 2.2.0", ] @@ -7582,7 +6992,7 @@ dependencies = [ "string_cache", "term", "tiny-keccak 2.0.2", - "unicode-xid 0.2.6", + "unicode-xid", "walkdir", ] @@ -7601,7 +7011,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e14eda50a3494b3bf7b9ce51c52434a761e383d7238ce1dd5dcec2fbc13e9fb" dependencies = [ - "dashmap 6.1.0", + "dashmap", "hashbrown 0.14.5", ] @@ -7642,7 +7052,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-targets 0.52.6", ] @@ -7660,34 +7070,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.7", -] - -[[package]] -name = "librocksdb-sys" -version = "0.11.0+8.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" -dependencies = [ - "bindgen 0.65.1", - "bzip2-sys", - "cc", - "glob", - "libc", - "libz-sys", - "lz4-sys", - "zstd-sys", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", + "redox_syscall", ] [[package]] @@ -7702,17 +7085,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "libz-sys" -version = "1.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -7764,8 +7136,8 @@ checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68" dependencies = [ "beef", "fnv", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "regex-syntax 0.6.29", "syn 2.0.90", ] @@ -7785,7 +7157,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "generator", "scoped-tls", "tracing", @@ -7801,16 +7173,6 @@ dependencies = [ "hashbrown 0.15.2", ] -[[package]] -name = "lz4-sys" -version = "1.11.1+lz4-1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "mac" version = "0.1.1" @@ -7864,7 +7226,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "digest 0.10.7", ] @@ -7881,12 +7243,12 @@ dependencies = [ "clap_complete", "elasticlunr-rs", "env_logger", - "handlebars 6.2.0", + "handlebars", "log", "memchr", "once_cell", "opener", - "pulldown-cmark 0.10.3", + "pulldown-cmark", "regex", "serde", "serde_json", @@ -7949,7 +7311,7 @@ version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "miette-derive 7.4.0", "thiserror 1.0.69", "unicode-width 0.1.14", @@ -7961,8 +7323,8 @@ version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -7972,8 +7334,8 @@ version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -7993,21 +7355,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "mini-moka" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803" -dependencies = [ - "crossbeam-channel", - "crossbeam-utils", - "dashmap 5.5.3", - "skeptic", - "smallvec", - "tagptr", - "triomphe", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -8040,7 +7387,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -8052,7 +7399,7 @@ checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.52.0", ] @@ -8068,7 +7415,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "downcast", "fragile", "mockall_derive", @@ -8082,9 +7429,9 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" dependencies = [ - "cfg-if 1.0.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "cfg-if", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -8111,17 +7458,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "net2" -version = "0.2.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi", -] - [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -8153,7 +7489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", "pin-utils", @@ -8166,7 +7502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", - "cfg-if 1.0.0", + "cfg-if", "cfg_aliases 0.1.1", "libc", ] @@ -8178,17 +7514,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", - "cfg-if 1.0.0", + "cfg-if", "cfg_aliases 0.2.1", "libc", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nom" version = "7.1.3" @@ -8255,7 +7585,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ - "num-bigint 0.4.6", + "num-bigint", "num-complex", "num-integer", "num-iter", @@ -8263,17 +7593,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -8285,23 +7604,6 @@ dependencies = [ "serde", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - [[package]] name = "num-complex" version = "0.4.6" @@ -8318,17 +7620,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - [[package]] name = "num-format" version = "0.4.4" @@ -8359,16 +7650,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-modular" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" -dependencies = [ - "num-integer", - "num-traits", -] - [[package]] name = "num-modular" version = "0.6.1" @@ -8381,7 +7662,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6" dependencies = [ - "num-modular 0.6.1", + "num-modular", ] [[package]] @@ -8390,7 +7671,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "num-bigint 0.4.6", + "num-bigint", "num-integer", "num-traits", "serde", @@ -8441,8 +7722,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -8453,8 +7734,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate 3.2.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -8507,12 +7788,12 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d95d0ec6457ad4d3d7fc0ad41db490b219587ed837ada87a26b28e535db15f" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.8.0", + "alloy-eips 0.8.0", "alloy-primitives", "alloy-rlp", - "alloy-serde", - "derive_more 1.0.0", + "alloy-serde 0.8.0", + "derive_more", "serde", "thiserror 2.0.6", ] @@ -8523,13 +7804,13 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eba1b44e2035ec04cc61762cb9b5457d0ecd29d9af631e1a1c107ef571ce2318" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", + "alloy-consensus 0.8.0", + "alloy-eips 0.8.0", + "alloy-network-primitives 0.8.0", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "derive_more 1.0.0", + "alloy-rpc-types-eth 0.8.0", + "alloy-serde 0.8.0", + "derive_more", "op-alloy-consensus", "serde", "serde_json", @@ -8561,8 +7842,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c" dependencies = [ "bytes", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -8585,7 +7866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -8599,8 +7880,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -8610,15 +7891,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.4.0+3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.104" @@ -8627,7 +7899,6 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -8783,7 +8054,7 @@ dependencies = [ "ecdsa 0.16.9", "elliptic-curve 0.13.8", "primeorder", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -8822,8 +8093,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -8834,8 +8105,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate 3.2.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -8845,17 +8116,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -8863,21 +8123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -8886,9 +8132,9 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.5.7", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -8941,18 +8187,12 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" dependencies = [ - "proc-macro2 1.0.92", + "proc-macro2", "proc-macro2-diagnostics", - "quote 1.0.37", + "quote", "syn 2.0.90", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.4" @@ -9007,8 +8247,8 @@ checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -9020,7 +8260,7 @@ checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -9091,8 +8331,8 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator 0.11.2", "phf_shared 0.11.2", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -9138,8 +8378,8 @@ version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -9149,8 +8389,8 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -9166,17 +8406,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der 0.7.9", - "pkcs8 0.10.2", - "spki 0.7.3", -] - [[package]] name = "pkcs8" version = "0.9.0" @@ -9272,7 +8501,7 @@ version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ - "proc-macro2 1.0.92", + "proc-macro2", "syn 2.0.90", ] @@ -9312,15 +8541,6 @@ dependencies = [ "uint", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -9347,8 +8567,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -9359,8 +8579,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "version_check", ] @@ -9370,8 +8590,8 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", ] [[package]] @@ -9381,26 +8601,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ "proc-macro-error-attr2", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - [[package]] name = "proc-macro2" version = "1.0.92" @@ -9416,8 +8621,8 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", "version_check", "yansi", @@ -9462,7 +8667,7 @@ checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.3", + "parking_lot", "prometheus-client-derive-encode", ] @@ -9472,8 +8677,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -9489,7 +8694,7 @@ dependencies = [ "lazy_static", "num-traits", "rand 0.8.5", - "rand_chacha 0.3.1", + "rand_chacha", "rand_xorshift", "regex-syntax 0.8.5", "rusty-fork", @@ -9503,8 +8708,8 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -9557,8 +8762,8 @@ checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.11.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -9570,8 +8775,8 @@ checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", "itertools 0.13.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -9656,37 +8861,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 1.0.109", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.6.0", - "memchr", - "unicase", -] - [[package]] name = "pulldown-cmark" version = "0.10.3" @@ -9711,12 +8885,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quick-junit" version = "0.5.1" @@ -9784,7 +8952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", - "getrandom 0.2.15", + "getrandom", "rand 0.8.5", "ring", "rustc-hash 2.1.0", @@ -9811,22 +8979,13 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - [[package]] name = "quote" version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.92", + "proc-macro2", ] [[package]] @@ -9864,19 +9023,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -9884,21 +9030,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", "serde", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -9924,31 +9060,13 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - [[package]] name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -10016,15 +9134,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.7" @@ -10040,7 +9149,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.15", + "getrandom", "libredox", "thiserror 1.0.69", ] @@ -10095,15 +9204,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - [[package]] name = "reqwest" version = "0.11.27" @@ -10188,7 +9288,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls 0.26.1", "tokio-socks", - "tokio-util 0.7.13", + "tokio-util", "tower-service", "url", "wasm-bindgen", @@ -10199,46 +9299,6 @@ dependencies = [ "windows-registry", ] -[[package]] -name = "reqwest-middleware" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" -dependencies = [ - "anyhow", - "async-trait", - "http 1.2.0", - "reqwest 0.12.9", - "serde", - "thiserror 1.0.69", - "tower-service", -] - -[[package]] -name = "rescue_poseidon" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82900c877a0ba5362ac5756efbd82c5b795dc509011c1253e2389d8708f1389d" -dependencies = [ - "addchain", - "arrayvec 0.7.6", - "blake2 0.10.6", - "byteorder", - "derivative", - "franklin-crypto", - "lazy_static", - "log", - "num-bigint 0.3.3", - "num-integer", - "num-iter", - "num-traits", - "rand 0.4.6", - "serde", - "sha3 0.9.1", - "smallvec", - "typemap_rev", -] - [[package]] name = "revm" version = "18.0.0" @@ -10246,7 +9306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15689a3c6a8d14b647b4666f2e236ef47b5a5133cdfd423f545947986fff7013" dependencies = [ "auto_impl", - "cfg-if 1.0.0", + "cfg-if", "dyn-clone", "revm-interpreter", "revm-precompile", @@ -10261,7 +9321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d056aaa21f36038ab35fe8ce940ee332903a0b4b992b8ca805fb60c85eb2086" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth", + "alloy-rpc-types-eth 0.8.0", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", @@ -10291,14 +9351,14 @@ dependencies = [ "aurora-engine-modexp", "blst", "c-kzg", - "cfg-if 1.0.0", + "cfg-if", "k256 0.13.4", "once_cell", "p256", "revm-primitives", "ripemd", "secp256k1 0.29.1", - "sha2 0.10.8", + "sha2", "substrate-bn", ] @@ -10309,13 +9369,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3702f132bb484f4f0d0ca4f6fbde3c82cfd745041abbedd6eda67730e1868ef0" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.4.2", "alloy-primitives", "auto_impl", "bitflags 2.6.0", "bitvec 1.0.1", "c-kzg", - "cfg-if 1.0.0", + "cfg-if", "dyn-clone", "enumn", "hex", @@ -10359,8 +9419,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if 1.0.0", - "getrandom 0.2.15", + "cfg-if", + "getrandom", "libc", "spin", "untrusted", @@ -10376,35 +9436,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "rkyv" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" -dependencies = [ - "bitvec 1.0.1", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid 1.11.0", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 1.0.109", -] - [[package]] name = "rlp" version = "0.5.2" @@ -10422,21 +9453,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", ] -[[package]] -name = "rocksdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" -dependencies = [ - "libc", - "librocksdb-sys", -] - [[package]] name = "route-recognizer" version = "0.3.1" @@ -10454,26 +9475,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest 0.10.7", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8 0.10.2", - "rand_core 0.6.4", - "signature 2.2.0", - "spki 0.7.3", - "subtle", - "zeroize", -] - [[package]] name = "rtoolbox" version = "0.0.2" @@ -10496,7 +9497,7 @@ dependencies = [ "ark-ff 0.4.2", "bytes", "fastrlp", - "num-bigint 0.4.6", + "num-bigint", "num-traits", "parity-scale-codec 3.7.0", "primitive-types 0.12.2", @@ -10525,22 +9526,6 @@ dependencies = [ "libusb1-sys", ] -[[package]] -name = "rust_decimal" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" -dependencies = [ - "arrayvec 0.7.6", - "borsh", - "bytes", - "num-traits", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -10753,7 +9738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" dependencies = [ "fnv", - "quick-error 1.2.3", + "quick-error", "tempfile", "wait-timeout", ] @@ -10765,7 +9750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ee1e066dc922e513bda599c6ccb5f3bb2b0ea5870a579448f2622993f0a9a2f" dependencies = [ "bitflags 2.6.0", - "cfg-if 1.0.0", + "cfg-if", "clipboard-win", "fd-lock", "home", @@ -10820,8 +9805,8 @@ version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ - "cfg-if 1.0.0", - "derive_more 1.0.0", + "cfg-if", + "derive_more", "parity-scale-codec 3.7.0", "scale-info-derive", ] @@ -10833,8 +9818,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" dependencies = [ "proc-macro-crate 3.2.0", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -10874,8 +9859,8 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "serde_derive_internals", "syn 2.0.90", ] @@ -10886,8 +9871,8 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" dependencies = [ - "ahash 0.8.11", - "cfg-if 1.0.0", + "ahash", + "cfg-if", "hashbrown 0.13.2", ] @@ -10912,7 +9897,7 @@ dependencies = [ "hmac", "pbkdf2 0.11.0", "salsa20", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -10931,12 +9916,6 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49c1eeaf4b6a87c7479688c6d52b9f1153cedd3c489300564f932b065c6eab95" -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "sec1" version = "0.3.0" @@ -11034,7 +10013,7 @@ dependencies = [ "core-foundation 0.9.4", "core-foundation-sys", "libc", - "num-bigint 0.4.6", + "num-bigint", "security-framework-sys", ] @@ -11208,12 +10187,6 @@ dependencies = [ "uuid 1.11.0", ] -[[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" - [[package]] name = "serde" version = "1.0.215" @@ -11239,8 +10212,8 @@ version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -11250,8 +10223,8 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -11294,8 +10267,8 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -11326,7 +10299,6 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ - "base64 0.13.1", "hex", "serde", "serde_with_macros", @@ -11339,8 +10311,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -11366,7 +10338,7 @@ dependencies = [ "futures 0.3.31", "log", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "scc", "serial_test_derive", ] @@ -11377,8 +10349,8 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -11388,7 +10360,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -11399,26 +10371,13 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -11429,7 +10388,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca2daa77078f4ddff27e75c4bf59e4c2697525f56dbb3c842d34a5d1f2b04a2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -11463,7 +10422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" dependencies = [ "cc", - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -11553,12 +10512,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simdutf8" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" - [[package]] name = "similar" version = "2.6.0" @@ -11585,7 +10538,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ - "num-bigint 0.4.6", + "num-bigint", "num-traits", "thiserror 1.0.69", "time", @@ -11597,21 +10550,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "skeptic" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" -dependencies = [ - "bytecount", - "cargo_metadata 0.14.2", - "error-chain", - "glob", - "pulldown-cmark 0.9.6", - "tempfile", - "walkdir", -] - [[package]] name = "slab" version = "0.4.9" @@ -11698,7 +10636,7 @@ dependencies = [ "lalrpop-util", "phf", "thiserror 1.0.69", - "unicode-xid 0.2.6", + "unicode-xid", ] [[package]] @@ -11710,7 +10648,7 @@ dependencies = [ "alloy-primitives", "bumpalo", "either", - "num-bigint 0.4.6", + "num-bigint", "num-rational", "semver 1.0.23", "solar-data-structures", @@ -11738,7 +10676,7 @@ dependencies = [ "bumpalo", "index_vec", "indexmap 2.7.0", - "parking_lot 0.12.3", + "parking_lot", "rayon", "rustc-hash 2.1.0", "smallvec", @@ -11778,8 +10716,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0cc54b74e214647c1bbfc098d080cc5deac77f8dcb99aca91747276b01a15ad" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -11794,7 +10732,7 @@ dependencies = [ "bumpalo", "itertools 0.13.0", "memchr", - "num-bigint 0.4.6", + "num-bigint", "num-rational", "num-traits", "smallvec", @@ -11813,7 +10751,7 @@ dependencies = [ "bon", "clap", "cliclack", - "derive_more 1.0.0", + "derive_more", "email-address-parser", "rayon", "soldeer-core", @@ -11829,7 +10767,7 @@ dependencies = [ "chrono", "cliclack", "const-hex", - "derive_more 1.0.0", + "derive_more", "dunce", "home", "ignore", @@ -11841,7 +10779,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "thiserror 2.0.6", "tokio", "toml_edit 0.22.22", @@ -11855,9 +10793,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spki" @@ -11880,332 +10815,97 @@ dependencies = [ ] [[package]] -name = "splitmut" -version = "0.2.1" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85070f382340e8b23a75808e83573ddf65f9ad9143df9573ca37c1ed2ee956a" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "sqlformat" -version = "0.2.6" +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str_stack" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" +checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ - "nom", - "unicode_categories", + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", ] [[package]] -name = "sqlx" -version = "0.8.2" +name = "string_cache_codegen" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", ] [[package]] -name = "sqlx-core" -version = "0.8.2" +name = "strip-ansi-escapes" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" dependencies = [ - "atoi", - "bigdecimal 0.4.5", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "either", - "event-listener 5.3.1", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.14.5", - "hashlink", - "hex", - "indexmap 2.7.0", - "ipnetwork", - "log", - "memchr", - "native-tls", - "once_cell", - "paste", - "percent-encoding", - "rust_decimal", - "serde", - "serde_json", - "sha2 0.10.8", - "smallvec", - "sqlformat", - "thiserror 1.0.69", - "tokio", - "tokio-stream", - "tracing", - "url", + "vte", ] [[package]] -name = "sqlx-macros" -version = "0.8.2" +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "sqlx-core", - "sqlx-macros-core", - "syn 2.0.90", + "strum_macros", ] [[package]] -name = "sqlx-macros-core" -version = "0.8.2" +name = "strum_macros" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "dotenvy", - "either", "heck", - "hex", - "once_cell", - "proc-macro2 1.0.92", - "quote 1.0.37", - "serde", - "serde_json", - "sha2 0.10.8", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", + "proc-macro2", + "quote", + "rustversion", "syn 2.0.90", - "tempfile", - "tokio", - "url", ] [[package]] -name = "sqlx-mysql" -version = "0.8.2" +name = "substrate-bn" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" -dependencies = [ - "atoi", - "base64 0.22.1", - "bigdecimal 0.4.5", - "bitflags 2.6.0", - "byteorder", - "bytes", - "chrono", - "crc", - "digest 0.10.7", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "rust_decimal", - "serde", - "sha1", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 1.0.69", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" -dependencies = [ - "atoi", - "base64 0.22.1", - "bigdecimal 0.4.5", - "bitflags 2.6.0", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "ipnetwork", - "itoa", - "log", - "md-5", - "memchr", - "num-bigint 0.4.6", - "once_cell", - "rand 0.8.5", - "rust_decimal", - "serde", - "serde_json", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror 1.0.69", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "serde_urlencoded", - "sqlx-core", - "tracing", - "url", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str_stack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.3", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2 1.0.92", - "quote 1.0.37", -] - -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - -[[package]] -name = "strip-ansi-escapes" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" -dependencies = [ - "vte", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2 1.0.92", - "quote 1.0.37", - "rustversion", - "syn 2.0.90", -] - -[[package]] -name = "substrate-bn" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b5bbfa79abbae15dd642ea8176a21a635ff3c00059961d1ea27ad04e5b441c" +checksum = "72b5bbfa79abbae15dd642ea8176a21a635ff3c00059961d1ea27ad04e5b441c" dependencies = [ "byteorder", "crunchy", @@ -12233,7 +10933,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "tempfile", "thiserror 1.0.69", "url", @@ -12253,25 +10953,14 @@ dependencies = [ "svm-rs", ] -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "unicode-ident", ] @@ -12281,8 +10970,8 @@ version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "unicode-ident", ] @@ -12293,20 +10982,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219389c1ebe89f8333df8bdfb871f6631c552ff399c23cac02480b6088aad8f0" dependencies = [ "paste", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.90", -] - -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -12331,8 +11008,8 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -12378,12 +11055,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tagptr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" - [[package]] name = "tap" version = "1.0.1" @@ -12396,7 +11067,7 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "once_cell", "rustix", @@ -12489,8 +11160,8 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -12500,8 +11171,8 @@ version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -12511,7 +11182,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -12630,11 +11301,12 @@ dependencies = [ "bytes", "libc", "mio 1.0.3", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", + "tracing", "windows-sys 0.52.0", ] @@ -12644,8 +11316,8 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -12700,7 +11372,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.13", + "tokio-util", ] [[package]] @@ -12719,20 +11391,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.13" @@ -12855,7 +11513,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.13", + "tokio-util", "tower-layer", "tower-service", "tracing", @@ -12896,12 +11554,26 @@ dependencies = [ "percent-encoding", "pin-project-lite", "tokio", - "tokio-util 0.7.13", + "tokio-util", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "tower-http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "http 1.2.0", + "pin-project-lite", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -12944,8 +11616,8 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -13076,12 +11748,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "triomphe" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" - [[package]] name = "try-lock" version = "0.2.5" @@ -13114,12 +11780,6 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" -[[package]] -name = "typemap_rev" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b08b0c1257381af16a5c3605254d529d3e7e109f3c62befc5d168968192998" - [[package]] name = "typenum" version = "1.17.0" @@ -13174,12 +11834,6 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-bom" version = "2.0.3" @@ -13207,12 +11861,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-properties" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" - [[package]] name = "unicode-segmentation" version = "1.12.0" @@ -13242,34 +11890,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unroll" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad948c1cb799b1a70f836077721a92a35ac177d4daddf4c20a633786d4cf618" -dependencies = [ - "quote 1.0.37", - "syn 1.0.109", -] - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -13343,7 +11969,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.15", + "getrandom", "serde", ] @@ -13353,7 +11979,7 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ - "getrandom 0.2.15", + "getrandom", "serde", ] @@ -13376,7 +12002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", - "cfg-if 1.0.0", + "cfg-if", "rustversion", "time", ] @@ -13420,8 +12046,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a511871dc5de990a3b2a0e715facfbc5da848c0c0395597a1415029fb7c250a" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -13447,8 +12073,8 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", ] [[package]] @@ -13479,31 +12105,19 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "wasm-bindgen-macro", ] @@ -13516,8 +12130,8 @@ checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", "wasm-bindgen-shared", ] @@ -13528,7 +12142,7 @@ version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "once_cell", "wasm-bindgen", @@ -13541,7 +12155,7 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ - "quote 1.0.37", + "quote", "wasm-bindgen-macro-support", ] @@ -13551,8 +12165,8 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -13585,7 +12199,7 @@ checksum = "0048ad49a55b9deb3953841fa1fc5858f0efbcb7a18868c899a360269fac1b23" dependencies = [ "futures 0.3.31", "js-sys", - "parking_lot 0.12.3", + "parking_lot", "pin-utils", "slab", "wasm-bindgen", @@ -13708,18 +12322,8 @@ dependencies = [ ] [[package]] -name = "whoami" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" -dependencies = [ - "redox_syscall 0.5.7", - "wasite", -] - -[[package]] -name = "widestring" -version = "1.1.0" +name = "widestring" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" @@ -13814,8 +12418,8 @@ version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -13825,8 +12429,8 @@ version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -13836,8 +12440,8 @@ version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -13847,8 +12451,8 @@ version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -14063,7 +12667,7 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-sys 0.48.0", ] @@ -14152,8 +12756,8 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", "synstructure", ] @@ -14174,8 +12778,8 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -14194,8 +12798,8 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", "synstructure", ] @@ -14215,8 +12819,8 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -14237,8 +12841,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "syn 2.0.90", ] @@ -14339,9 +12943,9 @@ dependencies = [ [[package]] name = "zk_evm" -version = "0.150.7" +version = "0.150.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc74fbe2b45fd19e95c59ea792c795feebdb616ebaa463f0ac567f495f47387" +checksum = "3278d0f75408ab35d25998e1124124cd108b48b2a81ed8e71e892ddc5a6be0aa" dependencies = [ "anyhow", "lazy_static", @@ -14349,7 +12953,7 @@ dependencies = [ "serde", "serde_json", "static_assertions", - "zk_evm_abstractions 0.150.7", + "zk_evm_abstractions 0.150.18", ] [[package]] @@ -14380,79 +12984,15 @@ dependencies = [ [[package]] name = "zk_evm_abstractions" -version = "0.150.7" +version = "0.150.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f333a3b059899df09e40deb041af881bc03e496fda5eec618ffb5e854ee7df" +checksum = "88b4e5a89cfe1594b6476be16c8c1d45f22ce12bff31c49e077b381a398edd8a" dependencies = [ "anyhow", "num_enum 0.6.1", "serde", "static_assertions", - "zkevm_opcode_defs 0.150.7", -] - -[[package]] -name = "zkevm_circuits" -version = "0.140.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c365c801e0c6eda83fbd153df45575172beb406bfb663d386f9154b4325eda" -dependencies = [ - "arrayvec 0.7.6", - "bincode", - "boojum", - "derivative", - "hex", - "itertools 0.10.5", - "rand 0.4.6", - "rand 0.8.5", - "seq-macro", - "serde", - "serde_json", - "smallvec", - "zkevm_opcode_defs 0.132.0", - "zksync_cs_derive", -] - -[[package]] -name = "zkevm_circuits" -version = "0.141.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccd0352e122a4e6f0046d2163b7e692e627b23fc3264faa77331a21b65833fd" -dependencies = [ - "arrayvec 0.7.6", - "bincode", - "boojum", - "derivative", - "hex", - "itertools 0.10.5", - "rand 0.4.6", - "rand 0.8.5", - "seq-macro", - "serde", - "serde_json", - "smallvec", - "zkevm_opcode_defs 0.141.0", - "zksync_cs_derive", -] - -[[package]] -name = "zkevm_circuits" -version = "0.150.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06fb35b00699d25175a2ad447f86a9088af8b0bc698bb57086fb04c13e52eab" -dependencies = [ - "arrayvec 0.7.6", - "boojum", - "derivative", - "hex", - "itertools 0.10.5", - "rand 0.4.6", - "rand 0.8.5", - "seq-macro", - "serde", - "smallvec", - "zkevm_opcode_defs 0.150.7", - "zksync_cs_derive", + "zkevm_opcode_defs 0.150.18", ] [[package]] @@ -14464,7 +13004,7 @@ dependencies = [ "bitflags 1.3.2", "ethereum-types 0.14.1", "lazy_static", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -14474,7 +13014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0769f7b27d8fb06e715da3290c575cac5d04d10a557faef180e847afce50ac4" dependencies = [ "bitflags 2.6.0", - "blake2 0.10.6", + "blake2", "ethereum-types 0.14.1", "k256 0.11.6", "lazy_static", @@ -14489,38 +13029,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6be7bd5f0e0b61211f544147289640b4712715589d7f2fe5229d92a7a3ac64c0" dependencies = [ "bitflags 2.6.0", - "blake2 0.10.6", + "blake2", "ethereum-types 0.14.1", "k256 0.13.4", "lazy_static", - "sha2 0.10.8", + "sha2", "sha3 0.10.8", ] [[package]] name = "zkevm_opcode_defs" -version = "0.150.7" +version = "0.150.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b83f3b279248af4ca86dec20a54127f02110b45570f3f6c1d13df49ba75c28a5" +checksum = "5bad437d4891536fdcc0054a3f04562c408817ff19d83b6c27569217692e6e74" dependencies = [ "bitflags 2.6.0", - "blake2 0.10.6", + "blake2", "ethereum-types 0.14.1", "k256 0.13.4", "lazy_static", "p256", "serde", - "sha2 0.10.8", + "sha2", "sha3 0.10.8", ] [[package]] name = "zksync_basic_types" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", "chrono", + "const-decoder", "ethabi 18.0.0", "hex", "num_enum 0.7.3", @@ -14528,6 +13069,7 @@ dependencies = [ "serde", "serde_json", "serde_with", + "sha2", "strum", "thiserror 1.0.69", "tiny-keccak 2.0.2", @@ -14536,15 +13078,15 @@ dependencies = [ [[package]] name = "zksync_bellman" -version = "0.30.1" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffa03efe9bdb137a4b36b97d1a74237e18c9ae42b755163d903a9d48c1a5d80" +checksum = "6b7c0061db44757522f2d82cad02f45dc98267210ac362071234ed08e30fd4d6" dependencies = [ "arrayvec 0.7.6", "bit-vec", "blake2s_simd", "byteorder", - "cfg-if 1.0.0", + "cfg-if", "crossbeam", "futures 0.3.31", "hex", @@ -14559,9 +13101,9 @@ dependencies = [ [[package]] name = "zksync_concurrency" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035269d811b3770debca372141ab64cad067dce8e58cb39a48cb7617d30c626b" +checksum = "e8312ab73d3caa55775bd531795b507fa8f76bd9dabfaeb0954fe43e8fc1323b" dependencies = [ "anyhow", "once_cell", @@ -14579,91 +13121,23 @@ dependencies = [ [[package]] name = "zksync_config" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", "rand 0.8.5", "secrecy", "serde", - "strum", - "strum_macros", - "time", - "url", - "vise", "zksync_basic_types", "zksync_concurrency", "zksync_consensus_utils", "zksync_crypto_primitives", ] -[[package]] -name = "zksync_consensus_crypto" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e38d1b5ed28c66e785caff53ea4863375555d818aafa03290397192dd3e665" -dependencies = [ - "anyhow", - "blst", - "ed25519-dalek", - "elliptic-curve 0.13.8", - "hex", - "k256 0.13.4", - "num-bigint 0.4.6", - "num-traits", - "rand 0.8.5", - "sha3 0.10.8", - "thiserror 1.0.69", - "tracing", - "zeroize", -] - -[[package]] -name = "zksync_consensus_roles" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49fbd4e69b276058f3dfc06cf6ada0e8caa6ed826e81289e4d596da95a0f17a" -dependencies = [ - "anyhow", - "bit-vec", - "hex", - "num-bigint 0.4.6", - "prost 0.12.6", - "rand 0.8.5", - "serde", - "thiserror 1.0.69", - "tracing", - "zksync_concurrency", - "zksync_consensus_crypto", - "zksync_consensus_utils", - "zksync_protobuf", - "zksync_protobuf_build", -] - -[[package]] -name = "zksync_consensus_storage" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b2aab4ed18b13cd584f4edcc2546c8da82f89ac62e525063e12935ff28c9be" -dependencies = [ - "anyhow", - "async-trait", - "prost 0.12.6", - "rand 0.8.5", - "thiserror 1.0.69", - "tracing", - "vise", - "zksync_concurrency", - "zksync_consensus_crypto", - "zksync_consensus_roles", - "zksync_protobuf", - "zksync_protobuf_build", -] - [[package]] name = "zksync_consensus_utils" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bac8f471b182d4fa3d40cf158aac3624fe636a1ff0b4cf3fe26a0e20c68a42" +checksum = "723e2a4b056cc5af192a83163c89a6951ee75c098cc5c4a4cdc435f4232d88bd" dependencies = [ "anyhow", "rand 0.8.5", @@ -14674,106 +13148,39 @@ dependencies = [ [[package]] name = "zksync_contracts" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "envy", - "ethabi 18.0.0", "hex", "once_cell", "serde", "serde_json", + "zksync_basic_types", "zksync_utils", ] [[package]] name = "zksync_crypto_primitives" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", - "blake2 0.10.6", + "blake2", "hex", "rand 0.8.5", "secp256k1 0.27.0", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "thiserror 1.0.69", "zksync_basic_types", - "zksync_utils", -] - -[[package]] -name = "zksync_cs_derive" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5939e2df4288c263c706ff18ac718e984149223ad4289d6d957d767dcfc04c81" -dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 1.0.109", -] - -[[package]] -name = "zksync_dal" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "anyhow", - "bigdecimal 0.4.5", - "bincode", - "chrono", - "hex", - "itertools 0.10.5", - "prost 0.12.6", - "rand 0.8.5", - "serde", - "serde_json", - "sqlx", - "strum", - "thiserror 1.0.69", - "tokio", - "tracing", - "vise", - "zksync_concurrency", - "zksync_consensus_crypto", - "zksync_consensus_roles", - "zksync_consensus_storage", - "zksync_consensus_utils", - "zksync_contracts", - "zksync_db_connection", - "zksync_l1_contract_interface", - "zksync_protobuf", - "zksync_protobuf_build", - "zksync_system_constants", - "zksync_types", - "zksync_utils", - "zksync_vm_interface", -] - -[[package]] -name = "zksync_db_connection" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "anyhow", - "rand 0.8.5", - "serde", - "serde_json", - "sqlx", - "thiserror 1.0.69", - "tokio", - "tracing", - "vise", - "zksync_basic_types", ] [[package]] name = "zksync_ff" -version = "0.30.1" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9524b06780b5e164e84b38840c7c428c739f051f35af6efc4d1285f629ceb88e" +checksum = "e6a500c97d9286f73540c26b63ae33b159bd48fec0c8bd206b4a9b4fe1217b8a" dependencies = [ "byteorder", "hex", @@ -14784,56 +13191,23 @@ dependencies = [ [[package]] name = "zksync_ff_derive" -version = "0.30.1" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f91e58e75d65877f09f83bc3dca8f054847ae7ec4f3e64bfa610a557edd8e8e" +checksum = "97bd48f18ebf350623093022d86be2f1ce23af332efa91890b751209aec8617a" dependencies = [ - "num-bigint 0.4.6", + "num-bigint", "num-integer", "num-traits", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2", + "quote", "serde", "syn 1.0.109", ] -[[package]] -name = "zksync_kzg" -version = "0.150.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc58af8e4e4ad1a851ffd2275e6a44ead0f15a7eaac9dc9d60a56b3b9c9b08e8" -dependencies = [ - "boojum", - "derivative", - "hex", - "once_cell", - "rayon", - "serde", - "serde_json", - "serde_with", - "zkevm_circuits 0.150.7", -] - -[[package]] -name = "zksync_l1_contract_interface" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "anyhow", - "hex", - "once_cell", - "sha2 0.10.8", - "sha3 0.10.8", - "zksync_kzg", - "zksync_prover_interface", - "zksync_solidity_vk_codegen", - "zksync_types", -] - [[package]] name = "zksync_mini_merkle_tree" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "once_cell", "zksync_basic_types", @@ -14843,14 +13217,10 @@ dependencies = [ [[package]] name = "zksync_multivm" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", - "circuit_sequencer_api 0.133.1", - "circuit_sequencer_api 0.140.3", - "circuit_sequencer_api 0.141.2", - "circuit_sequencer_api 0.142.2", - "circuit_sequencer_api 0.150.7", + "circuit_sequencer_api", "ethabi 18.0.0", "hex", "itertools 0.10.5", @@ -14862,48 +13232,23 @@ dependencies = [ "zk_evm 0.133.0", "zk_evm 0.140.0", "zk_evm 0.141.0", - "zk_evm 0.150.7", + "zk_evm 0.150.18", "zksync_contracts", "zksync_mini_merkle_tree", "zksync_system_constants", "zksync_types", - "zksync_utils", "zksync_vm2", "zksync_vm_interface", ] -[[package]] -name = "zksync_object_store" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "anyhow", - "async-trait", - "bincode", - "flate2", - "google-cloud-auth", - "google-cloud-storage", - "http 1.2.0", - "prost 0.12.6", - "rand 0.8.5", - "reqwest 0.12.9", - "serde_json", - "tokio", - "tracing", - "vise", - "zksync_config", - "zksync_protobuf", - "zksync_types", -] - [[package]] name = "zksync_pairing" -version = "0.30.1" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8412ae5574472fa567a097e183f9a01974b99dd0b5da3bfa1bbe6c57c579aa2" +checksum = "3b91b38db3a3f0f80d8b1f2342c77751ee8d63b746268e5719abbb5dfb150a8c" dependencies = [ "byteorder", - "cfg-if 1.0.0", + "cfg-if", "rand 0.4.6", "serde", "zksync_ff", @@ -14911,9 +13256,9 @@ dependencies = [ [[package]] name = "zksync_protobuf" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd55c64f54cb10967a435422f66ff5880ae14a232b245517c7ce38da32e0cab" +checksum = "e8986ad796f8e00d8999fee72effba1a21bce40f5f877d681ac9cd89a94834d8" dependencies = [ "anyhow", "bit-vec", @@ -14932,121 +13277,40 @@ dependencies = [ [[package]] name = "zksync_protobuf_build" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4121952bcaf711005dd554612fc6e2de9b30cb58088508df87f1d38046ce8ac8" +checksum = "8d870b31995e3acb8e47afeb68ebeeffcf6121e70020e65b3d5d31692115d236" dependencies = [ "anyhow", "heck", "prettyplease", - "proc-macro2 1.0.92", + "proc-macro2", "prost-build", "prost-reflect", "protox", - "quote 1.0.37", + "quote", "syn 2.0.90", ] -[[package]] -name = "zksync_prover_interface" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "chrono", - "circuit_sequencer_api 0.150.7", - "serde", - "serde_with", - "strum", - "zksync_multivm", - "zksync_object_store", - "zksync_types", -] - -[[package]] -name = "zksync_shared_metrics" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "rustc_version 0.4.1", - "tracing", - "vise", - "zksync_dal", - "zksync_types", -] - -[[package]] -name = "zksync_solidity_vk_codegen" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b310ab8a21681270e73f177ddf7974cabb7a96f0624ab8b008fd6ee1f9b4f687" -dependencies = [ - "ethereum-types 0.14.1", - "franklin-crypto", - "handlebars 3.5.5", - "hex", - "paste", - "rescue_poseidon", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "zksync_state" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "anyhow", - "async-trait", - "backon", - "chrono", - "itertools 0.10.5", - "mini-moka", - "once_cell", - "tokio", - "tracing", - "vise", - "zksync_dal", - "zksync_shared_metrics", - "zksync_storage", - "zksync_types", - "zksync_utils", - "zksync_vm_interface", -] - -[[package]] -name = "zksync_storage" -version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" -dependencies = [ - "num_cpus", - "once_cell", - "rocksdb", - "thread_local", - "tracing", - "vise", -] - [[package]] name = "zksync_system_constants" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "once_cell", "zksync_basic_types", - "zksync_utils", ] [[package]] name = "zksync_types" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", - "bigdecimal 0.4.5", - "blake2 0.10.6", + "bigdecimal", + "blake2", "chrono", - "derive_more 1.0.0", + "derive_more", "hex", "itertools 0.10.5", "num", @@ -15067,35 +13331,28 @@ dependencies = [ "zksync_protobuf", "zksync_protobuf_build", "zksync_system_constants", - "zksync_utils", ] [[package]] name = "zksync_utils" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", - "bigdecimal 0.4.5", "futures 0.3.31", - "hex", - "num", "once_cell", "reqwest 0.12.9", - "serde", "serde_json", - "thiserror 1.0.69", + "sha2", "tokio", "tracing", - "zk_evm 0.133.0", - "zksync_basic_types", "zksync_vlog", ] [[package]] name = "zksync_vlog" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", "chrono", @@ -15121,19 +13378,19 @@ dependencies = [ [[package]] name = "zksync_vm2" version = "0.2.1" -source = "git+https://github.com/matter-labs/vm2.git?rev=df5bec3d04d64d434f9b0ccb285ba4681008f7b3#df5bec3d04d64d434f9b0ccb285ba4681008f7b3" +source = "git+https://github.com/matter-labs/vm2.git?rev=457d8a7eea9093af9440662e33e598c13ba41633#457d8a7eea9093af9440662e33e598c13ba41633" dependencies = [ "enum_dispatch", "primitive-types 0.12.2", - "zk_evm_abstractions 0.150.7", - "zkevm_opcode_defs 0.150.7", + "zk_evm_abstractions 0.150.18", + "zkevm_opcode_defs 0.150.18", "zksync_vm2_interface", ] [[package]] name = "zksync_vm2_interface" version = "0.2.1" -source = "git+https://github.com/matter-labs/vm2.git?rev=df5bec3d04d64d434f9b0ccb285ba4681008f7b3#df5bec3d04d64d434f9b0ccb285ba4681008f7b3" +source = "git+https://github.com/matter-labs/vm2.git?rev=457d8a7eea9093af9440662e33e598c13ba41633#457d8a7eea9093af9440662e33e598c13ba41633" dependencies = [ "primitive-types 0.12.2", ] @@ -15141,7 +13398,7 @@ dependencies = [ [[package]] name = "zksync_vm_interface" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", "async-trait", @@ -15158,7 +13415,7 @@ dependencies = [ [[package]] name = "zksync_web3_decl" version = "0.1.0" -source = "git+https://github.com/matter-labs/zksync-era.git?rev=6c034f6e180cc92e99766f14c8840c90efa56cec#6c034f6e180cc92e99766f14c8840c90efa56cec" +source = "git+https://github.com/matter-labs/zksync-era.git?rev=core-v25.4.0#3ce7e8a6f695c8a04e718a4953ac919319f9572d" dependencies = [ "anyhow", "async-trait", @@ -15190,13 +13447,3 @@ dependencies = [ "once_cell", "simd-adler32", ] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/Cargo.toml b/Cargo.toml index 7893a22fe..3dceea7bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -232,7 +232,7 @@ syn-solidity = "0.8.14" alloy-chains = "0.1" alloy-rlp = "0.3" -alloy-zksync = "0.8.0" +alloy-zksync = "0.8.0" alloy-trie = "0.7.0" @@ -246,14 +246,16 @@ anstyle = "1.0" terminal_size = "0.4" ## zksync -era_test_node = { git = "https://github.com/matter-labs/era-test-node.git", rev = "94503847b402f0161c3372d5f357a4cb16a2d66d" } -zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" } -zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" } -zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" } -zksync_multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" } -zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" } -zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" } -zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "6c034f6e180cc92e99766f14c8840c90efa56cec" } +anvil_zksync_core = { git = "https://github.com/matter-labs/anvil-zksync.git", rev = "b21c4898d44e3b775423b8d698d425fc43a85981" } # https://github.com/matter-labs/anvil-zksync/pull/510 +anvil_zksync_types = { git = "https://github.com/matter-labs/anvil-zksync.git", rev = "b21c4898d44e3b775423b8d698d425fc43a85981" } # https://github.com/matter-labs/anvil-zksync/pull/510 +anvil_zksync_config = { git = "https://github.com/matter-labs/anvil-zksync.git", rev = "b21c4898d44e3b775423b8d698d425fc43a85981" } # https://github.com/matter-labs/anvil-zksync/pull/510 +anvil_zksync_api_server = { git = "https://github.com/matter-labs/anvil-zksync.git", rev = "b21c4898d44e3b775423b8d698d425fc43a85981" } # https://github.com/matter-labs/anvil-zksync/pull/510 +zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } +zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } +zksync_vm_interface = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } +zksync_multivm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } +zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } +zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "core-v25.4.0" } # macros proc-macro2 = "1.0" diff --git a/crates/cast/tests/cli/zk.rs b/crates/cast/tests/cli/zk.rs index 894431854..b6d9f6dea 100644 --- a/crates/cast/tests/cli/zk.rs +++ b/crates/cast/tests/cli/zk.rs @@ -5,13 +5,14 @@ const PAYMASTER_BYTECODE: &str = "0x00020000000000020003000000000002000000000301 const COUNTER_BYTECODE: &str = "0x0000008003000039000000400030043f0000000100200190000000150000c13d000000000201001900000010002001980000002d0000613d000000000101043b000000e001100270000000110010009c000000200000613d000000120010009c0000002d0000c13d0000000001000416000000000001004b0000002d0000c13d000000000100041a000000ff0110018f000000800010043f0000001501000041000000370001042e0000000001000416000000000001004b0000002d0000c13d000000000200041a0000001601200197000000000010041b0000002001000039000001000010044300000120000004430000000f01000041000000370001042e0000000001000416000000000001004b0000002d0000c13d000000000100041a000000ff0210018f000000ff0020008c0000002f0000c13d0000001301000041000000000010043f0000001101000039000000040010043f000000140100004100000038000104300000000001000019000000380001043000000016021001970000000101100039000000ff0110018f000000000121019f000000000010041b0000000001000019000000370001042e0000003600000432000000370001042e0000003800010430000000000000000000000000000000000000000000000000000000020000000000000000000000000000004000000100000000000000000000000000000000000000000000000000fffffffc00000000000000000000000000000000000000000000000000000000000000000000000000000000d09de08a000000000000000000000000000000000000000000000000000000008381f58a4e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000020000000800000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000000000000027b95d8697efbdb44a7508247e8c640a64fb3ead050f40cb23deb1910c501315"; casttest!(test_zk_cast_using_paymaster, async |_prj, cmd| { - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; let url = node.url(); - let (addr, private_key) = ZkSyncNode::rich_wallets() - .next() - .map(|(addr, pk, _)| (addr, pk)) - .expect("No rich wallets available"); + // This test seems to require a specific private key, so we use the hard-coded one. + let (addr, private_key) = ( + "0x36615Cf349d7F6344891B1e7CA7C72883F5dc049".to_string(), + "0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110".to_string(), + ); // Deploy paymaster cmd.args([ @@ -45,7 +46,7 @@ casttest!(test_zk_cast_using_paymaster, async |_prj, cmd| { "--value", "0.1ether", "--private-key", - private_key, + &private_key, "--rpc-url", &url, ]) @@ -53,7 +54,7 @@ casttest!(test_zk_cast_using_paymaster, async |_prj, cmd| { let balance_before = cmd .cast_fuse() - .args(["balance", addr, "--rpc-url", &url]) + .args(["balance", &addr, "--rpc-url", &url]) .assert_success() .get_output() .stdout_lossy(); @@ -64,7 +65,7 @@ casttest!(test_zk_cast_using_paymaster, async |_prj, cmd| { "0x70997970C51812dc3A010C7d01b50e0d17dc79C8", "increment()", "--private-key", - private_key, + &private_key, "--zk-paymaster-address", "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "--zk-paymaster-input", @@ -76,7 +77,7 @@ casttest!(test_zk_cast_using_paymaster, async |_prj, cmd| { let balance_after = cmd .cast_fuse() - .args(["balance", addr, "--rpc-url", &url]) + .args(["balance", &addr, "--rpc-url", &url]) .assert_success() .get_output() .stdout_lossy(); @@ -85,7 +86,7 @@ casttest!(test_zk_cast_using_paymaster, async |_prj, cmd| { }); casttest!(test_zk_cast_without_paymaster, async |_prj, cmd| { - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; let url = node.url(); let (addr, private_key) = ZkSyncNode::rich_wallets() diff --git a/crates/forge/tests/cli/zk_script.rs b/crates/forge/tests/cli/zk_script.rs index c4153043d..f7b4b163e 100644 --- a/crates/forge/tests/cli/zk_script.rs +++ b/crates/forge/tests/cli/zk_script.rs @@ -22,7 +22,7 @@ forgetest_async!(test_zk_can_execute_script_with_arguments, |prj, cmd| { zksync: ZkTransactionMetadata, } - let node = foundry_test_utils::ZkSyncNode::start(); + let node = foundry_test_utils::ZkSyncNode::start().await; cmd.args(["init", "--force"]).arg(prj.root()); cmd.assert_success(); diff --git a/crates/forge/tests/it/test_helpers.rs b/crates/forge/tests/it/test_helpers.rs index d7472c6a7..b8be5ce8e 100644 --- a/crates/forge/tests/it/test_helpers.rs +++ b/crates/forge/tests/it/test_helpers.rs @@ -553,7 +553,7 @@ pub fn rpc_endpoints_zk() -> RpcEndpoints { ]) } -pub fn run_zk_script_test( +pub async fn run_zk_script_test( root: impl AsRef, cmd: &mut TestCommand, script_path: &str, @@ -562,7 +562,7 @@ pub fn run_zk_script_test( expected_broadcastable_txs: usize, extra_args: Option<&[&str]>, ) { - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; let url = node.url(); if let Some(deps) = dependencies { @@ -582,7 +582,7 @@ pub fn run_zk_script_test( "--zk-startup", &script_path_contract, "--private-key", - private_key, + &private_key, "--chain", "260", "--gas-estimate-multiplier", diff --git a/crates/forge/tests/it/zk/cheats.rs b/crates/forge/tests/it/zk/cheats.rs index f39548805..2fb3c21b1 100644 --- a/crates/forge/tests/it/zk/cheats.rs +++ b/crates/forge/tests/it/zk/cheats.rs @@ -166,7 +166,7 @@ forgetest_async!(test_zk_use_factory_dep, |prj, cmd| { Some("transmissions11/solmate@v7 OpenZeppelin/openzeppelin-contracts cyfrin/zksync-contracts"), 2, Some(&["-vvvvv", "--via-ir", "--system-mode", "true", "--broadcast"]), - ); + ).await; }); fn setup_deploy_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/constructor.rs b/crates/forge/tests/it/zk/constructor.rs index 0cb078f3b..46bd51295 100644 --- a/crates/forge/tests/it/zk/constructor.rs +++ b/crates/forge/tests/it/zk/constructor.rs @@ -25,7 +25,8 @@ forgetest_async!(test_zk_constructor_works_in_script, |prj, cmd| { None, 3, Some(&["-vvvvv", "--broadcast"]), - ); + ) + .await; }); fn setup_deploy_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/create.rs b/crates/forge/tests/it/zk/create.rs index 97f874db8..8d9af9d2e 100644 --- a/crates/forge/tests/it/zk/create.rs +++ b/crates/forge/tests/it/zk/create.rs @@ -10,7 +10,7 @@ forgetest_async!(forge_zk_can_deploy_erc20, |prj, cmd| { util::initialize(prj.root()); prj.add_source("ERC20.sol", include_str!("../../../../../testdata/zk/ERC20.sol")).unwrap(); - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; let url = node.url(); let private_key = @@ -32,7 +32,7 @@ forgetest_async!(forge_zk_can_deploy_contracts_and_cast_a_transaction, |prj, cmd .unwrap(); prj.add_source("ERC20.sol", include_str!("../../../../../testdata/zk/ERC20.sol")).unwrap(); - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; let url = node.url(); let private_key = diff --git a/crates/forge/tests/it/zk/create2.rs b/crates/forge/tests/it/zk/create2.rs index d6d30ee33..8739b7d3e 100644 --- a/crates/forge/tests/it/zk/create2.rs +++ b/crates/forge/tests/it/zk/create2.rs @@ -16,7 +16,8 @@ forgetest_async!(can_deploy_via_create2, |prj, cmd| { None, 2, Some(&["-vvvvv", "--broadcast"]), - ); + ) + .await; }); fn setup_create2_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/deploy.rs b/crates/forge/tests/it/zk/deploy.rs index 5e298e184..84018936d 100644 --- a/crates/forge/tests/it/zk/deploy.rs +++ b/crates/forge/tests/it/zk/deploy.rs @@ -12,7 +12,8 @@ forgetest_async!(multiple_deployments_of_the_same_contract, |prj, cmd| { None, 3, Some(&["-vvvvv", "--broadcast"]), - ); + ) + .await; run_zk_script_test( prj.root(), &mut cmd, @@ -21,7 +22,8 @@ forgetest_async!(multiple_deployments_of_the_same_contract, |prj, cmd| { None, 3, Some(&["-vvvvv", "--broadcast"]), - ); + ) + .await; }); fn setup_deploy_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/factory.rs b/crates/forge/tests/it/zk/factory.rs index 001d72418..892fb3d37 100644 --- a/crates/forge/tests/it/zk/factory.rs +++ b/crates/forge/tests/it/zk/factory.rs @@ -49,7 +49,8 @@ forgetest_async!(script_zk_can_deploy_in_method, |prj, cmd| { None, 2, Some(&["--broadcast"]), - ); + ) + .await; run_zk_script_test( prj.root(), &mut cmd, @@ -58,7 +59,8 @@ forgetest_async!(script_zk_can_deploy_in_method, |prj, cmd| { None, 2, Some(&["--broadcast"]), - ); + ) + .await; }); forgetest_async!(script_zk_can_deploy_in_constructor, |prj, cmd| { @@ -71,7 +73,8 @@ forgetest_async!(script_zk_can_deploy_in_constructor, |prj, cmd| { None, 1, Some(&["--broadcast"]), - ); + ) + .await; run_zk_script_test( prj.root(), &mut cmd, @@ -80,7 +83,8 @@ forgetest_async!(script_zk_can_deploy_in_constructor, |prj, cmd| { None, 1, Some(&["--broadcast"]), - ); + ) + .await; }); forgetest_async!(script_zk_can_use_predeployed_factory, |prj, cmd| { @@ -93,7 +97,8 @@ forgetest_async!(script_zk_can_use_predeployed_factory, |prj, cmd| { None, 3, Some(&["--broadcast"]), - ); + ) + .await; run_zk_script_test( prj.root(), &mut cmd, @@ -102,7 +107,8 @@ forgetest_async!(script_zk_can_use_predeployed_factory, |prj, cmd| { None, 2, Some(&["--broadcast"]), - ); + ) + .await; }); fn setup_factory_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/factory_deps.rs b/crates/forge/tests/it/zk/factory_deps.rs index be569fc1d..602d2cddf 100644 --- a/crates/forge/tests/it/zk/factory_deps.rs +++ b/crates/forge/tests/it/zk/factory_deps.rs @@ -43,7 +43,7 @@ contract ZkLargeFactoryDependenciesScript is Script { ) .unwrap(); - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; // foundry default gas-limit is not enough to pay for factory deps // with Anvil-zksync's environment diff --git a/crates/forge/tests/it/zk/linking.rs b/crates/forge/tests/it/zk/linking.rs index 679e34ca5..4bdd728b7 100644 --- a/crates/forge/tests/it/zk/linking.rs +++ b/crates/forge/tests/it/zk/linking.rs @@ -19,7 +19,8 @@ forgetest_async!( None, 1, Some(&["-vvvvv"]), - ); + ) + .await; } ); diff --git a/crates/forge/tests/it/zk/nft.rs b/crates/forge/tests/it/zk/nft.rs index 0a07ea0b3..f7060c638 100644 --- a/crates/forge/tests/it/zk/nft.rs +++ b/crates/forge/tests/it/zk/nft.rs @@ -12,7 +12,8 @@ forgetest_async!(script_zk_can_deploy_nft, |prj, cmd| { Some("transmissions11/solmate@v7 OpenZeppelin/openzeppelin-contracts"), 1, Some(&["-vvvvv", "--broadcast"]), - ); + ) + .await; }); fn setup_nft_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/nonce.rs b/crates/forge/tests/it/zk/nonce.rs index 57870d5df..3dd857893 100644 --- a/crates/forge/tests/it/zk/nonce.rs +++ b/crates/forge/tests/it/zk/nonce.rs @@ -15,7 +15,8 @@ forgetest_async!(setup_block_on_script_test, |prj, cmd| { None, 4, Some(&["-vvvvv"]), - ); + ) + .await; }); #[tokio::test(flavor = "multi_thread")] diff --git a/crates/forge/tests/it/zk/paymaster.rs b/crates/forge/tests/it/zk/paymaster.rs index e761d13e6..abfc54d2b 100644 --- a/crates/forge/tests/it/zk/paymaster.rs +++ b/crates/forge/tests/it/zk/paymaster.rs @@ -39,7 +39,7 @@ async fn test_zk_contract_paymaster() { // Tests the deployment of contracts using a paymaster for fee abstraction forgetest_async!(test_zk_deploy_with_paymaster, |prj, cmd| { setup_deploy_prj(&mut prj); - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; let url = node.url(); let private_key = @@ -136,7 +136,8 @@ forgetest_async!(paymaster_script_test, |prj, cmd| { Some("OpenZeppelin/openzeppelin-contracts cyfrin/zksync-contracts"), 3, Some(&["-vvvvv", "--via-ir"]), - ); + ) + .await; }); fn setup_deploy_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/proxy.rs b/crates/forge/tests/it/zk/proxy.rs index b19995c69..d4f15acc1 100644 --- a/crates/forge/tests/it/zk/proxy.rs +++ b/crates/forge/tests/it/zk/proxy.rs @@ -12,7 +12,8 @@ forgetest_async!(script_zk_can_deploy_proxy, |prj, cmd| { Some("OpenZeppelin/openzeppelin-contracts"), 4, Some(&["--broadcast"]), - ); + ) + .await; }); fn setup_proxy_prj(prj: &mut TestProject) { diff --git a/crates/forge/tests/it/zk/script.rs b/crates/forge/tests/it/zk/script.rs index 0cb9f13d5..a2c5f569d 100644 --- a/crates/forge/tests/it/zk/script.rs +++ b/crates/forge/tests/it/zk/script.rs @@ -10,7 +10,7 @@ forgetest_async!(test_zk_can_broadcast_with_keystore_account, |prj, cmd| { prj.add_script("Deploy.s.sol", include_str!("../../fixtures/zk/Deploy.s.sol")).unwrap(); prj.add_source("Greeter.sol", include_str!("../../../../../testdata/zk/Greeter.sol")).unwrap(); - let node = ZkSyncNode::start(); + let node = ZkSyncNode::start().await; let url = node.url(); cmd.forge_fuse(); diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index ababc423b..7b839c258 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -33,12 +33,13 @@ rand.workspace = true snapbox = { version = "0.6", features = ["json", "regex"] } tokio.workspace = true tempfile.workspace = true +tower-http = { version = "0.6.2", features = ["cors"] } # zk zksync_types.workspace = true -era_test_node.workspace = true -jsonrpc-core = { git = "https://github.com/matter-labs/jsonrpc.git", branch = "master" } -jsonrpc-http-server = { git = "https://github.com/matter-labs/jsonrpc.git", branch = "master" } +anvil_zksync_core.workspace = true +anvil_zksync_api_server.workspace = true +anvil_zksync_config.workspace = true [dev-dependencies] tokio.workspace = true diff --git a/crates/test-utils/src/zksync.rs b/crates/test-utils/src/zksync.rs index ee1935d51..2758974b8 100644 --- a/crates/test-utils/src/zksync.rs +++ b/crates/test-utils/src/zksync.rs @@ -1,19 +1,17 @@ -//! Contains in-memory implementation of era-test-node. -use std::{ - net::{IpAddr, Ipv4Addr, SocketAddr}, - str::FromStr, -}; - -use era_test_node::{ - http_fork_source::HttpForkSource, - namespaces::{ - ConfigurationApiNamespaceT, DebugNamespaceT, EthNamespaceT, EthTestNodeNamespaceT, - EvmNamespaceT, HardhatNamespaceT, NetNamespaceT, Web3NamespaceT, ZksNamespaceT, +//! Contains in-memory implementation of anvil-zksync. +use std::{net::SocketAddr, str::FromStr}; + +use anvil_zksync_api_server::NodeServerBuilder; +use anvil_zksync_config::{types::SystemContractsOptions, TestNodeConfig}; +use anvil_zksync_core::{ + node::{ + BlockProducer, BlockSealer, BlockSealerMode, ImpersonationManager, InMemoryNode, + TimestampManager, TxPool, }, - node::InMemoryNode, + system_contracts::SystemContracts, }; -use jsonrpc_core::IoHandler; -use zksync_types::H160; +use tower_http::cors::AllowOrigin; +use zksync_types::{H160, U256}; /// List of legacy wallets (address, private key) that we seed with tokens at start. const LEGACY_RICH_WALLETS: [(&str, &str); 10] = [ @@ -113,7 +111,7 @@ const RICH_WALLETS: [(&str, &str, &str); 10] = [ ), ]; -/// In-memory era-test-node that is stopped when dropped. +/// In-memory anvil-zksync that is stopped when dropped. pub struct ZkSyncNode { port: u16, _guard: tokio::sync::oneshot::Sender<()>, @@ -126,69 +124,90 @@ impl ZkSyncNode { format!("http://127.0.0.1:{}", self.port) } - /// Start era-test-node in memory, binding a random available port + /// Start anvil-zksync in memory, binding a random available port /// /// The server is automatically stopped when the instance is dropped. - pub fn start() -> Self { - let (_guard, _guard_rx) = tokio::sync::oneshot::channel::<()>(); - - let io_handler = { - let node: InMemoryNode = - InMemoryNode::new(None, None, Default::default(), None); - - for wallet in LEGACY_RICH_WALLETS.iter() { - let address = wallet.0; - node.set_rich_account(H160::from_str(address).unwrap()); - } - for wallet in RICH_WALLETS.iter() { - let address = wallet.0; - node.set_rich_account(H160::from_str(address).unwrap()); - } - - let mut io = IoHandler::default(); - - io.extend_with(NetNamespaceT::to_delegate(node.clone())); - io.extend_with(Web3NamespaceT::to_delegate(node.clone())); - io.extend_with(ConfigurationApiNamespaceT::to_delegate(node.clone())); - io.extend_with(DebugNamespaceT::to_delegate(node.clone())); - io.extend_with(EthNamespaceT::to_delegate(node.clone())); - io.extend_with(EthTestNodeNamespaceT::to_delegate(node.clone())); - io.extend_with(EvmNamespaceT::to_delegate(node.clone())); - io.extend_with(HardhatNamespaceT::to_delegate(node.clone())); - io.extend_with(ZksNamespaceT::to_delegate(node)); - io - }; - let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 0); + pub async fn start() -> Self { + let (_guard, guard_rx) = tokio::sync::oneshot::channel::<()>(); let (port_tx, port) = tokio::sync::oneshot::channel(); std::thread::spawn(move || { - let runtime = tokio::runtime::Builder::new_multi_thread() - .enable_all() - .worker_threads(2) - .build() - .unwrap(); - - let server = jsonrpc_http_server::ServerBuilder::new(io_handler) - .threads(1) - .event_loop_executor(runtime.handle().clone()) - .start_http(&addr) - .unwrap(); - - // if no receiver was ready to receive the spawning thread died - _ = port_tx.send(server.address().port()); - // we only care that the channel is alive - _ = tokio::task::block_in_place(move || runtime.block_on(_guard_rx)); - - server.close(); + // We need to spawn a thread since `run_inner` future is not `Send`. + let runtime = + tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap(); + runtime.block_on(Self::run_inner(port_tx, guard_rx)); }); // wait for server to start - std::thread::sleep(std::time::Duration::from_millis(600)); - let port = - tokio::task::block_in_place(move || tokio::runtime::Handle::current().block_on(port)) - .expect("failed to start server"); + let port = port.await.expect("failed to start server"); + + Self { port, _guard } + } - Self { _guard, port } + async fn run_inner( + port_tx: tokio::sync::oneshot::Sender, + stop_guard: tokio::sync::oneshot::Receiver<()>, + ) { + const MAX_TRANSACTIONS: usize = 100; // Not that important for testing purposes. + + let config = TestNodeConfig::default(); + + let time = TimestampManager::default(); + let impersonation = ImpersonationManager::default(); + let pool = TxPool::new(impersonation.clone(), config.transaction_order); + let sealing_mode = BlockSealerMode::immediate(MAX_TRANSACTIONS, pool.add_tx_listener()); + let block_sealer = BlockSealer::new(sealing_mode); + + let node: InMemoryNode = InMemoryNode::new( + None, + None, + &config, + time, + impersonation, + pool.clone(), + block_sealer.clone(), + ); + + for wallet in LEGACY_RICH_WALLETS.iter() { + let address = wallet.0; + node.set_rich_account( + H160::from_str(address).unwrap(), + U256::from(1000u128 * 10u128.pow(18)), + ); + } + for wallet in RICH_WALLETS.iter() { + let address = wallet.0; + node.set_rich_account( + H160::from_str(address).unwrap(), + U256::from(1000u128 * 10u128.pow(18)), + ); + } + + let system_contracts = + SystemContracts::from_options(&SystemContractsOptions::BuiltInWithoutSecurity, false); + + let allow_origin = AllowOrigin::any(); + let server_builder = NodeServerBuilder::new(node.clone(), allow_origin); + + let server = server_builder.build(SocketAddr::from(([0, 0, 0, 0], 0))).await; + // if no receiver was ready to receive the spawning thread died + port_tx.send(server.local_addr().port()).expect("failed to send port"); + + let block_producer_handle = BlockProducer::new(node, pool, block_sealer, system_contracts); + + let handle = server.run(); + + tokio::select! { + _ = handle.stopped() => { + tracing::error!("Server stopped"); + }, + _ = block_producer_handle => { + tracing::error!("Block producer stopped"); + } + _ = stop_guard => { + tracing::info!("Server stopped by guard"); + } + }; } pub fn rich_wallets() -> impl Iterator { diff --git a/crates/zksync/core/Cargo.toml b/crates/zksync/core/Cargo.toml index 0ab76fa90..451489eaa 100644 --- a/crates/zksync/core/Cargo.toml +++ b/crates/zksync/core/Cargo.toml @@ -35,13 +35,14 @@ tracing.workspace = true serde.workspace = true # zk +anvil_zksync_core.workspace = true +anvil_zksync_types.workspace = true +anvil_zksync_config.workspace = true zksync_multivm.workspace = true zksync_basic_types.workspace = true zksync_types.workspace = true -era_test_node.workspace = true -zksync_utils.workspace = true zksync_contracts.workspace = true -zksync_state.workspace = true +zksync_vm_interface.workspace = true ansiterm = "0.12.2" eyre = "0.6" diff --git a/crates/zksync/core/src/cheatcodes.rs b/crates/zksync/core/src/cheatcodes.rs index 059a921bb..ad0f33aa6 100644 --- a/crates/zksync/core/src/cheatcodes.rs +++ b/crates/zksync/core/src/cheatcodes.rs @@ -13,11 +13,10 @@ use zksync_types::{ ACCOUNT_CODE_STORAGE_ADDRESS, CURRENT_VIRTUAL_BLOCK_INFO_POSITION, KNOWN_CODES_STORAGE_ADDRESS, L2_BASE_TOKEN_ADDRESS, NONCE_HOLDER_ADDRESS, SYSTEM_CONTEXT_ADDRESS, }; -use zksync_utils::bytecode::hash_bytecode; use crate::{ convert::{ConvertAddress, ConvertH160, ConvertH256, ConvertRU256, ConvertU256}, - EMPTY_CODE, + hash_bytecode, EMPTY_CODE, }; /// Sets `block.timestamp`. @@ -167,7 +166,7 @@ where .expect("account 'KNOWN_CODES_STORAGE_ADDRESS' could not be loaded"); } - let empty_code_hash = zksync_utils::bytecode::hash_bytecode(&EMPTY_CODE); + let empty_code_hash = hash_bytecode(&EMPTY_CODE); // update account code storage for empty code let account_key = address.to_h256().to_ru256(); diff --git a/crates/zksync/core/src/convert.rs b/crates/zksync/core/src/convert.rs index 0702b332f..db3598478 100644 --- a/crates/zksync/core/src/convert.rs +++ b/crates/zksync/core/src/convert.rs @@ -2,8 +2,7 @@ use revm::primitives::U256 as rU256; use revm::primitives::{Address, B256}; -use zksync_basic_types::{H160, H256, U256}; -use zksync_utils::{address_to_h256, h256_to_u256, u256_to_h256}; +use zksync_basic_types::{address_to_h256, h256_to_u256, u256_to_h256, H160, H256, U256}; /// Conversions from [U256] pub trait ConvertU256 { diff --git a/crates/zksync/core/src/lib.rs b/crates/zksync/core/src/lib.rs index 3a1bbf881..d5c7d8844 100644 --- a/crates/zksync/core/src/lib.rs +++ b/crates/zksync/core/src/lib.rs @@ -30,6 +30,7 @@ use eyre::eyre; use revm::{Database, InnerEvmContext}; use serde::{Deserialize, Serialize}; use std::fmt::Debug; +use zksync_types::bytecode::BytecodeHash; pub use utils::{fix_l2_gas_limit, fix_l2_gas_price}; pub use vm::{balance, encode_create_params, nonce}; @@ -45,7 +46,6 @@ use zksync_types::{ utils::{decompose_full_nonce, nonces_to_full_nonce, storage_key_for_eth_balance}, U256, }; -pub use zksync_utils::bytecode::hash_bytecode; type Result = std::result::Result; @@ -75,6 +75,23 @@ pub fn get_nonce_key(address: Address) -> rU256 { zksync_types::get_nonce_key(&address.to_h160()).key().to_ru256() } +/// Convenience wrapper for hashing EraVM bytecode. +pub fn hash_bytecode(bytecode: &[u8]) -> H256 { + BytecodeHash::for_bytecode(bytecode).value() +} + +// TODO: The approach towards bytecode has changed in core, so the same function was removed there. +// There is a chance that this function is no longer needed. +pub(crate) fn be_words_to_bytes(words: &[U256]) -> Vec { + let mut bytes = Vec::with_capacity(words.len() * 32); + for word in words { + let mut payload = [0u8; 32]; + word.to_big_endian(&mut payload); + bytes.extend_from_slice(&payload); + } + bytes +} + /// Represents additional data for ZK transactions that require a paymaster. #[derive(Clone, Debug, Default)] pub struct ZkPaymasterData { diff --git a/crates/zksync/core/src/vm/db.rs b/crates/zksync/core/src/vm/db.rs index 3a2f7371c..74017abcd 100644 --- a/crates/zksync/core/src/vm/db.rs +++ b/crates/zksync/core/src/vm/db.rs @@ -10,16 +10,17 @@ use alloy_primitives::{map::HashMap, Address, U256 as rU256}; use foundry_cheatcodes_common::record::RecordAccess; use revm::{primitives::Account, Database, EvmContext, InnerEvmContext}; use zksync_basic_types::{L2ChainId, H160, H256, U256}; -use zksync_state::interface::ReadStorage; use zksync_types::{ - get_code_key, get_nonce_key, get_system_context_init_logs, + get_code_key, get_nonce_key, get_system_context_init_logs, h256_to_u256, utils::{decompose_full_nonce, storage_key_for_eth_balance}, Nonce, StorageKey, StorageLog, StorageValue, }; +use zksync_vm_interface::storage::ReadStorage; -use zksync_utils::{bytecode::hash_bytecode, h256_to_u256}; - -use crate::convert::{ConvertAddress, ConvertH160, ConvertH256, ConvertRU256, ConvertU256}; +use crate::{ + convert::{ConvertAddress, ConvertH160, ConvertH256, ConvertRU256, ConvertU256}, + hash_bytecode, +}; /// Default chain id pub(crate) const DEFAULT_CHAIN_ID: u32 = 31337; @@ -33,7 +34,7 @@ pub struct ZKVMData<'a, DB: Database> { pub accesses: Option<&'a mut RecordAccess>, } -impl<'a, DB> Debug for ZKVMData<'a, DB> +impl Debug for ZKVMData<'_, DB> where DB: Database, { @@ -78,8 +79,8 @@ where /// Create a new instance of [ZKEVMData] with system contracts. pub fn new_with_system_contracts(ecx: &'a mut EvmContext, chain_id: L2ChainId) -> Self { - let contracts = era_test_node::system_contracts::get_deployed_contracts( - &era_test_node::system_contracts::Options::BuiltInWithoutSecurity, + let contracts = anvil_zksync_core::deps::system_contracts::get_deployed_contracts( + &anvil_zksync_config::types::SystemContractsOptions::BuiltInWithoutSecurity, false, ); let system_context_init_log = get_system_context_init_logs(chain_id); @@ -182,7 +183,7 @@ where } } -impl<'a, DB> ReadStorage for &mut ZKVMData<'a, DB> +impl ReadStorage for &mut ZKVMData<'_, DB> where DB: Database, ::Error: Debug, @@ -207,7 +208,7 @@ where .values() .find_map(|account| { if account.info.code_hash == hash_b256 { - return Some(account.info.code.clone().map(|code| code.bytecode().to_vec())) + return Some(account.info.code.clone().map(|code| code.bytecode().to_vec())); } None }) diff --git a/crates/zksync/core/src/vm/env.rs b/crates/zksync/core/src/vm/env.rs index 51e3e18b7..dcf9bdcd3 100644 --- a/crates/zksync/core/src/vm/env.rs +++ b/crates/zksync/core/src/vm/env.rs @@ -4,13 +4,12 @@ use zksync_multivm::{ interface::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode}, vm_latest::{constants::BATCH_COMPUTATIONAL_GAS_LIMIT, utils::l2_blocks::load_last_l2_block}, }; -use zksync_state::interface::{ReadStorage, StoragePtr}; use zksync_types::{ block::{unpack_block_info, L2BlockHasher}, fee_model::PubdataIndependentBatchFeeModelInput, - StorageKey, SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_BLOCK_INFO_POSITION, + h256_to_u256, StorageKey, SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_BLOCK_INFO_POSITION, }; -use zksync_utils::h256_to_u256; +use zksync_vm_interface::storage::{ReadStorage, StoragePtr}; // https://github.com/matter-labs/era-contracts/blob/aafee035db892689df3f7afe4b89fd6467a39313/system-contracts/bootloader/bootloader.yul#L86 const MAX_L2_GAS_PER_PUBDATA: u64 = 50000; @@ -131,7 +130,7 @@ pub(crate) fn load_last_l1_batch(storage: StoragePtr) -> Opti let block_number = batch_number as u32; if block_number == 0 { // The block does not exist yet - return None + return None; } Some((batch_number, batch_timestamp)) } diff --git a/crates/zksync/core/src/vm/farcall.rs b/crates/zksync/core/src/vm/farcall.rs index f26b7c94c..d19c977fb 100644 --- a/crates/zksync/core/src/vm/farcall.rs +++ b/crates/zksync/core/src/vm/farcall.rs @@ -21,8 +21,8 @@ use zksync_multivm::{ }, }, }; -use zksync_state::interface::{StoragePtr, WriteStorage}; use zksync_types::MSG_VALUE_SIMULATOR_ADDRESS; +use zksync_vm_interface::storage::{StoragePtr, WriteStorage}; use crate::convert::{ConvertAddress, ConvertH256, ConvertU256}; @@ -290,13 +290,13 @@ impl MockedCalls { if call.address == code_address { let value_matches = call.value.map_or(true, |value| value == actual_value); if !value_matches { - continue + continue; } if actual_calldata.starts_with(&call.calldata) { // return early if exact match if call.calldata.len() == actual_calldata.len() { - return Some(call_return_data.clone()) + return Some(call_return_data.clone()); } // else check for partial matches and pick the best @@ -381,7 +381,7 @@ impl ParsedFarCall { ParsedFarCall::SimpleCall { calldata, .. } => calldata, }[4..]; if params.is_empty() { - return Vec::new() + return Vec::new(); } params @@ -397,7 +397,7 @@ impl ParsedFarCall { ParsedFarCall::SimpleCall { calldata, .. } => calldata, }[4..]; if params.is_empty() || params.len() < 32 * offset_words { - return Vec::new() + return Vec::new(); } params[32 * offset_words..].to_vec() diff --git a/crates/zksync/core/src/vm/inspect.rs b/crates/zksync/core/src/vm/inspect.rs index 768c58320..abe56230b 100644 --- a/crates/zksync/core/src/vm/inspect.rs +++ b/crates/zksync/core/src/vm/inspect.rs @@ -1,10 +1,9 @@ use alloy_primitives::{hex, FixedBytes, Log}; -use era_test_node::{ - config::node::ShowCalls, - formatter, - system_contracts::{Options, SystemContracts}, - utils::bytecode_to_factory_dep, +use anvil_zksync_config::types::SystemContractsOptions as Options; +use anvil_zksync_core::{ + formatter::Formatter, system_contracts::SystemContracts, utils::bytecode_to_factory_dep, }; +use anvil_zksync_types::ShowCalls; use itertools::Itertools; use revm::{ db::states::StorageSlot, @@ -25,12 +24,12 @@ use zksync_multivm::{ tracers::CallTracer, vm_latest::{HistoryDisabled, ToTracerPointer, Vm}, }; -use zksync_state::interface::{ReadStorage, StoragePtr, WriteStorage}; use zksync_types::{ - get_nonce_key, l2::L2Tx, transaction_request::PaymasterParams, PackedEthSignature, StorageKey, - Transaction, ACCOUNT_CODE_STORAGE_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, NONCE_HOLDER_ADDRESS, + get_nonce_key, h256_to_address, h256_to_u256, l2::L2Tx, transaction_request::PaymasterParams, + u256_to_h256, PackedEthSignature, StorageKey, Transaction, ACCOUNT_CODE_STORAGE_ADDRESS, + CONTRACT_DEPLOYER_ADDRESS, NONCE_HOLDER_ADDRESS, }; -use zksync_utils::{be_words_to_bytes, h256_to_account_address, h256_to_u256, u256_to_h256}; +use zksync_vm_interface::storage::{ReadStorage, StoragePtr, WriteStorage}; use std::{ collections::HashMap, @@ -39,6 +38,7 @@ use std::{ }; use crate::{ + be_words_to_bytes, convert::{ConvertAddress, ConvertH160, ConvertH256, ConvertRU256, ConvertU256}, fix_l2_gas_limit, fix_l2_gas_price, is_system_address, vm::{ @@ -245,7 +245,7 @@ where info!("zk vm decoded result {}", hex::encode(&result)); let address = if result.len() == 32 { - Some(h256_to_account_address(&H256::from_slice(&result))) + Some(h256_to_address(&H256::from_slice(&result))) } else { None }; @@ -471,11 +471,14 @@ fn inspect_inner( let batch_env = create_l1_batch_env(storage.clone(), &ccx.zk_env); let system_contracts = SystemContracts::from_options(&Options::BuiltInWithoutSecurity, false); - let system_env = create_system_env(system_contracts.baseline_contracts, chain_id); + let baseline_contracts = + system_contracts.contracts(zksync_vm_interface::TxExecutionMode::VerifyExecute, false); + let system_env = create_system_env(baseline_contracts.clone(), chain_id); let mut vm: Vm<_, HistoryDisabled> = Vm::new(batch_env.clone(), system_env, storage.clone()); let tx: Transaction = l2_tx.clone().into(); + let initiator = tx.initiator_account(); let call_tracer_result = Arc::default(); let cheatcode_tracer_result = Arc::default(); @@ -555,7 +558,9 @@ fn inspect_inner( bootloader_debug, }; - formatter::print_vm_details(&tx_result); + let mut formatter = Formatter::new(); + + formatter.print_vm_details(&tx_result); info!("=== Console Logs: "); let log_parser = ConsoleLogParser::new(); @@ -572,13 +577,23 @@ fn inspect_inner( let resolve_hashes = get_env_var::("ZK_DEBUG_RESOLVE_HASHES"); let show_outputs = get_env_var::("ZK_DEBUG_SHOW_OUTPUTS"); info!("=== Calls: "); - for call in call_traces.iter() { - formatter::print_call(call, 0, &ShowCalls::All, show_outputs, resolve_hashes); + for (i, call) in call_traces.iter().enumerate() { + let is_last = i == call_traces.len() - 1; + formatter.print_call( + initiator, + None, + call, + is_last, + &ShowCalls::All, + show_outputs, + resolve_hashes, + ); } let mut deployed_bytecode_hashes = HashMap::::default(); info!("==== {}", format!("{} events", tx_result.logs.events.len())); - for event in &tx_result.logs.events { + for (i, event) in tx_result.logs.events.iter().enumerate() { + let is_last = i == tx_result.logs.events.len() - 1; if event.address == CONTRACT_DEPLOYER_ADDRESS { deployed_bytecode_hashes.insert( event.indexed_topics.get(3).cloned().unwrap_or_default().to_h160(), @@ -586,7 +601,7 @@ fn inspect_inner( ); } - formatter::print_event(event, resolve_hashes); + formatter.print_event(event, resolve_hashes, is_last); } let bytecodes = compressed_bytecodes @@ -615,7 +630,7 @@ fn inspect_inner( .unwrap_or_default(); if result.len() == 32 { - let address = h256_to_account_address(&H256::from_slice(&result)); + let address = h256_to_address(&H256::from_slice(&result)); deployed_bytecode_hashes.get(&address).cloned().and_then(|hash| { bytecodes .get(&h256_to_u256(hash)) @@ -812,7 +827,7 @@ pub fn batch_factory_dependencies(mut factory_deps: Vec>) -> Vec Vec { if tx.execute.factory_deps.is_empty() { - return vec![tx] + return vec![tx]; } let mut batched = batch_factory_dependencies(tx.execute.factory_deps); diff --git a/crates/zksync/core/src/vm/storage_view.rs b/crates/zksync/core/src/vm/storage_view.rs index bb7542e80..a398ff42b 100644 --- a/crates/zksync/core/src/vm/storage_view.rs +++ b/crates/zksync/core/src/vm/storage_view.rs @@ -1,7 +1,7 @@ use std::{cell::RefCell, collections::HashMap, fmt, rc::Rc}; -use zksync_state::interface::{ReadStorage, WriteStorage}; use zksync_types::{StorageKey, StorageValue, ACCOUNT_CODE_STORAGE_ADDRESS, H160, H256}; +use zksync_vm_interface::storage::{ReadStorage, WriteStorage}; use crate::convert::ConvertH160; @@ -151,8 +151,8 @@ impl WriteStorage for StorageView { #[cfg(test)] mod test { use super::*; - use zksync_state::interface::InMemoryStorage; use zksync_types::{AccountTreeId, Address, H256}; + use zksync_vm_interface::storage::InMemoryStorage; #[test] fn test_storage_access() { diff --git a/crates/zksync/core/src/vm/tracers/cheatcode.rs b/crates/zksync/core/src/vm/tracers/cheatcode.rs index 873f7c835..863648940 100644 --- a/crates/zksync/core/src/vm/tracers/cheatcode.rs +++ b/crates/zksync/core/src/vm/tracers/cheatcode.rs @@ -20,15 +20,15 @@ use zksync_multivm::{ zkevm_opcode_defs::{FatPointer, Opcode, CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER}, }, }; -use zksync_state::interface::{ReadStorage, StoragePtr, WriteStorage}; use zksync_types::{ ethabi, get_code_key, StorageValue, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, H160, H256, IMMUTABLE_SIMULATOR_STORAGE_ADDRESS, SYSTEM_CONTEXT_ADDRESS, U256, }; -use zksync_utils::bytecode::hash_bytecode; +use zksync_vm_interface::storage::{ReadStorage, StoragePtr, WriteStorage}; use crate::{ convert::{ConvertAddress, ConvertH160, ConvertH256, ConvertU256}, + hash_bytecode, vm::{ farcall::{CallAction, CallDepth, FarCallHandler}, ZkEnv, @@ -335,7 +335,7 @@ impl DynTracer> for Cheatcode if self.call_context.tx_caller == address { tracing::debug!("overriding account version for caller {address:?}"); self.farcall_handler.set_immediate_return(rU256::from(1u32).to_be_bytes_vec()); - return + return; } } } @@ -364,11 +364,11 @@ impl DynTracer> for Cheatcode if calldata.starts_with(&SELECTOR_SYSTEM_CONTEXT_BLOCK_NUMBER) { self.farcall_handler .set_immediate_return(self.call_context.block_number.to_be_bytes_vec()); - return + return; } else if calldata.starts_with(&SELECTOR_SYSTEM_CONTEXT_BLOCK_TIMESTAMP) { self.farcall_handler .set_immediate_return(self.call_context.block_timestamp.to_be_bytes_vec()); - return + return; } } } @@ -385,7 +385,7 @@ impl DynTracer> for Cheatcode { self.farcall_handler .set_immediate_return(self.call_context.block_basefee.to_be_bytes_vec()); - return + return; } } diff --git a/crates/zksync/core/src/vm/tracers/error.rs b/crates/zksync/core/src/vm/tracers/error.rs index fc1d21697..00cafa3c4 100644 --- a/crates/zksync/core/src/vm/tracers/error.rs +++ b/crates/zksync/core/src/vm/tracers/error.rs @@ -6,7 +6,7 @@ use zksync_multivm::{ vm_state::ErrorFlags, }, }; -use zksync_state::interface::{ReadStorage, WriteStorage}; +use zksync_vm_interface::storage::{ReadStorage, WriteStorage}; /// A tracer to allow logging low-level vm errors. #[derive(Debug, Default)] diff --git a/crates/zksync/core/src/vm/tracers/mod.rs b/crates/zksync/core/src/vm/tracers/mod.rs index 020445f30..78bb1c04f 100644 --- a/crates/zksync/core/src/vm/tracers/mod.rs +++ b/crates/zksync/core/src/vm/tracers/mod.rs @@ -1,7 +1,7 @@ -/// Contains tracer implementations for the zkEVM +//! Contains tracer implementations for the zkEVM pub mod bootloader { - pub use era_test_node::bootloader_debug::{BootloaderDebug, BootloaderDebugTracer}; + pub use anvil_zksync_core::bootloader_debug::{BootloaderDebug, BootloaderDebugTracer}; } pub mod cheatcode; pub mod error; diff --git a/rust-toolchain b/rust-toolchain index 94176b8f3..f4ebfd764 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-09-05" +channel = "stable" components = [ "rustfmt", "clippy" ]