Merge branch 'next' into merge-train/avm

Author: AztecBot

barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp

@@ -72,11 +72,10 @@ typedef struct blake2s_param__ blake2s_param;
 enum { BLAKE2_DUMMY_1 = 1 / (sizeof(blake2s_param) == BLAKE2S_OUTBYTES) };
 
 int blake2s_init(blake2s_state* S, size_t outlen);
-int blake2s_init_key(blake2s_state* S, size_t outlen, const void* key, size_t keylen);
 int blake2s_init_param(blake2s_state* S, const blake2s_param* P);
 int blake2s_update(blake2s_state* S, const void* in, size_t inlen);
 int blake2s_final(blake2s_state* S, void* out, size_t outlen);
 
 std::array<uint8_t, BLAKE2S_OUTBYTES> blake2s(std::vector<uint8_t> const& input);
 
-} // namespace bb::crypto
+} // namespace bb::crypto

barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp

@@ -16,6 +16,20 @@ struct test_vector {
     std::array<uint8_t, 32> output;
 };
 
+struct blake3_test_vector {
+    size_t input_len;
+    std::vector<uint8_t> hash;
+};
+
+std::vector<uint8_t> test_input(size_t input_len)
+{
+    std::vector<uint8_t> input;
+    for (size_t i = 0; i < input_len; ++i) {
+        input.push_back(uint8_t(i % 251));
+    }
+    return input;
+}
+
 template <size_t S> constexpr std::array<uint8_t, S> convert(const std::string_view& in)
 {
     std::array<uint8_t, S> output;
@@ -393,6 +407,102 @@ static constexpr std::array<test_vector, 73> test_vectors{
       }}
 };
 
