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

Remove evaluation from barycentric circuit assignment. #1430

Merged
merged 3 commits into from
Oct 13, 2024
Merged

Remove evaluation from barycentric circuit assignment. #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0b714e
use computed evaluation value instead of input
z2trillion Oct 10, 2024
3a12953
remove unused argument
z2trillion Oct 10, 2024
6eb45e0
Merge branch 'develop' into feat/remove_evaluation
roynalnaruto Oct 13, 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
116 changes: 60 additions & 56 deletions aggregator/src/aggregation/barycentric.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use num_bigint::{BigInt, Sign};
use std::{iter::successors, sync::LazyLock};

use crate::{
blob::BLOB_WIDTH,
blob::{BLOB_WIDTH, N_BYTES_U256},
constants::{BITS, LIMBS},
};

Expand Down Expand Up @@ -103,7 +103,6 @@ impl BarycentricEvaluationConfig {
ctx: &mut Context<Fr>,
blob: &[U256; BLOB_WIDTH],
challenge_digest: U256,
evaluation: U256,
) -> AssignedBarycentricEvaluationConfig {
// some constants for later use.
let one = self.scalar.load_constant(ctx, fe_to_biguint(&Fr::one()));
Expand Down Expand Up @@ -180,57 +179,6 @@ impl BarycentricEvaluationConfig {
QuantumCell::Existing(challenge_crt.truncation.limbs[2]),
);

////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////// PRECHECKS y /////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////
let evaluation_le = self.scalar.range().gate.assign_witnesses(
ctx,
evaluation
.to_le_bytes()
.iter()
.map(|&x| Value::known(Fr::from(x as u64))),
);
let evaluation_scalar = Scalar::from_raw(evaluation.0);
let evaluation_crt = self
.scalar
.load_private(ctx, Value::known(fe_to_biguint(&evaluation_scalar).into()));
let evaluation_limb1 = self.scalar.range().gate.inner_product(
ctx,
evaluation_le[0..11]
.iter()
.map(|&x| QuantumCell::Existing(x)),
powers_of_256[0..11].to_vec(),
);
let evaluation_limb2 = self.scalar.range().gate.inner_product(
ctx,
evaluation_le[11..22]
.iter()
.map(|&x| QuantumCell::Existing(x)),
powers_of_256[0..11].to_vec(),
);
let evaluation_limb3 = self.scalar.range().gate.inner_product(
ctx,
evaluation_le[22..32]
.iter()
.map(|&x| QuantumCell::Existing(x)),
powers_of_256[0..11].to_vec(),
);
self.scalar.range().gate.assert_equal(
ctx,
QuantumCell::Existing(evaluation_limb1),
QuantumCell::Existing(evaluation_crt.truncation.limbs[0]),
);
self.scalar.range().gate.assert_equal(
ctx,
QuantumCell::Existing(evaluation_limb2),
QuantumCell::Existing(evaluation_crt.truncation.limbs[1]),
);
self.scalar.range().gate.assert_equal(
ctx,
QuantumCell::Existing(evaluation_limb3),
QuantumCell::Existing(evaluation_crt.truncation.limbs[2]),
);

////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////// BARYCENTRIC EVALUATION //////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -317,9 +265,65 @@ impl BarycentricEvaluationConfig {
evaluation_computed = self.scalar.mul(ctx, &evaluation_computed, &factor);
evaluation_computed = self.scalar.carry_mod(ctx, &evaluation_computed);

// computed evaluation matches the expected evaluation.
self.scalar
.assert_equal(ctx, &evaluation_computed, &evaluation_crt);
////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////// PRECHECKS y /////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////
let evaluation_le_bytes = evaluation_computed
.value
.map(|x| {
x.to_bytes_le()
.1
.into_iter()
.chain(std::iter::repeat(0u8))
.map(u64::from)
.map(Fr::from)
.take(N_BYTES_U256)
.collect_vec()
})
.transpose_vec(N_BYTES_U256);

let evaluation_le = self
.scalar
.range()
.gate
.assign_witnesses(ctx, evaluation_le_bytes);

let evaluation_limb1 = self.scalar.range().gate.inner_product(
ctx,
evaluation_le[0..11]
.iter()
.map(|&x| QuantumCell::Existing(x)),
powers_of_256[0..11].to_vec(),
);
let evaluation_limb2 = self.scalar.range().gate.inner_product(
ctx,
evaluation_le[11..22]
.iter()
.map(|&x| QuantumCell::Existing(x)),
powers_of_256[0..11].to_vec(),
);
let evaluation_limb3 = self.scalar.range().gate.inner_product(
ctx,
evaluation_le[22..32]
.iter()
.map(|&x| QuantumCell::Existing(x)),
powers_of_256[0..11].to_vec(),
);
self.scalar.range().gate.assert_equal(
ctx,
QuantumCell::Existing(evaluation_limb1),
QuantumCell::Existing(evaluation_computed.truncation.limbs[0]),
);
self.scalar.range().gate.assert_equal(
ctx,
QuantumCell::Existing(evaluation_limb2),
QuantumCell::Existing(evaluation_computed.truncation.limbs[1]),
);
self.scalar.range().gate.assert_equal(
ctx,
QuantumCell::Existing(evaluation_limb3),
QuantumCell::Existing(evaluation_computed.truncation.limbs[2]),
);

////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////// EXPORT //////////////////////////////////////////
Expand Down
1 change: 0 additions & 1 deletion aggregator/src/aggregation/circuit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ impl<const N_SNARKS: usize> Circuit<Fr> for BatchCircuit<N_SNARKS> {
self.batch_hash
.point_evaluation_assignments
.challenge_digest,
self.batch_hash.point_evaluation_assignments.evaluation,
);

ctx.print_stats(&["barycentric"]);
Expand Down
1 change: 0 additions & 1 deletion aggregator/src/tests/blob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ impl Circuit<Fr> for BlobCircuit {
&mut ctx,
&point_eval.coefficients,
point_eval.challenge_digest,
point_eval.evaluation,
))
},
)?;
Expand Down
Loading