Skip to content

Commit

Permalink
Plane WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@codygunton
codygunton committed Nov 14, 2023
1 parent fb19414 commit 27b0b0e
Show file tree
Hide file tree
Showing 6 changed files with 134 additions and 73 deletions.
162 changes: 104 additions & 58 deletions barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,23 +216,6 @@ template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_relation_check_
auto sumcheck = Sumcheck(key->circuit_size, transcript);

sumcheck_output = sumcheck.prove(prover_polynomials, relation_parameters);
ClaimedEvaluations& evals = sumcheck_output.claimed_evaluations;
translation_consistency_data.op = evals.transcript_op;
translation_consistency_data.Px = evals.transcript_x;
translation_consistency_data.Py = evals.transcript_y;
translation_consistency_data.z1 = evals.transcript_z1;
translation_consistency_data.z2 = evals.transcript_z2;
// info(evals.transcript_op,
// "\n",
// evals.transcript_x,
// "\n",
// evals.transcript_y,
// "\n",
// evals.transcript_z1,
// "\n",
// evals.transcript_z2);
// info("is it transfered correctly?");
translation_consistency_data.print();
}

/**
Expand Down Expand Up @@ -290,42 +273,128 @@ template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_pcs_evaluation_
const auto& evaluation = gemini_output.opening_pairs[l + 1].evaluation;
transcript.send_to_verifier(label, evaluation);
}
}

evaluation_challenge_x = transcript.get_challenge("ds:evaluation_challenge_x");

translation_consistency_check_data.witnesses.emplace_back(prover_polynomials.transcript_op);
translation_consistency_check_data.witnesses.emplace_back(prover_polynomials.transcript_x);
translation_consistency_check_data.witnesses.emplace_back(prover_polynomials.transcript_y);
translation_consistency_check_data.witnesses.emplace_back(prover_polynomials.transcript_z1);
translation_consistency_check_data.witnesses.emplace_back(prover_polynomials.transcript_z2);

// WORKTODO
translation_consistency_data.op = Polynomial(prover_polynomials.transcript_op).evaluate(evaluation_challenge_x);
translation_consistency_data.Px = Polynomial(prover_polynomials.transcript_x).evaluate(evaluation_challenge_x);
translation_consistency_data.Py = Polynomial(prover_polynomials.transcript_y).evaluate(evaluation_challenge_x);
translation_consistency_data.z1 = Polynomial(prover_polynomials.transcript_z1).evaluate(evaluation_challenge_x);
translation_consistency_data.z2 = Polynomial(prover_polynomials.transcript_z2).evaluate(evaluation_challenge_x);

info("eccvm prover evaluation_challenge_x: ", evaluation_challenge_x);
info("eccvm prover translation_consistency_data.op: ", translation_consistency_data.op);
info("eccvm prover translation_consistency_data.Px: ", translation_consistency_data.Px);
info("eccvm prover translation_consistency_data.Py: ", translation_consistency_data.Py);
info("eccvm prover translation_consistency_data.z1: ", translation_consistency_data.z1);
info("eccvm prover translation_consistency_data.z2: ", translation_consistency_data.z2);

translation_consistency_check_data.opening_pairs = { { evaluation_challenge_x, translation_consistency_data.op },
{ evaluation_challenge_x, translation_consistency_data.Px },
{ evaluation_challenge_x, translation_consistency_data.Py },
{ evaluation_challenge_x, translation_consistency_data.z1 },
{ evaluation_challenge_x, translation_consistency_data.z2 } };
};

/**
* - Do Fiat-Shamir to get "nu" challenge.
* - Compute commitment [Q]_1
* */
template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_shplonk_batched_quotient_round()
template <ECCVMFlavor Flavor>
void ECCVMProver_<Flavor>::execute_batched_univariatization_shplonk_batched_quotient_round()
{
nu_challenge = transcript.get_challenge("Shplonk:nu");
nu_challenge = transcript.get_challenge("ShplonkUnivariatization:nu");

batched_quotient_Q =
batched_univariatization_batched_quotient_Q =
Shplonk::compute_batched_quotient(gemini_output.opening_pairs, gemini_output.witnesses, nu_challenge);

// commit to Q(X) and add [Q] to the transcript
transcript.send_to_verifier("Shplonk:Q", commitment_key->commit(batched_quotient_Q));
transcript.send_to_verifier("ShplonkUnivariatization:Q",
commitment_key->commit(batched_univariatization_batched_quotient_Q));
}