+/*
+ * The below test vector is a subset (covers inputs from 0 to 1024 bytes only) of the test vectors from the Blake3
+ * reference implementation. It has been modified to remove the keyed and derive_key context since our implementation
+ * does not support those modes. Further, we have converted the string formats from the source file into vector format
+ * for convenience.
+ *
+ * Link: https://github.com/BLAKE3-team/BLAKE3/blob/master/test_vectors/test_vectors.json
+ */
+blake3_test_vector full_test_vector[] = {
+    { 0,
+      {
+          0xAF, 0x13, 0x49, 0xB9, 0xF5, 0xF9, 0xA1, 0xA6, 0xA0, 0x40, 0x4D, 0xEA, 0x36, 0xDC, 0xC9, 0x49,
+          0x9B, 0xCB, 0x25, 0xC9, 0xAD, 0xC1, 0x12, 0xB7, 0xCC, 0x9A, 0x93, 0xCA, 0xE4, 0x1F, 0x32, 0x62,
+      } },
+    { 1,
+      {
+          0x2D, 0x3A, 0xDE, 0xDF, 0xF1, 0x1B, 0x61, 0xF1, 0x4C, 0x88, 0x6E, 0x35, 0xAF, 0xA0, 0x36, 0x73,
+          0x6D, 0xCD, 0x87, 0xA7, 0x4D, 0x27, 0xB5, 0xC1, 0x51, 0x02, 0x25, 0xD0, 0xF5, 0x92, 0xE2, 0x13,
+      } },
+    { 2,
+      {
+          0x7B, 0x70, 0x15, 0xBB, 0x92, 0xCF, 0x0B, 0x31, 0x80, 0x37, 0x70, 0x2A, 0x6C, 0xDD, 0x81, 0xDE,
+          0xE4, 0x12, 0x24, 0xF7, 0x34, 0x68, 0x4C, 0x2C, 0x12, 0x2C, 0xD6, 0x35, 0x9C, 0xB1, 0xEE, 0x63,
+      } },
+    { 3,
+      {
+          0xE1, 0xBE, 0x4D, 0x7A, 0x8A, 0xB5, 0x56, 0x0A, 0xA4, 0x19, 0x9E, 0xEA, 0x33, 0x98, 0x49, 0xBA,
+          0x8E, 0x29, 0x3D, 0x55, 0xCA, 0x0A, 0x81, 0x00, 0x67, 0x26, 0xD1, 0x84, 0x51, 0x9E, 0x64, 0x7F,
+      } },
+    { 4,
+      {
+          0xF3, 0x0F, 0x5A, 0xB2, 0x8F, 0xE0, 0x47, 0x90, 0x40, 0x37, 0xF7, 0x7B, 0x6D, 0xA4, 0xFE, 0xA1,
+          0xE2, 0x72, 0x41, 0xC5, 0xD1, 0x32, 0x63, 0x8D, 0x8B, 0xED, 0xCE, 0x9D, 0x40, 0x49, 0x4F, 0x32,
+      } },
+    { 5,
+      {
+          0xB4, 0x0B, 0x44, 0xDF, 0xD9, 0x7E, 0x7A, 0x84, 0xA9, 0x96, 0xA9, 0x1A, 0xF8, 0xB8, 0x51, 0x88,
+          0xC6, 0x6C, 0x12, 0x69, 0x40, 0xBA, 0x7A, 0xAD, 0x2E, 0x7A, 0xE6, 0xB3, 0x85, 0x40, 0x2A, 0xA2,
+      } },
+    { 6,
+      {
+          0x06, 0xC4, 0xE8, 0xFF, 0xB6, 0x87, 0x2F, 0xAD, 0x96, 0xF9, 0xAA, 0xCA, 0x5E, 0xEE, 0x15, 0x53,
+          0xEB, 0x62, 0xAE, 0xD0, 0xAD, 0x71, 0x98, 0xCE, 0xF4, 0x2E, 0x87, 0xF6, 0xA6, 0x16, 0xC8, 0x44,
+      } },
+    { 7,
+      {
+          0x3F, 0x87, 0x70, 0xF3, 0x87, 0xFA, 0xAD, 0x08, 0xFA, 0xA9, 0xD8, 0x41, 0x4E, 0x9F, 0x44, 0x9A,
+          0xC6, 0x8E, 0x6F, 0xF0, 0x41, 0x7F, 0x67, 0x3F, 0x60, 0x2A, 0x64, 0x6A, 0x89, 0x14, 0x19, 0xFE,
+      } },
+    { 8,
+      {
+          0x23, 0x51, 0x20, 0x7D, 0x04, 0xFC, 0x16, 0xAD, 0xE4, 0x3C, 0xCA, 0xB0, 0x86, 0x00, 0x93, 0x9C,
+          0x7C, 0x1F, 0xA7, 0x0A, 0x5C, 0x0A, 0xAC, 0xA7, 0x60, 0x63, 0xD0, 0x4C, 0x32, 0x28, 0xEA, 0xEB,
+      } },
+    { 63,
+      {
+          0xE9, 0xBC, 0x37, 0xA5, 0x94, 0xDA, 0xAD, 0x83, 0xBE, 0x94, 0x70, 0xDF, 0x7F, 0x7B, 0x37, 0x98,
+          0x29, 0x7C, 0x3D, 0x83, 0x4C, 0xE8, 0x0B, 0xA8, 0x5D, 0x6E, 0x20, 0x76, 0x27, 0xB7, 0xDB, 0x7B,
+      } },
+    { 64,
+      {
+          0x4E, 0xED, 0x71, 0x41, 0xEA, 0x4A, 0x5C, 0xD4, 0xB7, 0x88, 0x60, 0x6B, 0xD2, 0x3F, 0x46, 0xE2,
+          0x12, 0xAF, 0x9C, 0xAC, 0xEB, 0xAC, 0xDC, 0x7D, 0x1F, 0x4C, 0x6D, 0xC7, 0xF2, 0x51, 0x1B, 0x98,
+      } },
+    { 65,
+      {
+          0xDE, 0x1E, 0x5F, 0xA0, 0xBE, 0x70, 0xDF, 0x6D, 0x2B, 0xE8, 0xFF, 0xFD, 0x0E, 0x99, 0xCE, 0xAA,
+          0x8E, 0xB6, 0xE8, 0xC9, 0x3A, 0x63, 0xF2, 0xD8, 0xD1, 0xC3, 0x0E, 0xCB, 0x6B, 0x26, 0x3D, 0xEE,
+      } },
+    { 127,
+      {
+          0xD8, 0x12, 0x93, 0xFD, 0xA8, 0x63, 0xF0, 0x08, 0xC0, 0x9E, 0x92, 0xFC, 0x38, 0x2A, 0x81, 0xF5,
+          0xA0, 0xB4, 0xA1, 0x25, 0x1C, 0xBA, 0x16, 0x34, 0x01, 0x6A, 0x0F, 0x86, 0xA6, 0xBD, 0x64, 0x0D,
+      } },
+    { 128,
+      {
+          0xF1, 0x7E, 0x57, 0x05, 0x64, 0xB2, 0x65, 0x78, 0xC3, 0x3B, 0xB7, 0xF4, 0x46, 0x43, 0xF5, 0x39,
+          0x62, 0x4B, 0x05, 0xDF, 0x1A, 0x76, 0xC8, 0x1F, 0x30, 0xAC, 0xD5, 0x48, 0xC4, 0x4B, 0x45, 0xEF,
+      } },
+    { 129,
+      {
+          0x68, 0x3A, 0xAA, 0xE9, 0xF3, 0xC5, 0xBA, 0x37, 0xEA, 0xAF, 0x07, 0x2A, 0xED, 0x0F, 0x9E, 0x30,
+          0xBA, 0xC0, 0x86, 0x51, 0x37, 0xBA, 0xE6, 0x8B, 0x1F, 0xDE, 0x4C, 0xA2, 0xAE, 0xBD, 0xCB, 0x12,
+      } },
+    { 1023,
+      {
+          0x10, 0x10, 0x89, 0x70, 0xEE, 0xDA, 0x3E, 0xB9, 0x32, 0xBA, 0xAC, 0x14, 0x28, 0xC7, 0xA2, 0x16,
+          0x3B, 0x0E, 0x92, 0x4C, 0x9A, 0x9E, 0x25, 0xB3, 0x5B, 0xBA, 0x72, 0xB2, 0x8F, 0x70, 0xBD, 0x11,
+      } },
+    { 1024,
+      {
+          0x42, 0x21, 0x47, 0x39, 0xF0, 0x95, 0xA4, 0x06, 0xF3, 0xFC, 0x83, 0xDE, 0xB8, 0x89, 0x74, 0x4A,
+          0xC0, 0x0D, 0xF8, 0x31, 0xC1, 0x0D, 0xAA, 0x55, 0x18, 0x9B, 0x5D, 0x12, 0x1C, 0x85, 0x5A, 0xF7,
+      } }
+};
+
 TEST(MiscBlake3s, TestVectors)
 {
     constexpr_for<0, 1, 73>([&]<size_t index>() {
@@ -421,3 +531,11 @@ TEST(MiscBlake3s, TooLargeInputTest)
     std::vector<uint8_t> input(1025, 0);
     EXPECT_THROW_OR_ABORT(blake3::blake3s(input), "Assertion failed");
 }
+
+TEST(MiscBlake3s, test_official_vectors)
+{
+    for (auto v : full_test_vector) {
+        std::vector<uint8_t> input = test_input(v.input_len);
+        EXPECT_EQ(blake3::blake3s(input), v.hash);
+    }
+}

barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp

@@ -108,6 +108,34 @@ TEST(stdlib_blake2s, test_witness_and_constant)
     EXPECT_EQ(proof_result, true);
 }
 
+TEST(stdlib_blake2s, test_constant_only)
+{
+    Builder builder;
+    size_t len = 65;
+
+    // create a byte array that is a circuit constant
+    byte_array_ct input_arr = byte_array_ct::constant_padding(&builder, len, '1');
+
+    // create expected input vector
+    std::vector<uint8_t> input_v(len, '1');
+
+    // Verify the circuit input matches the expected input
+    EXPECT_EQ(input_arr.get_value(), input_v);
+
+    // hash the byte array
+    byte_array_ct output = stdlib::Blake2s<Builder>::hash(input_arr);
+
+    // compute expected hash
+    auto expected = crypto::blake2s(input_v);
+
+    EXPECT_EQ(output.get_value(), std::vector<uint8_t>(expected.begin(), expected.end()));
+
+    info("builder gates = ", builder.get_num_finalized_gates_inefficient());
+
+    bool proof_result = CircuitChecker::check(builder);
+    EXPECT_EQ(proof_result, true);
+}
+
 TEST(stdlib_blake2s, test_multiple_sized_blocks)
 {
 

barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp

@@ -113,6 +113,34 @@ TEST(stdlib_blake3s, test_witness_and_constant)
     EXPECT_EQ(proof_result, true);
 }
 
+TEST(stdlib_blake3s, test_constant_only)
+{
+    UltraBuilder builder;
+    size_t len = 65;
+
+    // create a byte array that is a circuit constant
+    byte_array_ct input_arr = byte_array_ct::constant_padding(&builder, len, '1');
+
+    // create expected input vector
+    std::vector<uint8_t> input_v(len, '1');
+
+    // Verify the circuit input matches the expected input
+    EXPECT_EQ(input_arr.get_value(), input_v);
+
+    // hash the byte array
+    byte_array_ct output = stdlib::Blake3s<UltraBuilder>::hash(input_arr);
+
+    // compute expected hash
+    auto expected = blake3::blake3s(input_v);
+
+    EXPECT_EQ(output.get_value(), std::vector<uint8_t>(expected.begin(), expected.end()));
+
+    info("builder gates = ", builder.get_num_finalized_gates_inefficient());
+
+    bool proof_result = CircuitChecker::check(builder);
+    EXPECT_EQ(proof_result, true);
+}
+
 TEST(stdlib_blake3s, test_multiple_sized_blocks)
 {
     int i = 0;