Update interfaces and tasks #86

Author: vo-nil

contracts/interfaces/modular_commitment.sol

@@ -20,6 +20,11 @@ pragma solidity >=0.8.4;
 import "../types.sol";
 
 interface ICommitmentScheme {
+    /**
+     * @dev Emitted when proof does not contain valid eta point values
+     */
+    event WrongEtaPointValues();
+
     function initialize(
         bytes32 tr_state_before
     ) external returns(bytes32 tr_state_after);
@@ -31,4 +36,4 @@ interface ICommitmentScheme {
         uint256 challenge,
         bytes32 transcript_state_before
     ) external view returns (bool);
-}
+}

contracts/interfaces/modular_verifier.sol

@@ -32,20 +32,19 @@ interface IModularVerifier {
     event WrongCommitment();
 
     /**
-     * @dev Emitted when table does not satisfy constraint system
+     * @dev Emitted when proof does not contain valid eta point values
      */
-    event ConstraintSystemNotSatisfied();
+    event WrongEtaPointValues();
 
     /**
-     * @dev Emitted when proof is verified
+     * @dev Emitted when table does not satisfy constraint system
      */
-    event ProofVerified();
+    event ConstraintSystemNotSatisfied();
 
     /**
-     * @dev Emitted when proof verification failed
+     * @dev Emitted when proof verification completed
      */
-    event ProofVerificationFailed();
-
+    event VerificationResult(bool result);
 
     /**
      * @dev Initializes verifier

contracts/zkllvm/circuit1/modular_verifier.sol

@@ -233,13 +233,10 @@ contract modular_verifier_circuit1 is IModularVerifier{
                 emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) {
-                emit ProofVerified();
-            } else {
-                emit ProofVerificationFailed();
-            }
         }
 
+        emit VerificationResult(state.b);
+
         result = state.b;
     }
 }

contracts/zkllvm/circuit1/params.json

@@ -48,7 +48,7 @@
             "17166126583027276163107155648953851600645935739886150467584901586847365754678"
         ],
         "grinding_params": {
-            "mask": "4294934528"
+            "mask": "4294901760"
         }
     }
 }

contracts/zkllvm/circuit2/input.json

@@ -233,13 +233,10 @@ contract modular_verifier_circuit2 is IModularVerifier{
                 emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) {
-                emit ProofVerified();
-            } else {
-                emit ProofVerificationFailed();
-            }
         }
 
+        emit VerificationResult(state.b);
+
         result = state.b;
     }
 }

contracts/zkllvm/circuit2/modular_verifier.sol

@@ -251,13 +251,10 @@ contract modular_verifier_circuit3 is IModularVerifier{
                 emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) {
-                emit ProofVerified();
-            } else {
-                emit ProofVerificationFailed();
-            }
         }
 
+        emit VerificationResult(state.b);
+
         result = state.b;
     }
 }

contracts/zkllvm/circuit2/proof.bin

@@ -251,13 +251,10 @@ contract modular_verifier_circuit4 is IModularVerifier{
                 emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) {
-                emit ProofVerified();
-            } else {
-                emit ProofVerificationFailed();
-            }
         }
 
+        emit VerificationResult(state.b);
+
         result = state.b;
     }
 }

contracts/zkllvm/circuit3/modular_verifier.sol

@@ -251,13 +251,10 @@ contract modular_verifier_circuit6 is IModularVerifier{
                 emit ConstraintSystemNotSatisfied();
                 state.b = false;
             }
-            if(state.b) {
-                emit ProofVerified();
-            } else {
-                emit ProofVerificationFailed();
-            }
         }
 
+        emit VerificationResult(state.b);
+
         result = state.b;
     }
 }

contracts/zkllvm/circuit4/modular_verifier.sol

@@ -159,7 +159,6 @@ function loadPublicInput(public_input_path){
         for(let i in public_input){
             let field = public_input[i];
             for(let k in field){
-                console.log("parsing: ", k);
                 let element;
                 if( k == 'field' ){
                     element = loadFieldElement(field[k]);
@@ -204,24 +203,29 @@ const verify_circuit_proof = async (modular_path: string, circuit: string) => {
     );
 
     let proof_path = folder_path + "/proof.bin";
-    console.log("Verify :",proof_path);
+    console.log("Verify :", proof_path);
     let proof  = loadProof(proof_path);
     let public_input = loadPublicInput(folder_path + "/public_input.json");
-    console.log("public input: ", public_input);
     let receipt = await (await verifier_contract.verify(proof, public_input, {gasLimit: 30_500_000})).wait();
-    console.log("Gas used: ⛽ ", receipt.gasUsed.toNumber());
+    console.log("⛽Gas used: ", receipt.gasUsed.toNumber());
     console.log("Events received:");
-    const event_icons : {[key:string] : string } = {
-        'WrongPublicInput' : '🤔',
-        'WrongCommitment' : '🤔',
-        'ConstraintSystemNotSatisfied' : '🤔',
-        'ProofVerified' : '✅',
-        'ProofVerificationFailed' : '🛑',
+    const event_to_string = (event) => {
+        switch(event.event) {
+            case 'VerificationResult': {
+                if (BigInt(event.data) != 0n) {
+                    return '✅ProofVerified';
+                } else {
+                    return '🛑ProofVerificationFailed';
+                }
+            }
+                break;
+            default:
+                return '🤔'+event.event;
+        }
     };
 
     for(const e of receipt.events) {
-        //console.log(e);
-        console.log("%s: %s", e.event, event_icons[e.event]);
+        console.log(event_to_string(e));
     }
     console.log("====================================");
 }