Feat: service manager router (Layr-Labs#193)

0xJomo · Jun 11, 2024 · 8e25b00 · 8e25b00
1 parent 5c7142b
commit 8e25b00
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/script/ServiceManagerRouterDeploy.s.sol b/script/ServiceManagerRouterDeploy.s.sol
@@ -1,5 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
+<<<<<<< HEAD
 pragma solidity ^0.8.12;
+=======
+pragma solidity =0.8.12;
+>>>>>>> Feat: service manager router (#193)
 
 import {ServiceManagerRouter} from "../src/ServiceManagerRouter.sol";
 import "forge-std/Script.sol";
@@ -12,4 +16,8 @@ contract ServiceManagerRouterDeploy is Script {
 
         vm.stopBroadcast();
     }
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> Feat: service manager router (#193)
diff --git a/src/ServiceManagerRouter.sol b/src/ServiceManagerRouter.sol
@@ -1,7 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1
+<<<<<<< HEAD
 pragma solidity ^0.8.12;
 
 import {IServiceManagerUI} from "./interfaces/IServiceManagerUI.sol";
+=======
+pragma solidity =0.8.12;
+
+import {IServiceManager} from "./interfaces/IServiceManager.sol";
+>>>>>>> Feat: service manager router (#193)
 
 /**
  * @title Contract that proxies calls to a ServiceManager contract.
@@ -20,7 +26,11 @@ contract ServiceManagerRouter {
      */
     function getRestakeableStrategies(address serviceManager) external view returns (address[] memory) {
         bytes memory data = abi.encodeWithSelector(
+<<<<<<< HEAD
             IServiceManagerUI.getRestakeableStrategies.selector
+=======
+            IServiceManager.getRestakeableStrategies.selector
+>>>>>>> Feat: service manager router (#193)
         );
         return _makeCall(serviceManager, data);
     }
@@ -32,7 +42,11 @@ contract ServiceManagerRouter {
      */
     function getOperatorRestakedStrategies(address serviceManager, address operator) external view returns (address[] memory) {
         bytes memory data = abi.encodeWithSelector(
+<<<<<<< HEAD
             IServiceManagerUI.getOperatorRestakedStrategies.selector,
+=======
+            IServiceManager.getOperatorRestakedStrategies.selector,
+>>>>>>> Feat: service manager router (#193)
             operator
         );
         return _makeCall(serviceManager, data);
@@ -53,4 +67,8 @@ contract ServiceManagerRouter {
             return failedCall;
         }
     }
+<<<<<<< HEAD
+}
+=======
 }
+>>>>>>> Feat: service manager router (#193)
diff --git a/test/unit/ServiceManagerRouter.t.sol b/test/unit/ServiceManagerRouter.t.sol
@@ -1,5 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
+<<<<<<< HEAD
 pragma solidity ^0.8.12;
+=======
+pragma solidity =0.8.12;
+>>>>>>> Feat: service manager router (#193)
 
 import {ServiceManagerRouter} from "../../src/ServiceManagerRouter.sol";
 import "../utils/MockAVSDeployer.sol";
@@ -17,7 +21,10 @@ contract ServiceManagerRouter_UnitTests is MockAVSDeployer {
         // Deploy dummy serviceManager
         dummyServiceManager = new ServiceManagerMock(
             avsDirectory,
+<<<<<<< HEAD
             rewardsCoordinatorImplementation,
+=======
+>>>>>>> Feat: service manager router (#193)
             registryCoordinatorImplementation,
             stakeRegistryImplementation
         );
@@ -68,4 +75,8 @@ contract ServiceManagerRouter_UnitTests is MockAVSDeployer {
         assertEq(strategies.length, 1);
         assertEq(strategies[0], badReturn);
     }
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> Feat: service manager router (#193)