Merge branch 'main' into random_proof_reward

taikoxyz · Feb 22, 2023 · 1093ba7 · 1093ba7
2 parents ca4e281 + 3e43c0c
commit 1093ba7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/packages/protocol/contracts/L1/ProofVerifier.sol b/packages/protocol/contracts/L1/ProofVerifier.sol
@@ -15,9 +15,7 @@ interface IProofVerifier {
     function verifyZKP(
         string memory verifierId,
         bytes calldata zkproof,
-        bytes32 blockHash,
-        address prover,
-        bytes32 txListHash
+        bytes32 instance
     ) external view returns (bool verified);
 
     function verifyMKP(
@@ -36,17 +34,13 @@ contract ProofVerifier is IProofVerifier, EssentialContract {
     function verifyZKP(
         string memory verifierId,
         bytes calldata zkproof,
-        bytes32 blockHash,
-        address prover,
-        bytes32 txListHash
+        bytes32 instance
     ) external view returns (bool) {
         return
             LibZKP.verify({
                 plonkVerifier: resolve(verifierId, false),
                 zkproof: zkproof,
-                blockHash: blockHash,
-                prover: prover,
-                txListHash: txListHash
+                instance: instance
             });
     }
 

diff --git a/packages/protocol/contracts/L1/libs/LibProving.sol b/packages/protocol/contracts/L1/libs/LibProving.sol
@@ -285,6 +285,14 @@ library LibProving {
 
         if (!skipZKPVerification) {
             for (uint256 i; i < config.zkProofsPerBlock; ++i) {
+                bytes32 instance = keccak256(
+                    abi.encode(
+                        blockHash,
+                        evidence.prover,
+                        evidence.meta.txListHash
+                    )
+                );
+
                 if (
                     !proofVerifier.verifyZKP({
                         verifierId: string(
@@ -296,9 +304,7 @@ library LibProving {
                             )
                         ),
                         zkproof: evidence.proofs[i],
-                        blockHash: blockHash,
-                        prover: evidence.prover,
-                        txListHash: evidence.meta.txListHash
+                        instance: instance
                     })
                 ) revert L1_ZKP();
             }

diff --git a/packages/protocol/contracts/libs/LibZKP.sol b/packages/protocol/contracts/libs/LibZKP.sol
@@ -14,9 +14,7 @@ library LibZKP {
     function verify(
         address plonkVerifier,
         bytes calldata zkproof,
-        bytes32 blockHash,
-        address prover,
-        bytes32 txListHash
+        bytes32 instance
     ) internal view returns (bool verified) {
         // TODO(david):public input is assembled in client software
         // for testing purposes right now, move this part of logic

diff --git a/packages/protocol/contracts/test/L1/TestTaikoL1.sol b/packages/protocol/contracts/test/L1/TestTaikoL1.sol
@@ -56,9 +56,7 @@ contract TestTaikoL1 is TaikoL1, IProofVerifier {
     function verifyZKP(
         string memory /*verifierId*/,
         bytes calldata /*zkproof*/,
-        bytes32 /*blockHash*/,
-        address /*prover*/,
-        bytes32 /*txListHash*/
+        bytes32 /*instance*/
     ) public pure override returns (bool) {
         return true;
     }

diff --git a/packages/protocol/contracts/test/L1/TestTaikoL1EnableTokenomics.sol b/packages/protocol/contracts/test/L1/TestTaikoL1EnableTokenomics.sol
@@ -57,9 +57,7 @@ contract TestTaikoL1EnableTokenomics is TaikoL1, IProofVerifier {
     function verifyZKP(
         string memory /*verifierId*/,
         bytes calldata /*zkproof*/,
-        bytes32 /*blockHash*/,
-        address /*prover*/,
-        bytes32 /*txListHash*/
+        bytes32 /*instance*/
     ) public pure override returns (bool) {
         return true;
     }

diff --git a/packages/protocol/contracts/test/libs/TestLibProving.sol b/packages/protocol/contracts/test/libs/TestLibProving.sol
@@ -291,6 +291,14 @@ library TestLibProving {
 
         if (!skipZKPVerification) {
             for (uint256 i; i < config.zkProofsPerBlock; ++i) {
+                bytes32 instance = keccak256(
+                    abi.encode(
+                        blockHash,
+                        evidence.prover,
+                        evidence.meta.txListHash
+                    )
+                );
+
                 if (
                     !proofVerifier.verifyZKP({
                         verifierId: string(
@@ -302,9 +310,7 @@ library TestLibProving {
                             )
                         ),
                         zkproof: evidence.proofs[i],
-                        blockHash: blockHash,
-                        prover: evidence.prover,
-                        txListHash: evidence.meta.txListHash
+                        instance: instance
                     })
                 ) revert L1_ZKP();
             }