wip

add outcome to lpc marshalling, todos #73 update marshalling for proof-producer #73 Remove r1cs marshalling tests and example, update todos for zk #73 todo merkle proof abstract method generate_assignments #73
NilFoundation · Oct 15, 2024 · 3e6afd2 · 3e6afd2
1 parent f2f6baf
commit 3e6afd2
Show file tree

Hide file tree

Showing 27 changed files with 58 additions and 1,654 deletions.
diff --git a/...rypto3/algebra/curves/detail/forms/twisted_edwards/extended_with_a_minus_1/element_g1.hpp b/...rypto3/algebra/curves/detail/forms/twisted_edwards/extended_with_a_minus_1/element_g1.hpp
@@ -221,7 +221,7 @@ namespace nil {
 
                         /*************************  Arithmetic operations  ***********************************/
 
-                        constexpr curve_element operator=(const curve_element &other) {
+                        constexpr curve_element& operator=(const curve_element &other) {
                             // handle special cases having to do with O
                             this->X = other.X;
                             this->Y = other.Y;
@@ -231,11 +231,18 @@ namespace nil {
                             return *this;
                         }
 
+                        constexpr curve_element operator=(curve_element<params_type, form, curves::coordinates::affine> const &other) {
+                            this->X = other.X;
+                            this->Y = other.Y;
+                            this->T = other.X*other.Y;
+                            this->Z = field_value_type::one();
+                            return *this;
+                        }
+
                         static curve_element from_affine(curve_element<params_type, form, curves::coordinates::affine> const &other) {
                             return curve_element(other.X, other.Y, other.X*other.Y, field_value_type::one());
                         }
 
-
                         template<typename Backend,
                                  boost::multiprecision::expression_template_option ExpressionTemplates>
                         constexpr const curve_element& operator=(

diff --git a/crypto3/libs/blueprint/include/nil/blueprint/zkevm/zkevm_operation.hpp b/crypto3/libs/blueprint/include/nil/blueprint/zkevm/zkevm_operation.hpp
@@ -69,7 +69,7 @@ namespace nil {
             // we expect that most of the operations would only use MIDDLE_OP
             virtual std::map<gate_class, std::vector<constraint_type>> generate_gates(zkevm_circuit_type &zkevm_circuit) = 0;
 
-            virtual void generate_assignments(zkevm_circuit_type &zkevm_circuit, zkevm_machine_interface &machine);
+            virtual void generate_assignments(zkevm_circuit_type &zkevm_circuit, zkevm_machine_interface &machine) = 0;
             // should return the same rows amount for everyс operation right now
             // here in case we would make it dynamic in the future
             virtual std::size_t rows_amount() = 0;

diff --git a/crypto3/libs/blueprint/test/zkevm/opcodes/div.cpp b/crypto3/libs/blueprint/test/zkevm/opcodes/div.cpp
@@ -35,7 +35,7 @@
 #include <nil/blueprint/zkevm/zkevm_circuit.hpp>
 #include "../opcode_tester.hpp"
 
-#include <nil/blueprint/zkevm/operations/mul.hpp>
+#include <nil/blueprint/zkevm/operations/div.hpp>
 
 using namespace nil::blueprint;
 using namespace nil::crypto3::algebra;

diff --git a/...ibs/marshalling/algebra/include/nil/crypto3/marshalling/algebra/processing/babyjubjub.hpp b/...ibs/marshalling/algebra/include/nil/crypto3/marshalling/algebra/processing/babyjubjub.hpp
@@ -51,11 +51,14 @@ namespace nil {
         namespace marshalling {
             namespace processing {
 
-                // Encoding of babyjubjub curve as described in Nocturne:
+                // Encoding of babyjubjub curve as described in Nocturne (endianness not specified)
                 // https://nocturne-xyz.gitbook.io/nocturne/protocol-details/encodings
                 // Only Y coordinate is encoded, plus 's' - the "sign" of X coordinate
                 // uint256(signBit) << 254 | y
-                // TODO: update reference or invent our own rules
+                //
+                // Similar encoding is used here:
+                // https://zkkit.pse.dev/functions/_zk_kit_baby_jubjub.packPoint.html
+                // with implicit little-endian
 
                 template<typename Coordinates>
                 struct curve_element_writer<
@@ -132,9 +135,6 @@ namespace nil {
                         nil::marshalling::status_type>::type
                         process(group_value_type &point, TIter &iter)
                     {
-
-                        // somehow add size check of container pointed by iter
-                        // assert(TSize == std::distance(first, last));
                         using base_field_type = typename group_type::field_type;
                         using base_integral_type = typename base_field_type::integral_type;
                         using group_affine_value_type =
@@ -156,9 +156,6 @@ namespace nil {
                             return decoded_point_affine.error();
                         }
 
-                        // TODO: remove hard-coded call for type conversion, implement type conversion between
-                        // coordinates
-                        //  through operator
                         point = decoded_point_affine.value();
                         return nil::marshalling::status_type::success;
                     }

diff --git a/.../marshalling/algebra/include/nil/crypto3/marshalling/algebra/processing/curve_element.hpp b/.../marshalling/algebra/include/nil/crypto3/marshalling/algebra/processing/curve_element.hpp
@@ -28,10 +28,6 @@
 #define CRYPTO3_MARSHALLING_PROCESSING_CURVE_ELEMENT_HPP
 
 #include <cstddef>
-#include <cstdint>
-#include <type_traits>
-#include <limits>
-#include <iterator>
 
 #include <nil/marshalling/endianness.hpp>
 #include <nil/marshalling/status_type.hpp>
@@ -46,8 +42,7 @@ namespace nil {
     namespace crypto3 {
         namespace marshalling {
             namespace processing {
-                // TODO: add marshalling algorithm specification template parameter and specialize parameters depending
-                //  on the algorithm and curve group if needed
+
                 template<typename Group>
                 struct curve_element_marshalling_params {
                     using group_type = Group;
@@ -78,13 +73,9 @@ namespace nil {
                 };
 
 
-                // TODO: do not specify marshalling algorithm by curve group, instead specify marshalling procedure only
-                //  by form, coordinates and specification policy
                 template<typename Endianness, typename Group>
                 struct curve_element_writer;
 
-                // TODO: do not specify marshalling algorithm by curve group, instead specify marshalling procedure only
-                //  by form, coordinates and specification policy
                 template<typename Endianness, typename Group>
                 struct curve_element_reader;
 

diff --git a/...lling/algebra/include/nil/crypto3/marshalling/algebra/processing/detail/curve_element.hpp b/...lling/algebra/include/nil/crypto3/marshalling/algebra/processing/detail/curve_element.hpp
@@ -79,8 +79,6 @@ namespace nil {
                         if (compression) {
                             result |= C_bit;
                         }
-                        // TODO: check condition of infinite point
-                        // TODO: did not work as affine point should be fixed for zero-point
                         if (point.is_zero()) {
                             result |= I_bit;
                         } else if (compression && sign_gf_p<typename GroupValueType::field_type>(point.to_affine().Y)) {

diff --git a/...3/libs/marshalling/algebra/include/nil/crypto3/marshalling/algebra/processing/ed25519.hpp b/...3/libs/marshalling/algebra/include/nil/crypto3/marshalling/algebra/processing/ed25519.hpp
@@ -126,8 +126,6 @@ namespace nil {
                         process(group_value_type &point, TIter &iter)
                     {
 
-                        // somehow add size check of container pointed by iter
-                        // assert(TSize == std::distance(first, last));
                         using base_field_type = typename group_type::field_type;
                         using base_integral_type = typename base_field_type::integral_type;
                         using group_affine_value_type =
@@ -149,10 +147,7 @@ namespace nil {
                             return decoded_point_affine.error();
                         }
 
-                        // TODO: remove hard-coded call for type conversion, implement type conversion between
-                        // coordinates
-                        //  through operator
-                        point = decoded_point_affine.value().to_extended_with_a_minus_1();
+                        point = decoded_point_affine.value();
                         return nil::marshalling::status_type::success;
                     }
                 };

diff --git a/.../marshalling/containers/include/nil/crypto3/marshalling/containers/types/merkle_proof.hpp b/.../marshalling/containers/include/nil/crypto3/marshalling/containers/types/merkle_proof.hpp
@@ -68,8 +68,10 @@ namespace nil {
                         // path_element_t
                         typename merkle_proof_path_element<TTypeBase, MerkleProof>::type,
                         // TODO: use nil::marshalling::option::fixed_size_storage<MerkleProof::arity - 1>
-                        nil::marshalling::option::sequence_size_field_prefix<
-                            nil::marshalling::types::integral<TTypeBase, std::uint64_t>>>;
+                        nil::marshalling::option::fixed_size_storage<MerkleProof::arity - 1>
+                            >;
+//                        nil::marshalling::option::sequence_size_field_prefix<
+//                            nil::marshalling::types::integral<TTypeBase, std::uint64_t>>>;
                 };
 
                 template<typename TTypeBase, typename MerkleProof, typename = void>

diff --git a/crypto3/libs/marshalling/zk/CMakeLists.txt b/crypto3/libs/marshalling/zk/CMakeLists.txt
@@ -44,10 +44,6 @@ target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
 
 cm_add_test_subdirectory(test)
 
-if(BUILD_EXAMPLES)
-    add_subdirectory(example)
-endif()
-
 if((CMAKE_COMPILER_IS_GNUCC) OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
     set(extra_flags_list -Wall -Wextra -Wcast-align -Wcast-qual
         -Wctor-dtor-privacy -Wmissing-include-dirs -Woverloaded-virtual

diff --git a/crypto3/libs/marshalling/zk/example/CMakeLists.txt b/crypto3/libs/marshalling/zk/example/CMakeLists.txt