From e01f4b32fe57b8ebfd1fd731804162cadcef4b89 Mon Sep 17 00:00:00 2001 From: Robin Salen Date: Wed, 17 Jan 2024 10:53:28 -0500 Subject: [PATCH] Reorganize workspace dependencies --- Cargo.toml | 24 ++++++++++++++++++++++++ common/Cargo.toml | 20 ++++++++++++-------- eth_test_parser/Cargo.toml | 32 ++++++++++++++++++-------------- evm_test_runner/Cargo.toml | 36 ++++++++++++++++++++---------------- 4 files changed, 74 insertions(+), 38 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 881e95d..7c25b62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,30 @@ members = [ "common", ] +[workspace.package] +edition = "2021" +license = "MIT OR Apache-2.0" +authors = ["Polygon Zero "] +repository = "https://github.com/0xPolygonZero/evm-tests" +keywords = ["cryptography", "SNARK", "PLONK", "FRI", "plonky2"] +categories = ["cryptography"] + +[workspace.dependencies] +anyhow = { version = "1.0.71", features = ["backtrace"] } +clap = {version = "4.2.7", features = ["derive"] } +ethereum-types = "0.14.1" +eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76" } +flexi_logger = { version = "0.25.4", features = ["async"] } +futures = "0.3.28" +keccak-hash = "0.10.0" +log = "0.4.17" +plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" } +plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" } +serde = "1.0.163" +serde_cbor = "0.11.2" +tokio = { version = "1.28.1" } + [profile.release] +opt-level = 3 lto = "fat" codegen-units = 1 diff --git a/common/Cargo.toml b/common/Cargo.toml index 6150101..af79662 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -2,15 +2,19 @@ name = "common" description = "Common logic shared between the parser and the runner." version = "0.1.0" -authors = ["Polygon Zero "] -edition = "2021" +edition.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true +keywords.workspace = true +categories.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = { version = "1.0.71", features = ["backtrace"] } -ethereum-types = "0.14.1" -eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76" } -flexi_logger = { version = "0.25.4", features = ["async"] } -plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" } -serde = {version = "1.0.163", features = ["derive"] } +anyhow = { workspace = true } +ethereum-types = { workspace = true } +eth_trie_utils = { workspace = true } +flexi_logger = { workspace = true } +plonky2_evm = { workspace = true } +serde = { workspace = true, features = ["derive"] } diff --git a/eth_test_parser/Cargo.toml b/eth_test_parser/Cargo.toml index 8a7ca78..b409365 100644 --- a/eth_test_parser/Cargo.toml +++ b/eth_test_parser/Cargo.toml @@ -2,29 +2,33 @@ name = "eth_test_parser" description = "Downloads and parses common Ethereum tests into a format runnable by Polygon Zero's EVM." version = "0.1.0" -authors = ["Polygon Zero "] -edition = "2021" +edition.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true +keywords.workspace = true +categories.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] common = { path = "../common" } -eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76" } -plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" } +eth_trie_utils = { workspace = true } +plonky2_evm = { workspace = true } -anyhow = { version = "1.0.71", features = ["backtrace"] } +anyhow = { workspace = true } bytes = "1.4.0" -clap = {version = "4.2.7", features = ["derive"] } -ethereum-types = "0.14.1" +clap = { workspace = true } +ethereum-types = { workspace = true } +flexi_logger = { workspace = true } +futures = { workspace = true } hex = { version = "0.4.3", features = ["serde"] } -flexi_logger = { version = "0.25.4", features = ["async"] } -keccak-hash = "0.10.0" -log = "0.4.17" +keccak-hash = { workspace = true } +log = { workspace = true } rlp = "0.5.2" rlp-derive = "0.1.0" -serde = "1.0.163" +serde = { workspace = true } serde_json = "1.0.96" serde_with = "3.0.0" -serde_cbor = "0.11.2" -tokio = { version = "1.28.1", features = ["full"] } -futures = "0.3.28" +serde_cbor = { workspace = true } +tokio = { workspace = true, features = ["full"] } diff --git a/evm_test_runner/Cargo.toml b/evm_test_runner/Cargo.toml index 5fb13d2..2d00855 100644 --- a/evm_test_runner/Cargo.toml +++ b/evm_test_runner/Cargo.toml @@ -2,33 +2,37 @@ name = "evm_test_runner" description = "Test runner for Polygon Zero's EVM." version = "0.1.0" -authors = ["Polygon Zero "] -edition = "2021" +edition.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true +keywords.workspace = true +categories.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] common = { path = "../common" } -plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" } -plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "b119e96f7f8dee57ebdbc6738e96891d2e628520" } +plonky2 = { workspace = true } +plonky2_evm = { workspace = true } -anyhow = { version = "1.0", features = ["backtrace"] } +anyhow = { workspace = true } askama = "0.12.0" chrono = { version = "0.4.24", features = ["serde"] } -clap = {version = "4.2.7", features = ["derive"] } +clap = { workspace = true } +console = "0.15.6" csv = "1.2.1" ctrlc = "3.2.5" -ethereum-types = "0.14.1" -flexi_logger = { version = "0.25.4", features = ["async"] } -futures = "0.3" +ethereum-types = { workspace = true } +flexi_logger = { workspace = true } +futures = { workspace = true } humantime = "2.1.0" indicatif = "0.17.3" -log = "0.4.17" -serde = "1.0.163" -serde_cbor = "0.11.2" +keccak-hash = { workspace = true } +log = { workspace = true } +serde = { workspace = true } +serde_cbor = { workspace = true } +similar = { version = "2.2.1", features = ["inline"] } termimad = "0.23.0" -tokio = {version = "1.28.1", features = ["fs", "macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["fs", "macros", "rt-multi-thread"] } tokio-stream = {version = "0.1.14", features = ["fs"] } -similar = { version = "2.2.1", features = ["inline"] } -keccak-hash = "0.10.0" -console = "0.15.6"