refactor: latest wavs 0.4.0-alpha.2

.env.example

@@ -1,21 +1,41 @@
 # == project ==
 # If you have custom env vars in your project, you can set them here
-# You also must update the `host_envs` field in `SERVICE_CONFIG` in `Makefile` 
+# You also must update the `host_envs` field in `SERVICE_CONFIG` in `Makefile`
 WAVS_ENV_YOURKEYHERE="00000000000000000000000000000000"
 
 # WAVS
 WAVS_DATA=~/wavs/data
 WAVS_LOG_LEVEL="info"
 WAVS_SUBMISSION_MNEMONIC="test test test test test test test test test test test junk"
-WAVS_AGGREGATOR_MNEMONIC="test test test test test test test test test test test junk"
 WAVS_COSMOS_SUBMISSION_MNEMONIC="cosmos mnemonic here"
 
 # CLI
 WAVS_CLI_DATA=~/wavs/cli
 WAVS_CLI_COSMOS_MNEMONIC="cosmos mnemonic here"
 WAVS_CLI_ETH_MNEMONIC="test test test test test test test test test test test junk"
-WAVS_CLI_LOG_LEVEL="info, wavs_cli=debug"
+WAVS_CLI_LOG_LEVEL="info, wavs_cli=info"
+
+# FUNDED_KEY=0x10df54bba92e291d74bc0b453d8173641f7df5b2db419d0276865079902636b6
 
 # Aggregator
 WAVS_AGGREGATOR_DATA=~/wavs/aggregator
-WAVS_AGGREGATOR_MNEMONIC="test test test test test test test test test test test junk"
+WAVS_AGGREGATOR_MNEMONIC="test test test test test test test test test test test junk"
+
+# TODO: Replace with your RPC URL
+RPC_URL=https://holesky.drpc.org
+
+
+
+# FIXME: place your project's metadata URI here
+METADATA_URI=https://wavs.xyz/metadata.json
+
+# what should I put here??
+QUICK_MODE=ON
+NUM_OPERATORS=3 # Number of operators to set up when QUICK_MODE is OFF
+DEPLOY_ENV=LOCAL
+FUNDED_KEY=
+CHAIN_ID=17000
+ETHERSCAN_API_KEY=foobar
+LOCAL_ETHEREUM_RPC_URL=http://localhost:8545
+LST_CONTRACT_ADDRESS=0x3F1c547b21f65e10480dE3ad8E19fAAC46C95034
+LST_STRATEGY_ADDRESS=0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3

.github/single-wavs-image-verifier.bash

@@ -51,29 +51,5 @@ main() {
     fi
 }
 
-test_data() {
-    # Example test data
-    TEST_DATA="
-    Running container ghcr.io/lay3rlabs/wavs:latest-beta
-    Pulling ghcr.io/lay3rlabs/wavs:latest
-    Found ghcr.io/lay3rlabs/wavs:0.1.0
-    Invalid: docker.io/other/image:1.0
-    Using ghcr.io/lay3rlabs/wavs:sha-abc123
-    ghcr.io/lay3rlabs/wavs:rc.1.0.0
-    Pulling ghcr.io/lay3rlabs/wavs:latest
-    Found ghcr.io/lay3rlabs/wavs:0.1.0
-    Invalid: docker.io/other/image:1.0
-    Using ghcr.io/lay3rlabs/wavs:sha-abc123
-    ghcr.io/lay3rlabs/wavs:rc.1.0.0
-    ghcr.io/lay3rlabs/wavs:latest-beta
-    ghcr.io/lay3rlabs/wavs:1.0.0-alpha
-    "
-
-    # Find all matches_set with line numbers (-n) and print the pattern at the top
-    echo "Pattern being used: $GREP_PATTERN"
-    echo -e "\nmatches_set found:"
-    echo "$TEST_DATA" | grep -P -o "$GREP_PATTERN"
-}
-
 # test_data
 main

.github/workflows/docs-ci.yml

@@ -91,20 +91,17 @@ jobs:
 
     - name: Install docci readme runner
       run: |
