Skip to content

Port latest changes related to composer and flavor code #47

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

Merged
Maddiaa0 merged 1 commit into from
Mar 5, 2024
Merged

Port latest changes related to composer and flavor code #47

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
6 changes: 3 additions & 3 deletions bberg/src/composer_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void {name}Composer::compute_witness(CircuitConstructor& circuit)

{name}Verifier output_state(verification_key);

auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>(verification_key->circuit_size, crs_factory_);
auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>();

output_state.pcs_verification_key = std::move(pcs_verification_key);

Expand Down Expand Up @@ -141,7 +141,7 @@ class {name}Composer {{

{name}Composer()
{{
crs_factory_ = bb::srs::get_crs_factory();
crs_factory_ = bb::srs::get_bn254_crs_factory();
}}

{name}Composer(std::shared_ptr<ProvingKey> p_key, std::shared_ptr<VerificationKey> v_key)
Expand All @@ -167,7 +167,7 @@ class {name}Composer {{

void compute_commitment_key(size_t circuit_size)
{{
commitment_key = std::make_shared<CommitmentKey>(circuit_size, crs_factory_);
commitment_key = std::make_shared<CommitmentKey>(circuit_size);
}};
}};

Expand Down
6 changes: 3 additions & 3 deletions bberg/src/flavor_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,10 @@ fn create_proving_and_verification_key(to_be_shifted: &[String]) -> String {

format!("
public:
class ProvingKey : public ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>> {{
class ProvingKey : public ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey> {{
public:
// Expose constructors on the base class
using Base = ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>>;
using Base = ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>;
using Base::Base;

{get_to_be_shifted}
Expand All @@ -350,7 +350,7 @@ fn create_proving_and_verification_key(to_be_shifted: &[String]) -> String {
std::array<PolynomialHandle, 0> get_table_column_wires() {{ return {{}}; }};
}};

using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>, VerifierCommitmentKey>;
")
}

Expand Down