onchain socket (#804)

Layr-Labs · Oct 31, 2024 · 177b51f · 177b51f
1 parent 4922529
commit 177b51f
Show file tree

Hide file tree

Showing 16 changed files with 407 additions and 248 deletions.
diff --git a/contracts/bindings/AVSDirectory/binding.go b/contracts/bindings/AVSDirectory/binding.go
diff --git a/contracts/bindings/BLSApkRegistry/binding.go b/contracts/bindings/BLSApkRegistry/binding.go
diff --git a/contracts/bindings/DelegationManager/binding.go b/contracts/bindings/DelegationManager/binding.go
diff --git a/contracts/bindings/EigenDAServiceManager/binding.go b/contracts/bindings/EigenDAServiceManager/binding.go
diff --git a/contracts/bindings/EjectionManager/binding.go b/contracts/bindings/EjectionManager/binding.go
diff --git a/contracts/bindings/IndexRegistry/binding.go b/contracts/bindings/IndexRegistry/binding.go
diff --git a/contracts/bindings/MockRollup/binding.go b/contracts/bindings/MockRollup/binding.go
diff --git a/contracts/bindings/OperatorStateRetriever/binding.go b/contracts/bindings/OperatorStateRetriever/binding.go
diff --git a/contracts/bindings/RegistryCoordinator/binding.go b/contracts/bindings/RegistryCoordinator/binding.go
diff --git a/contracts/bindings/SocketRegistry/binding.go b/contracts/bindings/SocketRegistry/binding.go
diff --git a/contracts/bindings/StakeRegistry/binding.go b/contracts/bindings/StakeRegistry/binding.go
diff --git a/contracts/compile.sh b/contracts/compile.sh
@@ -21,7 +21,7 @@ function create_binding {
 forge clean
 forge build
 
-contracts="AVSDirectory DelegationManager BitmapUtils OperatorStateRetriever RegistryCoordinator BLSApkRegistry IndexRegistry StakeRegistry BN254 EigenDAServiceManager IEigenDAServiceManager MockRollup EjectionManager"
+contracts="SocketRegistry AVSDirectory DelegationManager BitmapUtils OperatorStateRetriever RegistryCoordinator BLSApkRegistry IndexRegistry StakeRegistry BN254 EigenDAServiceManager IEigenDAServiceManager MockRollup EjectionManager"
 for contract in $contracts; do
     create_binding ./ $contract ./bindings
 done

diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware
diff --git a/contracts/script/DeployOpenEigenLayer.s.sol b/contracts/script/DeployOpenEigenLayer.s.sol
@@ -7,7 +7,6 @@ import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.so
 import "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
 
 import "eigenlayer-core/contracts/interfaces/IETHPOSDeposit.sol";
-import "eigenlayer-core/contracts/interfaces/IBeaconChainOracle.sol";
 
 import "eigenlayer-core/contracts/core/StrategyManager.sol";
 import "eigenlayer-core/contracts/core/Slasher.sol";
@@ -19,7 +18,6 @@ import "eigenlayer-core/contracts/strategies/StrategyBaseTVLLimits.sol";
 
 import "eigenlayer-core/contracts/pods/EigenPod.sol";
 import "eigenlayer-core/contracts/pods/EigenPodManager.sol";
-import "eigenlayer-core/contracts/pods/DelayedWithdrawalRouter.sol";
 
 import "eigenlayer-core/contracts/permissions/PauserRegistry.sol";
 
@@ -64,8 +62,6 @@ contract DeployOpenEigenLayer is Script, Test {
     StrategyManager public strategyManagerImplementation;
     EigenPodManager public eigenPodManager;
     EigenPodManager public eigenPodManagerImplementation;
-    DelayedWithdrawalRouter public delayedWithdrawalRouter;
-    DelayedWithdrawalRouter public delayedWithdrawalRouterImplementation;
     AVSDirectory public avsDirectory;
     AVSDirectory public avsDirectoryImplementation;
     RewardsCoordinator public rewardsCoordinator;
@@ -123,20 +119,14 @@ contract DeployOpenEigenLayer is Script, Test {
         eigenPodManager = EigenPodManager(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
         );
-        delayedWithdrawalRouter = DelayedWithdrawalRouter(
-            address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
-        );
         rewardsCoordinator = RewardsCoordinator(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenLayerProxyAdmin), ""))
         );
 
         // ETH POS deposit is 0 address
         eigenPodImplementation = new EigenPod(
             ethPOSDeposit,
-            delayedWithdrawalRouter,
             eigenPodManager,
-            // uint64(MAX_VALIDATOR_BALANCE_GWEI),
-            uint64(32 gwei),
             1000 // temp genesis time
         );
 
@@ -163,7 +153,6 @@ contract DeployOpenEigenLayer is Script, Test {
             slasher,
             delegation
         );
-        delayedWithdrawalRouterImplementation = new DelayedWithdrawalRouter(eigenPodManager);
 
         // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them.
         IStrategy[] memory _strategies;
@@ -213,20 +202,8 @@ contract DeployOpenEigenLayer is Script, Test {
             address(eigenPodManagerImplementation),
             abi.encodeWithSelector(
                 EigenPodManager.initialize.selector,
-                IBeaconChainOracle(address(0)),
-                executorMultisig,
-                eigenLayerPauserReg,
-                0
-            )
-        );
-        eigenLayerProxyAdmin.upgradeAndCall(
-            TransparentUpgradeableProxy(payable(address(delayedWithdrawalRouter))),
-            address(delayedWithdrawalRouterImplementation),
-            abi.encodeWithSelector(
-                DelayedWithdrawalRouter.initialize.selector,
                 executorMultisig,
                 eigenLayerPauserReg,
-                0,
                 0
             )
         );

diff --git a/contracts/script/EigenDADeployer.s.sol b/contracts/script/EigenDADeployer.s.sol
@@ -16,6 +16,7 @@ import {IServiceManager} from "eigenlayer-middleware/interfaces/IServiceManager.
 import {IBLSApkRegistry} from "eigenlayer-middleware/interfaces/IBLSApkRegistry.sol";
 import {EigenDAServiceManager, IAVSDirectory, IRewardsCoordinator} from "../src/core/EigenDAServiceManager.sol";
 import {EigenDAHasher} from "../src/libraries/EigenDAHasher.sol";
+import {ISocketRegistry, SocketRegistry} from "eigenlayer-middleware/SocketRegistry.sol";
 
 import {DeployOpenEigenLayer, ProxyAdmin, ERC20PresetFixedSupply, TransparentUpgradeableProxy, IPauserRegistry} from "./DeployOpenEigenLayer.s.sol";
 import "forge-std/Test.sol";
@@ -36,13 +37,15 @@ contract EigenDADeployer is DeployOpenEigenLayer {
     RegistryCoordinator public registryCoordinator;
     IIndexRegistry public indexRegistry;
     IStakeRegistry public stakeRegistry;
+    ISocketRegistry public socketRegistry;
     OperatorStateRetriever public operatorStateRetriever;
 
     BLSApkRegistry public apkRegistryImplementation;
     EigenDAServiceManager public eigenDAServiceManagerImplementation;
     IRegistryCoordinator public registryCoordinatorImplementation;
     IIndexRegistry public indexRegistryImplementation;
     IStakeRegistry public stakeRegistryImplementation;
+    ISocketRegistry public socketRegistryImplementation;
 
     struct AddressConfig {
         address eigenLayerCommunityMultisig;
@@ -110,6 +113,9 @@ contract EigenDADeployer is DeployOpenEigenLayer {
         apkRegistry = BLSApkRegistry(
             address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenDAProxyAdmin), ""))
         );
+        socketRegistry = ISocketRegistry(
+            address(new TransparentUpgradeableProxy(address(emptyContract), address(eigenDAProxyAdmin), ""))
+        );
 
         indexRegistryImplementation = new IndexRegistry(
             registryCoordinator
@@ -139,11 +145,19 @@ contract EigenDADeployer is DeployOpenEigenLayer {
             address(apkRegistryImplementation)
         );
 
+        socketRegistryImplementation = new SocketRegistry(registryCoordinator);
+
+        eigenDAProxyAdmin.upgrade(
+            TransparentUpgradeableProxy(payable(address(socketRegistry))),
+            address(socketRegistryImplementation)
+        );
+
         registryCoordinatorImplementation = new RegistryCoordinator(
                 IServiceManager(address(eigenDAServiceManager)),
                 stakeRegistry,
                 apkRegistry,
-                indexRegistry
+                indexRegistry,
+                socketRegistry
             );
 
         {

diff --git a/contracts/script/deploy/holesky/EigenDASM_RewardsUpgrade.s.sol b/contracts/script/deploy/holesky/EigenDASM_RewardsUpgrade.s.sol
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
+/*
 pragma solidity ^0.8.12;
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
@@ -32,7 +33,7 @@ import {EigenDAServiceManager} from "../../../src/core/EigenDAServiceManager.sol
  * forge script script/deploy/holesky/EigenDASM_RewardsUpgrade.s.sol:ServiceManagerBaseUpgrade --rpc-url $RPC_HOLESKY --private-key $PRIVATE_KEY --broadcast --verify -vvvv --sig "run(string memory deployArg)" upgrade
  * forge script script/deploy/holesky/EigenDASM_RewardsUpgrade.s.sol:ServiceManagerBaseUpgrade --rpc-url $RPC_HOLESKY --private-key $PRIVATE_KEY --broadcast --verify -vvvv --sig "run(string memory deployArg)" deploy
  * forge script script/deploy/holesky/EigenDASM_RewardsUpgrade.s.sol:ServiceManagerBaseUpgrade --rpc-url $RPC_HOLESKY --private-key $PRIVATE_KEY --broadcast --verify -vvvv --sig "run(string memory deployArg)" createAVSRewardsSubmission
- */
+ *//*
 contract ServiceManagerBaseUpgrade is ExistingDeploymentParser {
     // Hardcode these values to your needs
     address public serviceManager = 0x54A03db2784E3D0aCC08344D05385d0b62d4F432;
@@ -193,4 +194,5 @@ contract ServiceManagerBaseUpgrade is ExistingDeploymentParser {
             "ServiceManagerBaseUpgrade: deployer address is incorrect"
         );
     }
-}
+}
+*/
+1 −0		foundry.toml
+1 −1		lib/eigenlayer-contracts
+1 −1		src/EjectionManager.sol
+38 −33		src/RegistryCoordinator.sol
+6 −1		src/RegistryCoordinatorStorage.sol
+7 −2		src/ServiceManagerBase.sol
+52 −0		src/SocketRegistry.sol
+8 −0		src/interfaces/IRegistryCoordinator.sol
+2 −3		src/interfaces/IServiceManagerUI.sol
+10 −0		src/interfaces/ISocketRegistry.sol
+0 −20		src/interfaces/ISocketUpdater.sol
+52 −9		src/unaudited/ECDSAServiceManagerBase.sol
+3 −2		test/harnesses/RegistryCoordinatorHarness.t.sol
+2 −1		test/integration/CoreRegistration.t.sol
+19 −31		test/integration/IntegrationDeployer.t.sol
+1 −1		test/integration/User.t.sol
+0 −20		test/integration/mocks/BeaconChainOracleMock.t.sol
+16 −15		test/integration/utils/Sort.t.sol
+22 −0		test/mocks/ECDSAServiceManagerMock.sol
+14 −0		test/mocks/ECDSAStakeRegistryMock.sol
+2 −0		test/mocks/RegistryCoordinatorMock.sol
+8 −0		test/mocks/RewardsCoordinatorMock.sol
+1 −1		test/unit/BLSSignatureCheckerUnit.t.sol
+186 −0		test/unit/ECDSAServiceManager.t.sol
+12 −0		test/unit/EjectionManagerUnit.t.sol
+4 −4		test/unit/OperatorStateRetrieverUnit.t.sol
+30 −30		test/unit/RegistryCoordinatorUnit.t.sol
+2 −1		test/unit/StakeRegistryUnit.t.sol
+18 −2		test/utils/MockAVSDeployer.sol