Merge pull request #9 from NilFoundation/update_crypto3_and_related

Update crypto3 to the latest master (the last time, to the commit f15b449).
NilFoundation · Sep 15, 2024 · c09bc85 · c09bc85
2 parents b1862d2 + a92f582
commit c09bc85
Show file tree

Hide file tree

Showing 97 changed files with 3,878 additions and 1,763 deletions.
diff --git a/crypto3/libs/algebra/crypto3.algebra.podspec.json b/crypto3/libs/algebra/crypto3.algebra.podspec.json
@@ -18,7 +18,7 @@
     "branch": "master"
   },
   "xcconfig": {
-    "CLANG_CXX_LANGUAGE_STANDARD": "c++14",
+    "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
     "CLANG_CXX_LIBRARY": "libc++",
     "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
   },

diff --git a/crypto3/libs/block/crypto3.block.podspec.json b/crypto3/libs/block/crypto3.block.podspec.json
@@ -17,7 +17,7 @@
     "branch": "master"
   },
   "xcconfig": {
-    "CLANG_CXX_LANGUAGE_STANDARD": "c++14",
+    "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
     "CLANG_CXX_LIBRARY": "libc++",
     "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
   },

diff --git a/crypto3/libs/block/test/CMakeLists.txt b/crypto3/libs/block/test/CMakeLists.txt
@@ -21,7 +21,7 @@ macro(define_block_cipher_test name)
                                ${Boost_INCLUDE_DIRS})
 
     if(NOT CMAKE_CXX_STANDARD)
-        set_target_properties(${test_name} PROPERTIES CXX_STANDARD 14)
+        set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17)
     endif()
 
     string(CONCAT TEST_DATA ${CMAKE_CURRENT_SOURCE_DIR} "/data/" "${name}" ".json")

diff --git a/crypto3/libs/blueprint/include/nil/blueprint/basic_non_native_policy.hpp b/crypto3/libs/blueprint/include/nil/blueprint/basic_non_native_policy.hpp
@@ -29,6 +29,8 @@
 #include <nil/crypto3/algebra/curves/pallas.hpp>
 #include <nil/crypto3/algebra/curves/vesta.hpp>
 #include <nil/crypto3/algebra/curves/ed25519.hpp>
+#include <nil/crypto3/algebra/fields/bls12/base_field.hpp>
+#include <nil/crypto3/algebra/fields/bls12/scalar_field.hpp>
 
 #include <boost/multiprecision/cpp_int.hpp>
 #include <nil/crypto3/zk/snark/arithmetization/plonk/constraint_system.hpp>
@@ -251,8 +253,6 @@ namespace nil {
                 typedef std::array<var, ratio> non_native_var_type;
             };
 
-
-
             /*
              * Native element type.
              */

diff --git a/crypto3/libs/blueprint/test/zkevm/opcodes/iszero.cpp b/crypto3/libs/blueprint/test/zkevm/opcodes/iszero.cpp
@@ -26,7 +26,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <nil/blueprint/zkevm/zkevm_machine_interface.hpp>
 #include <nil/crypto3/algebra/fields/arithmetic_params/goldilocks64.hpp>
 
 #include <nil/blueprint/blueprint/plonk/circuit.hpp>
@@ -35,6 +34,8 @@
 #include <nil/blueprint/zkevm/zkevm_circuit.hpp>
 #include "../opcode_tester.hpp"
 
+#include <nil/blueprint/zkevm/operations/iszero.hpp>
+
 using namespace nil::blueprint;
 using namespace nil::crypto3::algebra;
 

diff --git a/crypto3/libs/blueprint/test/zkevm/opcodes/mul.cpp b/crypto3/libs/blueprint/test/zkevm/opcodes/mul.cpp
@@ -33,11 +33,10 @@
 #include <nil/blueprint/blueprint/plonk/assignment.hpp>
 
 #include <nil/blueprint/zkevm/zkevm_circuit.hpp>
-#include <nil/blueprint/zkevm/zkevm_operation.hpp>
-#include <nil/blueprint/zkevm/operations/mul.hpp>
-
 #include "../opcode_tester.hpp"
 
+#include <nil/blueprint/zkevm/operations/mul.hpp>
+
 using namespace nil::blueprint;
 using namespace nil::crypto3::algebra;
 

diff --git a/crypto3/libs/codec/crypto3.codec.podspec.json b/crypto3/libs/codec/crypto3.codec.podspec.json
@@ -17,7 +17,7 @@
     "branch": "master"
   },
   "xcconfig": {
-    "CLANG_CXX_LANGUAGE_STANDARD": "c++14",
+    "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
     "CLANG_CXX_LIBRARY": "libc++",
     "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
   },

diff --git a/crypto3/libs/codec/test/CMakeLists.txt b/crypto3/libs/codec/test/CMakeLists.txt
@@ -24,7 +24,7 @@ macro(define_codec_test name)
 
     if(NOT CMAKE_CXX_STANDARD)
         set_target_properties(codec_${name}_test PROPERTIES
-                              CXX_STANDARD 14
+                              CXX_STANDARD 17
                               CXX_STANDARD_REQUIRED TRUE)
     endif()
 

