Switch to turbo for dsl to work.

Fix js circuit size and vk hash.
AztecProtocol · Mar 13, 2023 · 9aae3b4 · 9aae3b4
1 parent 3af3974
commit 9aae3b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp b/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
@@ -14,7 +14,7 @@ void create_pedersen_constraint(plonk::TurboComposer& composer, const PedersenCo
         field_ct scalar_as_field = field_ct::from_witness_index(&composer, scalar);
         scalars.push_back(scalar_as_field);
     }
-    auto point = pedersen::commit(scalars);
+    auto point = pedersen_commitment::commit(scalars);
 
     composer.assert_equal(point.x.witness_index, input.result_x);
     composer.assert_equal(point.y.witness_index, input.result_y);

diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
@@ -801,9 +801,9 @@ TEST_F(join_split_tests, test_0_input_notes_and_detect_circuit_change)
     EXPECT_TRUE(result.valid);
 
     // The below part detects any changes in the join-split circuit
-    constexpr uint32_t CIRCUIT_GATE_COUNT = 59175;
+    constexpr uint32_t CIRCUIT_GATE_COUNT = 64000;
     constexpr uint32_t GATES_NEXT_POWER_OF_TWO = 65536;
-    const uint256_t VK_HASH("7c5f17b829f8a6b17292a998ec06b2481abb82923e838d7422c3aec5cd5edd95");
+    const uint256_t VK_HASH("476d4ccd2ee8355dc24bf2d0afcaeeea97e7ac5df736a4739035703f1666e926");
 
     auto number_of_gates_js = result.number_of_gates;
     auto vk_hash_js = get_verification_key()->sha256_hash();

diff --git a/cpp/src/barretenberg/plonk/proof_system/constants.hpp b/cpp/src/barretenberg/plonk/proof_system/constants.hpp
@@ -13,7 +13,7 @@ enum ComposerType {
 // This variable sets the composer (TURBO or ULTRA) of the entire stdlib and rollup modules.
 // To switch to using a new composer, only changing this variable should activate the new composer
 // throughout the stdlib and circuits.
-static constexpr uint32_t SYSTEM_COMPOSER = ComposerType::PLOOKUP;
+static constexpr uint32_t SYSTEM_COMPOSER = ComposerType::TURBO;
 
 namespace merkle {
 enum HashType {