chore(protocol): improve LibZKP (#13047)

taikoxyz · Jan 25, 2023 · bf9807e · bf9807e
1 parent 3e2af01
commit bf9807e
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 133 deletions.
diff --git a/packages/protocol/contracts/L1/ProofVerifier.sol b/packages/protocol/contracts/L1/ProofVerifier.sol
@@ -13,7 +13,7 @@ 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,
@@ -34,16 +34,15 @@ contract ProofVerifier is IProofVerifier, EssentialContract {
     }
 
     function verifyZKP(
-        bytes memory verificationKey,
+        string memory verifierId,
         bytes calldata zkproof,
         bytes32 blockHash,
         address prover,
         bytes32 txListHash
     ) external view returns (bool) {
         return
             LibZKP.verify({
-                plonkVerifier: resolve("plonk_verifier", false),
-                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
@@ -13,15 +13,12 @@ library LibZKP {
 
     function verify(
         address plonkVerifier,
-        bytes memory verificationKey,
         bytes calldata zkproof,
         bytes32 blockHash,
         address prover,
         bytes32 txListHash
     ) internal view returns (bool verified) {
-        // TODO(david):
-        // 1) verificationKey is hard-coded in the generated PlonkVerifier, make it as a configurable parameter.
-        // 2) public input is assembled in client software for testing purposes right now, move this part of logic
+        // 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);
     }

diff --git a/packages/protocol/contracts/test/L1/TestTaikoL1.sol b/packages/protocol/contracts/test/L1/TestTaikoL1.sol
@@ -52,7 +52,7 @@ contract TestTaikoL1 is TaikoL1, IProofVerifier {
     }
 
     function verifyZKP(
-        bytes memory /*verificationKey*/,
+        string memory /*verifierId*/,
         bytes calldata /*zkproof*/,
         bytes32 /*blockHash*/,
         address /*prover*/,

diff --git a/packages/protocol/contracts/test/L1/TestTaikoL1EnableTokenomics.sol b/packages/protocol/contracts/test/L1/TestTaikoL1EnableTokenomics.sol
@@ -52,7 +52,7 @@ contract TestTaikoL1EnableTokenomics is TaikoL1, IProofVerifier {
     }
 
     function verifyZKP(
-        bytes memory /*verificationKey*/,
+        string memory /*verifierId*/,
         bytes calldata /*zkproof*/,
         bytes32 /*blockHash*/,
         address /*prover*/,

diff --git a/packages/protocol/docs/common/ConfigManager.md b/packages/protocol/docs/common/ConfigManager.md
diff --git a/packages/protocol/tasks/deploy_L1.ts b/packages/protocol/tasks/deploy_L1.ts
@@ -117,17 +117,6 @@ export async function deployContracts(hre: any) {
         )
     );
 
-    // Config manager
-    const ConfigManager = await utils.deployContract(hre, "ConfigManager");
-    await utils.waitTx(hre, await ConfigManager.init());
-    await utils.waitTx(
-        hre,
-        await AddressManager.setAddress(
-            `${chainId}.config_manager`,
-            ConfigManager.address
-        )
-    );
-
     // TaikoL1
     const TaikoL1 = await utils.deployContract(
         hre,

diff --git a/packages/protocol/test/ConfigManager.test.ts b/packages/protocol/test/ConfigManager.test.ts