Skip to content

Upgrade to Noir beta14 #218

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

Open
recmo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade to Noir beta14 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@ zeroize = "1.8.1"
zstd = "0.13.3"

# Noir language dependencies
acir = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
bn254_blackbox_solver = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
nargo = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
nargo_cli = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
nargo_toml = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
noir_artifact_cli = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
noirc_abi = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
noirc_artifacts = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
noirc_driver = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.11" }
acir = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
bn254_blackbox_solver = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
nargo = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
nargo_cli = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
nargo_toml = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
noir_artifact_cli = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
noirc_abi = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
noirc_artifacts = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }
noirc_driver = { git = "https://github.com/noir-lang/noir", rev = "v1.0.0-beta.14" }

# Cryptography and proof systems
ark-bn254 = { version = "0.5.0", default-features = false, features = [
Expand Down
68 changes: 32 additions & 36 deletions provekit/r1cs-compiler/src/noir_to_r1cs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ use {
},
acir::{
circuit::{
opcodes::{
BlackBoxFuncCall, BlockType, ConstantOrWitnessEnum as ConstantOrACIRWitness,
},
opcodes::{BlackBoxFuncCall, BlockType, FunctionInput},
Circuit, Opcode,
},
native_types::{Expression, Witness as NoirWitness},
Expand All @@ -18,7 +16,7 @@ use {
ark_std::One,
provekit_common::{
utils::noir_to_native,
witness::{ConstantOrR1CSWitness, ConstantTerm, SumTerm, WitnessBuilder},
witness::{ConstantOrR1CSWitness, ConstantTerm, SumTerm, WitnessBuilder, BINOP_BITS},
FieldElement, NoirElement, R1CS,
},
std::{collections::BTreeMap, num::NonZeroU32, ops::Neg},
Expand Down Expand Up @@ -131,14 +129,12 @@ impl NoirToR1CSCompiler {
// R1CS witness (and builder) if required.
fn fetch_constant_or_r1cs_witness(
&mut self,
constant_or_witness: ConstantOrACIRWitness<NoirElement>,
constant_or_witness: &FunctionInput<NoirElement>,
) -> ConstantOrR1CSWitness {
match constant_or_witness {
ConstantOrACIRWitness::Constant(c) => {
ConstantOrR1CSWitness::Constant(noir_to_native(c))
}
ConstantOrACIRWitness::Witness(w) => {
let r1cs_witness = self.fetch_r1cs_witness_index(w);
FunctionInput::Constant(c) => ConstantOrR1CSWitness::Constant(noir_to_native(*c)),
FunctionInput::Witness(w) => {
let r1cs_witness = self.fetch_r1cs_witness_index(*w);
ConstantOrR1CSWitness::Witness(r1cs_witness)
}
}
Expand Down Expand Up @@ -276,15 +272,7 @@ impl NoirToR1CSCompiler {
memory_blocks.insert(block_id, block);
}

Opcode::MemoryOp {
block_id,
op,
predicate,
} => {
// Panic if the predicate is set (according to Noir developers, predicate is
// always None and will soon be removed).
assert!(predicate.is_none());

Opcode::MemoryOp { block_id, op } => {
let block_id = block_id.0 as usize;
assert!(
memory_blocks.contains_key(&block_id),
Expand Down Expand Up @@ -329,20 +317,16 @@ impl NoirToR1CSCompiler {
}

Opcode::BlackBoxFuncCall(black_box_func_call) => match black_box_func_call {
BlackBoxFuncCall::RANGE {
input: function_input,
} => {
let input = function_input.input();
let num_bits = function_input.num_bits();
BlackBoxFuncCall::RANGE { input, num_bits } => {
let input_witness = match input {
ConstantOrACIRWitness::Constant(_) => {
FunctionInput::Constant(_) => {
panic!(
"We should never be range-checking a constant value, as this \
should already be done by the noir-ACIR compiler"
);
}
ConstantOrACIRWitness::Witness(witness) => {
self.fetch_r1cs_witness_index(witness)
FunctionInput::Witness(witness) => {
self.fetch_r1cs_witness_index(*witness)
}
};
// println!(
Expand All @@ -351,7 +335,7 @@ impl NoirToR1CSCompiler {
// );
// Add the entry into the range blocks.
range_checks
.entry(num_bits)
.entry(*num_bits)
.or_default()
.push(input_witness);
}
Expand All @@ -360,17 +344,29 @@ impl NoirToR1CSCompiler {
// The inputs and outputs will have already been solved for by the ACIR solver.
// Collect the R1CS witnesses indices so that we can later constrain them
// appropriately.
BlackBoxFuncCall::AND { lhs, rhs, output } => {
BlackBoxFuncCall::AND {
lhs,
rhs,
output,
num_bits,
} => {
assert_eq!(*num_bits as usize, BINOP_BITS);
and_ops.push((
self.fetch_constant_or_r1cs_witness(lhs.input()),
self.fetch_constant_or_r1cs_witness(rhs.input()),
self.fetch_constant_or_r1cs_witness(lhs),
self.fetch_constant_or_r1cs_witness(rhs),
self.fetch_r1cs_witness_index(*output),
));
}
BlackBoxFuncCall::XOR { lhs, rhs, output } => {
BlackBoxFuncCall::XOR {
lhs,
rhs,
output,
num_bits,
} => {
assert_eq!(*num_bits as usize, BINOP_BITS);
xor_ops.push((
self.fetch_constant_or_r1cs_witness(lhs.input()),
self.fetch_constant_or_r1cs_witness(rhs.input()),
self.fetch_constant_or_r1cs_witness(lhs),
self.fetch_constant_or_r1cs_witness(rhs),
self.fetch_r1cs_witness_index(*output),
));
}
Expand All @@ -381,11 +377,11 @@ impl NoirToR1CSCompiler {
} => {
let input_witnesses: Vec<ConstantOrR1CSWitness> = inputs
.iter()
.map(|input| self.fetch_constant_or_r1cs_witness(input.input()))
.map(|input| self.fetch_constant_or_r1cs_witness(input))
.collect();
let hash_witnesses: Vec<ConstantOrR1CSWitness> = hash_values
.iter()
.map(|hv| self.fetch_constant_or_r1cs_witness(hv.input()))
.map(|hv| self.fetch_constant_or_r1cs_witness(hv))
.collect();
let output_witnesses: Vec<usize> = outputs
.iter()
Expand Down
Loading
Loading