Added events, added event handling in hardhat and moved gas estimation from solidity to hardhat #86

vo-nil · vo-nil · commit 9792556729c0 · 2023-11-10T10:51:24.000+03:00
diff --git a/contracts/interfaces/modular_verifier.sol b/contracts/interfaces/modular_verifier.sol
@@ -16,16 +16,51 @@
 //---------------------------------------------------------------------------//
 pragma solidity ^0.8.0;
 
+/**
+ * @dev Interface class to verify Placeholder proof
+ */
 interface IModularVerifier {
+
+    /**
+     * @dev Emitted when public input is wrong
+     */
+    event WrongPublicInput();
+
+    /**
+     * @dev Emitted when commitment is wrong
+     */
+    event WrongCommitment();
+
+    /**
+     * @dev Emitted when table does not satisfy constraint system
+     */
+    event ConstraintSystemNotSatisfied();
+
+    /**
+     * @dev Emitted when proof is verified
+     */
+    event ProofVerified();
+
+    /**
+     * @dev Emitted when proof verification failed
+     */
+    event ProofVerificationFailed();
+
+
+    /**
+     * @dev Initializes verifier
+     */
     function initialize(
-//        address permutation_argument_contract_address,
         address lookup_argument_contract_address,
         address gate_argument_contract_address,
         address commitment_contract_address
     ) external;
 
+    /**
+     * @dev Verifies proof
+     */
     function verify(
         bytes calldata blob,
         uint256[] calldata public_input
-    ) external view returns (bool result);
+    ) external returns (bool result);
 }
diff --git a/contracts/zkllvm/circuit1/modular_verifier.sol b/contracts/zkllvm/circuit1/modular_verifier.sol
@@ -76,7 +76,6 @@ contract modular_verifier_circuit1 is IModularVerifier{
         uint256 Z_at_xi;
         uint256 l0;
         uint256[f_parts] F;
-        uint256 gas;
         bool b;
     }
 
@@ -124,10 +123,9 @@ contract modular_verifier_circuit1 is IModularVerifier{
     function verify(
         bytes calldata blob,
         uint256[] calldata public_input
-    ) public view returns (bool result) {
+    ) public returns (bool result) {
         verifier_state memory state;
         state.b = true;
-        state.gas = gasleft();
         state.xi = basic_marshalling.get_uint256_be(blob, 0x79);
         state.Z_at_xi = addmod(field.pow_small(state.xi, rows_amount, modulus), modulus-1, modulus);
         state.l0 = mulmod(
@@ -139,7 +137,7 @@ contract modular_verifier_circuit1 is IModularVerifier{
         //0. Direct public input check
         if(public_input.length > 0) {
             if (!public_input_direct(blob[865:865+320], public_input, state)) {
-                console.log("Wrong public input!");
+                emit WrongPublicInput();
                 state.b = false;
             }
         }
@@ -198,7 +196,6 @@ contract modular_verifier_circuit1 is IModularVerifier{
                 F_consolidated = addmod(F_consolidated, mulmod(state.F[i],transcript.get_field_challenge(tr_state, modulus), modulus), modulus);
                 unchecked{i++;}
             }
-            uint256 points_num = basic_marshalling.get_length(blob, 0x79 + 0x20);
             transcript.update_transcript_b32_by_offset_calldata(tr_state, blob, 0x59);
         }
 
@@ -214,7 +211,7 @@ contract modular_verifier_circuit1 is IModularVerifier{
             if(!modular_commitment_scheme_circuit1.verify_eval(
                 blob[z_offset - 0x8:], commitments, state.xi, tr_state.current_challenge
             )) {
-                console.log("Error from commitment scheme!");
+                emit WrongCommitment();
                 state.b = false;
             }
         }
@@ -233,13 +230,16 @@ contract modular_verifier_circuit1 is IModularVerifier{
                 unchecked{i++;}
             }
             if( F_consolidated != mulmod(T_consolidated, state.Z_at_xi, modulus) ) {
-                console.log("Error. Table does't satisfy constraint system");
+                emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) console.log("SUCCESS!"); else console.log("FAILURE!");
+            if(state.b) {
+                emit ProofVerified();
+            } else {
+                emit ProofVerificationFailed();
+            }
         }
 
-        console.log("Gas for verification:", state.gas-gasleft());
         result = state.b;
     }
 }
