fix: remove v3

Author: pakim249CAL

contracts/bindings/EigenDADisperserRegistry/binding.go

@@ -17,7 +17,7 @@ import {IServiceManager} from "../lib/eigenlayer-middleware/src/interfaces/IServ
 import {IBLSApkRegistry} from "../lib/eigenlayer-middleware/src/interfaces/IBLSApkRegistry.sol";
 import {EigenDAServiceManager, IAVSDirectory, IRewardsCoordinator} from "../src/core/EigenDAServiceManager.sol";
 import {EigenDAThresholdRegistry} from "../src/core/EigenDAThresholdRegistry.sol";
-import {EigenDACertVerifierV3} from "src/periphery/EigenDACertVerifierV3.sol";
+import {EigenDACertVerifierV2} from "src/periphery/EigenDACertVerifierV2.sol";
 import {EigenDATypesV1 as DATypesV1} from "../src/libraries/V1/EigenDATypesV1.sol";
 import {EigenDATypesV2 as DATypesV2} from "../src/libraries/V2/EigenDATypesV2.sol";
 import {IEigenDAThresholdRegistry} from "../src/interfaces/IEigenDAThresholdRegistry.sol";
@@ -54,7 +54,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
     BLSApkRegistry public apkRegistry;
     EigenDAServiceManager public eigenDAServiceManager;
     EigenDAThresholdRegistry public eigenDAThresholdRegistry;
-    EigenDACertVerifierV3 public eigenDACertVerifier;
+    EigenDACertVerifierV2 public eigenDACertVerifier;
     RegistryCoordinator public registryCoordinator;
     IIndexRegistry public indexRegistry;
     IStakeRegistry public stakeRegistry;
@@ -317,7 +317,7 @@ contract EigenDADeployer is DeployOpenEigenLayer {
 
         operatorStateRetriever = new OperatorStateRetriever();
 
-        eigenDACertVerifier = new EigenDACertVerifierV3(
+        eigenDACertVerifier = new EigenDACertVerifierV2(
             IEigenDAThresholdRegistry(address(eigenDAThresholdRegistry)),
             IEigenDASignatureVerifier(address(eigenDAServiceManager)),
             IRegistryCoordinator(address(registryCoordinator)),

contracts/script/EigenDADeployer.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity =0.8.12;
 
-import {EigenDACertVerifierV3} from "src/periphery/EigenDACertVerifierV3.sol";
+import {EigenDACertVerifierV2} from "src/periphery/EigenDACertVerifierV2.sol";
 import {RegistryCoordinator} from "lib/eigenlayer-middleware/src/RegistryCoordinator.sol";
 import {IRegistryCoordinator} from "lib/eigenlayer-middleware/src/interfaces/IRegistryCoordinator.sol";
 import {EigenDAServiceManager} from "src/core/EigenDAServiceManager.sol";
@@ -55,7 +55,7 @@ contract CertVerifierDeployer is Script, Test {
         vm.startBroadcast();
 
         eigenDACertVerifier = address(
-            new EigenDACertVerifierV3(
+            new EigenDACertVerifierV2(
                 IEigenDAThresholdRegistry(eigenDAThresholdRegistry),
                 IEigenDASignatureVerifier(eigenDAServiceManager),
                 IRegistryCoordinator(registryCoordinator),

contracts/script/deploy/certverifier/CertVerifierDeployer.s.sol

@@ -20,7 +20,10 @@ contract EigenDADisperserRegistry is OwnableUpgradeable, EigenDADisperserRegistr
         _transferOwnership(_initialOwner);
     }
 
-    function setDisperserInfo(uint32 _disperserKey, EigenDATypesV2.DisperserInfo memory _disperserInfo) external onlyOwner {
+    function setDisperserInfo(uint32 _disperserKey, EigenDATypesV2.DisperserInfo memory _disperserInfo)
+        external
+        onlyOwner
+    {
         disperserKeyToInfo[_disperserKey] = _disperserInfo;
         emit DisperserAdded(_disperserKey, _disperserInfo.disperserAddress);
     }

contracts/src/core/EigenDADisperserRegistry.sol

@@ -10,7 +10,6 @@ import {EigenDATypesV1 as DATypesV1} from "../src/libraries/V1/EigenDATypesV1.so
 import {EigenDATypesV2 as DATypesV2} from "../src/libraries/V2/EigenDATypesV2.sol";
 import {EigenDACertVerificationV1Lib} from "../src/libraries/V1/EigenDACertVerificationV1Lib.sol";
 import {IEigenDAServiceManager} from "../src/interfaces/IEigenDAServiceManager.sol";
-import {EigenDACertVerifierV3} from "src/periphery/EigenDACertVerifierV3.sol";
 import {EigenDACertVerifierV2} from "src/periphery/EigenDACertVerifierV2.sol";
 import {EigenDAThresholdRegistry, IEigenDAThresholdRegistry} from "../src/core/EigenDAThresholdRegistry.sol";
 import {IEigenDABatchMetadataStorage} from "../src/interfaces/IEigenDABatchMetadataStorage.sol";
@@ -43,8 +42,7 @@ contract MockEigenDADeployer is BLSMockAVSDeployer {
     EigenDADisperserRegistry eigenDADisperserRegistryImplementation;
     PaymentVault paymentVault;
     PaymentVault paymentVaultImplementation;
-    EigenDACertVerifierV3 eigenDACertVerifier;
-    EigenDACertVerifierV2 eigenDACertVerifierV2;
+    EigenDACertVerifierV2 eigenDACertVerifier;
 
     ERC20 mockToken;
 
@@ -179,15 +177,7 @@ contract MockEigenDADeployer is BLSMockAVSDeployer {
 
         mockToken = new ERC20("Mock Token", "MOCK");
 
-        eigenDACertVerifier = new EigenDACertVerifierV3(
-            IEigenDAThresholdRegistry(address(eigenDAThresholdRegistry)),
-            IEigenDASignatureVerifier(address(eigenDAServiceManager)),
-            IRegistryCoordinator(address(registryCoordinator)),
-            defaultSecurityThresholds,
-            quorumNumbersRequired
-        );
-
-        eigenDACertVerifierV2 = new EigenDACertVerifierV2(
+        eigenDACertVerifier = new EigenDACertVerifierV2(
             IEigenDAThresholdRegistry(address(eigenDAThresholdRegistry)),
             IEigenDASignatureVerifier(address(eigenDAServiceManager)),
             IRegistryCoordinator(address(registryCoordinator)),