refactor: use ipfs:// with cid instead of gateway (#173)

* use `ipfs://` with cid instead

* change to online holesky rpc

* start wavs with ipfs gateway set in env

Author: reecepbcups

.env.example

@@ -3,7 +3,7 @@ METADATA_URI=https://raw.githubusercontent.com/Lay3rLabs/wavs-foundry-template/r
 LOCAL_ETHEREUM_RPC_URL=http://localhost:8545
 
 CHAIN_ID=17000
-TESTNET_RPC_URL=https://ethereum-holesky-rpc.publicnode.com
+TESTNET_RPC_URL=https://holesky.drpc.org
 
 # this key requires funds. used as the admin / deployer of contracts and core contracts.
 FUNDED_KEY=

Makefile

@@ -87,6 +87,7 @@ upload-component:
 	fi
 	@wget --post-file=./compiled/${COMPONENT_FILENAME} --header="Content-Type: application/wasm" -O - ${WAVS_ENDPOINT}/upload | jq -r .digest
 
+IPFS_GATEWAY?="https://ipfs.io/ipfs"
 ## deploy-service: deploying the WAVS component service json | SERVICE_URL, CREDENTIAL, WAVS_ENDPOINT
 deploy-service:
 # this wait is required to ensure the WAVS service has time to service check
@@ -97,11 +98,11 @@ deploy-service:
 	fi
 	@if [ -n "${WAVS_ENDPOINT}" ]; then \
 		if [ "$$(curl -s -o /dev/null -w "%{http_code}" ${WAVS_ENDPOINT}/app)" != "200" ]; then \
-			echo "Error: WAVS_ENDPOINT is not reachable. Please check the WAVS_ENDPOINT."; \
+			echo "Error: WAVS_ENDPOINT is not reachable. Please check WAVS is online, or run this again in a few seconds."; \
 			exit 1; \
 		fi; \
 	fi
-	@$(WAVS_CMD) deploy-service --service-url ${SERVICE_URL} --log-level=debug --data /data/.docker --home /data $(if $(WAVS_ENDPOINT),--wavs-endpoint $(WAVS_ENDPOINT),)
+	@$(WAVS_CMD) deploy-service --service-url ${SERVICE_URL} --log-level=debug --data /data/.docker --home /data $(if $(WAVS_ENDPOINT),--wavs-endpoint $(WAVS_ENDPOINT),) $(if $(IPFS_GATEWAY),--ipfs-gateway $(IPFS_GATEWAY),)
 
 ## get-trigger: get the trigger id | SERVICE_TRIGGER_ADDR, RPC_URL
 get-trigger:

README.md

@@ -302,16 +302,17 @@ export ipfs_cid=`SERVICE_FILE=${SERVICE_FILE} make upload-to-ipfs`
 # TESTNET: https://gateway.pinata.cloud/
 export IPFS_GATEWAY=$(sh script/get-ipfs-gateway.sh)
 
-export SERVICE_URI="${IPFS_GATEWAY}/ipfs/${ipfs_cid}"
-curl ${SERVICE_URI}
+export IPFS_URI="ipfs://${ipfs_cid}"
+curl "${IPFS_GATEWAY}/ipfs/${ipfs_cid}"
 
-cast send ${SERVICE_MANAGER_ADDRESS} 'setServiceURI(string)' "${SERVICE_URI}" -r ${RPC_URL} --private-key ${DEPLOYER_PK}
+cast send ${SERVICE_MANAGER_ADDRESS} 'setServiceURI(string)' "${IPFS_URI}" -r ${RPC_URL} --private-key ${DEPLOYER_PK}
 ```
 
 ## Start Aggregator
 
 ```bash
 sh ./script/create-aggregator.sh 1
+
 sh ./infra/aggregator-1/start.sh
 
 wget -q --header="Content-Type: application/json" --post-data='{"service": '"$(jq -c . ${SERVICE_FILE})"'}' ${AGGREGATOR_URL}/register-service -O -
@@ -322,13 +323,13 @@ wget -q --header="Content-Type: application/json" --post-data='{"service": '"$(j
 ```bash
 sh ./script/create-operator.sh 1
 
-# [!] UPDATE PROPER VALUES FOR TESTNET HERE (`wavs.toml`: registry, ipfs_gateway)
+# [!] UPDATE PROPER VALUES FOR TESTNET HERE (`wavs.toml`: ipfs_gateway)
 
-sh ./infra/wavs-1/start.sh
+IPFS_GATEWAY=${IPFS_GATEWAY}/ipfs/ sh ./infra/wavs-1/start.sh
 
 # Deploy the service JSON to WAVS so it now watches and submits.
 # 'opt in' for WAVS to watch (this is before we register to Eigenlayer)
-WAVS_ENDPOINT=http://127.0.0.1:8000 SERVICE_URL=${SERVICE_URI} make deploy-service
+WAVS_ENDPOINT=http://127.0.0.1:8000 SERVICE_URL=${IPFS_URI} IPFS_GATEWAY=${IPFS_GATEWAY}/ipfs/ make deploy-service
 ```
 
 ## Register service specific operator