diff --git a/contracts/zkllvm/circuit2/modular_verifier.sol b/contracts/zkllvm/circuit2/modular_verifier.sol
@@ -76,7 +76,6 @@ contract modular_verifier_circuit2 is IModularVerifier{
         uint256 Z_at_xi;
         uint256 l0;
         uint256[f_parts] F;
-        uint256 gas;
         bool b;
     }
 
@@ -124,10 +123,9 @@ contract modular_verifier_circuit2 is IModularVerifier{
     function verify(
         bytes calldata blob,
         uint256[] calldata public_input
-    ) public view returns (bool result) {
+    ) public returns (bool result) {
         verifier_state memory state;
         state.b = true;
-        state.gas = gasleft();
         state.xi = basic_marshalling.get_uint256_be(blob, 0x79);
         state.Z_at_xi = addmod(field.pow_small(state.xi, rows_amount, modulus), modulus-1, modulus);
         state.l0 = mulmod(
@@ -139,7 +137,7 @@ contract modular_verifier_circuit2 is IModularVerifier{
         //0. Direct public input check
         if(public_input.length > 0) {
             if (!public_input_direct(blob[865:865+352], public_input, state)) {
-                console.log("Wrong public input!");
+                emit WrongPublicInput();
                 state.b = false;
             }
         }
@@ -198,7 +196,6 @@ contract modular_verifier_circuit2 is IModularVerifier{
                 F_consolidated = addmod(F_consolidated, mulmod(state.F[i],transcript.get_field_challenge(tr_state, modulus), modulus), modulus);
                 unchecked{i++;}
             }
-            uint256 points_num = basic_marshalling.get_length(blob, 0x79 + 0x20);
             transcript.update_transcript_b32_by_offset_calldata(tr_state, blob, 0x59);
         }
 
@@ -214,7 +211,7 @@ contract modular_verifier_circuit2 is IModularVerifier{
             if(!modular_commitment_scheme_circuit2.verify_eval(
                 blob[z_offset - 0x8:], commitments, state.xi, tr_state.current_challenge
             )) {
-                console.log("Error from commitment scheme!");
+                emit WrongCommitment();
                 state.b = false;
             }
         }
@@ -233,13 +230,16 @@ contract modular_verifier_circuit2 is IModularVerifier{
                 unchecked{i++;}
             }
             if( F_consolidated != mulmod(T_consolidated, state.Z_at_xi, modulus) ) {
-                console.log("Error. Table does't satisfy constraint system");
+                emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) console.log("SUCCESS!"); else console.log("FAILURE!");
+            if(state.b) {
+                emit ProofVerified();
+            } else {
+                emit ProofVerificationFailed();
+            }
         }
 
-        console.log("Gas for verification:", state.gas-gasleft());
         result = state.b;
     }
 }
diff --git a/contracts/zkllvm/circuit3/modular_verifier.sol b/contracts/zkllvm/circuit3/modular_verifier.sol
@@ -76,7 +76,6 @@ contract modular_verifier_circuit3 is IModularVerifier{
         uint256 Z_at_xi;
         uint256 l0;
         uint256[f_parts] F;
-        uint256 gas;
         bool b;
     }
 
