Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 3 additions & 23 deletions contracts/scripts/validator-registry/DeployValidatorOptInHub.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,13 @@ 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 {
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(
Expand All @@ -37,16 +32,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;
}
}
Expand All @@ -58,8 +43,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 {
Expand All @@ -68,8 +51,7 @@ contract DeployMainnet is BaseDeploy {

deployValidatorOptInHub(
registries,
OWNER,
OPTIN_ROUTER
OWNER
);
vm.stopBroadcast();
}
Expand All @@ -82,7 +64,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];

Expand All @@ -93,8 +74,7 @@ contract DeployHoodi is BaseDeploy {
vm.startBroadcast();
deployValidatorOptInHub(
registries,
OWNER,
OPTIN_ROUTER
OWNER
);
vm.stopBroadcast();
}
Expand Down
Loading