refactor: remove wasi registry default config (#172)

* fix: bug with FUNDED_KEY

* Lay3rLabs/WAVS#668

* latest: remove cli specific aggregators

Author: reecepbcups

Makefile

@@ -8,7 +8,7 @@ CARGO=cargo
 COIN_MARKET_CAP_ID?=1
 COMPONENT_FILENAME?=evm_price_oracle.wasm
 CREDENTIAL?=""
-DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs:487a781
+DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs:b45bee6
 MIDDLEWARE_DOCKER_IMAGE?=ghcr.io/lay3rlabs/wavs-middleware:0.4.0-beta.5
 IPFS_ENDPOINT?=http://127.0.0.1:5001
 RPC_URL?=http://127.0.0.1:8545

script/build_service.sh

@@ -31,7 +31,7 @@ DEPLOY_ENV=${DEPLOY_ENV:-""}
 WAVS_ENDPOINT=${WAVS_ENDPOINT:-"http://localhost:8000"}
 REGISTRY=${REGISTRY:-"wa.dev"}
 
-BASE_CMD="docker run --rm --network host -w /data -v $(pwd):/data ghcr.io/lay3rlabs/wavs:487a781 wavs-cli service --json true --home /data --file /data/${FILE_LOCATION}"
+BASE_CMD="docker run --rm --network host -w /data -v $(pwd):/data ghcr.io/lay3rlabs/wavs:b45bee6 wavs-cli service --json true --home /data --file /data/${FILE_LOCATION}"
 
 if [ -z "$SERVICE_MANAGER_ADDRESS" ]; then
     # DevEx: attempt to grab it from the location if not set already

script/create-aggregator.sh

@@ -45,7 +45,7 @@ cat > "${AGG_LOC}/start.sh" << EOF
 #!/bin/bash
 cd \$(dirname "\$0") || exit 1
 
-IMAGE=ghcr.io/lay3rlabs/wavs:487a781
+IMAGE=ghcr.io/lay3rlabs/wavs:b45bee6
 INSTANCE=wavs-aggregator-${AGGREGATOR_INDEX}
 
 docker kill \${INSTANCE} > /dev/null 2>&1 || true

script/create-deployer.sh

@@ -25,7 +25,7 @@ mkdir -p .docker
 cast wallet new-mnemonic --json > .docker/deployer.json
 export DEPLOYER_PK=`jq -r .accounts[0].private_key .docker/deployer.json`
 export DEPLOYER_ADDRESS=`cast wallet address $DEPLOYER_PK`
-sed -i${SP}'' -e "s/^PRIVATE_KEY=.*$/PRIVATE_KEY=$DEPLOYER_PK/" .env
+sed -i${SP}'' -e "s/^FUNDED_KEY=.*$/FUNDED_KEY=$DEPLOYER_PK/" .env
 
 
 if [ "$DEPLOY_ENV" = "LOCAL" ]; then

script/create-operator.sh

@@ -55,7 +55,7 @@ cat > "${OPERATOR_LOC}/start.sh" << EOF
 #!/bin/bash
 cd \$(dirname "\$0") || exit 1
 
-IMAGE=ghcr.io/lay3rlabs/wavs:487a781
+IMAGE=ghcr.io/lay3rlabs/wavs:b45bee6
 WAVS_INSTANCE=wavs-${OPERATOR_INDEX}
 
 docker kill \${WAVS_INSTANCE} > /dev/null 2>&1 || true

script/upload-to-wasi-registry.sh

@@ -20,29 +20,28 @@ fi
 
 cd `git rev-parse --show-toplevel` || exit
 
-DEPLOY_ENV=$(sh ./script/get-deploy-status.sh)
-
-if [ "$DEPLOY_ENV" = "LOCAL" ]; then
-    echo "Publishing to local registry (http://${REGISTRY})..."
-    output=$(warg publish release --registry http://${REGISTRY} --name ${PKG_NAMESPACE}:${PKG_NAME} --version ${PKG_VERSION} ./compiled/${COMPONENT_FILENAME} 2>&1)
-    exit_code=$?
-
-    # Check for specific error conditions in the output
-    if [[ $exit_code -ne 0 ]]; then
-        if [[ "$output" =~ "failed to prove inclusion" ]]; then
-            echo "Package uploaded to local registry successfully..."
-        elif [[ "$output" =~ "error sending request for url" ]]; then
-            echo "NOTE: Check to make sure you are running the registry locally"
-            echo "${output}"
-            exit 1
-        else
-            echo "Unknown error occurred ${output}"
-            exit 1
-        fi
-    fi
+PROTOCOL="https"
+if [[ "$REGISTRY" == *"localhost"* ]] || [[ "$REGISTRY" == *"127.0.0.1"* ]]; then
+    PROTOCOL="http"
+fi
+echo "Publishing to registry (${PROTOCOL}://${REGISTRY})..."
+
 
-    exit 0
-else
-    echo "Publishing to remote registry (https://${REGISTRY})..."
-    warg publish release --registry https://${REGISTRY} --name ${PKG_NAMESPACE}:${PKG_NAME} --version ${PKG_VERSION} ./compiled/${COMPONENT_FILENAME} || true
+output=$(warg publish release --registry ${PROTOCOL}://${REGISTRY} --name ${PKG_NAMESPACE}:${PKG_NAME} --version ${PKG_VERSION} ./compiled/${COMPONENT_FILENAME} 2>&1 || true)
+exit_code=$?
+
+# Check for specific error conditions in the output
+if [[ $exit_code -ne 0 ]]; then
+    if [[ "$output" =~ "failed to prove inclusion" ]]; then
+        echo "Package uploaded to local registry successfully..."
+    elif [[ "$output" =~ "error sending request for url" ]]; then
+        echo "NOTE: Check to make sure you are running the registry locally"
+        echo "${output}"
+        exit 1
+    else
+        echo "Unknown error occurred ${output}"
+        exit 1
+    fi
 fi
+
+exit 0

wavs.toml

@@ -24,10 +24,6 @@ log_level = ["info", "wavs=debug"]
 ipfs_gateway = "http://127.0.0.1:8080/ipfs/"
 # ipfs_gateway = "https://gateway.pinata.cloud/ipfs/" # testnet / production
 
-# The domain used for the warg wasi registry
-registry_domain = "localhost:8090"
-# registry_domain = "wa.dev" # testnet / production
-
 # Those configs are global and shared between wavs and aggregator
 # jaeger = "http://localhost:4317"
 # prometheus = "http://localhost:9090"
@@ -135,19 +131,6 @@ data = "~/wavs/cli"
 
 # wavs_endpoint = "http://localhost:8000"
 
-# CLI-specific chain overrides
-[cli.chains.evm.local]
-aggregator_endpoint = "http://localhost:8001"
-
-[cli.chains.evm.local2]
-aggregator_endpoint = "http://localhost:8001"
-
-[cli.chains.evm.sepolia]
-aggregator_endpoint = "http://localhost:8001"
-
-[cli.chains.evm.holesky]
-aggregator_endpoint = "http://localhost:8001"
-
 # ----------------------------
 # Aggregator specific settings
 # ----------------------------