Widen dependencies (#405)

We already use `Cargo.lock` to keep track of exact versions. `Cargo.toml` is more of a general recipe telling the cargo which packages to consider. [Semantic Versioning](https://semver.org/) says: > Given a version number MAJOR.MINOR.PATCH, increment the: > 1. MAJOR version when you make incompatible API changes > 2. MINOR version when you add functionality in a backward compatible manner > 3. PATCH version when you make backward compatible bug fixes But for real-world reasons, we specify both Major and Minor here, because many crates introduced incompatible changes even between Minor versions. This PR fixes https://github.com/scroll-tech/ceno/security/dependabot/1
scroll-tech · Oct 18, 2024 · b1afd0a · b1afd0a
1 parent 083c6d7
commit b1afd0a
Show file tree

Hide file tree

Showing 16 changed files with 180 additions and 308 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,20 +24,33 @@ license = "MIT OR Apache-2.0"
 version = "0.1.0"
 
 [workspace.dependencies]
-ark-std = { version = "0.4" }
-# ark-std = { version = "0.4", features = ["print-trace"] }
-ark-poly = "0.4"
+ark-std = "0.4"
+cfg-if = "1.0"
+const_env = "0.1"
 criterion = { version = "0.5", features = ["html_reports"] }
+crossbeam-channel = "0.5"
 ff = "0.13"
 goldilocks = { git = "https://github.com/zhenfeizhang/Goldilocks" }
-halo2curves = "0.1.0"
+itertools = "0.13"
+paste = "1"
+plonky2 = "0.2"
 poseidon = { path = "./poseidon" }
-rand_chacha = { version = "0.3.1", features = ["serde1"] }
-rand_core = "0.6.4"
+pprof = { version = "0.13", features = ["flamegraph"] }
+rand = "0.8"
+rand_chacha = { version = "0.3", features = ["serde1"] }
+rand_core = "0.6"
 rand_xorshift = "0.3"
 rayon = "1.10"
 serde = { version = "1.0", features = ["derive"] }
-subtle = "2.6.1"
+serde_json = "1.0"
+strum = "0.26"
+strum_macros = "0.26"
+subtle = "2.6"
+tracing = { version = "0.1", features = [
+  "attributes",
+] }
+tracing-flame = "0.2"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [patch."https://github.com/zhenfeizhang/Goldilocks"]
 goldilocks = { git = "https://github.com/hero78119/Goldilocks" }

diff --git a/ceno_emul/Cargo.toml b/ceno_emul/Cargo.toml
@@ -6,12 +6,10 @@ version.workspace = true
 
 [dependencies]
 anyhow = { version = "1.0", default-features = false }
-elf = { version = "0.7.4" }
-strum = "0.25.0"
-strum_macros = "0.25.3"
-tracing = { version = "0.1", default-features = false, features = [
-  "attributes",
-] }
+elf = "0.7"
+strum.workspace = true
+strum_macros.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
 ceno-examples = { path = "../examples-builder" }
diff --git a/ceno_rt/Cargo.toml b/ceno_rt/Cargo.toml
@@ -5,5 +5,5 @@ name = "ceno_rt"
 version.workspace = true
 
 [dependencies]
-riscv = "0.11.1"
-riscv-rt = "0.12.2"
+riscv = "0.11"
+riscv-rt = "0.12"
diff --git a/ceno_zkvm/Cargo.toml b/ceno_zkvm/Cargo.toml
@@ -15,31 +15,31 @@ serde.workspace = true
 ceno_emul = { path = "../ceno_emul" }
 ff_ext = { path = "../ff_ext" }
 mpcs = { path = "../mpcs" }
-multilinear_extensions = { version = "0.1.0", path = "../multilinear_extensions" }
-sumcheck = { version = "0.1.0", path = "../sumcheck" }
+multilinear_extensions = { version = "0", path = "../multilinear_extensions" }
+sumcheck = { version = "0", path = "../sumcheck" }
 transcript = { path = "../transcript" }
 
-itertools = "0.12.1"
-paste = "1.0.15"
-strum = "0.25.0"
-strum_macros = "0.25.3"
-tracing = "0.1.40"
-tracing-flame = "0.2.0"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+itertools.workspace = true
+paste.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+tracing.workspace = true
+tracing-flame.workspace = true
+tracing-subscriber.workspace = true
 
-clap = { version = "4.5.20", features = ["derive"] }
-generic_static = "0.2.0"
-rand = "0.8"
-tempfile = "3.13.0"
-thread_local = "1.1.8"
+clap = { version = "4.5", features = ["derive"] }
+generic_static = "0.2"
+rand.workspace = true
+tempfile = "3.13"
+thread_local = "1.1"
 
 [dev-dependencies]
-base64 = "0.22.1"
-cfg-if = "1.0.0"
-const_env = "0.1.2"
-criterion = { version = "0.5", features = ["html_reports"] }
-pprof = { version = "0.13", features = ["flamegraph"] }
-serde_json = "1.0.129"
+base64 = "0.22"
+cfg-if.workspace = true
+const_env.workspace = true
+criterion.workspace = true
+pprof.workspace = true
+serde_json.workspace = true
 
 [build-dependencies]
 glob = "0.3"

diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/gkr-graph/Cargo.toml b/gkr-graph/Cargo.toml
@@ -10,8 +10,8 @@ ff.workspace = true
 ff_ext = { path = "../ff_ext" }
 gkr = { path = "../gkr", features = ["parallel"] }
 goldilocks.workspace = true
-itertools = "0.12.1"
-multilinear_extensions = { version = "0.1.0", path = "../multilinear_extensions" }
-simple-frontend = { version = "0.1.0", path = "../simple-frontend" }
-sumcheck = { version = "0.1.0", path = "../sumcheck" }
-transcript = { version = "0.1.0", path = "../transcript" }
+itertools.workspace = true
+multilinear_extensions = { version = "0", path = "../multilinear_extensions" }
+simple-frontend = { version = "0", path = "../simple-frontend" }
+sumcheck = { version = "0", path = "../sumcheck" }
+transcript = { version = "0", path = "../transcript" }
diff --git a/gkr/Cargo.toml b/gkr/Cargo.toml
@@ -9,26 +9,26 @@ ark-std.workspace = true
 ff.workspace = true
 goldilocks.workspace = true
 
-const_env = "0.1.2"
-crossbeam-channel = "0.5.13"
+const_env.workspace = true
+crossbeam-channel.workspace = true
 ff_ext = { path = "../ff_ext" }
-itertools = "0.12.1"
+itertools.workspace = true
 multilinear_extensions = { path = "../multilinear_extensions" }
 rayon.workspace = true
 serde.workspace = true
-serde_json = "1.0.129"
+serde_json.workspace = true
 simple-frontend = { path = "../simple-frontend" }
 sumcheck = { path = "../sumcheck" }
-tracing = "0.1.40"
-tracing-flame = "0.2.0"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing.workspace = true
+tracing-flame.workspace = true
+tracing-subscriber.workspace = true
 transcript = { path = "../transcript" }
 
 [dev-dependencies]
-cfg-if = "1.0.0"
-criterion = { version = "0.5", features = ["html_reports"] }
-pprof = { version = "0.13", features = ["flamegraph"] }
-tiny-keccak = { version = "2.0.2", features = ["keccak"] }
+cfg-if.workspace = true
+criterion.workspace = true
+pprof.workspace = true
+tiny-keccak = { version = "2.0", features = ["keccak"] }
 
 [features]
 default = []

diff --git a/mpcs/Cargo.toml b/mpcs/Cargo.toml
@@ -6,33 +6,31 @@ version.workspace = true
 
 [dependencies]
 aes = "0.8"
-ark-std = { version = "0.4" }
-bitvec = "1.0.1"
-blake2 = { version = "0.10.6" }
-blake2b_simd = "1.0.2"
-ctr = { git = "https://github.com/RustCrypto/block-modes", rev = "78fefba" }
+ark-std.workspace = true
+bitvec = "1.0"
+blake2 = "0.10"
+blake2b_simd = "1.0"
+ctr = "0.9"
 ff.workspace = true
 ff_ext = { path = "../ff_ext" }
-generic-array = { version = "0.14.7", features = ["serde"] }
+# TODO: move to version 1, once our dependencies are updated
+generic-array = { version = "0.14", features = ["serde"] }
 goldilocks.workspace = true
-halo2_curves = { git = "https://github.com/privacy-scaling-explorations/halo2curves", tag = "0.3.3", package = "halo2curves", features = [
-  "derive_serde",
-] }
-itertools = "0.12.1"
+itertools.workspace = true
 multilinear_extensions = { path = "../multilinear_extensions" }
-num-bigint = "0.4.6"
-num-integer = "0.1.46"
-plonky2 = "0.2.2"
+num-bigint = "0.4"
+num-integer = "0.1"
+plonky2.workspace = true
 poseidon.workspace = true
-rand = "0.8"
+rand.workspace = true
 rand_chacha.workspace = true
-rayon = { version = "1.10.0", optional = true }
+rayon = { workspace = true, optional = true }
 serde.workspace = true
-sha3 = "0.10.8"
+sha3 = "0.10"
 transcript = { path = "../transcript" }
 
 [dev-dependencies]
-criterion = { version = "0.5", features = ["html_reports"] }
+criterion.workspace = true
 gkr = { path = "../gkr" }
 simple-frontend = { path = "../simple-frontend" }
 

diff --git a/multilinear_extensions/Cargo.toml b/multilinear_extensions/Cargo.toml
@@ -9,15 +9,15 @@ ark-std.workspace = true
 ff.workspace = true
 ff_ext = { path = "../ff_ext" }
 goldilocks.workspace = true
-itertools = "0.12.1"
+itertools.workspace = true
 rayon.workspace = true
 serde.workspace = true
-tracing = "0.1.40"
-tracing-flame = "0.2.0"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing.workspace = true
+tracing-flame.workspace = true
+tracing-subscriber.workspace = true
 
 [dev-dependencies]
-criterion = { version = "0.5", features = ["html_reports"] }
+criterion.workspace = true
 env_logger = "0.11"
 log = "0.4"
 

diff --git a/poseidon/Cargo.toml b/poseidon/Cargo.toml
@@ -9,12 +9,12 @@ criterion.workspace = true
 ff.workspace = true
 goldilocks.workspace = true
 serde.workspace = true
-unroll = "0.1.5"
+unroll = "0.1"
 
 [dev-dependencies]
 ark-std.workspace = true
-plonky2 = "0.2.2"
-rand = "0.8.5"
+plonky2.workspace = true
+rand.workspace = true
 
 [[bench]]
 harness = false

diff --git a/simple-frontend/Cargo.toml b/simple-frontend/Cargo.toml
@@ -10,6 +10,6 @@ ark-std.workspace = true
 ff.workspace = true
 ff_ext = { path = "../ff_ext" }
 goldilocks.workspace = true
-itertools = "0.12.1"
+itertools.workspace = true
 rayon.workspace = true
 serde.workspace = true
diff --git a/singer-utils/Cargo.toml b/singer-utils/Cargo.toml
@@ -11,11 +11,11 @@ ff_ext = { path = "../ff_ext" }
 goldilocks.workspace = true
 
 gkr = { path = "../gkr", features = ["parallel"] }
-gkr-graph = { version = "0.1.0", path = "../gkr-graph" }
-itertools = "0.12.1"
+gkr-graph = { version = "0", path = "../gkr-graph" }
+itertools.workspace = true
 multilinear_extensions = { path = "../multilinear_extensions", features = ["parallel"] }
-simple-frontend = { version = "0.1.0", path = "../simple-frontend" }
-strum = "0.26.3"
-strum_macros = "0.26.4"
-sumcheck = { version = "0.1.0", path = "../sumcheck" }
-transcript = { version = "0.1.0", path = "../transcript" }
+simple-frontend = { version = "0", path = "../simple-frontend" }
+strum.workspace = true
+strum_macros.workspace = true
+sumcheck = { version = "0", path = "../sumcheck" }
+transcript = { version = "0", path = "../transcript" }
diff --git a/singer/Cargo.toml b/singer/Cargo.toml
@@ -13,26 +13,26 @@ serde.workspace = true
 
 ff_ext = { path = "../ff_ext" }
 gkr = { path = "../gkr", features = ["parallel"] }
-gkr-graph = { version = "0.1.0", path = "../gkr-graph" }
+gkr-graph = { version = "0", path = "../gkr-graph" }
 mpcs = { path = "../mpcs" }
-multilinear_extensions = { version = "0.1.0", path = "../multilinear_extensions" }
-simple-frontend = { version = "0.1.0", path = "../simple-frontend" }
-singer-utils = { version = "0.1.0", path = "../singer-utils" }
+multilinear_extensions = { version = "0", path = "../multilinear_extensions" }
+simple-frontend = { version = "0", path = "../simple-frontend" }
+singer-utils = { version = "0", path = "../singer-utils" }
 transcript = { path = "../transcript" }
 
-itertools = "0.12.1"
-paste = "1.0.15"
-strum = "0.25.0"
-strum_macros = "0.25.3"
-tracing = "0.1.40"
-tracing-flame = "0.2.0"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+itertools.workspace = true
+paste.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+tracing-flame.workspace = true
+tracing-subscriber.workspace = true
 
 [dev-dependencies]
-cfg-if = "1.0.0"
-const_env = "0.1.2"
-criterion = { version = "0.5", features = ["html_reports"] }
-pprof = { version = "0.13", features = ["flamegraph"] }
+cfg-if.workspace = true
+const_env.workspace = true
+criterion.workspace = true
+pprof.workspace = true
+tracing.workspace = true
 
 [features]
 dbg-add-opcode = []

diff --git a/sumcheck/Cargo.toml b/sumcheck/Cargo.toml
@@ -5,24 +5,24 @@ name = "sumcheck"
 version.workspace = true
 
 [dependencies]
-ark-ff = "0.4.2"
 ark-std.workspace = true
-const_env = "0.1.2"
+const_env.workspace = true
 ff.workspace = true
 ff_ext = { path = "../ff_ext" }
 goldilocks.workspace = true
-itertools = "0.12.1"
+itertools.workspace = true
 rayon.workspace = true
 serde.workspace = true
-tracing = "0.1.40"
+tracing.workspace = true
+tracing-flame.workspace = true
 
-crossbeam-channel = "0.5.13"
+crossbeam-channel.workspace = true
 multilinear_extensions = { path = "../multilinear_extensions", features = ["parallel"] }
 transcript = { path = "../transcript" }
 
 [dev-dependencies]
-criterion = { version = "0.5", features = ["html_reports"] }
-pprof = { version = "0.13", features = ["flamegraph"] }
+criterion.workspace = true
+pprof.workspace = true
 
 [[bench]]
 harness = false

diff --git a/transcript/Cargo.toml b/transcript/Cargo.toml
@@ -6,11 +6,10 @@ version.workspace = true
 
 [dependencies]
 ark-std.workspace = true
-crossbeam-channel = "0.5.13"
+crossbeam-channel.workspace = true
 ff.workspace = true
 ff_ext = { path = "../ff_ext" }
 goldilocks.workspace = true
-halo2curves.workspace = true
 poseidon.workspace = true
 rayon.workspace = true
 serde.workspace = true