Holesky Launch

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-cli/src/cli.rs

@@ -101,6 +101,14 @@ pub struct SendCommand {
     #[clap(long, env = "BLOB", default_value = "false")]
     pub blob: bool,
 
+    /// The max fee per gas in gwei.
+    #[clap(long, env = "MAX_FEE")]
+    pub max_fee: Option<u128>,
+
+    /// The max priority fee per gas in gwei.
+    #[clap(long, env = "PRIORITY_FEE", default_value = "2")]
+    pub priority_fee: u128,
+
     /// If set, the transaction will target the devnet environment.
     /// This is only used in Kurtosis for internal testing purposes
     #[clap(long, hide = true, env = "DEVNET", default_value = "false")]

bolt-cli/src/commands/send.rs

@@ -1,7 +1,9 @@
 use std::time::Duration;
 
 use alloy::{
-    consensus::{BlobTransactionSidecar, SidecarBuilder, SimpleCoder, Transaction},
+    consensus::{
+        constants::GWEI_TO_WEI, BlobTransactionSidecar, SidecarBuilder, SimpleCoder, Transaction,
+    },
     eips::eip2718::Encodable2718,
     network::{EthereumWallet, TransactionBuilder, TransactionBuilder4844},
     primitives::{keccak256, Address, B256, U256},
@@ -73,6 +75,12 @@ impl SendCommand {
         for _ in 0..self.count {
             // generate a simple self-transfer of ETH
             let mut req = create_tx_request(wallet.address(), self.blob);
+            if let Some(max_fee) = self.max_fee {
+                req.set_max_fee_per_gas(max_fee * GWEI_TO_WEI as u128);
+            }
+
+            req.set_max_priority_fee_per_gas(self.priority_fee * GWEI_TO_WEI as u128);
+
             if let Some(next_nonce) = next_nonce {
                 req.set_nonce(next_nonce);
             }

bolt-cli/src/common/keystore.rs

@@ -51,7 +51,9 @@ impl KeystoreSecret {
     /// Load the keystore passwords from a directory containing individual password files.
     pub fn from_directory(root_dir: &str) -> Result<Self> {
         let mut secrets = HashMap::new();
-        for entry in fs::read_dir(root_dir)? {
+        for entry in fs::read_dir(root_dir)
+            .wrap_err(format!("failed to read secrets directory. path: {}", &root_dir))?
+        {
             let entry = entry.wrap_err("Failed to read secrets directory entry")?;
             let path = entry.path();
 
@@ -108,12 +110,14 @@ impl Drop for KeystoreSecret {
 /// -- ...
 /// Reference: https://github.com/chainbound/bolt/blob/4634ff905561009e4e74f9921dfdabf43717010f/bolt-sidecar/src/signer/keystore.rs#L109
 pub fn keystore_paths(keys_path: &str) -> Result<Vec<PathBuf>> {
-    let keys_path = Path::new(keys_path).to_path_buf();
+    let keys_path_buf = Path::new(keys_path).to_path_buf();
     let json_extension = OsString::from("json");
 
     let mut keystores_paths = vec![];
     // Iter over the `keys` directory
-    for entry in read_dir(keys_path)? {
+    for entry in read_dir(keys_path_buf)
+        .wrap_err(format!("failed to read keys directory. path: {keys_path}"))?
+    {
         let path = read_path(entry)?;
         if path.is_dir() {
             for entry in read_dir(path)? {

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/README.md

@@ -57,7 +57,7 @@ The values of these parameters can also be found in [`parameters.json`](./config
 
 ## Validator Registration: `BoltValidators`
 
-The [`BoltValidators`](./src/contracts/BoltValidatorsV1.sol) contract is the only point of entry for
+The [`BoltValidators`](./src/contracts/BoltValidatorsV2.sol) contract is the only point of entry for
 validators to signal their intent to participate in Bolt Protocol and authenticate with their BLS private key.
 
 The registration process includes the following steps:
@@ -76,7 +76,7 @@ will allow us to test the registration flow in a controlled environment.
 
 ## Bolt Network Entrypoint: `BoltManager`
 
-The [`BoltManager`](./src/contracts/BoltManagerV1.sol) contract is a crucial component of Bolt that
+The [`BoltManager`](./src/contracts/BoltManagerV2.sol) contract is a crucial component of Bolt that
 integrates with restaking ecosystems Symbiotic and Eigenlayer. It manages the registration and
 coordination of validators, operators, and vaults within the Bolt network.
 
@@ -156,10 +156,10 @@ request is valid according to Bolt Protocol rules. -->
 | Name                   | Address                | Notes                   |
 | ---------------------- | -------------------- | ----------------------- |
 | [`BoltParametersV1`](./src/contracts/BoltParametersV1.sol) | [0x20d1cf3A5BD5928dB3118b2CfEF54FDF9fda5c12](https://holesky.etherscan.io/address/0x20d1cf3A5BD5928dB3118b2CfEF54FDF9fda5c12) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
-| [`BoltValidatorsV1`](./src/contracts/BoltValidatorsV1.sol) |  [0x47D2DC1DE1eFEFA5e6944402f2eda3981D36a9c8](https://holesky.etherscan.io/address/0x47D2DC1DE1eFEFA5e6944402f2eda3981D36a9c8) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
-| [`BoltManagerV1`](./src/contracts/BoltManagerV1.sol) |  [0x440202829b493F9FF43E730EB5e8379EEa3678CF](https://holesky.etherscan.io/address/0x440202829b493F9FF43E730EB5e8379EEa3678CF) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
-| [`BoltEigenLayerMiddlewareV1`](./src/contracts/BoltEigenLayerMiddlewareV1.sol) |  [0xa632a3e652110Bb2901D5cE390685E6a9838Ca04](https://holesky.etherscan.io/address/0xa632a3e652110Bb2901D5cE390685E6a9838Ca04) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
-| [`BoltSymbioticMiddlewareV1`](./src/contracts/BoltSymbioticMiddlewareV1.sol) |  [0x04f40d9CaE475E5BaA462acE53E5c58A0DD8D8e8](https://holesky.etherscan.io/address/0x04f40d9CaE475E5BaA462acE53E5c58A0DD8D8e8) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
+| [`BoltValidatorsV2`](./src/contracts/BoltValidatorsV2.sol) |  [0x47D2DC1DE1eFEFA5e6944402f2eda3981D36a9c8](https://holesky.etherscan.io/address/0x47D2DC1DE1eFEFA5e6944402f2eda3981D36a9c8) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
+| [`BoltManagerV2`](./src/contracts/BoltManagerV2.sol) |  [0x440202829b493F9FF43E730EB5e8379EEa3678CF](https://holesky.etherscan.io/address/0x440202829b493F9FF43E730EB5e8379EEa3678CF) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
+| [`BoltEigenLayerMiddlewareV2`](./src/contracts/BoltEigenLayerMiddlewareV2.sol) |  [0xa632a3e652110Bb2901D5cE390685E6a9838Ca04](https://holesky.etherscan.io/address/0xa632a3e652110Bb2901D5cE390685E6a9838Ca04) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
+| [`BoltSymbioticMiddlewareV2`](./src/contracts/BoltSymbioticMiddlewareV2.sol) |  [0x04f40d9CaE475E5BaA462acE53E5c58A0DD8D8e8](https://holesky.etherscan.io/address/0x04f40d9CaE475E5BaA462acE53E5c58A0DD8D8e8) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v5.0/contracts/proxy/ERC1967/ERC1967Proxy.sol) |
 
 ## Testing
 

bolt-contracts/config/holesky/deployments.json

@@ -1,38 +1,38 @@
 {
-    "bolt": {
-        "validators": "0x47D2DC1DE1eFEFA5e6944402f2eda3981D36a9c8",
-        "parameters": "0x20d1cf3A5BD5928dB3118b2CfEF54FDF9fda5c12",
-        "manager": "0x440202829b493F9FF43E730EB5e8379EEa3678CF"
-    },
-    "symbiotic": {
-        "network": "0xb017002D8024d8c8870A5CECeFCc63887650D2a4",
-        "operatorRegistry": "0x6F75a4ffF97326A00e52662d82EA4FdE86a2C548",
-        "networkOptInService": "0x58973d16FFA900D11fC22e5e2B6840d9f7e13401",
-        "vaultFactory": "0x407A039D94948484D356eFB765b3c74382A050B4",
-        "vaultConfigurator": "0xD2191FE92987171691d552C219b8caEf186eb9cA",
-        "networkRegistry": "0x7d03b7343BF8d5cEC7C0C27ecE084a20113D15C9",
-        "networkMiddlewareService": "0x62a1ddfD86b4c1636759d9286D3A0EC722D086e3",
-        "middleware": "0x04f40d9CaE475E5BaA462acE53E5c58A0DD8D8e8",
-        "supportedVaults": [
-            "0xc79c533a77691641d52ebD5e87E51dCbCaeb0D78",
-            "0xe5708788c90e971f73D928b7c5A8FD09137010e0",
-            "0x11c5b9A9cd8269580aDDbeE38857eE451c1CFacd",
-            "0xC56Ba584929c6f381744fA2d7a028fA927817f2b",
-            "0xcDdeFfcD2bA579B8801af1d603812fF64c301462",
-            "0x91e84e12Bb65576C0a6614c5E6EbbB2eA595E10f"
-        ]
-    },
-    "eigenLayer": {
-        "avsDirectory": "0x055733000064333CaDDbC92763c58BF0192fFeBf",
-        "delegationManager": "0xA44151489861Fe9e3055d95adC98FbD462B948e7",
-        "strategyManager": "0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6",
-        "middleware": "0xa632a3e652110Bb2901D5cE390685E6a9838Ca04",
-        "supportedStrategies": [
-            "0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3",
-            "0x3A8fBdf9e77DFc25d09741f51d3E181b25d0c4E0",
-            "0x80528D6e9A2BAbFc766965E0E26d5aB08D9CFaF9",
-            "0x70EB4D3c164a6B4A5f908D4FBb5a9cAfFb66bAB6",
-            "0xaccc5A86732BE85b5012e8614AF237801636F8e5"
-        ]
-    }
-}
+  "bolt": {
+    "validators": "0x47D2DC1DE1eFEFA5e6944402f2eda3981D36a9c8",
+    "parameters": "0x20d1cf3A5BD5928dB3118b2CfEF54FDF9fda5c12",
+    "manager": "0x440202829b493F9FF43E730EB5e8379EEa3678CF"
+  },
+  "symbiotic": {
+    "network": "0xb017002D8024d8c8870A5CECeFCc63887650D2a4",
+    "operatorRegistry": "0x6F75a4ffF97326A00e52662d82EA4FdE86a2C548",
+    "networkOptInService": "0x58973d16FFA900D11fC22e5e2B6840d9f7e13401",
+    "vaultFactory": "0x407A039D94948484D356eFB765b3c74382A050B4",
+    "vaultConfigurator": "0xD2191FE92987171691d552C219b8caEf186eb9cA",
+    "networkRegistry": "0x7d03b7343BF8d5cEC7C0C27ecE084a20113D15C9",
+    "networkMiddlewareService": "0x62a1ddfD86b4c1636759d9286D3A0EC722D086e3",
+    "middleware": "0x04f40d9CaE475E5BaA462acE53E5c58A0DD8D8e8",
+    "supportedVaults": [
+      "0xc79c533a77691641d52ebD5e87E51dCbCaeb0D78",
+      "0xe5708788c90e971f73D928b7c5A8FD09137010e0",
+      "0x11c5b9A9cd8269580aDDbeE38857eE451c1CFacd",
+      "0xC56Ba584929c6f381744fA2d7a028fA927817f2b",
+      "0xcDdeFfcD2bA579B8801af1d603812fF64c301462",
+      "0x91e84e12Bb65576C0a6614c5E6EbbB2eA595E10f"
+    ]
+  },
+  "eigenLayer": {
+    "avsDirectory": "0x055733000064333CaDDbC92763c58BF0192fFeBf",
+    "delegationManager": "0xA44151489861Fe9e3055d95adC98FbD462B948e7",
+    "strategyManager": "0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6",
+    "middleware": "0xa632a3e652110Bb2901D5cE390685E6a9838Ca04",
+    "supportedStrategies": [
+      "0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3",
+      "0x3A8fBdf9e77DFc25d09741f51d3E181b25d0c4E0",
+      "0x80528D6e9A2BAbFc766965E0E26d5aB08D9CFaF9",
+      "0x70EB4D3c164a6B4A5f908D4FBb5a9cAfFb66bAB6",
+      "0xaccc5A86732BE85b5012e8614AF237801636F8e5"
+    ]
+  }
+}

bolt-contracts/config/holesky/operators/eigenlayer/depositIntoStrategy.json

@@ -0,0 +1,5 @@
+{
+  "strategy": "",
+  "token": "",
+  "amount": 0
+}

bolt-contracts/config/holesky/operators/eigenlayer/registerIntoBoltAVS.json

@@ -0,0 +1,5 @@
+{
+  "rpc": "<scheme>://<host>:<port>",
+  "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "expiry": "0x1000000000000000000000000000000000000000000000000000000000000000"
+}

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,54 @@ 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 +163,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);