simplified submit,trigger, service manager

Author: reecepbcups

src/LayerServiceManager.sol

@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {ILayerServiceManager} from "./interfaces/ILayerServiceManager.sol";
+import {ECDSAServiceManagerBase} from "@eigenlayer/middleware/src/unaudited/ECDSAServiceManagerBase.sol";
+import {ECDSAStakeRegistry} from "@eigenlayer/middleware/src/unaudited/ECDSAStakeRegistry.sol";
+import {IERC1271Upgradeable} from "@openzeppelin-upgrades/contracts/interfaces/IERC1271Upgradeable.sol";
+import {ECDSAUpgradeable} from "@openzeppelin-upgrades/contracts/utils/cryptography/ECDSAUpgradeable.sol";
+
+/**
+ * @title LayerServiceManager
+ * @notice contract that validates signatures using the ECDSAStakeRegistry.
+ * typically this contract is called from some "ILayerServiceHandler" (a vanilla implementation of ILayerService/ILayerServiceMulti)
+ */
+contract LayerServiceManager is ECDSAServiceManagerBase,ILayerServiceManager {
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+    constructor(
+        address _avsDirectory,
+        address _stakeRegistry,
+        address _rewardsCoordinator,
+        address _delegationManager
+    )
+        ECDSAServiceManagerBase(
+            _avsDirectory,
+            _stakeRegistry,
+            _rewardsCoordinator,
+            _delegationManager
+        )
+    {
+    }
+
+    // ------------------------------------------------------------------------
+    // Functions
+    // ------------------------------------------------------------------------
+
+    /**
+     * @notice Validate signed data via ECDSAStakeRegistry.
+     */
+    function validate(bytes calldata data, bytes calldata signature) external view
+    {
+        bytes32 message = keccak256(data);
+        bytes32 ethSignedMessageHash = ECDSAUpgradeable.toEthSignedMessageHash(message);
+        bytes4 magicValue = IERC1271Upgradeable.isValidSignature.selector;
+
+        // If the registry returns the magicValue, signature is considered valid
+        if( magicValue !=
+            ECDSAStakeRegistry(stakeRegistry).isValidSignature(
+                ethSignedMessageHash,
+                signature
+            )
+        ) {
+            revert ILayerServiceManager.InvalidSignature();
+        }
+    }
+}

src/WavsSubmit.sol

@@ -1,41 +1,25 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IWavsService} from "./interfaces/IWAVSServiceHandler.sol";
+import {ILayerServiceHandler} from "./interfaces/ILayerServiceHandler.sol";
+import {ILayerServiceManager} from "./interfaces/ILayerServiceManager.sol";
 import {ISimpleTrigger} from "./interfaces/ISimpleTrigger.sol";
 import {ISimpleSubmit} from "./interfaces/ISimpleSubmit.sol";
 
-contract WavsSubmit is IWavsService {
-    address private owner;
-    address private serviceManager;
+contract SimpleSubmit is ILayerServiceHandler {
+    ILayerServiceManager private _serviceManager;
 
     mapping(ISimpleTrigger.TriggerId => bool) validTriggers;
     mapping(ISimpleTrigger.TriggerId => bytes) datas;
     mapping(ISimpleTrigger.TriggerId => bytes) signatures;
 
-    constructor() {
-        owner = msg.sender;
+    constructor(ILayerServiceManager serviceManager) {
+        _serviceManager = serviceManager;
     }
 
-    modifier onlyOwner() {
-        require(msg.sender == owner, "Only the owner can call this function.");
-        _;
-    }
-
-    modifier onlyServiceManager() {
-        require(msg.sender == serviceManager, "Only the service manager can call this function.");
-        _;
-    }
-
-    function setServiceManager(address newServiceManager) external onlyOwner {
-        serviceManager = newServiceManager;
-    }
-
-    function getServiceManager() public view returns (address) {
-        return serviceManager;
-    }
+    function handleSignedData(bytes calldata data, bytes calldata signature) external {
+        _serviceManager.validate(data, signature);
 
-    function handleSignedData(bytes calldata data, bytes calldata signature) external onlyServiceManager {
         ISimpleSubmit.DataWithId memory dataWithId = abi.decode(data, (ISimpleSubmit.DataWithId));
 
         signatures[dataWithId.triggerId] = signature;

src/WavsTrigger.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
 import {ISimpleTrigger} from "./interfaces/ISimpleTrigger.sol";
@@ -33,7 +34,10 @@ contract SimpleTrigger {
         ISimpleTrigger.TriggerId triggerId = nextTriggerId;
 
         // Create the trigger
-        Trigger memory trigger = Trigger({creator: msg.sender, data: data});
+        Trigger memory trigger = Trigger({
+            creator: msg.sender,
+            data: data
+        });
 
         // update storages
         triggersById[triggerId] = trigger;
@@ -43,8 +47,11 @@ contract SimpleTrigger {
         // emit the id directly in an event
 
         // now be layer-compatible
-        ISimpleTrigger.TriggerInfo memory triggerInfo =
-            ISimpleTrigger.TriggerInfo({triggerId: triggerId, creator: trigger.creator, data: trigger.data});
+        ISimpleTrigger.TriggerInfo memory triggerInfo = ISimpleTrigger.TriggerInfo({
+            triggerId: triggerId,
+            creator: trigger.creator,
+            data: trigger.data
+        });
 
         emit NewTrigger(abi.encode(triggerInfo));
     }
@@ -56,6 +63,11 @@ contract SimpleTrigger {
     function getTrigger(ISimpleTrigger.TriggerId triggerId) public view returns (ISimpleTrigger.TriggerInfo memory) {
         Trigger storage trigger = triggersById[triggerId];
 
-        return ISimpleTrigger.TriggerInfo({triggerId: triggerId, creator: trigger.creator, data: trigger.data});
+        return ISimpleTrigger.TriggerInfo({
+            triggerId: triggerId,
+            creator: trigger.creator,
+            data: trigger.data
+        });
     }
+
 }