Merge branch 'master' into md/mirror-aztec-nr

AztecProtocol · Sep 13, 2023 · 92f62eb · 92f62eb
2 parents 1aa783c + 1afc566
commit 92f62eb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp
@@ -59,18 +59,19 @@ template <typename T, typename... Args> std::string check_memory_span(T* obj, Ar
     return {};
 }
 
-template <msgpack_concepts::HasMsgPack T> std::string check_msgpack_method(T& object)
+template <msgpack_concepts::HasMsgPack T> std::string check_msgpack_method(const T& object)
 {
     std::string result;
     auto checker = [&](auto&... values) { result = check_memory_span(&object, &values...); };
-    object.msgpack([&](auto&... keys_and_values) { std::apply(checker, drop_keys(std::tie(keys_and_values...))); });
+    const_cast<T&>(object).msgpack( // NOLINT
+        [&](auto&... keys_and_values) { std::apply(checker, drop_keys(std::tie(keys_and_values...))); });
     return result;
 }
-void check_msgpack_usage(auto object)
+void check_msgpack_usage(const auto& object)
 {
     std::string result = check_msgpack_method(object);
     if (!result.empty()) {
         throw_or_abort(result);
     }
 }
-} // namespace msgpack
+} // namespace msgpack
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp
@@ -66,7 +66,7 @@ struct MsgpackSchemaPacker : msgpack::packer<msgpack::sbuffer> {
 
         // Note: if this fails to compile, check first in list of template Arg's
         // it may need a msgpack_schema_pack specialization (particularly if it doesn't define MSGPACK_FIELDS).
-        (_msgpack_schema_pack(*this, Args{}), ...); /* pack schemas of all template Args */
+        (_msgpack_schema_pack(*this, *std::make_unique<Args>()), ...); /* pack schemas of all template Args */
     }
     /**
      * @brief Encode a type that defines msgpack based on its key value pairs.
@@ -108,7 +108,10 @@ concept SchemaPackable = requires(T value, MsgpackSchemaPacker packer) { msgpack
 
 // Helper for packing (key, value, key, value, ...) arguments
 template <typename Value, typename... Rest>
-inline void _schema_pack_map_content(MsgpackSchemaPacker& packer, std::string key, Value value, Rest... rest)
+inline void _schema_pack_map_content(MsgpackSchemaPacker& packer,
+                                     std::string key,
+                                     const Value& value,
+                                     const Rest&... rest)
 {
     static_assert(
         msgpack_concepts::SchemaPackable<Value>,
@@ -200,7 +203,9 @@ inline void msgpack_schema_pack(MsgpackSchemaPacker& packer, std::array<T, N> co
     packer.pack("array");
     // That has a size 2 tuple as its 2nd arg
     packer.pack_array(2); /* param list format for consistency*/
-    _msgpack_schema_pack(packer, T{});
+    // To avoid WASM problems with large stack objects, we use a heap allocation.
+    // Small note: This works because make_unique goes of scope only when the whole line is done.
+    _msgpack_schema_pack(packer, *std::make_unique<T>());
     packer.pack(N);
 }
 

diff --git a/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts b/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts
@@ -384,7 +384,7 @@ describe('sequencer/solo_block_builder', () => {
 
       const [l2Block] = await builder.buildL2Block(globalVariables, txs, l1ToL2Messages);
       expect(l2Block.number).toEqual(blockNumber);
-    }, 20_000);
+    }, 40_000);
 
     // This test specifically tests nullifier values which previously caused e2e_private_token test to fail
     it('e2e_private_token edge case regression test on nullifier values', async () => {