feat(registry): cheaper on-chain batch opt-in (48k gas)

bolt-cli/README.md

@@ -7,7 +7,7 @@ The Bolt CLI is a collection of command-line tools for interacting with Bolt pro
 Prerequisites:
 
 - [Rust toolchain][rust]
-- [Protoc][protoc]
+- [Protoc][protoc] (as well as `libprotobuf-dev` for some Linux distributions)
 
 Once you have the necessary prerequisites, you can build the binary in the following way:
 

bolt-contracts/.gas-snapshot

@@ -13,18 +13,25 @@ BoltChallengerTest:testProveTransactionInclusion() (gas: 176543)
 BoltChallengerTest:testResolveChallengeFullDefenseSingleTx() (gas: 562694)
 BoltChallengerTest:testResolveChallengeFullDefenseStackedTxs() (gas: 939716)
 BoltChallengerTest:testResolveExpiredChallenge() (gas: 426457)
-BoltManagerEigenLayerTest:testDeregisterOperatorFromAVS() (gas: 755578)
-BoltManagerEigenLayerTest:testGetOperatorStake() (gas: 919551)
-BoltManagerEigenLayerTest:testNonExistentProposerStatus() (gas: 901546)
-BoltManagerEigenLayerTest:testProposerStatus() (gas: 928359)
-BoltManagerEigenLayerTest:testProposersLookaheadStatus() (gas: 2221042)
-BoltManagerSymbioticTest:testGetNonExistentProposerStatus() (gas: 1168685)
-BoltManagerSymbioticTest:testGetProposerStatus() (gas: 1415457)
-BoltManagerSymbioticTest:testProposersLookaheadStatus() (gas: 2488651)
-BoltManagerSymbioticTest:testReadOperatorStake() (gas: 1448345)
-BoltValidatorsTest:testUnsafeRegistration() (gas: 149361)
-BoltValidatorsTest:testUnsafeRegistrationFailsIfAlreadyRegistered() (gas: 148862)
-BoltValidatorsTest:testUnsafeRegistrationInvalidOperator() (gas: 22820)
-BoltValidatorsTest:testUnsafeRegistrationWhenNotAllowed() (gas: 33183)
+BoltManagerEigenLayerTest:testDeregisterOperatorFromAVS() (gas: 757038)
+BoltManagerEigenLayerTest:testGetOperatorStake() (gas: 916622)
+BoltManagerEigenLayerTest:testNonExistentProposerStatus() (gas: 902889)
+BoltManagerEigenLayerTest:testProposerStatus() (gas: 927230)
+BoltManagerEigenLayerTest:testProposersLookaheadStatus() (gas: 2197665)
+BoltManagerSymbioticTest:testGetNonExistentProposerStatus() (gas: 1309103)
+BoltManagerSymbioticTest:testGetProposerStatus() (gas: 1556603)
+BoltManagerSymbioticTest:testProposersLookaheadStatus() (gas: 2632992)
+BoltManagerSymbioticTest:testReadOperatorStake() (gas: 1590527)
+BoltValidatorsTest:testUnsafeBatchRegistrationGasUsage() (gas: 29088733)
+BoltValidatorsTest:testUnsafeRegistration() (gas: 138036)
+BoltValidatorsTest:testUnsafeRegistrationFailsIfAlreadyRegistered() (gas: 135421)
+BoltValidatorsTest:testUnsafeRegistrationInvalidOperator() (gas: 17352)
+BoltValidatorsTest:testUnsafeRegistrationWhenNotAllowed() (gas: 12330)
+BoltValidatorsV2Test:testReadRegisteredValidatorsV2() (gas: 8051)
+BoltValidatorsV2Test:testUnauthorizedController() (gas: 3613)
+BoltValidatorsV2Test:testUnsafeBatchRegistrationV2() (gas: 29122477)
+BoltValidatorsV2Test:testUnsafeRegistrationInvalidOperatorV2() (gas: 10332)
+BoltValidatorsV2Test:testUnsafeRegistrationV2() (gas: 215472)
+BoltValidatorsV2Test:testUpdateMaxGasLimitV2() (gas: 4434)
 TransactionDecoderTest:testDecodeAllTestCases() (gas: 0)
 TransactionDecoderTest:testDecodeGasUsage() (gas: 53281)

bolt-contracts/script/holesky/admin/Upgrade.s.sol

@@ -9,16 +9,20 @@ import {Upgrades, Options} from "@openzeppelin-foundry-upgrades/src/Upgrades.sol
 import {BoltParametersV1} from "../../../src/contracts/BoltParametersV1.sol";
 import {BoltValidatorsV1} from "../../../src/contracts/BoltValidatorsV1.sol";
 import {BoltManagerV1} from "../../../src/contracts/BoltManagerV1.sol";