diff --git a/crypto3/libs/containers/CMakeLists.txt b/crypto3/libs/containers/CMakeLists.txt
@@ -57,7 +57,6 @@ target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTER
 
 cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INCLUDE include NAMESPACE ${CMAKE_WORKSPACE_NAME}::)
 
-include(CMTest)
 cm_add_test_subdirectory(test)
 
 if (BUILD_EXAMPLES)

diff --git a/crypto3/libs/containers/include/nil/crypto3/container/merkle/tree.hpp b/crypto3/libs/containers/include/nil/crypto3/container/merkle/tree.hpp
@@ -175,6 +175,7 @@ namespace nil {
 
                     typedef typename node_type::value_type value_type;
                     constexpr static const std::size_t value_bits = node_type::value_bits;
+                    constexpr static const std::size_t arity = Arity;
 
                     typedef std::vector<value_type> container_type;
 
@@ -253,15 +254,15 @@ namespace nil {
                     }
 
                     bool operator==(const merkle_tree_impl &rhs) const {
-                        return _hashes == rhs.val;
+                        return _hashes == rhs._hashes;
                     }
 
                     bool operator!=(const merkle_tree_impl &rhs) const {
                         return !(rhs == *this);
                     }
 
                     allocator_type get_allocator() const BOOST_NOEXCEPT {
-                        return this->val.__alloc();
+                        return this->_hashes.__alloc();
                     }
 
                     iterator begin() BOOST_NOEXCEPT {

diff --git a/crypto3/libs/containers/test/merkle/merkle.cpp b/crypto3/libs/containers/test/merkle/merkle.cpp
@@ -26,12 +26,6 @@
 
 #define BOOST_TEST_MODULE containter_merkletree_test
 
-#include <chrono>
-#include <cstdio>
-#include <limits>
-#include <type_traits>
-#include <cstdint>
-
 #include <nil/crypto3/algebra/random_element.hpp>
 #include <nil/crypto3/algebra/type_traits.hpp>
 #include <nil/crypto3/hash/block_to_field_elements_wrapper.hpp>
@@ -41,7 +35,6 @@
 #include <nil/crypto3/hash/keccak.hpp>
 #include <nil/crypto3/hash/pedersen.hpp>
 #include <nil/crypto3/hash/poseidon.hpp>
-#include <nil/crypto3/hash/algorithm/hash.hpp>
 
 #include <nil/crypto3/container/merkle/tree.hpp>
 #include <nil/crypto3/container/merkle/proof.hpp>
@@ -50,6 +43,13 @@
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/data/monomorphic.hpp>
 
+#include <chrono>
+#include <cstdio>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+#include <nil/crypto3/hash/algorithm/hash.hpp>
+
 using namespace nil::crypto3;
 using namespace nil::crypto3::containers;
 

diff --git a/crypto3/libs/hash/crypto3.hash.podspec.json b/crypto3/libs/hash/crypto3.hash.podspec.json
@@ -17,7 +17,7 @@
     "branch": "master"
   },
   "xcconfig": {
-    "CLANG_CXX_LANGUAGE_STANDARD": "c++14",
+    "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
     "CLANG_CXX_LIBRARY": "libc++",
     "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
   },

diff --git a/crypto3/libs/hash/test/crc.cpp b/crypto3/libs/hash/test/crc.cpp
@@ -8,13 +8,8 @@
 
 #define BOOST_TEST_MODULE crc_test
 
-#include <iostream>
-#include <string>
-#include <cassert>
-#include <cstdint>
-#include <unordered_map>
-
 #include <nil/crypto3/hash/algorithm/hash.hpp>
+
 #include <nil/crypto3/hash/crc.hpp>
 #include <nil/crypto3/hash/hash_state.hpp>
 
@@ -24,6 +19,12 @@
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/data/monomorphic.hpp>
 
+#include <iostream>
+#include <string>
+#include <cassert>
+#include <cstdint>
+#include <unordered_map>
+
 using namespace nil::crypto3;
 using namespace nil::crypto3::hashes;
 using namespace nil::crypto3::accumulators;

diff --git a/crypto3/libs/hash/test/tiger.cpp b/crypto3/libs/hash/test/tiger.cpp
@@ -25,12 +25,6 @@
 
 #define BOOST_TEST_MODULE tiger_test
 
-#include <iostream>
-#include <string>
-#include <unordered_map>
-#include <cstdio>
-#include <cstdint>
-
 #include <nil/crypto3/hash/algorithm/hash.hpp>
 #include <nil/crypto3/hash/adaptor/hashed.hpp>
 
@@ -45,6 +39,12 @@
 
 #include <boost/static_assert.hpp>
 
+#include <iostream>
+#include <string>
+#include <unordered_map>
+#include <cstdio>
+#include <cstdint>
+
 using namespace nil::crypto3;
 using namespace nil::crypto3::accumulators;
 

diff --git a/crypto3/libs/kdf/crypto3.kdf.podspec.json b/crypto3/libs/kdf/crypto3.kdf.podspec.json
@@ -17,7 +17,7 @@
     "branch": "master"
   },
   "xcconfig": {
-    "CLANG_CXX_LANGUAGE_STANDARD": "c++14",
+    "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
     "CLANG_CXX_LIBRARY": "libc++",
     "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
   },

