wip

Author: reecepbcups

.gitmodules

@@ -4,3 +4,4 @@
 [submodule "lib/WAVS"]
 	path = lib/WAVS
 	url = https://github.com/Lay3rLabs/WAVS
+	branch = chain-name-newtype

README.md

@@ -75,11 +75,14 @@ make start-all
 
 ```bash
 # Deploy (override: FOUNDRY_ANVIL_PRIVATE_KEY)
-forge script ./script/WavsServiceManager.s.sol --rpc-url http://localhost:8545 --broadcast
+forge script ./script/WavsSubmit.s.sol --rpc-url http://localhost:8545 --broadcast
 
 # Grab deployed service manager from script file output
-export SERVICE_MANAGER_ADDRESS=`jq -r '.service_manager' "./.docker/cli/script_deploy.json"`
-echo "Service Manager Address: $SERVICE_MANAGER_ADDRESS"
+export SERVICE_HANDLER_ADDR=`jq -r '.service_handler' "./.docker/cli/script_deploy.json"`
+echo "Service Handler Addr: $SERVICE_HANDLER_ADDR"
+
+wavs-cli deploy-eigen-service-manager --data ./.docker/cli --service-handler ${SERVICE_HANDLER_ADDR}
+export SERVICE_MANAGER=0x99bba657f2bbc93c02d617f8ba121cb8fc104acf # manually parsing because json output is terrible
 ```
 
 ### Build WASI components
@@ -106,7 +109,7 @@ trigger_event=$(cast sig-event "NewTrigger(bytes)"); echo "Trigger Event: $trigg
 service_info=`wavs-cli deploy-service --log-level=error --data ./.docker/cli --component $(pwd)/compiled/eth_trigger_weather.wasm \
   --trigger-event-name ${trigger_event:2} \
   --trigger eth-contract-event \
-  --submit-address ${SERVICE_MANAGER_ADDRESS} \
+  --submit-address ${SERVICE_MANAGER} \
   --service-config '{"fuelLimit":100000000,"maxGas":5000000,"hostEnvs":["WAVS_ENV_OPEN_WEATHER_API_KEY"],"kv":[],"workflowId":"default","componentId":"default"}'`
 
 echo "Service info: $service_info"

lib/WAVS

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
-import {WavsServiceManager} from "../src/WavsServiceManager.sol";
+import {WavsSubmit} from "../src/WavsSubmit.sol";
 import {ECDSAStakeRegistry} from "@eigenlayer/middleware/src/unaudited/ECDSAStakeRegistry.sol";
 import {IDelegationManager} from
     "@eigenlayer/middleware/lib/eigenlayer-contracts/src/contracts/interfaces/IDelegationManager.sol";
@@ -13,8 +13,8 @@ import { Strings } from "@openzeppelin-contracts/utils/Strings.sol";
 
 
 
-// forge script ./script/WavsServiceManager.s.sol --rpc-url http://localhost:8545 --broadcast
-contract WavsServiceManagerScript is Script {
+// forge script ./script/WavsSubmit.s.sol --rpc-url http://localhost:8545 --broadcast
+contract WavsSubmitScript is Script {
     using stdJson for string;
 
     string root = vm.projectRoot();
@@ -38,22 +38,22 @@ contract WavsServiceManagerScript is Script {
         console.log("rewards_coordinator:", eigen.rewards_coordinator);
         console.log("avs_directory:", eigen.avs_directory);
 
-        WavsServiceManager sm = new WavsServiceManager(
-            eigen.avs_directory, address(ecdsa_registry), eigen.rewards_coordinator, eigen.delegation_manager
+        WavsSubmit submit = new WavsSubmit(
+            // eigen.avs_directory, address(ecdsa_registry), eigen.rewards_coordinator, eigen.delegation_manager
         );
 
         IStrategy mockStrategy = IStrategy(address(0x1234));
         Quorum memory quorum = Quorum({strategies: new StrategyParams[](1)});
         quorum.strategies[0] = StrategyParams({strategy: mockStrategy, multiplier: 10_000});
-        ecdsa_registry.initialize(address(sm), 0, quorum);
+        ecdsa_registry.initialize(address(submit), 0, quorum);
 
         vm.stopBroadcast();
 
         console.log("ecdsa_registry:", address(ecdsa_registry));
-        console.log("service_manager:", address(sm));
+        console.log("service_handler:", address(submit));
 
         string memory json = "json";
-        json.serialize("service_manager", Strings.toHexString(address(sm)));
+        json.serialize("service_handler", Strings.toHexString(address(submit)));
         string memory finalJson = json.serialize("ecdsa_registry", Strings.toHexString(address(ecdsa_registry)));
         vm.writeFile(script_output_path, finalJson);
     }

script/WavsServiceManager.s.sol script/WavsSubmit.s.solscript/WavsServiceManager.s.sol renamed to script/WavsSubmit.s.sol

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {IServiceHandler} from "./interfaces/IWAVSServiceHandler.sol";
+import {ISimpleTrigger} from "./interfaces/ISimpleTrigger.sol";
+import {ISimpleSubmit} from "./interfaces/ISimpleSubmit.sol";
+
+contract WavsSubmit is IServiceHandler {
+    address private owner;
+    address private serviceManager;
+
+    mapping(ISimpleTrigger.TriggerId => bool) validTriggers;
+    mapping(ISimpleTrigger.TriggerId => bytes) datas;
+    mapping(ISimpleTrigger.TriggerId => bytes) signatures;
+
+    constructor() {
+        owner = msg.sender;
+    }
+
+    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 handleAddPayload(bytes calldata data, bytes calldata signature) external { // onlyServiceManager
+        ISimpleSubmit.DataWithId memory dataWithId = abi.decode(data, (ISimpleSubmit.DataWithId));
+
+        signatures[dataWithId.triggerId] = signature;
+        datas[dataWithId.triggerId] = dataWithId.data;
+        validTriggers[dataWithId.triggerId] = true;
+    }
+
+    function isValidTriggerId(ISimpleTrigger.TriggerId triggerId) external view returns (bool) {
+        return validTriggers[triggerId];
+    }
+
+    function getSignature(ISimpleTrigger.TriggerId triggerId) external view returns (bytes memory signature) {
+        signature = signatures[triggerId];
+    }
+
+    function getData(ISimpleTrigger.TriggerId triggerId) external view returns (bytes memory data) {
+        data = datas[triggerId];
+    }
+}

src/WavsServiceManager.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+// https://github.com/Lay3rLabs/WAVS/blob/chain-name-newtype/sdk/contracts/solidity/interfaces/IServiceHandler.sol
+interface IServiceHandler {
+    /**
+     * @notice Called by LayerServiceManager after successful payload signature validation.
+     * @param data The arbitrary data that was signed.
+     * @param signature The signature of the data.
+     */
+    function handleAddPayload(bytes calldata data, bytes calldata signature) external;
+}