Skip to content

Commit adc0460

Browse files
Update to Ceno's version of the toolchain (#12)
We are getting a lot of [flak from dependabot about security problems](https://github.com/scroll-tech/ceno-recursion/security/dependabot) in dependencies. So let's update our dependencies to fix them. Also rename to `config.toml` to make the newer cargo happy.
1 parent 4aad122 commit adc0460

File tree

18 files changed

+754
-830
lines changed

18 files changed

+754
-830
lines changed

circ_blocks/Cargo.lock

Lines changed: 439 additions & 374 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

circ_blocks/Cargo.toml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,23 @@ circ_hc = { path = "circ_hc", default-features = false, features = [
1414
"lru",
1515
] }
1616
circ_waksman = { path = "circ_waksman" }
17-
rug = { version = "1.11", features = ["serde"] }
18-
gmp-mpfr-sys = { version = "1.4", optional = true }
19-
lazy_static = { version = "1.4", optional = true }
17+
rug = { version = "1.26", features = ["serde"] }
18+
gmp-mpfr-sys = { version = "1.6", optional = true }
19+
lazy_static = { version = "1.5", optional = true }
2020
rand = "0.8"
2121
rand_chacha = "0.3"
22-
rsmt2 = { version = "0.14", optional = true }
22+
rsmt2 = { version = "0.16", optional = true }
2323
ieee754 = { version = "0.2", optional = true }
2424
zokrates_parser = { path = "third_party/ZoKrates/zokrates_parser", optional = true }
2525
zokrates_pest_ast = { path = "third_party/ZoKrates/zokrates_pest_ast", optional = true }
26-
typed-arena = { version = "2.0", optional = true }
26+
typed-arena = { version = "2", optional = true }
2727
log = "0.4"
28-
thiserror = "1.0"
28+
thiserror = "1"
2929
bellman = { git = "https://github.com/alex-ozdemir/bellman.git", branch = "mirage", optional = true }
30-
rug-polynomial = { version = "0.2.5", optional = true }
3130
rayon = { version = "1", optional = true }
3231
ff = { version = "0.12", optional = true }
3332
fxhash = "0.2"
34-
good_lp = { version = "1.1", features = [
33+
good_lp = { version = "1.10", features = [
3534
"lp-solvers",
3635
"coin_cbc",
3736
], default-features = false, optional = true }
@@ -43,10 +42,10 @@ serde_bytes = { version = "0.11", optional = true }
4342
bincode = { version = "1.3.3", optional = true }
4443
byteorder = { version = "1", optional = true }
4544
lang-c = { version = "0.10.1", optional = true }
46-
logos = "0.12"
45+
logos = "0.14"
4746
pairing = { version = "0.22", optional = true }
48-
pest = { version = "2.4", optional = true }
49-
pest_derive = { version = "2.1", optional = true }
47+
pest = { version = "2.7", optional = true }
48+
pest_derive = { version = "2.7", optional = true }
5049
pest-ast = { version = "0.3", optional = true }
5150
from-pest = { version = "0.3", optional = true }
5251
itertools = "0.10"
@@ -57,26 +56,25 @@ spartan_parallel = { path = "../spartan_parallel", default-features = false, fea
5756
"profile",
5857
] }
5958
merlin = { version = "3.0.0" }
60-
curve25519-dalek = { version = "3.2.0", features = ["serde"], optional = true }
59+
curve25519-dalek = { version = "4", features = ["serde"], optional = true }
6160
# TODO: kill
62-
paste = "1.0"
61+
paste = "1"
6362
im = "15"
6463
once_cell = "1"
6564
regex = "1"
6665

6766
[dev-dependencies]
6867
quickcheck = "1"
6968
quickcheck_macros = "1"
70-
env_logger = "0.8"
69+
env_logger = "0.11"
7170
bls12_381 = "0.7"
72-
approx = "0.5.0"
71+
approx = "0.5"
7372

7473
[patch.crates-io]
7574
ff = { path = "../ff" }
76-
curve25519-dalek = { git = "https://github.com/Jiangkm3/curve25519-dalek.git", branch = "3.2-dependency-fix" }
7775

7876
[features]
79-
default = ["bellman", "r1cs", "poly", "smt", "zok"]
77+
default = ["bellman", "r1cs", "smt", "zok"]
8078
# frontends
8179
c = ["lang-c"]
8280
zok = ["smt", "zokrates_parser", "zokrates_pest_ast", "typed-arena", "petgraph"]
@@ -86,7 +84,6 @@ smt = ["rsmt2", "ieee754"]
8684
lp = ["good_lp", "lp-solvers"]
8785
aby = ["lp"]
8886
r1cs = ["bincode", "rayon"]
89-
poly = ["rug-polynomial"]
9087
spartan = ["r1cs", "dep:spartan", "curve25519-dalek", "bincode", "gmp-mpfr-sys"]
9188
bellman = [
9289
"r1cs",

0 commit comments

Comments
 (0)