diff --git a/crypto3/libs/mac/crypto3.mac.podspec.json b/crypto3/libs/mac/crypto3.mac.podspec.json
@@ -17,7 +17,7 @@
     "branch": "master"
   },
   "xcconfig": {
-    "CLANG_CXX_LANGUAGE_STANDARD": "c++14",
+    "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
     "CLANG_CXX_LIBRARY": "libc++",
     "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
   },

diff --git a/.../libs/marshalling/algebra/include/nil/crypto3/marshalling/algebra/types/field_element.hpp b/.../libs/marshalling/algebra/include/nil/crypto3/marshalling/algebra/types/field_element.hpp
@@ -686,12 +686,16 @@ namespace nil {
                 //     return field;
                 // }
 
-                template<typename FieldValueType, typename Endianness>
-                nil::marshalling::types::array_list<
-                    nil::marshalling::field_type<Endianness>,
-                    field_element<nil::marshalling::field_type<Endianness>, FieldValueType>,
+
+                template<typename FieldValueType, typename TTypeBase>
+                using field_element_vector = nil::marshalling::types::array_list<
+                    TTypeBase,
+                    field_element<TTypeBase, FieldValueType>,
                     nil::marshalling::option::sequence_size_field_prefix<
-                        nil::marshalling::types::integral<nil::marshalling::field_type<Endianness>, std::size_t>>>
+                        nil::marshalling::types::integral<TTypeBase, std::size_t>>>;
+
+                template<typename FieldValueType, typename Endianness>
+                field_element_vector<FieldValueType, nil::marshalling::field_type<Endianness>>
                     fill_field_element_vector(const std::vector<FieldValueType> &field_elem_vector) {
 
                     using TTypeBase = nil::marshalling::field_type<Endianness>;
@@ -711,12 +715,7 @@ namespace nil {
 
                 template<typename FieldValueType, typename Endianness>
                 std::vector<FieldValueType> make_field_element_vector(
-                    const nil::marshalling::types::array_list<
-                        nil::marshalling::field_type<Endianness>,
-                        field_element<nil::marshalling::field_type<Endianness>, FieldValueType>,
-                        nil::marshalling::option::sequence_size_field_prefix<
-                            nil::marshalling::types::integral<nil::marshalling::field_type<Endianness>, std::size_t>>>
-                        &field_elem_vector) {
+                    const field_element_vector<FieldValueType, nil::marshalling::field_type<Endianness>>& field_elem_vector) {
 
                     std::vector<FieldValueType> result;
                     result.reserve(field_elem_vector.value().size());

diff --git a/crypto3/libs/marshalling/core/CMakeLists.txt b/crypto3/libs/marshalling/core/CMakeLists.txt
@@ -19,6 +19,10 @@ if(CRYPTO3_MARSHALLING_THROWS)
     add_definitions(-DCRYPTO3_MARSHALLING_THROWS)
 endif()
 
+if(NOT CMAKE_CXX_STANDARD)
+    set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17)
+endif()
+
 cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME})
 
 add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE)

diff --git a/crypto3/libs/marshalling/core/include/nil/marshalling/options.hpp b/crypto3/libs/marshalling/core/include/nil/marshalling/options.hpp
@@ -43,6 +43,12 @@
 
 namespace nil {
     namespace marshalling {
+        namespace types {
+            // We cannot include integral.hpp, it includes this file. So just declare the class.
+            template<typename TFieldBase, typename T, typename... TOptions>
+            class integral;
+        }
+
         namespace option {
             namespace detail {
 
@@ -286,6 +292,10 @@ namespace nil {
             template<typename TField>
             struct sequence_size_field_prefix { };
 
+            template <typename TTypeBase>
+                using size_t_sequence_size_field_prefix = sequence_size_field_prefix<
+                    nil::marshalling::types::integral<TTypeBase, std::size_t>>;
+
             /// @brief Option that modifies the default behaviour of collection fields to
             ///     prepend the serialized data with number of @b bytes information.
             /// @details Similar to @ref sequence_size_field_prefix, but instead of

diff --git a/...ibs/marshalling/core/include/nil/marshalling/types/adapter/sequence_size_field_prefix.hpp b/...ibs/marshalling/core/include/nil/marshalling/types/adapter/sequence_size_field_prefix.hpp
@@ -32,6 +32,7 @@
 namespace nil {
     namespace marshalling {
         namespace types {
+
             namespace adapter {
 
                 template<typename TSizeField, typename TBase>
@@ -129,7 +130,6 @@ namespace nil {
                         base_impl_type::write_no_status(iter);
                     }
                 };
-
             }    // namespace adapter
         }        // namespace types
     }            // namespace marshalling