post rebase fixes.

AztecProtocol · Feb 8, 2023 · 5069953 · 5069953
1 parent 3b507ac
commit 5069953
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/cpp/src/aztec/CMakeLists.txt b/cpp/src/aztec/CMakeLists.txt
@@ -119,13 +119,15 @@ if(WASM)
         $<TARGET_OBJECTS:crypto_blake3s_objects>
         $<TARGET_OBJECTS:crypto_keccak_objects>
         $<TARGET_OBJECTS:crypto_schnorr_objects>
-        $<TARGET_OBJECTS:crypto_pedersen_objects>
+        $<TARGET_OBJECTS:crypto_pedersen_hash_objects>
+        $<TARGET_OBJECTS:crypto_pedersen_commitment_objects>
         $<TARGET_OBJECTS:ecc_objects>
         $<TARGET_OBJECTS:polynomials_objects>
         $<TARGET_OBJECTS:plonk_objects>
         $<TARGET_OBJECTS:stdlib_primitives_objects>
         $<TARGET_OBJECTS:stdlib_schnorr_objects>
-        $<TARGET_OBJECTS:stdlib_pedersen_objects>
+        $<TARGET_OBJECTS:stdlib_pedersen_hash_objects>
+        $<TARGET_OBJECTS:stdlib_pedersen_commitment_objects>
         $<TARGET_OBJECTS:stdlib_blake2s_objects>
         $<TARGET_OBJECTS:stdlib_blake3s_objects>
         $<TARGET_OBJECTS:stdlib_sha256_objects>
@@ -147,13 +149,15 @@ else()
         $<TARGET_OBJECTS:crypto_blake3s_objects>
         $<TARGET_OBJECTS:crypto_keccak_objects>
         $<TARGET_OBJECTS:crypto_schnorr_objects>
-        $<TARGET_OBJECTS:crypto_pedersen_objects>
+        $<TARGET_OBJECTS:crypto_pedersen_hash_objects>
+        $<TARGET_OBJECTS:crypto_pedersen_commitment_objects>
         $<TARGET_OBJECTS:ecc_objects>
         $<TARGET_OBJECTS:polynomials_objects>
         $<TARGET_OBJECTS:plonk_objects>
         $<TARGET_OBJECTS:stdlib_primitives_objects>
         $<TARGET_OBJECTS:stdlib_schnorr_objects>
-        $<TARGET_OBJECTS:stdlib_pedersen_objects>
+        $<TARGET_OBJECTS:stdlib_pedersen_hash_objects>
+        $<TARGET_OBJECTS:stdlib_pedersen_commitment_objects>
         $<TARGET_OBJECTS:stdlib_blake2s_objects>
         $<TARGET_OBJECTS:stdlib_blake3s_objects>
         $<TARGET_OBJECTS:stdlib_sha256_objects>

diff --git a/cpp/src/aztec/honk/composer/standard_honk_composer.hpp b/cpp/src/aztec/honk/composer/standard_honk_composer.hpp
@@ -16,6 +16,9 @@ namespace honk {
 class StandardHonkComposer {
   public:
     static constexpr waffle::ComposerType type = waffle::ComposerType::STANDARD_HONK;
+    static constexpr waffle::merkle::HashType merkle_hash_type = waffle::merkle::HashType::LOOKUP_PEDERSEN;
+    static constexpr waffle::pedersen::CommitmentType commitment_type =
+        waffle::pedersen::CommitmentType::FIXED_BASE_PEDERSEN;
 
     static constexpr size_t UINT_LOG2_BASE = 2;
     // An instantiation of the circuit constructor that only depends on arithmetization, not  on the proof system

diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/CMakeLists.txt b/cpp/src/aztec/join_split_example/proofs/join_split/CMakeLists.txt
@@ -5,7 +5,7 @@ barretenberg_module(
   crypto_schnorr
   stdlib_blake2s
   stdlib_sha256
-  stdlib_pedersen
+  stdlib_pedersen_commitment
   stdlib_schnorr
   stdlib_primitives
   stdlib_merkle_tree)
diff --git a/cpp/src/aztec/stdlib/commitment/pedersen/pedersen.bench.cpp b/cpp/src/aztec/stdlib/commitment/pedersen/pedersen.bench.cpp
@@ -97,7 +97,7 @@ void construct_pedersen_witnesses_bench(State& state) noexcept
         waffle::TurboComposer composer =
             waffle::TurboComposer(BARRETENBERG_SRS_PATH, static_cast<size_t>(state.range(0)));
         generate_test_pedersen_circuit(composer, static_cast<size_t>(state.range(0)));
-        std::cout << "composer gates = " << composer.n << std::endl;
+        std::cout << "composer gates = " << composer.get_num_gates() << std::endl;
         composer.compute_witness();
     }
 }