feat(protocol): deploy the generated Yul plonk verifier (#13016)

taikoxyz · Jan 26, 2023 · eb5d564 · eb5d564
1 parent 1bfa69b
commit eb5d564
Show file tree

Hide file tree

Showing 18 changed files with 1,839 additions and 165 deletions.
diff --git a/packages/protocol/.gitignore b/packages/protocol/.gitignore
@@ -6,7 +6,7 @@ typechain
 abis
 abi
 deployments/*.json
-
+bin
 yarn.lock
 yarn-debug.log*
 yarn-error.log*

diff --git a/packages/protocol/contracts/L1/ProofVerifier.sol b/packages/protocol/contracts/L1/ProofVerifier.sol
@@ -6,18 +6,19 @@
 
 pragma solidity ^0.8.9;
 
-import "../thirdparty/LibMerkleTrie.sol";
+import "../common/EssentialContract.sol";
 import "../libs/LibZKP.sol";
+import "../thirdparty/LibMerkleTrie.sol";
 
 /// @author dantaik <[email protected]>
 interface IProofVerifier {
     function verifyZKP(
-        bytes memory verificationKey,
+        string memory verifierId,
         bytes calldata zkproof,
         bytes32 blockHash,
         address prover,
         bytes32 txListHash
-    ) external pure returns (bool verified);
+    ) external view returns (bool verified);
 
     function verifyMKP(
         bytes memory key,
@@ -27,17 +28,21 @@ interface IProofVerifier {
     ) external pure returns (bool verified);
 }
 
-contract ProofVerifier is IProofVerifier {
+contract ProofVerifier is IProofVerifier, EssentialContract {
+    function init(address addressManager) external initializer {
+        EssentialContract._init(addressManager);
+    }
+
     function verifyZKP(
-        bytes memory verificationKey,
+        string memory verifierId,
         bytes calldata zkproof,
         bytes32 blockHash,
         address prover,
         bytes32 txListHash
-    ) external pure returns (bool) {
+    ) external view returns (bool) {
         return
             LibZKP.verify({
-                verificationKey: verificationKey,
+                plonkVerifier: resolve(verifierId, false),
                 zkproof: zkproof,
                 blockHash: blockHash,
                 prover: prover,

diff --git a/packages/protocol/contracts/L1/libs/LibProposing.sol b/packages/protocol/contracts/L1/libs/LibProposing.sol
@@ -6,7 +6,6 @@
 
 pragma solidity ^0.8.9;
 
-import "../../common/ConfigManager.sol";
 import "../../libs/LibTxDecoder.sol";
 import "../TkoToken.sol";
 import "./LibUtils.sol";

diff --git a/packages/protocol/contracts/L1/libs/LibProving.sol b/packages/protocol/contracts/L1/libs/LibProving.sol
@@ -8,7 +8,6 @@ pragma solidity ^0.8.9;
 
 import {IProofVerifier} from "../ProofVerifier.sol";
 import "../../common/AddressResolver.sol";
-import "../../common/ConfigManager.sol";
 import "../../libs/LibAnchorSignature.sol";
 import "../../libs/LibBlockHeader.sol";
 import "../../libs/LibReceiptDecoder.sol";
@@ -256,9 +255,9 @@ library LibProving {
             } else {
                 require(
                     proofVerifier.verifyZKP({
-                        verificationKey: ConfigManager(
-                            resolver.resolve("config_manager", false)
-                        ).getValue(string(abi.encodePacked("zk_vkey_", i))),
+                        verifierId: string(
+                            abi.encodePacked("plonk_verifier_", i)
+                        ),
                         zkproof: evidence.proofs[i],
                         blockHash: blockHash,
                         prover: evidence.prover,

diff --git a/packages/protocol/contracts/common/ConfigManager.sol b/packages/protocol/contracts/common/ConfigManager.sol
diff --git a/packages/protocol/contracts/libs/LibZKP.sol b/packages/protocol/contracts/libs/LibZKP.sol
@@ -12,13 +12,14 @@ library LibZKP {
      *********************/
 
     function verify(
-        bytes memory verificationKey,
+        address plonkVerifier,
         bytes calldata zkproof,
         bytes32 blockHash,
         address prover,
         bytes32 txListHash
-    ) internal pure returns (bool verified) {
-        // TODO
-        return true;
+    ) internal view returns (bool verified) {
+        // TODO(david):public input is assembled in client software for testing purposes right now, move this part of logic
+        //    to here.
+        (verified, ) = plonkVerifier.staticcall(zkproof);
     }
 }