Fix exec (#44)

* more updates / cleanup

* fix exec

* wasi-exec override CMC ID

* simplify trigger matches

---------

Co-authored-by: David Komer <6406986+dakom@users.noreply.github.com>
Co-authored-by: Reece Williams <reecepbcups@gmail.com>

Author: dakom

Makefile

@@ -16,6 +16,7 @@ RPC_URL?=http://localhost:8545
 SERVICE_MANAGER_ADDR?=`jq -r '.eigen_service_managers.local | .[-1]' .docker/deployments.json`
 SERVICE_TRIGGER_ADDR?=`jq -r '.trigger' "./.docker/script_deploy.json"`
 SERVICE_SUBMISSION_ADDR?=`jq -r '.service_handler' "./.docker/script_deploy.json"`
+COIN_MARKET_CAP_ID?=1
 
 ## build: building the project
 build: _build_forge wasi-build
@@ -29,6 +30,12 @@ wasi-build:
 	@mkdir -p ./compiled
 	@cp ./target/wasm32-wasip1/release/*.wasm ./compiled/
 
+## wasi-exec: executing the WAVS wasi component(s) | COMPONENT_FILENAME, COIN_MARKET_CAP_ID
+wasi-exec:
+	@$(WAVS_CMD) exec --log-level=info --data /data/.docker --home /data \
+	--component "/data/compiled/${COMPONENT_FILENAME}" \
+	--input `cast format-bytes32-string $(COIN_MARKET_CAP_ID)`
+
 ## update-submodules: update the git submodules
 update-submodules:
 	@git submodule update --init --recursive
@@ -95,7 +102,6 @@ deploy-service:
 	--service-config ${SERVICE_CONFIG}
 
 ## trigger-service: triggering the service | SERVICE_TRIGGER_ADDR, COIN_MARKET_CAP_ID, RPC_URL
-COIN_MARKET_CAP_ID?=1
 trigger-service:
 	@forge script ./script/Trigger.s.sol ${SERVICE_TRIGGER_ADDR} ${COIN_MARKET_CAP_ID} --sig "run(string,string)" --rpc-url $(RPC_URL) --broadcast -v 4
 

README.md

@@ -40,14 +40,16 @@ forge test
 
 ```bash
 make wasi-build
-
-# TODO: currently broken upstream
-# Verify execution works as expected without deploying
-# wavs-cli exec --component $(pwd)/compiled/eth_price_oracle.wasm --input `cast format-bytes32-string 1`
 ```
 
 > You can also use `make build` to build the contracts and components in one command
 
+### Execute WASI component directly
+
+```bash
+make wasi-exec
+```
+
 ## WAVS
 
 ### Start Anvil, WAVS, and Deploy Eigenlayer
@@ -84,7 +86,7 @@ make deploy-service
 ## Trigger the Service
 
 ```bash
-# Trigger contract via `script/Trigger.s.sol`
+# Trigger contract via `script/Trigger.s.sol` for BTC
 COIN_MARKET_CAP_ID=1 make trigger-service
 ```
 

components/eth-price-oracle/src/lib.rs

@@ -1,5 +1,5 @@
 mod trigger;
-use trigger::{decode_trigger_event, encode_trigger_output};
+use trigger::{decode_trigger_event, encode_trigger_output, Destination};
 pub mod bindings;
 use crate::bindings::{export, Guest, TriggerAction};
 use serde::{Deserialize, Serialize};
@@ -13,9 +13,9 @@ struct Component;
 export!(Component with_types_in bindings);
 
 impl Guest for Component {
-    fn run(trigger_action: TriggerAction) -> std::result::Result<Vec<u8>, String> {
-        let (trigger_id, req) =
-            decode_trigger_event(trigger_action.data).map_err(|e| e.to_string())?;
+    fn run(action: TriggerAction) -> std::result::Result<Vec<u8>, String> {
+        let (trigger_id, req, dest) =
+            decode_trigger_event(action.data).map_err(|e| e.to_string())?;
 
         // Convert bytes to string and parse first char as u64
         let input = std::str::from_utf8(&req).map_err(|e| e.to_string())?;
@@ -38,7 +38,10 @@ impl Guest for Component {
         });
 
         match res {
-            Ok(data) => Ok(encode_trigger_output(trigger_id, &data)),
+            Ok(data) => match dest {
+                Destination::Ethereum => Ok(encode_trigger_output(trigger_id, &data)),
+                Destination::CliOutput => Ok(data),
+            },
             Err(e) => Err(e),
         }
     }

components/eth-price-oracle/src/trigger.rs

@@ -1,19 +1,21 @@
-// Helpers to work with "trigger id" flows - which our example components do
 use crate::bindings::wavs::worker::layer_types::{TriggerData, TriggerDataEthContractEvent};
 use alloy_sol_types::SolValue;
 use anyhow::Result;
+use wavs_wasi_chain::decode_event_log_data;
 
-pub fn decode_trigger_event(trigger_data: TriggerData) -> Result<(u64, Vec<u8>)> {
+pub enum Destination {
+    Ethereum,
+    CliOutput,
+}
+
+pub fn decode_trigger_event(trigger_data: TriggerData) -> Result<(u64, Vec<u8>, Destination)> {
     match trigger_data {
         TriggerData::EthContractEvent(TriggerDataEthContractEvent { log, .. }) => {
-            let event: solidity::NewTrigger = wavs_wasi_chain::decode_event_log_data!(log)?;
+            let event: solidity::NewTrigger = decode_event_log_data!(log)?;
             let trigger_info = solidity::TriggerInfo::abi_decode(&event._0, false)?;
-            Ok((trigger_info.triggerId, trigger_info.data.to_vec()))
-        }
-        TriggerData::Raw(data) => {
-            let trigger_info = solidity::TriggerInfo::abi_decode(&data, false)?;
-            Ok((trigger_info.triggerId, data.to_vec()))
+            Ok((trigger_info.triggerId, trigger_info.data.to_vec(), Destination::Ethereum))
         }
+        TriggerData::Raw(data) => Ok((0, data.clone(), Destination::CliOutput)),
         _ => Err(anyhow::anyhow!("Unsupported trigger data type")),
     }
 }