script/create-operator.sh

@@ -57,16 +57,17 @@ cd \$(dirname "\$0") || exit 1
 
 IMAGE=ghcr.io/lay3rlabs/wavs:b45bee6
 WAVS_INSTANCE=wavs-${OPERATOR_INDEX}
+IPFS_GATEWAY=\${IPFS_GATEWAY:-"https://ipfs.io/ipfs/"}
 
 docker kill \${WAVS_INSTANCE} > /dev/null 2>&1 || true
 docker rm \${WAVS_INSTANCE} > /dev/null 2>&1 || true
 
-docker run -d --rm --name \${WAVS_INSTANCE} --network host --env-file .env -v \$(pwd):/root/wavs \${IMAGE} wavs --home /root/wavs --host 0.0.0.0 --log-level info
+docker run -d --rm --name \${WAVS_INSTANCE} --network host --env-file .env -v \$(pwd):/root/wavs \${IMAGE} wavs --home /root/wavs --ipfs-gateway \${IPFS_GATEWAY} --host 0.0.0.0 --log-level info
 sleep 0.25
 
 if [ ! "\$(docker ps -q -f name=\${WAVS_INSTANCE})" ]; then
   echo "Container \${WAVS_INSTANCE} is not running. Reason:"
-  docker run --rm --name \${WAVS_INSTANCE} --network host --env-file .env -v \$(pwd):/root/wavs \${IMAGE} wavs --home /root/wavs --host 0.0.0.0 --log-level info
+  docker run --rm --name \${WAVS_INSTANCE} --network host --env-file .env -v \$(pwd):/root/wavs \${IMAGE} wavs --home /root/wavs --ipfs-gateway \${IPFS_GATEWAY} --host 0.0.0.0 --log-level info
 fi
 EOF
 

script/start_all.sh

@@ -2,9 +2,17 @@
 
 set -e
 
+if [ -f .env ] && grep -q '^TESTNET_RPC_URL=' .env; then
+  TESTNET_RPC_URL=$(grep -E '^TESTNET_RPC_URL=' .env | cut -d '=' -f2- | tr -d '"')
+else
+  rpc_url="https://holesky.drpc.org"
+  echo "No TESTNET_RPC_URL found in .env, using default ${rpc_url}"
+  TESTNET_RPC_URL=${rpc_url}
+fi
+
 PORT=8545
 MIDDLEWARE_IMAGE=ghcr.io/lay3rlabs/wavs-middleware:0.4.0-beta.5
-FORK_RPC_URL=${FORK_RPC_URL:-"https://ethereum-holesky-rpc.publicnode.com"}
+FORK_RPC_URL=${FORK_RPC_URL:-"${TESTNET_RPC_URL}"}
 DEPLOY_ENV=$(sh ./script/get-deploy-status.sh)
 
 ## == Start watcher ==

wavs.toml

@@ -20,9 +20,8 @@
 [default]
 log_level = ["info", "wavs=debug"]
 
-# The IPFS gateway URL used to access IPFS content over HTTP.
-ipfs_gateway = "http://127.0.0.1:8080/ipfs/"
-# ipfs_gateway = "https://gateway.pinata.cloud/ipfs/" # testnet / production
+# The IPFS gateway URL used to access IPFS content over HTTP. (set in wavs start command for now)
+# ipfs_gateway = "https://gateway.pinata.cloud/ipfs/"
 
 # Those configs are global and shared between wavs and aggregator
 # jaeger = "http://localhost:4317"
@@ -76,8 +75,8 @@ http_endpoint = "https://ethereum-sepolia-rpc.publicnode.com"
 
 [default.chains.evm.holesky]
 chain_id = "17000"
-ws_endpoint = "wss://ethereum-holesky-rpc.publicnode.com"
-http_endpoint = "https://ethereum-holesky-rpc.publicnode.com"
+ws_endpoint = "wss://holesky.drpc.org"
+http_endpoint = "https://holesky.drpc.org"
 
 [default.chains.evm.holesky-fork]
 chain_id = "17000"