chore(evm): rearrange libraries

unionlabs · Dec 16, 2024 · 6ad2b0b · 6ad2b0b
1 parent 07d94b0
commit 6ad2b0b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/evm/contracts/clients/CometblsClient.sol b/evm/contracts/clients/CometblsClient.sol
@@ -5,14 +5,13 @@ import "@openzeppelin-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin-upgradeable/utils/PausableUpgradeable.sol";
 
-import "./ICS23MembershipVerifier.sol";
-import "./Verifier.sol";
-
 import "../core/02-client/ILightClient.sol";
 import "../core/24-host/IBCStore.sol";
 import "../core/24-host/IBCCommitment.sol";
 import "../lib/Common.sol";
 import "../lib/ICS23.sol";
+import "../lib/CometblsZKVerifier.sol";
+import "../lib/ICS23Verifier.sol";
 
 struct SignedHeader {
     uint64 height;
@@ -402,7 +401,7 @@ contract CometblsClient is
         }
         bytes32 contractAddress = clientStates[clientId].contractAddress;
         bytes32 appHash = consensusStates[clientId][height].appHash;
-        return ICS23MembershipVerifier.verifyMembership(
+        return ICS23Verifier.verifyMembership(
             appHash,
             proof,
             abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),
@@ -424,7 +423,7 @@ contract CometblsClient is
         }
         bytes32 contractAddress = clientStates[clientId].contractAddress;
         bytes32 appHash = consensusStates[clientId][height].appHash;
-        return ICS23MembershipVerifier.verifyNonMembership(
+        return ICS23Verifier.verifyNonMembership(
             appHash,
             proof,
             abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),
@@ -550,7 +549,7 @@ contract CometblsClient is
             commitmentHash
         ];
 
-        return Verifier.verifyProof(
+        return CometblsZKVerifier.verifyProof(
             zkp.proof, zkp.proofCommitment, zkp.proofCommitmentPOK, publicInputs
         );
     }

diff --git a/evm/contracts/clients/CosmosInCosmosClient.sol b/evm/contracts/clients/CosmosInCosmosClient.sol
@@ -11,8 +11,7 @@ import "../core/24-host/IBCStore.sol";
 import "../core/24-host/IBCCommitment.sol";
 import "../lib/ICS23.sol";
 import "../lib/Common.sol";
-
-import "./ICS23MembershipVerifier.sol";
+import "../lib/ICS23Verifier.sol";
 
 struct TendermintConsensusState {
     uint64 timestamp;
@@ -216,7 +215,7 @@ contract CosmosInCosmosClient is
             revert CosmosInCosmosLib.ErrClientFrozen();
         }
         bytes32 appHash = consensusStates[clientId][height].appHash;
-        return ICS23MembershipVerifier.verifyMembership(
+        return ICS23Verifier.verifyMembership(
             appHash,
             proof,
             abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),
@@ -235,7 +234,7 @@ contract CosmosInCosmosClient is
             revert CosmosInCosmosLib.ErrClientFrozen();
         }
         bytes32 appHash = consensusStates[clientId][height].appHash;
-        return ICS23MembershipVerifier.verifyNonMembership(
+        return ICS23Verifier.verifyNonMembership(
             appHash,
             proof,
             abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),

diff --git a/evm/contracts/clients/Verifier.sol → evm/contracts/lib/CometblsZKVerifier.sol b/evm/contracts/clients/Verifier.sol → evm/contracts/lib/CometblsZKVerifier.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.27;
 /// @author Remco Bloemen
 /// @notice Supports verifying Groth16 proofs. Proofs can be in uncompressed
 /// (256 bytes) and compressed (128 bytes) format.
-library Verifier {
+library CometblsZKVerifier {
     // Addresses of precompiles
     uint256 constant PRECOMPILE_MODEXP = 0x05;
     uint256 constant PRECOMPILE_ADD = 0x06;

diff --git a/...racts/clients/ICS23MembershipVerifier.sol → evm/contracts/lib/ICS23Verifier.sol b/...racts/clients/ICS23MembershipVerifier.sol → evm/contracts/lib/ICS23Verifier.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.27;
 import "../lib/ICS23.sol";
 import "../lib/UnionICS23.sol";
 
-library ICS23MembershipVerifier {
+library ICS23Verifier {
     function verifyMembership(
         bytes32 root,
         bytes calldata proof,

diff --git a/evm/evm.nix b/evm/evm.nix
@@ -467,13 +467,11 @@ _: {
           #         FOUNDRY_PROFILE="test" forge coverage --ir-minimum --report lcov
           #         lcov --remove ./lcov.info -o ./lcov.info.pruned \
           #           'contracts/Multicall.sol' \
-          #           'contracts/clients/Verifier.sol' \
           #           'contracts/apps/ucs/00-pingpong/*' \
           #           'contracts/lib/*' \
           #           'contracts/core/OwnableIBCHandler.sol' \
           #           'contracts/core/24-host/IBCCommitment.sol' \
           #           'contracts/core/25-handler/IBCHandler.sol' \
-          #           'contracts/clients/ICS23MembershipVerifier.sol' \
           #           'tests/*'
           #         genhtml lcov.info.pruned -o $out --branch-coverage
           #       mv lcov.info.pruned $out/lcov.info

diff --git a/evm/tests/src/Verifier.t.sol b/evm/tests/src/Verifier.t.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.27;
 
 import "forge-std/Test.sol";
 
-import "../../contracts/clients/Verifier.sol";
+import "../../contracts/lib/CometblsZKVerifier.sol";
 import {
     CometblsClient,
     SignedHeader