@@ -124,10 +123,9 @@ contract modular_verifier_circuit3 is IModularVerifier{
     function verify(
         bytes calldata blob,
         uint256[] calldata public_input
-    ) public view returns (bool result) {
+    ) public returns (bool result) {
         verifier_state memory state;
         state.b = true;
-        state.gas = gasleft();
         state.xi = basic_marshalling.get_uint256_be(blob, 0xa1);
         state.Z_at_xi = addmod(field.pow_small(state.xi, rows_amount, modulus), modulus-1, modulus);
         state.l0 = mulmod(
@@ -139,7 +137,7 @@ contract modular_verifier_circuit3 is IModularVerifier{
         //0. Direct public input check
         if(public_input.length > 0) {
             if (!public_input_direct(blob[905:905+672], public_input, state)) {
-                console.log("Wrong public input!");
+                emit WrongPublicInput();
                 state.b = false;
             }
         }
@@ -216,7 +214,6 @@ contract modular_verifier_circuit3 is IModularVerifier{
                 F_consolidated = addmod(F_consolidated, mulmod(state.F[i],transcript.get_field_challenge(tr_state, modulus), modulus), modulus);
                 unchecked{i++;}
             }
-            uint256 points_num = basic_marshalling.get_length(blob, 0xa1 + 0x20);
             transcript.update_transcript_b32_by_offset_calldata(tr_state, blob, 0x59);
         }
 
@@ -232,7 +229,7 @@ contract modular_verifier_circuit3 is IModularVerifier{
             if(!modular_commitment_scheme_circuit3.verify_eval(
                 blob[z_offset - 0x8:], commitments, state.xi, tr_state.current_challenge
             )) {
-                console.log("Error from commitment scheme!");
+                emit WrongCommitment();
                 state.b = false;
             }
         }
@@ -251,13 +248,16 @@ contract modular_verifier_circuit3 is IModularVerifier{
                 unchecked{i++;}
             }
             if( F_consolidated != mulmod(T_consolidated, state.Z_at_xi, modulus) ) {
-                console.log("Error. Table does't satisfy constraint system");
+                emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) console.log("SUCCESS!"); else console.log("FAILURE!");
+            if(state.b) {
+                emit ProofVerified();
+            } else {
+                emit ProofVerificationFailed();
+            }
         }
 
-        console.log("Gas for verification:", state.gas-gasleft());
         result = state.b;
     }
 }
diff --git a/contracts/zkllvm/circuit4/modular_verifier.sol b/contracts/zkllvm/circuit4/modular_verifier.sol
@@ -76,7 +76,6 @@ contract modular_verifier_circuit4 is IModularVerifier{
         uint256 Z_at_xi;
         uint256 l0;
         uint256[f_parts] F;
-        uint256 gas;
         bool b;
     }
 
@@ -124,10 +123,9 @@ contract modular_verifier_circuit4 is IModularVerifier{
     function verify(
         bytes calldata blob,
         uint256[] calldata public_input
-    ) public view returns (bool result) {
+    ) public returns (bool result) {
         verifier_state memory state;
         state.b = true;
-        state.gas = gasleft();
         state.xi = basic_marshalling.get_uint256_be(blob, 0xa1);
         state.Z_at_xi = addmod(field.pow_small(state.xi, rows_amount, modulus), modulus-1, modulus);
         state.l0 = mulmod(
@@ -139,7 +137,7 @@ contract modular_verifier_circuit4 is IModularVerifier{
         //0. Direct public input check
         if(public_input.length > 0) {
             if (!public_input_direct(blob[905:905+736], public_input, state)) {
-                console.log("Wrong public input!");
+                emit WrongPublicInput();
                 state.b = false;
             }
         }
@@ -216,7 +214,6 @@ contract modular_verifier_circuit4 is IModularVerifier{
                 F_consolidated = addmod(F_consolidated, mulmod(state.F[i],transcript.get_field_challenge(tr_state, modulus), modulus), modulus);
                 unchecked{i++;}
             }
-            uint256 points_num = basic_marshalling.get_length(blob, 0xa1 + 0x20);
             transcript.update_transcript_b32_by_offset_calldata(tr_state, blob, 0x59);
         }
 
@@ -232,7 +229,7 @@ contract modular_verifier_circuit4 is IModularVerifier{
             if(!modular_commitment_scheme_circuit4.verify_eval(
                 blob[z_offset - 0x8:], commitments, state.xi, tr_state.current_challenge
             )) {
-                console.log("Error from commitment scheme!");
+                emit WrongCommitment();
                 state.b = false;
             }
         }
@@ -251,13 +248,16 @@ contract modular_verifier_circuit4 is IModularVerifier{
                 unchecked{i++;}
             }
             if( F_consolidated != mulmod(T_consolidated, state.Z_at_xi, modulus) ) {
-                console.log("Error. Table does't satisfy constraint system");
+                emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) console.log("SUCCESS!"); else console.log("FAILURE!");
+            if(state.b) {
+                emit ProofVerified();
+            } else {
+                emit ProofVerificationFailed();
+            }
         }
 
-        console.log("Gas for verification:", state.gas-gasleft());
         result = state.b;
     }
 }
