Merge remote-tracking branch 'origin/next' into lw/checkpoint_circuit

Author: LeilaWang

.vscode/settings.json

@@ -174,7 +174,7 @@
   // Clangd. Note that this setting may be overridden by user settings
   // to the default value "clangd".
   //
-  "clangd.path": "clangd-16",
+  "clangd.path": "clangd-20",
   //
   // C/C++ (should be disabled)
   //

barretenberg/bbup/bb-versions.json

@@ -1,4 +1,11 @@
 {
+  "1.0.0-beta.11": "0.87.0",
+  "1.0.0-beta.10": "0.87.0",
+  "1.0.0-beta.9": "0.87.0",
+  "1.0.0-beta.8": "0.87.0",
+  "1.0.0-beta.7": "0.87.0",
+  "1.0.0-beta.6": "0.84.0",
+  "1.0.0-beta.5": "0.84.0",
   "1.0.0-beta.4": "0.84.0",
   "1.0.0-beta.3": "0.82.2",
   "1.0.0-beta.2": "0.82.2",

barretenberg/cpp/format.sh

@@ -4,27 +4,27 @@ set -e
 if [ "$1" == "staged" ]; then
   echo Formatting barretenberg staged files...
   for FILE in $(git diff-index --diff-filter=d --relative --cached --name-only HEAD | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
-    clang-format-16 -i $FILE
+    clang-format-20 -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
     git add $FILE
   done
 elif [ "$1" == "changed" ]; then
   echo Formatting barretenberg changed files...
   for FILE in $(git diff-index --diff-filter=d --relative --name-only HEAD | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
-    clang-format-16 -i $FILE
+    clang-format-20 -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
   done
 elif [ "$1" == "check" ]; then
   find ./src -iname *.hpp -o -iname *.cpp -o -iname *.tcc | grep -v src/msgpack-c | grep -v bb/deps  | \
-    parallel -N10 clang-format-16 --dry-run --Werror
+    parallel -N10 clang-format-20 --dry-run --Werror
 elif [ -n "$1" ]; then
   for FILE in $(git diff-index --relative --name-only $1 | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
-    clang-format-16 -i $FILE
+    clang-format-20 -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
   done
 else
   for FILE in $(find ./src -iname *.hpp -o -iname *.cpp -o -iname *.tcc | grep -v src/msgpack-c); do
-    clang-format-16 -i $FILE
+    clang-format-20 -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
   done
 fi

barretenberg/cpp/src/barretenberg/common/fuzzer.hpp

@@ -123,9 +123,7 @@ uint256_t read_uint256(const uint8_t* data, size_t buffer_size = 32)
  */
 template <typename T>
 concept SimpleRng = requires(T a) {
-    {
-        a.next()
-    } -> std::convertible_to<uint32_t>;
+    { a.next() } -> std::convertible_to<uint32_t>;
 };
 /**
  * @brief Concept for forcing ArgumentSizes to be size_t
@@ -189,9 +187,7 @@ concept ArithmeticFuzzHelperConstraint = requires {
  */
 template <typename T>
 concept CheckableComposer = requires(T a) {
-    {
-        bb::CircuitChecker::check(a)
-    } -> std::same_as<bool>;
+    { bb::CircuitChecker::check(a) } -> std::same_as<bool>;
 };
 
 /**
@@ -203,9 +199,7 @@ concept CheckableComposer = requires(T a) {
  */
 template <typename T, typename Composer, typename Context>
 concept PostProcessingEnabled = requires(Composer composer, Context context) {
-    {
-        T::postProcess(&composer, context)
-    } -> std::same_as<bool>;
+    { T::postProcess(&composer, context) } -> std::same_as<bool>;
 };
 
 /**

barretenberg/cpp/src/barretenberg/common/named_union.hpp

@@ -20,9 +20,7 @@ namespace bb {
  */
 template <typename T>
 concept HasMsgpackSchemaName = requires {
-    {
-        T::MSGPACK_SCHEMA_NAME
-    } -> std::convertible_to<std::string_view>;
+    { T::MSGPACK_SCHEMA_NAME } -> std::convertible_to<std::string_view>;
 };
 
 /**

barretenberg/cpp/src/barretenberg/common/tuplet.hpp

@@ -75,8 +75,8 @@
 #define _TUPLET_TYPES_CMP_WITH(T, U)                                                                                   \
     ::std::enable_if_t<::tuplet::sfinae::detail::_all_true<::tuplet::sfinae::detail::_has_cmp<T, U>...>(), bool>
 #else
-#define _TUPLET_TYPES_EQ_WITH(T, U) ::std::enable_if_t<((::tuplet::sfinae::detail::_has_eq<T, U>)&&...), bool>
-#define _TUPLET_TYPES_CMP_WITH(T, U) ::std::enable_if_t<((::tuplet::sfinae::detail::_has_cmp<T, U>)&&...), bool>
+#define _TUPLET_TYPES_EQ_WITH(T, U) ::std::enable_if_t<((::tuplet::sfinae::detail::_has_eq<T, U>) && ...), bool>
+#define _TUPLET_TYPES_CMP_WITH(T, U) ::std::enable_if_t<((::tuplet::sfinae::detail::_has_cmp<T, U>) && ...), bool>
 #endif
 #endif
 
@@ -287,45 +287,31 @@ concept assignable_to = requires(U u, T t) { t = u; };
 
 template <class T>
 concept ordered = requires(T const& t) {
-    {
-        t <=> t
-    };
+    { t <=> t };
 };
 
 template <class T, class U>
 concept ordered_with = requires(T const& t, U const& u) {
-    {
-        t <=> u
-    };
+    { t <=> u };
 };
 template <class T>
 concept equality_comparable = requires(T const& t) {
-    {
-        t == t
-    } -> same_as<bool>;
+    { t == t } -> same_as<bool>;
 };
 
 template <class T, class U>
 concept equality_comparable_with = requires(T const& t, U const& u) {
-    {
-        t == u
-    } -> same_as<bool>;
+    { t == u } -> same_as<bool>;
 };
 
 template <class T>
 concept partial_comparable = equality_comparable<T> && requires(T const& t) {
-    {
-        t < t
-    } -> same_as<bool>;
+    { t < t } -> same_as<bool>;
 };
 template <class T, class U>
 concept partial_comparable_with = equality_comparable_with<T, U> && requires(T const& t, U const& u) {
-    {
-        t < u
-    } -> same_as<bool>;
-    {
-        t > u
-    } -> same_as<bool>;
+    { t < u } -> same_as<bool>;
+    { t > u } -> same_as<bool>;
 };
 
 #endif

barretenberg/cpp/src/barretenberg/common/utils.hpp

@@ -32,9 +32,7 @@ template <typename... Ts> size_t hash_as_tuple(const Ts&... ts)
 // Define std::hash for any type that has a hash() method.
 template <typename T>
 concept Hashable = requires(const T& t) {
-    {
-        t.hash()
-    } -> std::same_as<std::size_t>;
+    { t.hash() } -> std::same_as<std::size_t>;
 };
 
 template <Hashable T> struct std::hash<T> {

barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp

@@ -137,7 +137,7 @@ template <typename Curve> struct GeneratorContext {
 
     GeneratorContext() = default;
     GeneratorContext(size_t hash_index)
-        : offset(hash_index){};
+        : offset(hash_index) {};
     GeneratorContext(size_t _offset, std::string_view _domain_separator)
         : offset(_offset)
         , domain_separator(_domain_separator)

barretenberg/cpp/src/barretenberg/crypto/merkle_tree/indexed_tree/content_addressed_indexed_tree.hpp

@@ -71,7 +71,7 @@ class ContentAddressedIndexedTree : public ContentAddressedAppendOnlyTree<Store,
     ContentAddressedIndexedTree(std::unique_ptr<Store> store,
                                 std::shared_ptr<ThreadPool> workers,
                                 const index_t& initial_size)
-        : ContentAddressedIndexedTree(std::move(store), workers, initial_size, std::vector<LeafValueType>()){};
+        : ContentAddressedIndexedTree(std::move(store), workers, initial_size, std::vector<LeafValueType>()) {};
     ContentAddressedIndexedTree(ContentAddressedIndexedTree const& other) = delete;
     ContentAddressedIndexedTree(ContentAddressedIndexedTree&& other) = delete;
     ~ContentAddressedIndexedTree() = default;

barretenberg/cpp/src/barretenberg/crypto/merkle_tree/node_store/array_store.hpp

@@ -17,15 +17,15 @@ class MockTransaction {
     using Ptr = std::unique_ptr<MockTransaction>;
     bool get_node(uint32_t, index_t, std::vector<uint8_t>&) const { return false; }
 
-    template <typename T> void get_value_by_integer(T&, std::vector<uint8_t>&){};
+    template <typename T> void get_value_by_integer(T&, std::vector<uint8_t>&) {};
 
-    void get_value(std::vector<uint8_t>&, std::vector<uint8_t>&){};
+    void get_value(std::vector<uint8_t>&, std::vector<uint8_t>&) {};
 
     void put_node(uint32_t, index_t, const std::vector<uint8_t>&) {}
 
-    template <typename T> void put_value_by_integer(T&, std::vector<uint8_t>&){};
+    template <typename T> void put_value_by_integer(T&, std::vector<uint8_t>&) {};
 
-    void put_value(std::vector<uint8_t>&, std::vector<uint8_t>&){};
+    void put_value(std::vector<uint8_t>&, std::vector<uint8_t>&) {};
 };
 
 class MockPersistedStore {
@@ -88,8 +88,8 @@ template <typename PersistedStore> class ArrayStore {
         root = meta.root;
     }
 
-    void commit(){};
-    void rollback(){};
+    void commit() {};
+    void rollback() {};
 
     ReadTransactionPtr create_read_transactiono() { return std::make_unique<ReadTransaction>(); }