/**
* - Do Fiat-Shamir to get "z" challenge.
* - Compute polynomial Q(X) - Q_z(X)
* */
template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_shplonk_partial_evaluation_round()
template <ECCVMFlavor Flavor>
void ECCVMProver_<Flavor>::execute_batched_univariatization_shplonk_partial_evaluation_round()
{
const FF z_challenge = transcript.get_challenge("Shplonk:z");
const FF z_challenge = transcript.get_challenge("ShplonkUnivariatization:z");

batched_univariatization_shplonk_output =
Shplonk::compute_partially_evaluated_batched_quotient(gemini_output.opening_pairs,
gemini_output.witnesses,
std::move(batched_univariatization_batched_quotient_Q),
nu_challenge,
z_challenge);
}

shplonk_output = Shplonk::compute_partially_evaluated_batched_quotient(
gemini_output.opening_pairs, gemini_output.witnesses, std::move(batched_quotient_Q), nu_challenge, z_challenge);
/**
* - Compute final PCS opening proof:
* - For KZG, this is the quotient commitment [W]_1
* - For IPA, the vectors L and R // WORKTODO?
* */
template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_batched_univariatization_ipa_round()
{
PCS::compute_opening_proof(commitment_key,
batched_univariatization_shplonk_output.opening_pair,
batched_univariatization_shplonk_output.witness,
transcript);
}

/**
* - Do Fiat-Shamir to get "nu" challenge.
* - Compute commitment [Q]_1
* */
template <ECCVMFlavor Flavor>
void ECCVMProver_<Flavor>::execute_translation_consistency_check_shplonk_batched_quotient_round()
{
nu_challenge = transcript.get_challenge("ShplonkTranslation:nu");

translation_consistency_check_batched_quotient_Q = Shplonk::compute_batched_quotient(
translation_consistency_check_data.opening_pairs, translation_consistency_check_data.witnesses, nu_challenge);

// commit to Q(X) and add [Q] to the transcript
transcript.send_to_verifier("ShplonkTranslation:Q",
commitment_key->commit(translation_consistency_check_batched_quotient_Q));
}

/**
* - Do Fiat-Shamir to get "z" challenge.
* - Compute polynomial Q(X) - Q_z(X)
* */
template <ECCVMFlavor Flavor>
void ECCVMProver_<Flavor>::execute_translation_consistency_check_shplonk_partial_evaluation_round()
{
const FF z_challenge = transcript.get_challenge("ShplonkTranslation:z");

translation_consistency_check_shplonk_output = Shplonk::compute_partially_evaluated_batched_quotient(
translation_consistency_check_data.opening_pairs,
translation_consistency_check_data.witnesses,
std::move(translation_consistency_check_batched_quotient_Q),
nu_challenge,
z_challenge);
}

/**
* - Compute final PCS opening proof:
* - For KZG, this is the quotient commitment [W]_1
* - For IPA, the vectors L and R
* - For IPA, the vectors L and R // WORKTODO?
* */
template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_final_pcs_round()
template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_translation_consistency_check_ipa_round()
{
PCS::compute_opening_proof(commitment_key, shplonk_output.opening_pair, shplonk_output.witness, transcript);
PCS::compute_opening_proof(commitment_key,
translation_consistency_check_shplonk_output.opening_pair,
translation_consistency_check_shplonk_output.witness,
transcript);
}