diff --git a/contracts/zkllvm/circuit6/modular_verifier.sol b/contracts/zkllvm/circuit6/modular_verifier.sol
@@ -76,7 +76,6 @@ contract modular_verifier_circuit6 is IModularVerifier{
         uint256 Z_at_xi;
         uint256 l0;
         uint256[f_parts] F;
-        uint256 gas;
         bool b;
     }
 
@@ -124,10 +123,9 @@ contract modular_verifier_circuit6 is IModularVerifier{
     function verify(
         bytes calldata blob,
         uint256[] calldata public_input
-    ) public view returns (bool result) {
+    ) public returns (bool result) {
         verifier_state memory state;
         state.b = true;
-        state.gas = gasleft();
         state.xi = basic_marshalling.get_uint256_be(blob, 0xa1);
         state.Z_at_xi = addmod(field.pow_small(state.xi, rows_amount, modulus), modulus-1, modulus);
         state.l0 = mulmod(
@@ -139,7 +137,7 @@ contract modular_verifier_circuit6 is IModularVerifier{
         //0. Direct public input check
         if(public_input.length > 0) {
             if (!public_input_direct(blob[905:905+736], public_input, state)) {
-                console.log("Wrong public input!");
+                emit WrongPublicInput();
                 state.b = false;
             }
         }
@@ -216,7 +214,6 @@ contract modular_verifier_circuit6 is IModularVerifier{
                 F_consolidated = addmod(F_consolidated, mulmod(state.F[i],transcript.get_field_challenge(tr_state, modulus), modulus), modulus);
                 unchecked{i++;}
             }
-            uint256 points_num = basic_marshalling.get_length(blob, 0xa1 + 0x20);
             transcript.update_transcript_b32_by_offset_calldata(tr_state, blob, 0x59);
         }
 
@@ -232,7 +229,7 @@ contract modular_verifier_circuit6 is IModularVerifier{
             if(!modular_commitment_scheme_circuit6.verify_eval(
                 blob[z_offset - 0x8:], commitments, state.xi, tr_state.current_challenge
             )) {
-                console.log("Error from commitment scheme!");
+                emit WrongCommitment();
                 state.b = false;
             }
         }
@@ -251,13 +248,16 @@ contract modular_verifier_circuit6 is IModularVerifier{
                 unchecked{i++;}
             }
             if( F_consolidated != mulmod(T_consolidated, state.Z_at_xi, modulus) ) {
-                console.log("Error. Table does't satisfy constraint system");
+                emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) console.log("SUCCESS!"); else console.log("FAILURE!");
+            if(state.b) {
+                emit ProofVerified();
+            } else {
+                emit ProofVerificationFailed();
+            }
         }
 
-        console.log("Gas for verification:", state.gas-gasleft());
         result = state.b;
     }
 }
