Merge branch 'master' into mm/initial-merge

AztecProtocol · Mar 8, 2024 · 2f52efa · 2f52efa
2 parents 28c38ea + 3342371
commit 2f52efa
Show file tree

Hide file tree

Showing 29 changed files with 128 additions and 1,166 deletions.
diff --git a/barretenberg/barretenberg.code-workspace b/barretenberg/barretenberg.code-workspace
@@ -79,6 +79,9 @@
     // Some settings can only be configured here.
     // The following are just provided as example.
     "settings": {
+        "files.associations": {
+            "*.tcc": "cpp",
+          },
         //
         // Clangd. Note that this setting may be overridden by  user settings
         // to the default value "clangd".

diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh
@@ -33,7 +33,6 @@ TESTS=(
   crypto_schnorr_tests
   crypto_sha256_tests
   ecc_tests
-  join_split_example_proofs_inner_proof_data_tests
   join_split_example_proofs_notes_tests
   numeric_tests
   plonk_tests

diff --git a/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc
@@ -88,7 +88,7 @@ schnorr_signature schnorr_construct_signature(const std::string& message, const
     // method is overloaded to utilise a suitable entropy source
     // (see https://github.com/WebAssembly/WASI/blob/main/phases/snapshot/docs.md)
     //
-    // TODO: securely erase `k`
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/895): securely erase `k`
     Fr k = Fr::random_element();
 
     typename G1::affine_element R(G1::one * k);

diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp
diff --git a/...cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp b/...cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp