From 676ecfcc511b3c1f6c28c940e124ababab791906 Mon Sep 17 00:00:00 2001
From: owen-eth <owen@primev.xyz>
Date: Mon, 20 Oct 2025 17:08:49 -0400
Subject: [PATCH 1/2] updated hub deployment to not immediately impact
 optinrouter

---
 .../DeployValidatorOptInHub.s.sol             | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol b/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol
index e52afb6ff..2d68b1ec0 100644
--- a/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol
+++ b/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol
@@ -19,8 +19,7 @@ import {MainnetConstants} from "../MainnetConstants.sol";
 contract BaseDeploy is Script {
     function deployValidatorOptInHub(
         address[] memory registries,
-        address owner,
-        address optinRouter
+        address owner
     ) public returns (address) {
         console.log("Deploying ValidatorOptInHub on chain:", block.chainid);
         address proxy = Upgrades.deployUUPSProxy(
@@ -37,16 +36,6 @@ contract BaseDeploy is Script {
         AlwaysFalseRegistry alwaysFalse = new AlwaysFalseRegistry();
         console.log("AlwaysFalseRegistry deployed at:", address(alwaysFalse));
 
-        address alwaysFalseAddress = address(alwaysFalse);
-        address hubAddress = address(hub);
-
-        // Make router backwards compatible by getting data from the hub
-        ValidatorOptInRouter router = ValidatorOptInRouter(payable(optinRouter));
-        router.setVanillaRegistry(IVanillaRegistry(hubAddress));
-        router.setMevCommitAVS(IMevCommitAVS(alwaysFalseAddress));
-        router.setMevCommitMiddleware(IMevCommitMiddleware(alwaysFalseAddress));
-        console.log("ValidatorOptInRouter wired to hub");
-
         return proxy;
     }
 }
@@ -58,8 +47,6 @@ contract DeployMainnet is BaseDeploy {
     
     address constant public OWNER = MainnetConstants.PRIMEV_TEAM_MULTISIG;
 
-    address constant public OPTIN_ROUTER = 0x821798d7b9d57dF7Ed7616ef9111A616aB19ed64;
-
     address[] public registries = [VANILLA_REGISTRY, MEV_COMMIT_AVS, MEV_COMMIT_MIDDLEWARE];
 
     function run() external {
@@ -68,8 +55,7 @@ contract DeployMainnet is BaseDeploy {
 
         deployValidatorOptInHub(
             registries,
-            OWNER,
-            OPTIN_ROUTER
+            OWNER
         );
         vm.stopBroadcast();
     }
@@ -82,7 +68,6 @@ contract DeployHoodi is BaseDeploy {
 
     //This is the most important field. On mainnet it'll be the primev multisig.
     address constant public OWNER = 0x1623fE21185c92BB43bD83741E226288B516134a;
-    address constant public OPTIN_ROUTER = 0xa380ba6d6083a4Cb2a3B62b0a81Ea8727861c13e;
 
     address[] public registries = [VANILLA_REGISTRY, MEV_COMMIT_AVS, MEV_COMMIT_MIDDLEWARE];
 
@@ -93,8 +78,7 @@ contract DeployHoodi is BaseDeploy {
         vm.startBroadcast();
         deployValidatorOptInHub(
             registries,
-            OWNER,
-            OPTIN_ROUTER
+            OWNER
         );
         vm.stopBroadcast();
     }

From dd2617b76ea9989855b7edf3b4aa67f462d7b78d Mon Sep 17 00:00:00 2001
From: owen-eth <owen@primev.xyz>
Date: Mon, 20 Oct 2025 17:55:44 -0400
Subject: [PATCH 2/2] removed unused imports

---
 .../scripts/validator-registry/DeployValidatorOptInHub.s.sol  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol b/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol
index 2d68b1ec0..b0571ffad 100644
--- a/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol
+++ b/contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol
@@ -9,11 +9,7 @@ import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
 import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
 import {ValidatorOptInHub} from "../../contracts/validator-registry/ValidatorOptInHub.sol";
-import {ValidatorOptInRouter} from "../../contracts/validator-registry/ValidatorOptInRouter.sol";
 import {AlwaysFalseRegistry} from "../../contracts/validator-registry/falseRegistry/AlwaysFalseRegistry.sol";
-import {IMevCommitAVS} from "../../contracts/interfaces/IMevCommitAVS.sol";
-import {IMevCommitMiddleware} from "../../contracts/interfaces/IMevCommitMiddleware.sol";
-import {IVanillaRegistry} from "../../contracts/interfaces/IVanillaRegistry.sol";
 import {MainnetConstants} from "../MainnetConstants.sol";
 
 contract BaseDeploy is Script {