diff --git a/tasks/modular-test.ts b/tasks/modular-test.ts

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ contract modular_verifier_circuit1 is IModularVerifier{`
`76`	`76`	`uint256 Z_at_xi;`
`77`	`77`	`uint256 l0;`
`78`	`78`	`uint256[f_parts] F;`
`79`		`- uint256 gas;`
`80`	`79`	`bool b;`
`81`	`80`	`}`
`82`	`81`
`@@ -124,10 +123,9 @@ contract modular_verifier_circuit1 is IModularVerifier{`
`124`	`123`	`function verify(`
`125`	`124`	`bytes calldata blob,`
`126`	`125`	`uint256[] calldata public_input`
`127`		`- ) public view returns (bool result) {`
	`126`	`+ ) public returns (bool result) {`
`128`	`127`	`verifier_state memory state;`
`129`	`128`	`state.b = true;`
`130`		`- state.gas = gasleft();`
`131`	`129`	`state.xi = basic_marshalling.get_uint256_be(blob, 0x79);`
`132`	`130`	`state.Z_at_xi = addmod(field.pow_small(state.xi, rows_amount, modulus), modulus-1, modulus);`
`133`	`131`	`state.l0 = mulmod(`
`@@ -139,7 +137,7 @@ contract modular_verifier_circuit1 is IModularVerifier{`
`139`	`137`	`//0. Direct public input check`
`140`	`138`	`if(public_input.length > 0) {`
`141`	`139`	`if (!public_input_direct(blob[865:865+320], public_input, state)) {`
`142`		`- console.log("Wrong public input!");`
	`140`	`+ emit WrongPublicInput();`
`143`	`141`	`state.b = false;`
`144`	`142`	`}`
`145`	`143`	`}`
`@@ -198,7 +196,6 @@ contract modular_verifier_circuit1 is IModularVerifier{`
`198`	`196`	`F_consolidated = addmod(F_consolidated, mulmod(state.F[i],transcript.get_field_challenge(tr_state, modulus), modulus), modulus);`
`199`	`197`	`unchecked{i++;}`
`200`	`198`	`}`
`201`		`- uint256 points_num = basic_marshalling.get_length(blob, 0x79 + 0x20);`
`202`	`199`	`transcript.update_transcript_b32_by_offset_calldata(tr_state, blob, 0x59);`
`203`	`200`	`}`
`204`	`201`
`@@ -214,7 +211,7 @@ contract modular_verifier_circuit1 is IModularVerifier{`
`214`	`211`	`if(!modular_commitment_scheme_circuit1.verify_eval(`
`215`	`212`	`blob[z_offset - 0x8:], commitments, state.xi, tr_state.current_challenge`
`216`	`213`	`)) {`
`217`		`- console.log("Error from commitment scheme!");`
	`214`	`+ emit WrongCommitment();`
`218`	`215`	`state.b = false;`
`219`	`216`	`}`
`220`	`217`	`}`
`@@ -233,13 +230,16 @@ contract modular_verifier_circuit1 is IModularVerifier{`
`233`	`230`	`unchecked{i++;}`
`234`	`231`	`}`
`235`	`232`	`if( F_consolidated != mulmod(T_consolidated, state.Z_at_xi, modulus) ) {`
`236`		`- console.log("Error. Table does't satisfy constraint system");`
	`233`	`+ emit ConstraintSystemNotSatisfied();`
`237`	`234`	`state.b = false;`
`238`	`235`	`}`
`239`		`- if(state.b) console.log("SUCCESS!"); else console.log("FAILURE!");`
	`236`	`+ if(state.b) {`
	`237`	`+ emit ProofVerified();`
	`238`	`+ } else {`
	`239`	`+ emit ProofVerificationFailed();`
	`240`	`+ }`
`240`	`241`	`}`
`241`	`242`
`242`		`- console.log("Gas for verification:", state.gas-gasleft());`
`243`	`243`	`result = state.b;`
`244`	`244`	`}`
`245`	`245`	`}`