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.

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

feat: Reproducible ClientIVC proofs #6227

Merged
merged 6 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ bool ClientIVC::verify(Proof& proof, const std::vector<VerifierAccumulator>& ver

// Decider verification
ClientIVC::FoldingVerifier folding_verifier({ verifier_instances[0], verifier_instances[1] });
auto verifier_accumulator = folding_verifier.verify_folding_proof(proof.fold_proof);
auto verifier_accumulator = folding_verifier.verify_folding_proof(proof.folding_proof);

ClientIVC::DeciderVerifier decider_verifier(verifier_accumulator);
bool decision = decider_verifier.verify_proof(proof.decider_proof);
Expand Down
17 changes: 16 additions & 1 deletion barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,24 @@ class ClientIVC {

// A full proof for the IVC scheme
struct Proof {
FoldProof fold_proof; // final fold proof
FoldProof folding_proof; // final fold proof
HonkProof decider_proof;
Goblin::Proof goblin_proof;

std::vector<FF> to_buffer() const
{
size_t proof_size = folding_proof.size() + decider_proof.size() + goblin_proof.size();

std::vector<FF> result;
result.reserve(proof_size);
const auto insert = [&result](const std::vector<FF>& buf) {
result.insert(result.end(), buf.begin(), buf.end());
};
insert(folding_proof);
insert(decider_proof);
insert(goblin_proof.to_buffer());
return result;
}
};

struct PrecomputedVerificationKeys {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ TEST(ECCVMCircuitBuilderTests, BaseCase)
op_queue->mul_accumulate(c, x);

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -53,7 +53,7 @@ TEST(ECCVMCircuitBuilderTests, Add)
op_queue->add_accumulate(a);

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -68,7 +68,7 @@ TEST(ECCVMCircuitBuilderTests, Mul)
op_queue->mul_accumulate(a, x);

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -89,7 +89,7 @@ TEST(ECCVMCircuitBuilderTests, ShortMul)
op_queue->eq_and_reset();

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -106,7 +106,7 @@ TEST(ECCVMCircuitBuilderTests, EqFails)
op_queue->add_erroneous_equality_op_for_testing();

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, false);
}

Expand All @@ -117,7 +117,7 @@ TEST(ECCVMCircuitBuilderTests, EmptyRow)
op_queue->empty_row_for_testing();

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -134,7 +134,7 @@ TEST(ECCVMCircuitBuilderTests, EmptyRowBetweenOps)
op_queue->eq_and_reset();

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -150,7 +150,7 @@ TEST(ECCVMCircuitBuilderTests, EndWithEq)
op_queue->eq_and_reset();

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -167,7 +167,7 @@ TEST(ECCVMCircuitBuilderTests, EndWithAdd)
op_queue->add_accumulate(a);

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -184,7 +184,7 @@ TEST(ECCVMCircuitBuilderTests, EndWithMul)
op_queue->mul_accumulate(a, x);

ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand All @@ -202,7 +202,7 @@ TEST(ECCVMCircuitBuilderTests, EndWithNoop)

op_queue->empty_row_for_testing();
ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}

Expand Down Expand Up @@ -240,6 +240,6 @@ TEST(ECCVMCircuitBuilderTests, MSM)
compute_msms(j, op_queue);
}
ECCVMCircuitBuilder circuit{ op_queue };
bool result = ECCVMTraceChecker::check(circuit);
bool result = ECCVMTraceChecker::check(circuit, &engine);
EXPECT_EQ(result, true);
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ using Builder = typename ECCVMFlavor::CircuitBuilder;
using FF = typename ECCVMFlavor::FF;
using ProverPolynomials = typename ECCVMFlavor::ProverPolynomials;

