Skip to content

fix(bberg): update aggregation_state usage to match bberg changes #599

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

Closed
dbanks12 wants to merge 2 commits into from
Closed

fix(bberg): update aggregation_state usage to match bberg changes #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18863dd
fix aggregation state usage in circuits C++
May 16, 2023
cc81d7e
merge master in
May 16, 2023
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
2 changes: 1 addition & 1 deletion circuits/cpp/barretenberg
Open in desktop
Submodule barretenberg updated 42 files
+1 −1 cpp/.aztec-packages-commit
+0 −1 cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp
+10 −0 cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp
+4 −4 cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp
+1 −1 cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp
+10 −9 cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp
+2 −2 cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp
+10 −10 cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp
+3 −2 cpp/src/barretenberg/honk/composer/ultra_honk_composer.hpp
+2 −1 cpp/src/barretenberg/honk/composer/ultra_honk_composer.test.cpp
+2 −1 cpp/src/barretenberg/honk/proof_system/prover.hpp
+2 −1 cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
+3 −2 cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
+4 −3 cpp/src/barretenberg/plonk/composer/splitting_tmp/ultra_plonk_composer.hpp
+1 −1 cpp/src/barretenberg/plonk/composer/splitting_tmp/ultra_plonk_composer.test.cpp
+140 −119 cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
+32 −29 cpp/src/barretenberg/plonk/composer/ultra_composer.hpp
+1 −1 cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp
+24 −33 cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
+108 −111 cpp/src/barretenberg/proof_system/circuit_constructors/ultra_circuit_constructor.cpp
+56 −63 cpp/src/barretenberg/proof_system/circuit_constructors/ultra_circuit_constructor.hpp
+1 −1 cpp/src/barretenberg/proof_system/circuit_constructors/ultra_circuit_constructor.test.cpp
+74 −8 cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp
+9 −2 cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp
+33 −10 cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp
+1 −1 cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp
+12 −10 cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
+96 −145 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp
+14 −16 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
+4 −7 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp
+40 −40 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp
+225 −187 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
+33 −10 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
+8 −5 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp
+166 −106 cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp
+23 −2 cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
+98 −155 cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
+208 −93 cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
+20 −50 cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
+43 −10 cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
+13 −5 cpp/src/barretenberg/transcript/transcript.cpp
+52 −52 sol/src/ultra/keys/RecursiveUltraVerificationKey.sol
4 changes: 2 additions & 2 deletions circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ template <typename NCT> struct CombinedAccumulatedData {
to_ct(aggregation_object.P0),
to_ct(aggregation_object.P1),
to_ct(aggregation_object.public_inputs),
aggregation_object.proof_witness_indices,
aggregation_object.has_data,
aggregation_object.proof_witness_indices,
},

to_ct(new_commitments),
Expand Down Expand Up @@ -100,8 +100,8 @@ template <typename NCT> struct CombinedAccumulatedData {
to_nt(aggregation_object.P0),
to_nt(aggregation_object.P1),
to_nt(aggregation_object.public_inputs),
aggregation_object.proof_witness_indices,
aggregation_object.has_data,
aggregation_object.proof_witness_indices,
},

to_nt(new_commitments),
Expand Down