Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit e1ac7ce

Browse files
committed
Added marshalling for preprocessed public data, LPC commitment state, polys_evaluator.
1 parent 4a10666 commit e1ac7ce

File tree

73 files changed

+3199
-1100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3199
-1100
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ else()
5353
target_architecture(CMAKE_TARGET_ARCHITECTURE)
5454
endif()
5555

56-
find_package(Boost REQUIRED COMPONENTS container random filesystem log log_setup program_options thread system unit_test_framework timer)
56+
find_package(Boost REQUIRED COMPONENTS container random filesystem log log_setup program_options thread system unit_test_framework timer log)
5757

5858
add_subdirectories("${CMAKE_CURRENT_LIST_DIR}/libs/")
5959
add_subdirectories("${CMAKE_CURRENT_LIST_DIR}/libs/marshalling")

libs/algebra/crypto3.algebra.podspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"branch": "master"
1919
},
2020
"xcconfig": {
21-
"CLANG_CXX_LANGUAGE_STANDARD": "c++14",
21+
"CLANG_CXX_LANGUAGE_STANDARD": "c++17",
2222
"CLANG_CXX_LIBRARY": "libc++",
2323
"HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
2424
},

libs/block/crypto3.block.podspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"branch": "master"
1818
},
1919
"xcconfig": {
20-
"CLANG_CXX_LANGUAGE_STANDARD": "c++14",
20+
"CLANG_CXX_LANGUAGE_STANDARD": "c++17",
2121
"CLANG_CXX_LIBRARY": "libc++",
2222
"HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
2323
},

libs/block/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ macro(define_block_cipher_test name)
2121
${Boost_INCLUDE_DIRS})
2222

2323
if(NOT CMAKE_CXX_STANDARD)
24-
set_target_properties(${test_name} PROPERTIES CXX_STANDARD 14)
24+
set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17)
2525
endif()
2626

2727
string(CONCAT TEST_DATA ${CMAKE_CURRENT_SOURCE_DIR} "/data/" "${name}" ".json")

libs/blueprint/include/nil/blueprint/basic_non_native_policy.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <nil/crypto3/algebra/curves/pallas.hpp>
3030
#include <nil/crypto3/algebra/curves/vesta.hpp>
3131
#include <nil/crypto3/algebra/curves/ed25519.hpp>
32+
#include <nil/crypto3/algebra/fields/bls12/base_field.hpp>
33+
#include <nil/crypto3/algebra/fields/bls12/scalar_field.hpp>
3234

3335
#include <boost/multiprecision/cpp_int.hpp>
3436
#include <nil/crypto3/zk/snark/arithmetization/plonk/constraint_system.hpp>
@@ -251,8 +253,6 @@ namespace nil {
251253
typedef std::array<var, ratio> non_native_var_type;
252254
};
253255

254-
255-
256256
/*
257257
* Native element type.
258258
*/

libs/codec/crypto3.codec.podspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"branch": "master"
1818
},
1919
"xcconfig": {
20-
"CLANG_CXX_LANGUAGE_STANDARD": "c++14",
20+
"CLANG_CXX_LANGUAGE_STANDARD": "c++17",
2121
"CLANG_CXX_LIBRARY": "libc++",
2222
"HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
2323
},

libs/codec/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ macro(define_codec_test name)
2424

2525
if(NOT CMAKE_CXX_STANDARD)
2626
set_target_properties(codec_${name}_test PROPERTIES
27-
CXX_STANDARD 14
27+
CXX_STANDARD 17
2828
CXX_STANDARD_REQUIRED TRUE)
2929
endif()
3030

libs/containers/include/nil/crypto3/container/merkle/tree.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ namespace nil {
175175

176176
typedef typename node_type::value_type value_type;
177177
constexpr static const std::size_t value_bits = node_type::value_bits;
178+
constexpr static const std::size_t arity = Arity;
178179

179180
typedef std::vector<value_type> container_type;
180181

@@ -253,15 +254,15 @@ namespace nil {
253254
}
254255

255256
bool operator==(const merkle_tree_impl &rhs) const {
256-
return _hashes == rhs.val;
257+
return _hashes == rhs._hashes;
257258
}
258259

259260
bool operator!=(const merkle_tree_impl &rhs) const {
260261
return !(rhs == *this);
261262
}
262263

263264
allocator_type get_allocator() const BOOST_NOEXCEPT {
264-
return this->val.__alloc();
265+
return this->_hashes.__alloc();
265266
}
266267

267268
iterator begin() BOOST_NOEXCEPT {

libs/hash/crypto3.hash.podspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"branch": "master"
1818
},
1919
"xcconfig": {
20-
"CLANG_CXX_LANGUAGE_STANDARD": "c++14",
20+
"CLANG_CXX_LANGUAGE_STANDARD": "c++17",
2121
"CLANG_CXX_LIBRARY": "libc++",
2222
"HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
2323
},

libs/kdf/crypto3.kdf.podspec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"branch": "master"
1818
},
1919
"xcconfig": {
20-
"CLANG_CXX_LANGUAGE_STANDARD": "c++14",
20+
"CLANG_CXX_LANGUAGE_STANDARD": "c++17",
2121
"CLANG_CXX_LIBRARY": "libc++",
2222
"HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\""
2323
},

0 commit comments

Comments
 (0)