Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Refactor constraint system #29

Merged
merged 16 commits into from
Feb 4, 2022
Merged

Refactor constraint system #29

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f7b7906
Branch name updated in deps
phoinic Aug 19, 2021
4885c39
Merge branch 'avoid_collision_in_fs_init' into proof_size_optimization
DanieleDiBenedetto Sep 1, 2021
023913e
sc_testnet_2 initial commit
DanieleDiBenedetto Sep 2, 2021
a492616
Update Marlin to use ConstraintSystemImpl
lgiussan Sep 29, 2021
761b455
rename ConstraintSystemImpl and ConstraintSystem
lgiussan Oct 18, 2021
acbef98
Merge branch 'dev' into refactor_constraint_system
lgiussan Oct 18, 2021
a029e27
Unify make_matrices_square for prover and indexer
lgiussan Oct 21, 2021
49c3016
Align to new ConstraintSystem constructor interface
lgiussan Oct 26, 2021
78371bf
Rename some functions and restore assertions
lgiussan Oct 26, 2021
7f7927a
Merge branch 'dev' into refactor_constraint_system
lgiussan Oct 26, 2021
1e766a6
cargo fmt
lgiussan Oct 26, 2021
5842fc6
Remove unneeded helper function
lgiussan Oct 26, 2021
17ef35a
Ginger-Lib endo branch sync
phoinic Oct 28, 2021
4878c0b
Update dependencies
lgiussan Oct 29, 2021
b792d5b
Merge branch 'endo' into refactor_constraint_system
lgiussan Oct 29, 2021
3208be2
Merge remote-tracking branch 'origin/dev' into refactor_constraint_sy…
lgiussan Nov 16, 2021
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
14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ license = "MIT/Apache-2.0"
edition = "2018"

[dependencies]
algebra = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "development", features = ["parallel", "fft", "derive"] }
bench-utils = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "development" }
r1cs-core = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "development" }
r1cs-std = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "development" }
algebra = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "sc_testnet_2", features = ["parallel", "fft", "derive"] }
bench-utils = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "sc_testnet_2" }
r1cs-core = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "refactor_constraint_system" }
r1cs-std = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "refactor_constraint_system" }

poly-commit = { git = "https://github.com/HorizenLabs/poly-commit", branch = "dev" }
poly-commit = { git = "https://github.com/HorizenLabs/poly-commit", branch = "sc_testnet_2" }

rand = "0.8.4"
rand_core = { version = "0.6.3" }
Expand All @@ -39,8 +39,8 @@ digest = { version = "0.8" }
derivative = { version = "2", features = ["use_core"] }

[dev-dependencies]
algebra = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "development", features = ["tweedle", "derive"]}
r1cs-std = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "development", features = ["tweedle"]}
algebra = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "sc_testnet_2", features = ["tweedle", "derive"]}
r1cs-std = { git = "https://github.com/HorizenOfficial/ginger-lib", branch = "refactor_constraint_system", features = ["tweedle"]}

blake2 = { version = "0.8.1", default-features = false }
criterion = "0.3"
Expand Down
14 changes: 7 additions & 7 deletions benches/tweedle_test_circuits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use marlin::*;
use poly_commit::ipa_pc::InnerProductArgPC;

use algebra::PrimeField;
use r1cs_core::{ConstraintSynthesizer, ConstraintSystem, SynthesisError};
use r1cs_core::{ConstraintSynthesizer, ConstraintSystemAbstract, SynthesisError};

use criterion::Criterion;
use criterion::{BatchSize, BenchmarkId};
Expand Down Expand Up @@ -94,7 +94,7 @@ pub struct TestCircuit2c<F: PrimeField> {
}

impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit1a<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
fn generate_constraints<CS: ConstraintSystemAbstract<F>>(
self,
cs: &mut CS,
) -> Result<(), SynthesisError> {
Expand Down Expand Up @@ -146,7 +146,7 @@ impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit1a<F> {
}

impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit1b<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
fn generate_constraints<CS: ConstraintSystemAbstract<F>>(
self,
cs: &mut CS,
) -> Result<(), SynthesisError> {
Expand Down Expand Up @@ -211,7 +211,7 @@ impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit1b<F> {
}

impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit1c<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
fn generate_constraints<CS: ConstraintSystemAbstract<F>>(
self,
cs: &mut CS,
) -> Result<(), SynthesisError> {
Expand Down Expand Up @@ -297,7 +297,7 @@ impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit1c<F> {
}

impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit2a<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
fn generate_constraints<CS: ConstraintSystemAbstract<F>>(
self,
cs: &mut CS,
) -> Result<(), SynthesisError> {
Expand Down Expand Up @@ -349,7 +349,7 @@ impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit2a<F> {
}

impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit2b<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
fn generate_constraints<CS: ConstraintSystemAbstract<F>>(
self,
cs: &mut CS,
) -> Result<(), SynthesisError> {
Expand Down Expand Up @@ -428,7 +428,7 @@ impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit2b<F> {
}

impl<F: PrimeField> ConstraintSynthesizer<F> for TestCircuit2c<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
fn generate_constraints<CS: ConstraintSystemAbstract<F>>(
self,
cs: &mut CS,
) -> Result<(), SynthesisError> {
Expand Down
Loading