Internal commitment scheme#21

NilFoundation · Oct 4, 2023 · b203e04 · b203e04
1 parent 3d97686
commit b203e04
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/include/nil/blueprint/transpiler/lpc_scheme_gen.hpp b/include/nil/blueprint/transpiler/lpc_scheme_gen.hpp
@@ -127,6 +127,12 @@ namespace nil {
                 }
                 i++;
             }
+
+            std::vector<std::uint8_t> init_blob = {};
+            nil::crypto3::zk::transcript::fiat_shamir_heuristic_sequential<typename PlaceholderParams::transcript_hash_type> transcript(init_blob);
+            transcript(common_data.vk.constraint_system_hash);
+            transcript(common_data.vk.fixed_values_commitment);
+            auto etha = transcript.template challenge<typename PlaceholderParams::field_type>();
 
             auto fri_params = lpc_scheme.get_fri_params();
             replacements["$R$"] = to_string(fri_params.r);
@@ -141,6 +147,7 @@ namespace nil {
             replacements["$LOOKUP_POINTS_ID$"] = to_string(lookup_point_id);
             replacements["$POINTS_IDS$"] = points_ids.str();
             replacements["$POINTS_INITIALIZATION$"] = points_initializer.str();
+            replacements["$ETHA$"] = to_string(etha);
             if( PlaceholderParams::commitment_scheme_type::fri_type::use_grinding){
                 replacements["$GRINDING_CHECK$"] = modular_commitment_grinding_check_template;
             } else {

diff --git a/include/nil/blueprint/transpiler/templates/commitment_scheme.hpp b/include/nil/blueprint/transpiler/templates/commitment_scheme.hpp
@@ -39,7 +39,7 @@ import "../../containers/merkle_verifier.sol";
 import "../../algebra/polynomial.sol";
 import "hardhat/console.sol";
 
-contract modular_commitment_scheme_$TEST_NAME$ {
+library modular_commitment_scheme_$TEST_NAME$ {
     uint256 constant modulus = $MODULUS$;
     uint64 constant batches_num = $BATCHES_NUM$;
     uint256 constant r = $R$;
@@ -53,7 +53,7 @@ contract modular_commitment_scheme_$TEST_NAME$ {
     uint256 constant lookup_point = $LOOKUP_POINTS_ID$;
     bytes constant   points_ids = hex"$POINTS_IDS$";
     uint256 constant omega = $OMEGA$;
-    uint256 _etha;
+    uint256 constant _etha = $ETHA$;
 
     struct commitment_state{
         bytes   leaf_data;
@@ -287,10 +287,11 @@ contract modular_commitment_scheme_$TEST_NAME$ {
 
     function initialize(
         bytes32 tr_state_before
-    ) external returns(bytes32 tr_state_after){
+    ) internal returns(bytes32 tr_state_after){
         types.transcript_data memory tr_state;
         tr_state.current_challenge = tr_state_before;
-        _etha = transcript.get_field_challenge(tr_state, modulus);
+        uint256 etha = transcript.get_field_challenge(tr_state, modulus);
+        require(etha == _etha, "Wrong etha");
         tr_state_after = tr_state.current_challenge;
     }
 
@@ -413,7 +414,7 @@ contract modular_commitment_scheme_$TEST_NAME$ {
         uint256[5] memory commitments,                   
         uint256 challenge,
         bytes32 transcript_state
-    ) external view returns (bool){
+    ) internal view returns (bool){
         types.transcript_data memory tr_state;
         tr_state.current_challenge = transcript_state;
         commitment_state memory state;

diff --git a/include/nil/blueprint/transpiler/templates/modular_verifier.hpp b/include/nil/blueprint/transpiler/templates/modular_verifier.hpp
@@ -93,8 +93,9 @@ contract modular_verifier_$TEST_NAME$ is IModularVerifier{
         _gate_argument_address = gate_argument_address;
         _commitment_contract_address = commitment_contract_address;
 
-        ICommitmentScheme commitment_scheme = ICommitmentScheme(commitment_contract_address);
-        tr_state.current_challenge = commitment_scheme.initialize(tr_state.current_challenge);
+//        ICommitmentScheme commitment_scheme = ICommitmentScheme(commitment_contract_address);
+//        tr_state.current_challenge = commitment_scheme.initialize(tr_state.current_challenge);
+        tr_state.current_challenge = modular_commitment_scheme_$TEST_NAME$.initialize(tr_state.current_challenge);
         transcript_state = tr_state.current_challenge;
     }
 
@@ -169,14 +170,14 @@ contract modular_verifier_$TEST_NAME$ is IModularVerifier{
         bool b = true;
         //8. Commitment scheme verify_eval
         {
-            ICommitmentScheme commitment_scheme = ICommitmentScheme(_commitment_contract_address);
+//            ICommitmentScheme commitment_scheme = ICommitmentScheme(_commitment_contract_address);
             uint256[5] memory commitments;
             commitments[0] = uint256(vk2);
             for(uint16 i = 1; i < $BATCHES_NUM$;){
                 commitments[i] = basic_marshalling.get_uint256_be(blob, 0x9 + (i-1)*(0x28));
                 unchecked{i++;}
             }
-            if(!commitment_scheme.verify_eval(
+            if(!modular_commitment_scheme_$TEST_NAME$.verify_eval(
                 blob[z_offset - 0x8:], commitments, xi, tr_state.current_challenge
             )) {
                 console.log("Error from commitment scheme!");