template <ECCVMFlavor Flavor> plonk::proof& ECCVMProver_<Flavor>::export_proof()
Expand All @@ -336,42 +405,19 @@ template <ECCVMFlavor Flavor> plonk::proof& ECCVMProver_<Flavor>::export_proof()

template <ECCVMFlavor Flavor> plonk::proof& ECCVMProver_<Flavor>::construct_proof()
{
// Add circuit size public input size and public inputs to transcript.
execute_preamble_round();

// Compute first three wire commitments
execute_wire_commitments_round();

// Compute sorted list accumulator and commitment
execute_log_derivative_commitments_round();

// Fiat-Shamir: beta & gamma
// Compute grand product(s) and commitments.
execute_grand_product_computation_round();

// Fiat-Shamir: alpha
// Run sumcheck subprotocol.
execute_relation_check_rounds();

// Fiat-Shamir: rho
// Compute Fold polynomials and their commitments.
execute_univariatization_round();

// Fiat-Shamir: r
// Compute Fold evaluations
execute_pcs_evaluation_round();

// Fiat-Shamir: nu
// Compute Shplonk batched quotient commitment Q
execute_shplonk_batched_quotient_round();

// Fiat-Shamir: z
// Compute partial evaluation Q_z
execute_shplonk_partial_evaluation_round();

// Fiat-Shamir: z
// Compute PCS opening proof (either KZG quotient commitment or IPA opening proof)
execute_final_pcs_round();
execute_batched_univariatization_shplonk_batched_quotient_round();
execute_batched_univariatization_shplonk_partial_evaluation_round();
execute_batched_univariatization_ipa_round();
// execute_translation_consistency_check_shplonk_batched_quotient_round();
// execute_translation_consistency_check_shplonk_partial_evaluation_round();
// execute_translation_consistency_check_ipa_round();

return export_proof();
}
Expand Down
20 changes: 14 additions & 6 deletions barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {
void execute_relation_check_rounds();
void execute_univariatization_round();
void execute_pcs_evaluation_round();
void execute_shplonk_batched_quotient_round();
void execute_shplonk_partial_evaluation_round();
void execute_final_pcs_round();
void execute_batched_univariatization_shplonk_batched_quotient_round();
void execute_batched_univariatization_shplonk_partial_evaluation_round();
void execute_batched_univariatization_ipa_round();
void execute_translation_consistency_check_shplonk_batched_quotient_round();
void execute_translation_consistency_check_shplonk_partial_evaluation_round();
void execute_translation_consistency_check_ipa_round();

plonk::proof& export_proof();
plonk::proof& construct_proof();
Expand All @@ -53,6 +56,8 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {

std::shared_ptr<ProvingKey> key;

FF evaluation_challenge_x;

// Container for spans of all polynomials required by the prover (i.e. all multivariates evaluated by Sumcheck).
ProverPolynomials prover_polynomials;

Expand All @@ -61,14 +66,17 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {
// Container for d + 1 Fold polynomials produced by Gemini
std::vector<Polynomial> gemini_polynomials;

Polynomial batched_quotient_Q; // batched quotient poly computed by Shplonk
FF nu_challenge; // needed in both Shplonk rounds
Polynomial batched_univariatization_batched_quotient_Q; // batched quotient poly computed by Shplonk
Polynomial translation_consistency_check_batched_quotient_Q; // batched quotient poly computed by Shplonk
FF nu_challenge; // needed in both Shplonk rounds

Polynomial quotient_W;

sumcheck::SumcheckOutput<Flavor> sumcheck_output;
pcs::gemini::ProverOutput<Curve> gemini_output;
pcs::shplonk::ProverOutput<Curve> shplonk_output;
pcs::gemini::ProverOutput<Curve> translation_consistency_check_data; // WORKTODO: move this struct
pcs::shplonk::ProverOutput<Curve> batched_univariatization_shplonk_output;
pcs::shplonk::ProverOutput<Curve> translation_consistency_check_shplonk_output;
std::shared_ptr<PCSCommitmentKey> commitment_key;

using Gemini = pcs::gemini::GeminiProver_<Curve>;
Expand Down
8 changes: 4 additions & 4 deletions barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ TEST_F(FullGoblinComposerTests, SimpleCircuit)
auto eccvm_composer = ECCVMComposer();
auto eccvm_prover = eccvm_composer.create_prover(eccvm_builder);
auto eccvm_verifier = eccvm_composer.create_verifier(eccvm_builder);
auto eccvm_proof = eccvm_prover.construct_proof();
bool eccvm_verified = eccvm_verifier.verify_proof(eccvm_proof);
EXPECT_TRUE(eccvm_verified);
[[maybe_unused]] auto eccvm_proof = eccvm_prover.construct_proof();
// bool eccvm_verified = eccvm_verifier.verify_proof(eccvm_proof);
// EXPECT_TRUE(eccvm_verified);

// Execute the Translator
auto batching_challenge = Fbase::random_element();
auto evaluation_input = Fbase::random_element();
auto evaluation_input = eccvm_prover.evaluation_challenge_x;
auto translator_builder =
TranslatorBuilder(batching_challenge, evaluation_input, *op_queue); // WORKTODO: take pointer or ref
auto translator_composer = TranslatorComposer();
Expand Down
1 change: 1 addition & 0 deletions barretenberg/cpp/src/barretenberg/goblin/translation_consistency_data.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once
#include "barretenberg/ecc/curves/bn254/fq.hpp"
#include "barretenberg/ecc/curves/bn254/fr.hpp"
#include <vector>

namespace barretenberg {
struct GoblinTranslationConsistencyData {
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ template <typename Fr> class Polynomial {
return coefficients_.get()[i];
};

Fr evaluate(const Fr& z, const size_t target_size) const;
Fr evaluate(const Fr& z) const;
[[nodiscard]] Fr evaluate(const Fr& z, const size_t target_size) const;
[[nodiscard]] Fr evaluate(const Fr& z) const;

Fr compute_barycentric_evaluation(const Fr& z, const EvaluationDomain<Fr>& domain)
requires polynomial_arithmetic::SupportsFFT<Fr>;
Expand Down
12 changes: 9 additions & 3 deletions barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,17 +317,23 @@ bool GoblinTranslatorVerifier_<Flavor>::verify_proof(
const BF& z1 = translation_consistency_data.z1;
const BF& z2 = translation_consistency_data.z2;

info("x: ", x);
info("translator vm verifier x: ", x);
info("circuit_size: ", circuit_size);

const BF x_power = x.pow(22);
const BF eccvm_opening = op + (v1 * Px) + (v2 * Py) + (v3 * z1) + (v4 * z2);
info("translator verifier translation_consistency_data.op: ", translation_consistency_data.op);
info("translator verifier translation_consistency_data.Px: ", translation_consistency_data.Px);
info("translator verifier translation_consistency_data.Py: ", translation_consistency_data.Py);
info("translator verifier translation_consistency_data.z1: ", translation_consistency_data.z1);
info("translator verifier translation_consistency_data.z2: ", translation_consistency_data.z2);

const BF eccvm_opening = (op + (v1 * Px) + (v2 * Py) + (v3 * z1) + (v4 * z2));
// info("v1 : ", v1);
// info("v1^2: ", v1 * v1);
// info("v2 : ", v2);
// info("v2^2: ", v2 * v2);
// info("v4 : ", v4);
info("accumulated_result: ", accumulated_result);
info("accumulated_result: ", x_power * accumulated_result);
info("eccvm_opening: ", eccvm_opening);
return x_power * accumulated_result == eccvm_opening;
};
Expand Down

0 comments on commit 27b0b0e

Please sign in to comment.