Simplify and modularize aggregate verifier + verifiers

interfaces/multiproof/IVerifier.sol

@@ -2,5 +2,16 @@
 pragma solidity 0.8.15;
 
 interface IVerifier {
+
+    /// @notice Verifies a proof.
+    /// @param proofBytes The proof.
+    /// @param imageId The image ID.
+    /// @param journal The journal.
+    /// @return valid Whether the proof is valid.
     function verify(bytes calldata proofBytes, bytes32 imageId, bytes32 journal) external view returns (bool);
+
+    /// @notice Nullifies the prover to prevent further proof verification.
+    /// @dev Should only occur if a soundness issue is found.
+    /// @dev Should only be callable by a proper dispute game.
+    function nullify() external;
 }

scripts/deploy/DeployImplementations.s.sol

@@ -717,14 +717,14 @@ contract DeployImplementations is Script {
     }
 
     function deployAggregateVerifierImpl(Input memory _input, Output memory _output) private {
-        address zkVerifier = address(new MockVerifier());
+        address zkVerifier = address(new MockVerifier(_output.anchorStateRegistryImpl));
 
         address teeVerifierImpl;
         {
             SystemConfigGlobal scgImpl = new SystemConfigGlobal(INitroEnclaveVerifier(_input.nitroEnclaveVerifier));
             vm.label(address(scgImpl), "SystemConfigGlobalImpl");
             _output.systemConfigGlobalImpl = scgImpl;
-            teeVerifierImpl = address(new TEEVerifier(scgImpl));
+            teeVerifierImpl = address(new TEEVerifier(scgImpl, _output.anchorStateRegistryImpl));
         }
 
         _output.aggregateVerifierImpl = IVerifier(

scripts/multiproof/DeployDevNoNitro.s.sol

@@ -120,9 +120,9 @@ contract DeployDevNoNitro is Script {
 
         vm.startBroadcast();
 
-        _deployTEEContracts(cfg.finalSystemOwner());
         _registerProposer(cfg.teeProposer());
         _deployInfrastructure(gameType);
+        _deployTEEContracts(cfg.finalSystemOwner());
         _deployAggregateVerifier(gameType);
 
         vm.stopBroadcast();
@@ -140,7 +140,9 @@ contract DeployDevNoNitro is Script {
         );
         console.log("DevSystemConfigGlobal:", systemConfigGlobalProxy);
 
-        teeVerifier = address(new TEEVerifier(SystemConfigGlobal(systemConfigGlobalProxy)));
+        teeVerifier = address(
+            new TEEVerifier(SystemConfigGlobal(systemConfigGlobalProxy), IAnchorStateRegistry(mockAnchorRegistry))
+        );
         console.log("TEEVerifier:", teeVerifier);
     }
 
@@ -173,7 +175,7 @@ contract DeployDevNoNitro is Script {
     }
 
     function _deployAggregateVerifier(GameType gameType) internal {
-        address zkVerifier = address(new MockVerifier());
+        address zkVerifier = address(new MockVerifier(IAnchorStateRegistry(mockAnchorRegistry)));
         console.log("MockVerifier (ZK):", zkVerifier);
 
         mockDelayedWETH = address(new MockDelayedWETH());

scripts/multiproof/DeployDevWithNitro.s.sol

@@ -154,9 +154,9 @@ contract DeployDevWithNitro is Script {
 
         vm.startBroadcast();
 
-        _deployTEEContracts(cfg.finalSystemOwner(), cfg.nitroEnclaveVerifier());
         _registerProposer(cfg.teeProposer());
         _deployInfrastructure(gameType);
+        _deployTEEContracts(cfg.finalSystemOwner(), cfg.nitroEnclaveVerifier());
         _deployAggregateVerifier(gameType);
 
         vm.stopBroadcast();
@@ -175,7 +175,9 @@ contract DeployDevWithNitro is Script {
         );
         console.log("SystemConfigGlobal:", systemConfigGlobalProxy);
 
-        teeVerifier = address(new TEEVerifier(SystemConfigGlobal(systemConfigGlobalProxy)));
+        teeVerifier = address(
+            new TEEVerifier(SystemConfigGlobal(systemConfigGlobalProxy), IAnchorStateRegistry(mockAnchorRegistry))
+        );
         console.log("TEEVerifier:", teeVerifier);
     }
 
@@ -208,7 +210,7 @@ contract DeployDevWithNitro is Script {
     }
 
     function _deployAggregateVerifier(GameType gameType) internal {
-        address zkVerifier = address(new MockVerifier());
+        address zkVerifier = address(new MockVerifier(IAnchorStateRegistry(mockAnchorRegistry)));
         console.log("MockVerifier (ZK):", zkVerifier);
 
         mockDelayedWETH = address(new MockDelayedWETH());