fix(contracts) Verifier digest mutability

metacraft-labs · Sep 26, 2024 · 968855c · 968855c
1 parent 56c80f5
commit 968855c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/beacon-light-client/solidity/contracts/balance_verifier/BalanceVerifier.sol b/beacon-light-client/solidity/contracts/balance_verifier/BalanceVerifier.sol
@@ -7,9 +7,6 @@ import {ZeroAddressError} from '../Errors.sol';
 import '@openzeppelin/contracts/access/Ownable.sol';
 
 abstract contract BalanceVerifier is Ownable, IBalanceVerifier {
-  /// @notice the verifierDigest of the plonky2 circuit
-  uint256 public immutable VERIFIER_DIGEST;
-
   /// @notice The genesis block timestamp.
   uint256 public immutable GENESIS_BLOCK_TIMESTAMP;
 
@@ -23,8 +20,11 @@ abstract contract BalanceVerifier is Ownable, IBalanceVerifier {
 
   address internal verifier;
 
+  /// @notice the verifierDigest of the plonky2 circuit
+  uint256 public verifierDigest;
+
   constructor(
-    uint256 verifierDigest,
+    uint256 _verifierDigest,
     uint256 genesisBlockTimestamp,
     address _verifier,
     address _owner
@@ -33,16 +33,19 @@ abstract contract BalanceVerifier is Ownable, IBalanceVerifier {
       revert ZeroAddressError();
     }
     verifier = _verifier;
-
-    VERIFIER_DIGEST = verifierDigest;
+    verifierDigest = _verifierDigest;
     GENESIS_BLOCK_TIMESTAMP = genesisBlockTimestamp;
   }
 
-  function setVerifier(address _verifier) external override onlyOwner {
+  function setVerifier(
+    address _verifier,
+    uint256 newVerifierDigest
+  ) external override onlyOwner {
     if (_verifier == address(0)) {
       revert ZeroAddressError();
     }
     verifier = _verifier;
+    verifierDigest = newVerifierDigest;
   }
 
   /// @notice Verifies the proof and writes the data for given slot if valid

diff --git a/beacon-light-client/solidity/contracts/balance_verifier/BalanceVerifierDiva.sol b/beacon-light-client/solidity/contracts/balance_verifier/BalanceVerifierDiva.sol
@@ -43,7 +43,7 @@ contract BalanceVerifierDiva is BalanceVerifier, IBalanceVerifierDiva {
     uint64 _numberOfSlashedValidators
   ) external override {
     uint256[] memory publicInputs = new uint256[](2);
-    publicInputs[0] = VERIFIER_DIGEST;
+    publicInputs[0] = verifierDigest;
     publicInputs[1] = (uint256(
       sha256(
         abi.encodePacked(

diff --git a/beacon-light-client/solidity/contracts/balance_verifier/BalanceVerifierLido.sol b/beacon-light-client/solidity/contracts/balance_verifier/BalanceVerifierLido.sol
@@ -37,7 +37,7 @@ contract BalanceVerifierLido is BalanceVerifier, IBalanceVerifierLido {
     uint64 _numberOfSlashedValidators
   ) external override {
     uint256[] memory publicInputs = new uint256[](2);
-    publicInputs[0] = VERIFIER_DIGEST;
+    publicInputs[0] = verifierDigest;
     publicInputs[1] = (uint256(
       sha256(
         abi.encodePacked(

diff --git a/beacon-light-client/solidity/contracts/balance_verifier/interfaces/IBalanceVerifier.sol b/beacon-light-client/solidity/contracts/balance_verifier/interfaces/IBalanceVerifier.sol
@@ -14,5 +14,5 @@ interface IBalanceVerifier {
   /// @dev Verification failed
   error VerificationFailed();
 
-  function setVerifier(address newVerifier) external;
+  function setVerifier(address newVerifier, uint256 newVerifierDigest) external;
 }