From c819a42a0db862e64289639ccf9fc110d867e231 Mon Sep 17 00:00:00 2001 From: nicolas <48695862+merklefruit@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:56:42 +0200 Subject: [PATCH 1/2] fix: symbiotic network opt-in --- .../config/holesky/deployments.json | 6 +-- .../RegisterSymbioticOperator.s.sol | 42 +++++++++++++------ 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/bolt-contracts/config/holesky/deployments.json b/bolt-contracts/config/holesky/deployments.json index 4e8d76a8b..ae5065de0 100644 --- a/bolt-contracts/config/holesky/deployments.json +++ b/bolt-contracts/config/holesky/deployments.json @@ -3,13 +3,13 @@ "validators": "0x05275a4799cd1B07D81319390fC62Bc7BDbDf269" }, "symbiotic": { - "network": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "network": "0x90F79bf6EB2c4f870365E785982E1f101E93b906", "operatorRegistry": "0xAdFC41729fF447974cE27DdFa358A0f2096c3F39", "networkOptInService": "0xF5AFc9FA3Ca63a07E529DDbB6eae55C665cCa83E", "vaultFactory": "0x18C659a269a7172eF78BBC19Fe47ad2237Be0590", "networkRegistry": "0xac5acD8A105C8305fb980734a5AD920b5920106A", "networkMiddlewareService": "0x683F470440964E353b389391CdDDf8df381C282f", - "middleware": "", + "middleware": "0x76Ab811E448174b2C2fD7D421984e2eAb6716578", "supportedVaults": [ "0x1df2fbfcD600ADd561013f44B2D055E2e974f605", "0xf427d00c34609053d97167352061DD2F0F27F853" @@ -19,7 +19,7 @@ "avsDirectory": "0x055733000064333CaDDbC92763c58BF0192fFeBf", "delegationManager": "0xA44151489861Fe9e3055d95adC98FbD462B948e7", "strategyManager": "0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6", - "middleware": "", + "middleware": "0x279F5be63FD1D0A32d77258028933a7e3E75fF08", "supportedStrategies": [ "0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3", "0x3A8fBdf9e77DFc25d09741f51d3E181b25d0c4E0", diff --git a/bolt-contracts/script/holesky/validators/RegisterSymbioticOperator.s.sol b/bolt-contracts/script/holesky/validators/RegisterSymbioticOperator.s.sol index 57264a4c9..0089432c0 100644 --- a/bolt-contracts/script/holesky/validators/RegisterSymbioticOperator.s.sol +++ b/bolt-contracts/script/holesky/validators/RegisterSymbioticOperator.s.sol @@ -4,40 +4,56 @@ pragma solidity 0.8.25; import {Script, console} from "forge-std/Script.sol"; import {BoltSymbioticMiddlewareV1} from "../../../src/contracts/BoltSymbioticMiddlewareV1.sol"; +import {IOptInService} from "@symbiotic/interfaces/service/IOptInService.sol"; contract RegisterSymbioticOperator is Script { + struct Config { + string rpc; + BoltSymbioticMiddlewareV1 symbioticMiddleware; + IOptInService symbioticNetworkOptInService; + address symbioticNetwork; + } + function run() public { uint256 operatorSk = vm.envUint("OPERATOR_SK"); address operator = vm.addr(operatorSk); - BoltSymbioticMiddlewareV1 middleware = _readMiddleware(); - string memory rpc = _readRPC(); + Config memory config = _readConfig(); + + // First, make sure the operator is opted into the network + if (!config.symbioticNetworkOptInService.isOptedIn(operator, config.symbioticNetwork)) { + console.log("Operator is not opted into the network yet. Opting in..."); + vm.startBroadcast(operatorSk); + config.symbioticNetworkOptInService.optIn(config.symbioticNetwork); + vm.stopBroadcast(); + console.log("Operator successfully opted into the network"); + } console.log("Registering Symbiotic operator"); console.log("Operator address:", operator); - console.log("Operator RPC:", rpc); + console.log("Operator RPC:", config.rpc); vm.startBroadcast(operatorSk); - middleware.registerOperator(rpc); + config.symbioticMiddleware.registerOperator(config.rpc); console.log("Successfully registered Symbiotic operator"); vm.stopBroadcast(); } - function _readMiddleware() public view returns (BoltSymbioticMiddlewareV1) { + function _readConfig() public view returns (Config memory) { 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")); - } - - function _readRPC() public view returns (string memory) { - string memory root = vm.projectRoot(); - string memory path = string.concat(root, "/config/holesky/operator.json"); - string memory json = vm.readFile(path); + string memory operatorPath = string.concat(root, "/config/holesky/operator.json"); + string memory operatorJson = vm.readFile(operatorPath); - return vm.parseJsonString(json, ".rpc"); + return Config({ + rpc: vm.parseJsonString(operatorJson, ".rpc"), + symbioticNetwork: vm.parseJsonAddress(json, ".symbiotic.network"), + symbioticMiddleware: BoltSymbioticMiddlewareV1(vm.parseJsonAddress(json, ".symbiotic.middleware")), + symbioticNetworkOptInService: IOptInService(vm.parseJsonAddress(json, ".symbiotic.networkOptInService")) + }); } } From ce3fadcdc288e1c08415e27d6a5cc3f974dfc9f3 Mon Sep 17 00:00:00 2001 From: nicolas <48695862+merklefruit@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:02:56 +0200 Subject: [PATCH 2/2] chore: revert adding middleware addresses --- bolt-contracts/config/holesky/deployments.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bolt-contracts/config/holesky/deployments.json b/bolt-contracts/config/holesky/deployments.json index ae5065de0..2aa89b3ed 100644 --- a/bolt-contracts/config/holesky/deployments.json +++ b/bolt-contracts/config/holesky/deployments.json @@ -9,7 +9,7 @@ "vaultFactory": "0x18C659a269a7172eF78BBC19Fe47ad2237Be0590", "networkRegistry": "0xac5acD8A105C8305fb980734a5AD920b5920106A", "networkMiddlewareService": "0x683F470440964E353b389391CdDDf8df381C282f", - "middleware": "0x76Ab811E448174b2C2fD7D421984e2eAb6716578", + "middleware": "", "supportedVaults": [ "0x1df2fbfcD600ADd561013f44B2D055E2e974f605", "0xf427d00c34609053d97167352061DD2F0F27F853" @@ -19,7 +19,7 @@ "avsDirectory": "0x055733000064333CaDDbC92763c58BF0192fFeBf", "delegationManager": "0xA44151489861Fe9e3055d95adC98FbD462B948e7", "strategyManager": "0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6", - "middleware": "0x279F5be63FD1D0A32d77258028933a7e3E75fF08", + "middleware": "", "supportedStrategies": [ "0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3", "0x3A8fBdf9e77DFc25d09741f51d3E181b25d0c4E0",