https://github.com/Lay3rLabs/WAVS/pull/354

Author: reecepbcups

.gitmodules

@@ -4,5 +4,5 @@
 [submodule "lib/WAVS"]
 	path = lib/WAVS
 	url = https://github.com/Lay3rLabs/WAVS
+	commit = f1e33d0efd347bea9d99a546cde774d4372a0bf3
 	# tag = v0.3.0-alpha4
-	commit = 8a49769b4fc5175d3c0193e1db73d7e8f926531e

Cargo-component.lock

@@ -0,0 +1,11 @@
+# This file is automatically generated by cargo-component.
+# It is not intended for manual editing.
+version = 1
+
+[[package]]
+name = "wavs:worker"
+
+[[package.version]]
+requirement = "^0.3.0-alpha1"
+version = "0.3.0-alpha1"
+digest = "sha256:980fca53013305edfa10643b98c8afbb11a8f8207f0c59aebec612a4b9254dd3"

Cargo.lock

@@ -18,12 +18,13 @@ rust-version = "1.80.0"
 [workspace.dependencies]
 bindings = { path = "crates/bindings" }
 wit-bindgen-rt = {version = "0.37.0", features = ["bitflags"]}
+wit-bindgen = "0.37.0"
 wstd = "0.5.1"
 wasi = "0.14.0"
 serde = { version = "1.0.211", features = ["derive"] }
 serde_json = "1.0.127"
-# layer WAVS imports
-layer-wasi = { path = "./lib/WAVS/sdk/wasi" }
+# WAVS imports
+wavs-wasi-chain = { path = "./lib/WAVS/sdk/wasi-chain" }
 alloy-contract = "0.9.2"
 alloy-json-rpc = "0.9.2"
 alloy-primitives = "0.8.15"
@@ -45,4 +46,3 @@ tendermint-rpc = "0.40.1"
 tower-service = "0.3.3"
 url = "2.5.3"
 wasmtime-wasi = { version = "24.0.0", default-features = true }
-wit-bindgen = "0.37.0"

Cargo.toml

@@ -53,6 +53,8 @@ make test
 ```bash
 # MacOS: if you get permission errors: eval `ssh-agent -s` && ssh-add
 (cd lib/WAVS; cargo install --path ./packages/cli)
+
+(cd lib/WAVS; just docker-build)
 ```
 
 ### Start Anvil, WAVS, and Deploy Eigenlayer
@@ -115,7 +117,8 @@ make wasi-build
 # Contract trigger function signature to listen for
 trigger_event=$(cast sig-event "NewTrigger(bytes)"); echo "Trigger Event: $trigger_event"
 
-service_info=`wavs-cli deploy-service --log-level=error --data ./.docker/cli --component $(pwd)/compiled/eth_trigger_weather.wasm \
+
+service_info=`wavs-cli deploy-service --log-level=info --quiet-results=false --data ./.docker/cli --component $(pwd)/compiled/eth_trigger_weather.wasm \
   --trigger-event-name ${trigger_event:2} \
   --trigger eth-contract-event \
   --trigger-address ${TRIGGER_ADDR} \
@@ -124,8 +127,13 @@ service_info=`wavs-cli deploy-service --log-level=error --data ./.docker/cli --c
 
 echo "Service info: $service_info"
 
+# TODO!: this has regressed. we no longer can parse out the ServiceID easily from JSON output. it is tracing::info'ed
+# https://github.com/Lay3rLabs/WAVS/commit/a97b0eeaa180d406b3f1fc85dc64a539219ed9a3
+#
+# SERVICE_ID=`echo $service_info | jq -r .service[0]`; echo "Service ID: $SERVICE_ID"
+SERVICE_ID=`echo $service_info | grep -o 'name: "[^"]*"' | cut -d'"' -f2`; echo "Service ID: $SERVICE_ID"
+
 # Submit AVS request -> chain
-SERVICE_ID=`echo $service_info | jq -r .service[0]`; echo "Service ID: $SERVICE_ID"
 wavs-cli add-task --input "Nashville,TN" --data ./.docker/cli --service-id ${SERVICE_ID}
 
 # Grab data from the contract directly

README.md

@@ -7,8 +7,9 @@ rust-version.workspace = true
 repository.workspace = true
 
 [dependencies]
-wit-bindgen-rt = { workspace = true }
-layer-wasi = { workspace = true }
+wit-bindgen = { workspace = true }
+wit-bindgen-rt = {workspace = true}
+wavs-wasi-chain = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 reqwest = { version = "0.12.9", features = ["json"] }
@@ -18,6 +19,7 @@ layer-climb = { workspace = true }
 alloy-sol-types = { workspace = true }
 anyhow = { workspace = true }
 alloy-contract = { workspace = true }
+alloy-primitives = {workspace = true}
 
 [lib]
 crate-type = ["cdylib"]
@@ -31,3 +33,4 @@ lto = true
 
 [package.metadata.component]
 package = "component:eth-trigger-weather"
+target = "wavs:worker/layer-trigger-world@0.3.0-alpha1"