+import {BoltManagerV2} from "../../../src/contracts/BoltManagerV2.sol";
 import {BoltEigenLayerMiddlewareV1} from "../../../src/contracts/BoltEigenLayerMiddlewareV1.sol";
 import {BoltEigenLayerMiddlewareV2} from "../../../src/contracts/BoltEigenLayerMiddlewareV2.sol";
 import {BoltSymbioticMiddlewareV1} from "../../../src/contracts/BoltSymbioticMiddlewareV1.sol";
 import {BoltSymbioticMiddlewareV2} from "../../../src/contracts/BoltSymbioticMiddlewareV2.sol";
+import {BoltValidatorsV1} from "../../../src/contracts/BoltValidatorsV1.sol";
+import {BoltValidatorsV2} from "../../../src/contracts/BoltValidatorsV2.sol";
 import {BoltConfig} from "../../../src/lib/Config.sol";
 
 contract UpgradeBolt is Script {
     struct Deployments {
         address boltManager;
         address boltParameters;
+        address boltValidators;
         address symbioticNetwork;
         address symbioticOperatorRegistry;
         address symbioticOperatorNetOptIn;
@@ -103,6 +107,56 @@ contract UpgradeBolt is Script {
         console.log("BoltSymbioticMiddleware proxy upgraded from %s to %s", opts.referenceContract, upgradeTo);
     }
 
+    function upgradeBoltValidators() public {
+        address admin = msg.sender;
+        console.log("Upgrading BoltValidators with admin", admin);
+        // TODO: Validate upgrades with Upgrades.validateUpgrade
+
+        Options memory opts;
+        opts.unsafeSkipAllChecks = true;
+        opts.referenceContract = "BoltValidatorsV1.sol";
+
+        string memory upgradeTo = "BoltValidatorsV2.sol";
+
+        Deployments memory deployments = _readDeployments();
+
+        bytes memory initBoltValidators =
+            abi.encodeCall(BoltValidatorsV2.initializeV2, (admin, deployments.boltParameters));
+
+        vm.startBroadcast(admin);
+
+        Upgrades.upgradeProxy(deployments.boltValidators, upgradeTo, initBoltValidators, opts);
+
+        vm.stopBroadcast();
+
+        console.log("BoltValidators proxy upgraded from %s to %s", opts.referenceContract, upgradeTo);
+    }
+
+    function upgradeBoltManager() public {
+        address admin = msg.sender;
+        console.log("Upgrading BoltManager with admin", admin);
+        // TODO: Validate upgrades with Upgrades.validateUpgrade
+
+        Options memory opts;
+        opts.unsafeSkipAllChecks = true;
+        opts.referenceContract = "BoltManagerV1.sol";
+        string memory upgradeTo = "BoltManagerV2.sol";
+
+        Deployments memory deployments = _readDeployments();
+        bytes memory initManager = abi.encodeCall(
+            BoltManagerV2.initializeV2, 
+            (admin, deployments.boltParameters, deployments.boltValidators)
+        );
+
+        vm.startBroadcast(admin);
+
+        Upgrades.upgradeProxy(deployments.boltManager, upgradeTo, initManager, opts);
+
+        vm.stopBroadcast();
+
+        console.log("BoltManager proxy upgraded from %s to %s", opts.referenceContract, upgradeTo);
+    }
+
     function _readDeployments() public view returns (Deployments memory) {
         string memory root = vm.projectRoot();
         string memory path = string.concat(root, "/config/holesky/deployments.json");
@@ -111,6 +165,7 @@ contract UpgradeBolt is Script {
         return Deployments({
             boltParameters: vm.parseJsonAddress(json, ".bolt.parameters"),
             boltManager: vm.parseJsonAddress(json, ".bolt.manager"),
+            boltValidators: vm.parseJsonAddress(json, ".bolt.validators"),
             symbioticNetwork: vm.parseJsonAddress(json, ".symbiotic.network"),
             symbioticOperatorRegistry: vm.parseJsonAddress(json, ".symbiotic.operatorRegistry"),
             symbioticOperatorNetOptIn: vm.parseJsonAddress(json, ".symbiotic.networkOptInService"),

bolt-contracts/script/holesky/admin/helpers/RegisterAVS.s.sol

@@ -3,14 +3,14 @@ pragma solidity 0.8.25;
 
 import {Script, console} from "forge-std/Script.sol";
 
-import {BoltEigenLayerMiddlewareV1} from "../../../../src/contracts/BoltEigenLayerMiddlewareV1.sol";
+import {BoltEigenLayerMiddlewareV2} from "../../../../src/contracts/BoltEigenLayerMiddlewareV2.sol";
 
 contract RegisterAVS is Script {
     function run() public {
         address admin = msg.sender;
         console.log("Running with admin address:", admin);
 
-        BoltEigenLayerMiddlewareV1 middleware = BoltEigenLayerMiddlewareV1(readMiddleware());
+        BoltEigenLayerMiddlewareV2 middleware = BoltEigenLayerMiddlewareV2(readMiddleware());
 
         string memory avsURI = "https://boltprotocol.xyz/avs.json";
         console.log("Setting AVS metadata URI to:", avsURI);

bolt-contracts/script/holesky/admin/helpers/UpdateSupportedVaults.s.sol

@@ -6,11 +6,11 @@ import {Script, console} from "forge-std/Script.sol";
 import {INetworkRegistry} from "@symbiotic/interfaces/INetworkRegistry.sol";
 import {INetworkMiddlewareService} from "@symbiotic/interfaces/service/INetworkMiddlewareService.sol";
 
-import {BoltSymbioticMiddlewareV1} from "../../../../src/contracts/BoltSymbioticMiddlewareV1.sol";
+import {BoltSymbioticMiddlewareV2} from "../../../../src/contracts/BoltSymbioticMiddlewareV2.sol";
 
 contract UpdateSupportedVaults is Script {
     function run() public {
-        BoltSymbioticMiddlewareV1 middleware = _readSymbioticMiddleware();
+        BoltSymbioticMiddlewareV2 middleware = _readSymbioticMiddleware();
 
         address[] memory whitelisted = middleware.getWhitelistedVaults();
         address[] memory toWhitelist = _readVaultsToWhitelist();
@@ -64,11 +64,11 @@ contract UpdateSupportedVaults is Script {
         return vm.parseJsonAddressArray(json, ".symbiotic.supportedVaults");
     }
 
-    function _readSymbioticMiddleware() public view returns (BoltSymbioticMiddlewareV1) {
+    function _readSymbioticMiddleware() public view returns (BoltSymbioticMiddlewareV2) {
         string memory root = vm.projectRoot();
         string memory path = string.concat(root, "/config/holesky/deployments.json");
         string memory json = vm.readFile(path);
 
-        return BoltSymbioticMiddlewareV1(vm.parseJsonAddress(json, ".symbiotic.middleware"));
+        return BoltSymbioticMiddlewareV2(vm.parseJsonAddress(json, ".symbiotic.middleware"));
     }
 }

bolt-contracts/script/holesky/operators/RegisterEigenLayerOperator.s.sol

@@ -9,9 +9,9 @@ import {IStrategyManager} from "@eigenlayer/src/contracts/interfaces/IStrategyMa
 import {IStrategy, IERC20} from "@eigenlayer/src/contracts/interfaces/IStrategy.sol";
 import {ISignatureUtils} from "@eigenlayer/src/contracts/interfaces/ISignatureUtils.sol";
 
-import {BoltEigenLayerMiddlewareV1} from "../../../src/contracts/BoltEigenLayerMiddlewareV1.sol";
+import {BoltEigenLayerMiddlewareV2} from "../../../src/contracts/BoltEigenLayerMiddlewareV2.sol";
 import {IBoltMiddlewareV1} from "../../../src/interfaces/IBoltMiddlewareV1.sol";
-import {IBoltManagerV1} from "../../../src/interfaces/IBoltManagerV1.sol";
+import {IBoltManagerV2} from "../../../src/interfaces/IBoltManagerV2.sol";
 
 contract RegisterEigenLayerOperator is Script {
     struct OperatorConfig {
@@ -43,7 +43,7 @@ contract RegisterEigenLayerOperator is Script {
         uint256 operatorSk = vm.envUint("OPERATOR_SK");
         address operator = vm.addr(operatorSk);
 
-        BoltEigenLayerMiddlewareV1 middleware = _readMiddleware();
+        BoltEigenLayerMiddlewareV2 middleware = _readMiddleware();
         IAVSDirectory avsDirectory = _readAvsDirectory();
         OperatorConfig memory config = _readConfig("config/holesky/operators/eigenlayer/registerIntoBoltAVS.json");
 
@@ -76,12 +76,12 @@ contract RegisterEigenLayerOperator is Script {
         address operatorAddress = vm.envAddress("OPERATOR_ADDRESS");
         console.log("Checking operator registration for address", operatorAddress);
 
-        IBoltManagerV1 boltManager = _readBoltManager();
+        IBoltManagerV2 boltManager = _readBoltManager();
         bool isRegistered = boltManager.isOperator(operatorAddress);
         console.log("Operator is registered:", isRegistered);
         require(isRegistered, "Operator is not registered");
 
-        BoltEigenLayerMiddlewareV1 middleware = _readMiddleware();
+        BoltEigenLayerMiddlewareV2 middleware = _readMiddleware();
         (address[] memory tokens, uint256[] memory amounts) = middleware.getOperatorCollaterals(operatorAddress);
 
         for (uint256 i; i < tokens.length; ++i) {
@@ -91,12 +91,12 @@ contract RegisterEigenLayerOperator is Script {
         }
     }
 
-    function _readMiddleware() public view returns (BoltEigenLayerMiddlewareV1) {
+    function _readMiddleware() public view returns (BoltEigenLayerMiddlewareV2) {
         string memory root = vm.projectRoot();
         string memory path = string.concat(root, "/config/holesky/deployments.json");
         string memory json = vm.readFile(path);
 
-        return BoltEigenLayerMiddlewareV1(vm.parseJsonAddress(json, ".eigenLayer.middleware"));
+        return BoltEigenLayerMiddlewareV2(vm.parseJsonAddress(json, ".eigenLayer.middleware"));
     }
 
     function _readAvsDirectory() public view returns (IAVSDirectory) {
@@ -122,11 +122,11 @@ contract RegisterEigenLayerOperator is Script {
         return IStrategyManager(vm.parseJsonAddress(json, ".eigenLayer.strategyManager"));
     }
 
-    function _readBoltManager() public view returns (IBoltManagerV1) {
+    function _readBoltManager() public view returns (IBoltManagerV2) {
         string memory root = vm.projectRoot();
         string memory path = string.concat(root, "/config/holesky/deployments.json");
         string memory json = vm.readFile(path);
-        return IBoltManagerV1(vm.parseJsonAddress(json, ".bolt.manager"));
+        return IBoltManagerV2(vm.parseJsonAddress(json, ".bolt.manager"));
     }
 
     function _readConfig(

bolt-contracts/script/holesky/operators/RegisterSymbioticOperator.s.sol

@@ -3,15 +3,15 @@ pragma solidity 0.8.25;
 
 import {Script, console} from "forge-std/Script.sol";
 
-import {BoltSymbioticMiddlewareV1} from "../../../src/contracts/BoltSymbioticMiddlewareV1.sol";
-import {IBoltManagerV1} from "../../../src/interfaces/IBoltManagerV1.sol";
+import {BoltSymbioticMiddlewareV2} from "../../../src/contracts/BoltSymbioticMiddlewareV2.sol";
+import {IBoltManagerV2} from "../../../src/interfaces/IBoltManagerV2.sol";
 
 import {IOptInService} from "@symbiotic/interfaces/service/IOptInService.sol";
 import {IVault} from "@symbiotic/interfaces/vault/IVault.sol";
 
 contract RegisterSymbioticOperator is Script {
     struct Config {
-        BoltSymbioticMiddlewareV1 symbioticMiddleware;
+        BoltSymbioticMiddlewareV2 symbioticMiddleware;
         IOptInService symbioticNetworkOptInService;
         address symbioticNetwork;
     }
@@ -54,7 +54,7 @@ contract RegisterSymbioticOperator is Script {
         address operatorAddress = vm.envAddress("OPERATOR_ADDRESS");
         console.log("Checking operator registration for address", operatorAddress);
 
-        IBoltManagerV1 boltManager = _readBoltManager();
+        IBoltManagerV2 boltManager = _readBoltManager();
         bool isRegistered = boltManager.isOperator(operatorAddress);
 
         console.log("Operator is registered:", isRegistered);
@@ -68,15 +68,15 @@ contract RegisterSymbioticOperator is Script {
 
         return Config({
             symbioticNetwork: vm.parseJsonAddress(json, ".symbiotic.network"),
-            symbioticMiddleware: BoltSymbioticMiddlewareV1(vm.parseJsonAddress(json, ".symbiotic.middleware")),
+            symbioticMiddleware: BoltSymbioticMiddlewareV2(vm.parseJsonAddress(json, ".symbiotic.middleware")),
             symbioticNetworkOptInService: IOptInService(vm.parseJsonAddress(json, ".symbiotic.networkOptInService"))
         });
     }
 
-    function _readBoltManager() public view returns (IBoltManagerV1) {
+    function _readBoltManager() public view returns (IBoltManagerV2) {
         string memory root = vm.projectRoot();
         string memory path = string.concat(root, "/config/holesky/deployments.json");
         string memory json = vm.readFile(path);
-        return IBoltManagerV1(vm.parseJsonAddress(json, ".bolt.manager"));
+        return IBoltManagerV2(vm.parseJsonAddress(json, ".bolt.manager"));
     }
 }