Skip to content

Update to Ceno's version of the toolchain #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dda1bbc
Update to Ceno's version of the toolchain
matthiasgoergens Oct 18, 2024
42d0f46
Widen dependencies more
matthiasgoergens Oct 18, 2024
6bee9b9
Minimise diff
matthiasgoergens Oct 18, 2024
83487e0
Merge remote-tracking branch 'origin/main' into matthias/update-toolc…
matthiasgoergens Oct 28, 2024
5131556
Update
matthiasgoergens Nov 15, 2024
f4c692a
Merge remote-tracking branch 'origin/main' into matthias/update-toolc…
matthiasgoergens Nov 18, 2024
c762640
Fix
matthiasgoergens Nov 18, 2024
6b53af5
Fix atty
matthiasgoergens Nov 18, 2024
ed3f35e
Formatting
matthiasgoergens Nov 18, 2024
2b611ab
Fix
matthiasgoergens Nov 18, 2024
3d39683
Remove mention of SIMD
matthiasgoergens Nov 18, 2024
f88099b
Fix `cargo check --all-targets`
matthiasgoergens Nov 18, 2024
d7ac22a
Fix
matthiasgoergens Nov 18, 2024
1d39d6a
Remove zokrates failing tests
matthiasgoergens Nov 18, 2024
2d118b8
Remove unused and broken zokrates_stdlib
matthiasgoergens Nov 18, 2024
e5a95e1
Remove crap
matthiasgoergens Nov 18, 2024
240111e
Merge branch 'matthias/fix-cargo-check' into matthias/update-toolchain
matthiasgoergens Nov 18, 2024
0b7f1d5
Merge remote-tracking branch 'origin/main' into matthias/update-toolc…
matthiasgoergens Nov 18, 2024
a5e3aa8
Restore zokrates_stdlib
matthiasgoergens Nov 18, 2024
09230c3
Merge remote-tracking branch 'origin/main' into matthias/update-toolc…
matthiasgoergens Nov 18, 2024
b7e2070
Remove unused test
matthiasgoergens Nov 18, 2024
b9db585
Merge remote-tracking branch 'origin/main' into matthias/update-toolc…
matthiasgoergens Nov 18, 2024
034db20
Merge remote-tracking branch 'origin/main' into matthias/update-toolc…
matthiasgoergens Nov 18, 2024
3c60b84
Merge remote-tracking branch 'origin/main' into matthias/update-toolc…
matthiasgoergens Nov 18, 2024
f069e7b
Restore collect_vec avoidal
matthiasgoergens Nov 18, 2024
1ac3296
Simplify
matthiasgoergens Nov 18, 2024
b2f9d18
Better name
matthiasgoergens Nov 18, 2024
d33cc76
Move
matthiasgoergens Nov 18, 2024
d532a83
Be a bit more specific with versions
matthiasgoergens Nov 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
813 changes: 439 additions & 374 deletions circ_blocks/Cargo.lock

Large diffs are not rendered by default.

33 changes: 15 additions & 18 deletions circ_blocks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,23 @@ circ_hc = { path = "circ_hc", default-features = false, features = [
"lru",
] }
circ_waksman = { path = "circ_waksman" }
rug = { version = "1.11", features = ["serde"] }
gmp-mpfr-sys = { version = "1.4", optional = true }
lazy_static = { version = "1.4", optional = true }
rug = { version = "1.26", features = ["serde"] }
gmp-mpfr-sys = { version = "1.6", optional = true }
lazy_static = { version = "1.5", optional = true }
rand = "0.8"
rand_chacha = "0.3"
rsmt2 = { version = "0.14", optional = true }
rsmt2 = { version = "0.16", optional = true }
ieee754 = { version = "0.2", optional = true }
zokrates_parser = { path = "third_party/ZoKrates/zokrates_parser", optional = true }
zokrates_pest_ast = { path = "third_party/ZoKrates/zokrates_pest_ast", optional = true }
typed-arena = { version = "2.0", optional = true }
typed-arena = { version = "2", optional = true }
log = "0.4"
thiserror = "1.0"
thiserror = "1"
bellman = { git = "https://github.com/alex-ozdemir/bellman.git", branch = "mirage", optional = true }
rug-polynomial = { version = "0.2.5", optional = true }
rayon = { version = "1", optional = true }
ff = { version = "0.12", optional = true }
fxhash = "0.2"
good_lp = { version = "1.1", features = [
good_lp = { version = "1.10", features = [
"lp-solvers",
"coin_cbc",
], default-features = false, optional = true }
Expand All @@ -43,10 +42,10 @@ serde_bytes = { version = "0.11", optional = true }
bincode = { version = "1.3.3", optional = true }
byteorder = { version = "1", optional = true }
lang-c = { version = "0.10.1", optional = true }
logos = "0.12"
logos = "0.14"
pairing = { version = "0.22", optional = true }
pest = { version = "2.4", optional = true }
pest_derive = { version = "2.1", optional = true }
pest = { version = "2.7", optional = true }
pest_derive = { version = "2.7", optional = true }
pest-ast = { version = "0.3", optional = true }
from-pest = { version = "0.3", optional = true }
itertools = "0.10"
Expand All @@ -57,26 +56,25 @@ spartan_parallel = { path = "../spartan_parallel", default-features = false, fea
"profile",
] }
merlin = { version = "3.0.0" }
curve25519-dalek = { version = "3.2.0", features = ["serde"], optional = true }
curve25519-dalek = { version = "4", features = ["serde"], optional = true }
# TODO: kill
paste = "1.0"
paste = "1"
im = "15"
once_cell = "1"
regex = "1"

[dev-dependencies]
quickcheck = "1"
quickcheck_macros = "1"
env_logger = "0.8"
env_logger = "0.11"
bls12_381 = "0.7"
approx = "0.5.0"
approx = "0.5"

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

[features]
default = ["bellman", "r1cs", "poly", "smt", "zok"]
default = ["bellman", "r1cs", "smt", "zok"]
# frontends
c = ["lang-c"]
zok = ["smt", "zokrates_parser", "zokrates_pest_ast", "typed-arena", "petgraph"]
Expand All @@ -86,7 +84,6 @@ smt = ["rsmt2", "ieee754"]
lp = ["good_lp", "lp-solvers"]
aby = ["lp"]
r1cs = ["bincode", "rayon"]
poly = ["rug-polynomial"]
spartan = ["r1cs", "dep:spartan", "curve25519-dalek", "bincode", "gmp-mpfr-sys"]
bellman = [
"r1cs",
Expand Down
Loading