diff --git a/Cargo.lock b/Cargo.lock index 256a5553d..a8a585cbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1552,9 +1552,11 @@ dependencies = [ "core2", "criterion", "ff", + "font-kit", "fpe", "getset", "group", + "half 2.2.1", "halo2_gadgets", "halo2_poseidon 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "halo2_proofs", diff --git a/Cargo.toml b/Cargo.toml index bb0739f02..95daae6b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ k256 = { version = "0.13.0", default-features = false, features = ["arithmetic", lazy_static = "1" memuse = { version = "0.2.2", default-features = false } pasta_curves = "0.5" -proptest = { version = "1.0.0", optional = true } +proptest = { version = "=1.2.0", optional = true } rand = { version = "0.8", default-features = false } rand_core = { version = "0.6", default-features = false } reddsa = { version = "0.5", default-features = false } @@ -66,6 +66,10 @@ core2 = { version = "0.3", default-features = false, features = ["alloc"] } image = { version = "0.24", optional = true } plotters = { version = "0.3.0", optional = true } +# Pinned to versions that still build on MSRV 1.70 (font-kit + half) +font-kit = { version = "=0.11.0", optional = true } +half = { version = "=2.2.1", optional = true } + [dev-dependencies] criterion = "0.4" # 0.5 depends on clap 4 which has MSRV 1.70 halo2_gadgets = { git = "https://github.com/QED-it/halo2", branch = "zsa1", features = ["test-dependencies"] } @@ -88,7 +92,7 @@ std = ["core2/std", "group/wnaf-memuse", "reddsa/std"] circuit = ["dep:halo2_gadgets", "dep:halo2_proofs", "std"] unstable-frost = [] multicore = ["halo2_proofs?/multicore"] -dev-graph = ["halo2_proofs?/dev-graph", "image", "plotters"] +dev-graph = ["halo2_proofs?/dev-graph", "image", "plotters", "font-kit", "half"] test-dependencies = ["proptest", "rand/std"] [[bench]]