latest everything up until addTrigger call (panic)

Author: reecepbcups

README.md

@@ -77,6 +77,11 @@ make start-all
 ### Upload your WAVS Service Manager
 
 ```bash
+# Deploy service-manager
+sudo chmod 0666 .docker/cli/deployments.json
+wavs-cli deploy-eigen-service-manager --data ./.docker/cli
+export SERVICE_MANAGER=`jq -r '.eigen_service_managers.local | .[-1]' .docker/cli/deployments.json`
+
 # Deploy
 export FOUNDRY_ANVIL_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 forge script ./script/WavsSubmit.s.sol --rpc-url http://localhost:8545 --broadcast
@@ -86,18 +91,6 @@ export SERVICE_HANDLER_ADDR=`jq -r '.service_handler' "./.docker/cli/script_depl
 echo "Service Handler Addr: $SERVICE_HANDLER_ADDR"
 
 export TRIGGER_ADDR=`jq -r '.trigger' "./.docker/cli/script_deploy.json"`; echo "Trigger Addr: $TRIGGER_ADDR"
-
-# add read-write access
-sudo chmod 0666 .docker/cli/deployments.json
-
-wavs-cli deploy-eigen-service-manager --data ./.docker/cli --service-handler ${SERVICE_HANDLER_ADDR}
-export SERVICE_MANAGER=0x0e801d84fa97b50751dbf25036d067dcf18858bf
-
-# Set the service manager in the service handler
-# - handleAddPayload can only be called by onlyServiceManager
-# - add-task requires to getServiceManager() from the contract to deploy
-cast send ${SERVICE_HANDLER_ADDR} "setServiceManager(address)" ${SERVICE_MANAGER} --rpc-url http://localhost:8545 --private-key $FOUNDRY_ANVIL_PRIVATE_KEY
-# cast call ${SERVICE_HANDLER_ADDR} "getServiceManager()(address)" --rpc-url http://localhost:8545
 ```
 
 ### Build WASI components
@@ -123,12 +116,13 @@ wavs-cli deploy-service --log-level=error --quiet-results=false --data ./.docker
   --trigger eth-contract-event \
   --trigger-address ${TRIGGER_ADDR} \
   --submit-address ${SERVICE_MANAGER} \
-  --service-config '{"fuelLimit":100000000,"maxGas":5000000,"hostEnvs":["WAVS_ENV_OPEN_WEATHER_API_KEY"],"kv":[],"workflowId":"default","componentId":"default"}'
+  --service-config '{"fuel_limit":100000000,"max_gas":5000000,"host_envs":["WAVS_ENV_OPEN_WEATHER_API_KEY"],"kv":[],"workflow_id":"default","component_id":"default"}'
 
 SERVICE_ID=`jq -r '.services | to_entries[-1].value.id' .docker/cli/deployments.json`; echo "Service ID: $SERVICE_ID"
 
 # Submit AVS request -> chain
-wavs-cli add-task --input "Nashville,TN" --data ./.docker/cli --service-id ${SERVICE_ID}
+# wavs-cli add-task --input "Nashville,TN" --data ./.docker/cli --service-id ${SERVICE_ID}
+cast send ${TRIGGER_ADDR} "addTrigger(bytes)" `cast format-bytes32-string Nashville,TN` --rpc-url http://localhost:8545 --private-key $FOUNDRY_ANVIL_PRIVATE_KEY
 
 # Grab data from the contract directly
 hex_bytes=$(cast decode-abi "getData(uint64)(bytes)" `cast call ${SERVICE_HANDLER_ADDR} "getData(uint64)" 1`)

script/WavsSubmit.s.sol

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import {WavsSubmit} from "../src/WavsSubmit.sol";
+import {SimpleSubmit} from "../src/WavsSubmit.sol";
 import {SimpleTrigger} from "../src/WavsTrigger.sol";
+import {LayerServiceManager} from "../src/LayerServiceManager.sol";
 
 import "forge-std/Script.sol";
 import {stdJson} from "forge-std/StdJson.sol";
@@ -29,35 +30,18 @@ contract WavsSubmitScript is Script {
     function run() public {
         vm.startBroadcast(privateKey);
 
-        EigenContracts memory eigen = loadEigenContractsFromFS();
-
-        ECDSAStakeRegistry ecdsa_registry = new ECDSAStakeRegistry(IDelegationManager(eigen.delegation_manager));
-
-        console.log("delegation_manager:", eigen.delegation_manager);
-        console.log("rewards_coordinator:", eigen.rewards_coordinator);
-        console.log("avs_directory:", eigen.avs_directory);
-
-        WavsSubmit submit = new WavsSubmit(
-            // eigen.avs_directory, address(ecdsa_registry), eigen.rewards_coordinator, eigen.delegation_manager
-        );
+        address[] memory service_managers = loadServiceManagersFromFS();
+        LayerServiceManager service_manager = LayerServiceManager(service_managers[service_managers.length - 1]);
 
+        SimpleSubmit submit = new SimpleSubmit(service_manager);
         SimpleTrigger trigger = new SimpleTrigger();
 
-        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(submit), 0, quorum);
-
         vm.stopBroadcast();
 
-        console.log("ecdsa_registry:", address(ecdsa_registry));
-        console.log("service_handler:", address(submit));
-        console.log("trigger:", address(trigger));
-
         string memory json = "json";
         json.serialize("service_handler", Strings.toHexString(address(submit)));
         json.serialize("trigger", Strings.toHexString(address(trigger)));
-        string memory finalJson = json.serialize("ecdsa_registry", Strings.toHexString(address(ecdsa_registry)));
+        string memory finalJson = json.serialize("service_manager", Strings.toHexString(address(service_manager)));
         vm.writeFile(script_output_path, finalJson);
     }
 
@@ -67,11 +51,16 @@ contract WavsSubmitScript is Script {
         address rc = address(uint160(bytes20(json.readBytes(".eigen_core.local.rewards_coordinator"))));
         address avs = address(uint160(bytes20(json.readBytes(".eigen_core.local.avs_directory"))));
 
-        EigenContracts memory fixture =
-            EigenContracts({delegation_manager: dm, rewards_coordinator: rc, avs_directory: avs});
+        EigenContracts memory fixture = EigenContracts({delegation_manager: dm, rewards_coordinator: rc, avs_directory: avs});
 
         return fixture;
     }
+
+    function loadServiceManagersFromFS() public view returns (address[] memory) {
+        string memory json = vm.readFile(deployments_path);
+        address[] memory service_managers = json.readAddressArray(".eigen_service_managers.local");
+        return service_managers;
+    }
 }
 
 struct EigenContracts {