-        RELEASE=https://github.com/Reecepbcups/docci/releases/download/v0.6.0/docci
+        RELEASE=https://github.com/Reecepbcups/docci/releases/download/v0.7.1/docci
         sudo wget --quiet -O /usr/local/bin/docci ${RELEASE}
         sudo chmod a+rx /usr/local/bin/docci
 
 
     # installs wasm-tools as well, required for rust & ts
     - name: Run docci (go)
-      run: |
-        docci components/golang-eth-price-oracle/config.json
+      run: docci components/golang-eth-price-oracle/config.json
 
     - name: Run docci (rust)
-      run: |
-        docci components/eth-price-oracle/config.json
+      run: docci components/eth-price-oracle/config.json
 
-    - name: Run docci (typescript)
-      run: |
-        docci components/js-eth-price-oracle/config.json
+    # - name: Run docci (typescript)
+      # run: docci components/js-eth-price-oracle/config.json

.gitignore

@@ -4,9 +4,11 @@ cache/
 broadcast/
 compiled/*.wasm
 .docker/*.json
+.docker/*.log
 .env
 node_modules/
 lcov.info
 internal/
 wavs:worker*.wit
 wavs:worker*.wasm
+.nodes

Cargo-component.lock

@@ -6,6 +6,6 @@ version = 1
 name = "wavs:worker"
 
 [[package.version]]
-requirement = "^0.4.0-alpha.1"
-version = "0.4.0-alpha.1"
-digest = "sha256:7fe7d9e60fa1fa215b8e70b24ed77f9bd62c1d98c09060036d8b7e7b804e0dac"
+requirement = "^0.4.0-alpha.2"
+version = "0.4.0-alpha.2"
+digest = "sha256:6b8578c639c35ca2fd53c2cb7c357e29e62a605ebe4b3180bd5ad00f069d3624"

Cargo.toml

@@ -18,7 +18,7 @@ wit-bindgen-rt = {version = "0.39.0", features = ["bitflags"]}
 wit-bindgen = "0.39.0"
 wstd = "0.5.1"
 wasi = "0.14.1"
-wavs-wasi-chain = "0.3.0"
+wavs-wasi-utils = { git = "https://github.com/Lay3rLabs/wavs-wasi" }
 
 # Other
 serde = { version = "1.0.217", features = ["derive"] }

Makefile

@@ -14,7 +14,7 @@ SERVICE_CONFIG_FILE?=.docker/service.json
 CARGO=cargo
 # the directory to build, or "" for all
 WASI_BUILD_DIR ?= ""
-DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs:0.4.0-alpha1-amd64
+DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs:reece_priv_key_signing_apr_10
 WAVS_CMD ?= $(SUDO) docker run --rm --network host $$(test -f .env && echo "--env-file ./.env") -v $$(pwd):/data ${DOCKER_IMAGE} wavs-cli
 ANVIL_PRIVATE_KEY?=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 RPC_URL?=http://localhost:8545
@@ -83,30 +83,36 @@ start-all: clean-docker setup-env
 
 ## get-service-handler: getting the service handler address from the script deploy
 get-service-handler-from-deploy:
-	@jq -r '.service_handler' "./.docker/script_deploy.json"
+	@jq -r '.deployedTo' "./.docker/submit.json"
 
 get-eigen-service-manager-from-deploy:
 	@jq -r '.eigen_service_managers.local | .[-1]' .docker/deployments.json
 
 ## get-trigger: getting the trigger address from the script deploy
 get-trigger-from-deploy:
-	@jq -r '.trigger' "./.docker/script_deploy.json"
+	@jq -r '.deployedTo' "./.docker/trigger.json"
 
 ## wavs-cli: running wavs-cli in docker
 wavs-cli:
 	@$(WAVS_CMD) $(filter-out $@,$(MAKECMDGOALS))
 
 ## upload-component: uploading the WAVS component | COMPONENT_FILENAME
 upload-component:
-	@curl --silent -X POST http://127.0.0.1:8000/upload --data-binary @./compiled/$(COMPONENT_FILENAME) -H "Content-Type: application/wasm" | jq -r .digest
+# TODO: move to $(WAVS_CMD)  upload-component ./compiled/${COMPONENT_FILENAME}
+	@wget --post-file=./compiled/${COMPONENT_FILENAME} --header="Content-Type: application/wasm" -O - http://127.0.0.1:8000/upload | jq -r .digest
 
 ## deploy-service: deploying the WAVS component service json | SERVICE_CONFIG_FILE
 deploy-service:
-	@$(WAVS_CMD) deploy-service-raw --log-level=info --data /data/.docker --home /data --service `jq -c . < $(SERVICE_CONFIG_FILE)`
+	@$(WAVS_CMD) deploy-service-raw --service `jq . -cr ${SERVICE_CONFIG_FILE}` --log-level=info --data /data/.docker --home /data
 
-## show-result: showing the result | SERVICE_TRIGGER_ADDR, SERVICE_SUBMISSION_ADDR, RPC_URL
+## get-trigger: get the trigger id | SERVICE_TRIGGER_ADDR, RPC_URL
+get-trigger:
+	@forge script ./script/ShowResult.s.sol ${SERVICE_TRIGGER_ADDR} --sig 'trigger(string)' --rpc-url $(RPC_URL) --broadcast -v 4
+
+TRIGGER_ID?=1
+## show-result: showing the result | SERVICE_SUBMISSION_ADDR, TRIGGER_ID, RPC_URL
 show-result:
-	@forge script ./script/ShowResult.s.sol ${SERVICE_TRIGGER_ADDR} ${SERVICE_SUBMISSION_ADDR} --sig 'run(string,string)' --rpc-url $(RPC_URL) --broadcast -v 4
+	@forge script ./script/ShowResult.s.sol ${SERVICE_SUBMISSION_ADDR} ${TRIGGER_ID} --sig 'data(string,uint64)' --rpc-url $(RPC_URL) --broadcast -v 4
 
 _build_forge:
 	@forge build

README.md

@@ -173,17 +173,25 @@ Result (utf8):
 
 Start an ethereum node (anvil), the WAVS service, and deploy [eigenlayer](https://www.eigenlayer.xyz/) contracts to the local network.
 
-```bash docci-background docci-delay-after=5
-# copy over the .env file if you need to override the defaults
-# the default component does not require any env variables
-#
-# cp .env.example .env
-
+```bash docci-background docci-delay-after=15
 # Start the backend
 #
 # This must remain running in your terminal. Use another terminal to run other commands.
 # You can stop the services with `ctrl+c`. Some MacOS terminals require pressing it twice.
-make start-all
+# make start-all
+cp .env.example .env
+
+sh ./script/start_all.sh
+```
+
+Wait for full local deployment, then grab values
+
+```bash docci-delay-after=2
+while [ ! -f .docker/start.log ]; do echo "waiting for start.log" && sleep 1; done
+
+export SERVICE_MANAGER_ADDRESS=$(jq -r .addresses.WavsServiceManager .nodes/avs_deploy.json)
+export PRIVATE_KEY=$(cat .nodes/deployer)
+export MY_ADDR=$(cast wallet address --private-key $PRIVATE_KEY)
 ```
 
 ### Deploy Service Contracts
@@ -196,20 +204,20 @@ make start-all
 `SERVICE_MANAGER_ADDR` is the address of the Eigenlayer service manager contract. It was deployed in the previous step. Then you deploy the trigger and submission contracts which depends on the service manager. The service manager will verify that a submission is valid (from an authorized operator) before saving it to the blockchain. The trigger contract is any arbitrary contract that emits some event that WAVS will watch for. Yes, this can be on another chain (e.g. an L2) and then the submission contract on the L1 *(Ethereum for now because that is where Eigenlayer is deployed)*.
 
 ```bash
-export SERVICE_MANAGER_ADDR=`make get-eigen-service-manager-from-deploy`
-forge script ./script/Deploy.s.sol ${SERVICE_MANAGER_ADDR} --sig 'run(string)' --rpc-url http://localhost:8545 --broadcast
-```
+forge create SimpleSubmit --json --broadcast -r http://127.0.0.1:8545 --private-key "${PRIVATE_KEY}" --constructor-args "${SERVICE_MANAGER_ADDRESS}" > .docker/submit.json
+export SERVICE_SUBMISSION_ADDR=`jq -r .deployedTo .docker/submit.json`
 
-> [!TIP]
-> You can see the deployed trigger address with `make get-trigger-from-deploy`
+forge create SimpleTrigger --json --broadcast -r http://127.0.0.1:8545 --private-key "${PRIVATE_KEY}" > .docker/trigger.json
+export SERVICE_TRIGGER_ADDR=`jq -r .deployedTo .docker/trigger.json`
+```
 
 ## Deploy Service
 
 Deploy the compiled component with the contract information from the previous steps. Review the [makefile](./Makefile) for more details and configuration options.`TRIGGER_EVENT` is the event that the trigger contract emits and WAVS watches for. By altering `SERVICE_TRIGGER_ADDR` you can watch events for contracts others have deployed.
 
-```bash docci-delay-per-cmd=1
+```bash docci-delay-per-cmd=2
 # Build your service JSON with optional overrides in the script
-COMPONENT_FILENAME=eth_price_oracle.wasm sh ./script/build_service.sh
+COMPONENT_FILENAME=eth_price_oracle.wasm AGGREGATOR_URL=http://127.0.0.1:8001 sh ./script/build_service.sh
 
 # Deploy the service JSON to WAVS so it now watches and submits
 # the results based on the service json configuration.
@@ -234,7 +242,10 @@ forge script ./script/Trigger.s.sol ${SERVICE_TRIGGER_ADDR} ${COIN_MARKET_CAP_ID
 
 Query the latest submission contract id from the previous request made.
 
+```bash docci-delay-per-cmd=2 docci-output-contains="1"
+make get-trigger
+```
+
 ```bash docci-delay-per-cmd=2 docci-output-contains="BTC"
-# Get the latest TriggerId and show the result via `script/ShowResult.s.sol`
-make show-result
+TRIGGER_ID=1 make show-result
 ```

cli.toml

@@ -55,22 +55,18 @@ gas_denom = "untrn"
 chain_id = "31337"
 ws_endpoint = "ws://localhost:8545"
 http_endpoint = "http://localhost:8545"
-aggregator_endpoint = "http://localhost:8001"
 
 [chains.eth.local2]
 chain_id = "31338"
 ws_endpoint = "ws://localhost:8645"
 http_endpoint = "http://localhost:8645"
-aggregator_endpoint = "http://localhost:8001"
 
 [chains.eth.sepolia]
 chain_id = "11155111"
 ws_endpoint = "wss://ethereum-sepolia-rpc.publicnode.com"
 http_endpoint = "https://ethereum-sepolia-rpc.publicnode.com"
-aggregator_endpoint = "http://localhost:8001"
 
 [chains.eth.holesky]
 chain_id = "17000"
 ws_endpoint = "wss://ethereum-holesky-rpc.publicnode.com"
 http_endpoint = "https://ethereum-holesky-rpc.publicnode.com"
-aggregator_endpoint = "http://localhost:8001"

components/eth-price-oracle/Cargo.toml

@@ -8,7 +8,7 @@ repository.workspace = true
 
 [dependencies]
 wit-bindgen-rt = {workspace = true}
-wavs-wasi-chain = { workspace = true }
+wavs-wasi-utils = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 alloy-sol-macro = { workspace = true }
@@ -28,4 +28,4 @@ lto = true
 
 [package.metadata.component]
 package = "component:eth-price-oracle"
-target = "wavs:worker/[email protected].1"
+target = "wavs:worker/[email protected].2"

components/eth-price-oracle/config.json

@@ -1,15 +1,13 @@
 {
   "__tool": "github.com/reecepbcups/docci",
   "paths": [
-    "README.md",
-    "docs/tutorial"
+    "README.md"
   ],
   "env_vars": {},
   "pre_cmds": [],
   "log_level": "ERROR",
   "cleanup_cmds": [
     "killall anvil || true",
-    "docker compose rm --stop --force --volumes || true",
-    "docker rm -f wavs wavs-aggregator wavs-deploy-service-manager wavs-deploy-eigenlayer || true"
+    "docker compose rm --stop --force --volumes || true"
   ]
 }