wavs-middleware 0.4.1

Author: reecepbcups

Makefile

@@ -9,7 +9,7 @@ COIN_MARKET_CAP_ID?=1
 COMPONENT_FILENAME?=evm_price_oracle.wasm
 CREDENTIAL?=""
 DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs:35c96a4
-MIDDLEWARE_DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs-middleware:79dffa2
+MIDDLEWARE_DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs-middleware:0.4.1
 IPFS_ENDPOINT?=http://127.0.0.1:5001
 RPC_URL?=http://127.0.0.1:8545
 SERVICE_FILE?=.docker/service.json

README.md

@@ -130,7 +130,7 @@ warg key new
 ```bash docci-ignore
 # if foundry is not installed:
 # `curl -L https://foundry.paradigm.xyz | bash && $HOME/.foundry/bin/foundryup`
-forge init --template Lay3rLabs/wavs-foundry-template my-wavs --branch main
+forge init --template Lay3rLabs/wavs-foundry-template my-wavs --branch 0.4
 ```
 
 > \[!TIP]

docs/tutorial/6-run-service.mdx

@@ -129,7 +129,7 @@ export WAVS_SERVICE_MANAGER_ADDRESS=$(jq -r .addresses.WavsServiceManager ./.nod
 COMMAND="register ${OPERATOR_PRIVATE_KEY} ${AVS_SIGNING_ADDRESS} 0.001ether" make wavs-middleware
 
 # Verify registration
-COMMAND="list_operator" PAST_BLOCKS=500 make wavs-middleware
+COMMAND="list_operators" PAST_BLOCKS=500 make wavs-middleware
 ```
 
 ## Trigger the service

package-lock.json

@@ -27,7 +27,7 @@
     "@defi-wonderland/natspec-smells": "1.1.6",
     "@openzeppelin/contracts": "^5.2.0",
     "forge-std": "github:foundry-rs/forge-std#v1.9.6",
-    "@wavs/solidity": "0.4.0-rc",
+    "@wavs/solidity": "0.4.0",
     "lint-staged": ">=10",
     "solhint-community": "4.0.0",
     "sort-package-json": "2.10.0"

package.json

@@ -10,6 +10,13 @@ if [ -z "$WAVS_SERVICE_MANAGER_ADDRESS" ]; then
     fi
 fi
 
+forge build
+if [ $? -ne 0 ]; then
+    echo "Forge build failed. Running 'npm install' and deleting the 'out/' and 'cache/' directory."
+    npm install
+    rm -rf out/ cache/
+    forge build
+fi
 
 export DEPLOYER_PK=$(cat .nodes/deployer)
 

script/deploy-contracts.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 # set -e
 
+if [ ! -d compiled/ ] || [ -z "$(find compiled/ -name '*.wasm')" ]; then
+    echo "No WASM files found in compiled/. Building components."
+    make wasi-build
+fi
+
 if git status --porcelain | grep -q "^.* components/"; then
     echo "Found pending changes in components/*, building"
     WASI_BUILD_DIR=components/evm-price-oracle make wasi-build
@@ -103,6 +108,8 @@ sleep 5
 WAVS_ENDPOINT=http://127.0.0.1:8000 SERVICE_URL=${IPFS_URI} IPFS_GATEWAY=${IPFS_GATEWAY} make deploy-service
 
 ### === Register service specific operator ===
+
+# OPERATOR_PRIVATE_KEY, AVS_SIGNING_ADDRESS
 SERVICE_INDEX=0 source ./script/avs-signing-key.sh
 
 # TODO: move this check into the middleware (?)
@@ -124,6 +131,6 @@ export WAVS_SERVICE_MANAGER_ADDRESS=$(jq -r .addresses.WavsServiceManager ./.nod
 COMMAND="register ${OPERATOR_PRIVATE_KEY} ${AVS_SIGNING_ADDRESS} 0.001ether" make wavs-middleware
 
 # Verify registration
-COMMAND="list_operator" PAST_BLOCKS=500 make wavs-middleware
+COMMAND="list_operators" PAST_BLOCKS=500 make wavs-middleware
 
 echo "✅ Deployment complete!"

script/deploy-script.sh

@@ -11,7 +11,8 @@ contract SimpleSubmit is ITypes, IWavsServiceHandler {
     /// @notice Mapping of trigger data
     mapping(TriggerId _triggerId => bytes _data) internal _datas;
     /// @notice Mapping of trigger signatures
-    mapping(TriggerId _triggerId => SignatureData _signature) internal _signatures;
+    mapping(TriggerId _triggerId => SignatureData _signature)
+        internal _signatures;
 
     /// @notice Service manager instance
     IWavsServiceManager private _serviceManager;
@@ -25,25 +26,41 @@ contract SimpleSubmit is ITypes, IWavsServiceHandler {
     }
 
     /// @inheritdoc IWavsServiceHandler
-    function handleSignedEnvelope(Envelope calldata envelope, SignatureData calldata signatureData) external {
+    function handleSignedEnvelope(
+        Envelope calldata envelope,
+        SignatureData calldata signatureData
+    ) external {
         _serviceManager.validate(envelope, signatureData);
 
-        DataWithId memory dataWithId = abi.decode(envelope.payload, (DataWithId));
+        DataWithId memory dataWithId = abi.decode(
+            envelope.payload,
+            (DataWithId)
+        );
 
         _signatures[dataWithId.triggerId] = signatureData;
         _datas[dataWithId.triggerId] = dataWithId.data;
         _validTriggers[dataWithId.triggerId] = true;
     }
 
-    function isValidTriggerId(TriggerId _triggerId) external view returns (bool _isValid) {
+    function isValidTriggerId(
+        TriggerId _triggerId
+    ) external view returns (bool _isValid) {
         _isValid = _validTriggers[_triggerId];
     }
 
-    function getSignature(TriggerId _triggerId) external view returns (SignatureData memory _signature) {
+    function getSignature(
+        TriggerId _triggerId
+    ) external view returns (SignatureData memory _signature) {
         _signature = _signatures[_triggerId];
     }
 
-    function getData(TriggerId _triggerId) external view returns (bytes memory _data) {
+    function getData(
+        TriggerId _triggerId
+    ) external view returns (bytes memory _data) {
         _data = _datas[_triggerId];
     }
+
+    function getServiceManager() external view override returns (address) {
+        return address(_serviceManager);
+    }
 }