bool ECCVMTraceChecker::check(Builder& builder)
bool ECCVMTraceChecker::check(Builder& builder, numeric::RNG* engine_ptr)
{
const FF gamma = FF::random_element();
const FF beta = FF::random_element();
const FF gamma = FF::random_element(engine_ptr);
const FF beta = FF::random_element(engine_ptr);
const FF beta_sqr = beta.sqr();
const FF beta_cube = beta_sqr * beta;
auto eccvm_set_permutation_delta =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
namespace bb {
class ECCVMTraceChecker {
public:
static bool check(ECCVMCircuitBuilder&);
static bool check(ECCVMCircuitBuilder&, numeric::RNG* engine_ptr = nullptr);
};
} // namespace bb
17 changes: 10 additions & 7 deletions barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,24 @@ class Goblin {
HonkProof eccvm_proof;
HonkProof translator_proof;
TranslationEvaluations translation_evaluations;
std::vector<Fr> to_buffer()

size_t size() const
{
// ACIRHACK: so much copying and duplication added here and elsewhere
std::vector<Fr> translation_evaluations_buf; // = translation_evaluations.to_buffer();
size_t proof_size =
merge_proof.size() + eccvm_proof.size() + translator_proof.size() + translation_evaluations_buf.size();
return merge_proof.size() + eccvm_proof.size() + translator_proof.size() + TranslationEvaluations::size();
};

std::vector<Fr> result(proof_size);
std::vector<Fr> to_buffer() const
{
// ACIRHACK: so much copying and duplication added here and elsewhere
std::vector<Fr> result;
result.reserve(size());
const auto insert = [&result](const std::vector<Fr>& buf) {
result.insert(result.end(), buf.begin(), buf.end());
};
insert(merge_proof);
insert(eccvm_proof);
insert(translator_proof);
insert(translation_evaluations_buf);
insert(translation_evaluations.to_buffer());
return result;
}
};
Expand Down
5 changes: 3 additions & 2 deletions barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "barretenberg/stdlib_circuit_builders/mock_circuits.hpp"

namespace bb {

class GoblinMockCircuits {
public:
using Curve = curve::BN254;
Expand Down Expand Up @@ -120,8 +121,8 @@ class GoblinMockCircuits {
{
// Add some arbitrary ecc op gates
for (size_t i = 0; i < 3; ++i) {
auto point = Point::random_element();
auto scalar = FF::random_element();
auto point = Point::random_element(&engine);
auto scalar = FF::random_element(&engine);
builder.queue_ecc_add_accum(point);
builder.queue_ecc_mul_accum(point, scalar);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
#pragma once
#include "barretenberg/ecc/curves/bn254/fq.hpp"
#include "barretenberg/ecc/fields/field_conversion.hpp"

namespace bb {
struct TranslationEvaluations {
fq op, Px, Py, z1, z2;
std::vector<uint8_t> to_buffer()
static constexpr uint32_t NUM_EVALUATIONS = 5;
static size_t size() { return field_conversion::calc_num_bn254_frs<fq>() * NUM_EVALUATIONS; }
std::vector<fr> to_buffer() const
{
std::vector<uint8_t> result(5 * sizeof(fq));
std::vector<fr> result;
result.reserve(size());
const auto insert = [&result](const fq& elt) {
std::vector<uint8_t> buf = elt.to_buffer();
std::vector<fr> buf = field_conversion::convert_to_bn254_frs(elt);
result.insert(result.end(), buf.begin(), buf.end());
};
insert(op);
Expand Down
8 changes: 4 additions & 4 deletions barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class DebugEngine : public RNG {
: engine(std::mt19937_64(12345))
{}

DebugEngine(std::seed_seq& seed)
DebugEngine(std::uint_fast64_t seed)
: engine(std::mt19937_64(seed))
{}

Expand Down Expand Up @@ -116,12 +116,12 @@ class DebugEngine : public RNG {
/**
* Used by tests to ensure consistent behavior.
*/
RNG& get_debug_randomness(bool reset)
RNG& get_debug_randomness(bool reset, std::uint_fast64_t seed)
{
// static std::seed_seq seed({ 1, 2, 3, 4, 5 });
static DebugEngine debug_engine;
static DebugEngine debug_engine = DebugEngine();
if (reset) {
debug_engine = DebugEngine();
debug_engine = DebugEngine(seed);
}
return debug_engine;
}
Expand Down
3 changes: 2 additions & 1 deletion barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "../uintx/uintx.hpp"
#include "unistd.h"
#include <cstdint>
#include <random>

namespace bb::numeric {

Expand Down Expand Up @@ -45,7 +46,7 @@ class RNG {
}
};

RNG& get_debug_randomness(bool reset = false);
RNG& get_debug_randomness(bool reset = false, std::uint_fast64_t seed = 12345);
RNG& get_randomness();

} // namespace bb::numeric
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

namespace bb::stdlib {

namespace {
auto& engine = numeric::get_debug_randomness();
}

/**
* @brief Verify ECDSA signature. Produces unsatisfiable constraints if signature fails
*
Expand Down Expand Up @@ -241,7 +245,7 @@ template <typename Builder> void generate_ecdsa_verification_test_circuit(Builde
crypto::ecdsa_key_pair<fr, g1> account;
for (size_t i = 0; i < num_iterations; i++) {
// Generate unique signature for each iteration
account.private_key = curve::fr::random_element();
account.private_key = curve::fr::random_element(&engine);
account.public_key = curve::g1::one * account.private_key;

crypto::ecdsa_signature signature =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ template <typename FF> void GoblinUltraCircuitBuilder_<FF>::add_goblin_gates_to_
this->blocks.poseidon_internal, this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);

// add dummy mul accum op and an equality op
this->queue_ecc_mul_accum(bb::g1::affine_element::one() * FF::random_element(), FF::random_element());
this->queue_ecc_mul_accum(bb::g1::affine_element::one(), 2);
this->queue_ecc_eq();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

namespace bb {

namespace {
auto& engine = numeric::get_debug_randomness();
}
class MockCircuits {
public:
using Curve = curve::BN254;
Expand All @@ -20,9 +23,9 @@ class MockCircuits {
{
// For good measure, include a gate with some public inputs
for (size_t i = 0; i < num_gates; ++i) {
FF a = FF::random_element();
FF b = FF::random_element();
FF c = FF::random_element();
FF a = FF::random_element(&engine);
FF b = FF::random_element(&engine);
FF c = FF::random_element(&engine);
FF d = a + b + c;
uint32_t a_idx = builder.add_public_variable(a);
uint32_t b_idx = builder.add_variable(b);
Expand All @@ -43,9 +46,9 @@ class MockCircuits {
{
// For good measure, include a gate with some public inputs
for (size_t i = 0; i < num_gates; ++i) {
FF a = FF::random_element();
FF b = FF::random_element();
FF c = FF::random_element();
FF a = FF::random_element(&engine);
FF b = FF::random_element(&engine);
FF c = FF::random_element(&engine);
FF d = a + b + c;
uint32_t a_idx = builder.add_variable(a);
uint32_t b_idx = builder.add_variable(b);
Expand Down Expand Up @@ -98,8 +101,8 @@ class MockCircuits {
static void construct_goblin_ecc_op_circuit(GoblinUltraCircuitBuilder& builder)
{
// Add a mul accum op, an add accum op and an equality op
builder.queue_ecc_add_accum(Point::one() * FF::random_element());
builder.queue_ecc_mul_accum(Point::one() * FF::random_element(), FF::random_element());
builder.queue_ecc_add_accum(Point::one() * FF::random_element(&engine));
builder.queue_ecc_mul_accum(Point::one() * FF::random_element(&engine), FF::random_element(&engine));
builder.queue_ecc_eq();
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@

using namespace bb;

namespace {
auto& engine = numeric::get_debug_randomness();
}

using ProverInstance = ProverInstance_<UltraFlavor>;
using VerificationKey = UltraFlavor::VerificationKey;

Expand Down
Loading