Relay upgrade

process-compose.yaml

@@ -1,46 +1,51 @@
 processes:
-  setup:
-    description: setup
+  downloadZkAndDatFiles:
+    description: download .zk and .dat files and verify their checksum
     working_dir: ./relay/process-compose-scripts/
-    command: ./start-setup.sh
-
-  proverserver_check:
-    description: check if proverserver is live
-    working_dir: ./relay/process-compose-scripts/
-    command: ./check-proverserver.sh
-    depends_on:
-      setup:
-        condition: process_completed
+    command: ./download-zk-and-dat-files.sh
 
   redis:
     description: redis
     log_location: ./logs/redis.log
     working_dir: ./relay/process-compose-scripts/
     command: ./start-redis.sh
     depends_on:
-      setup:
+      downloadZkAndDatFiles:
         condition: process_completed
     availability:
       restart: always
 
   proverserver:
     description: proverserver
+    environment:
+      - 'HOST = ${PROVER_SERVER_HOST}'
     log_location: ./logs/prover_server.log
     working_dir: ./relay/process-compose-scripts/
     command: ./start-proverserver.sh
     depends_on:
-      setup:
+      downloadZkAndDatFiles:
         condition: process_completed
     availability:
       restart: always
+    readiness_probe:
+      http_get:
+        host: $HOST
+        scheme: http
+        path: '/status'
+        port: ${PROVER_SERVER_PORT}
+      initial_delay_seconds: 10
+      period_seconds: 10
+      success_threshold: 1
+      timeout_seconds: 1
+      failure_threshold: 120
 
   prometheus:
     description: prometheus
     log_location: ./logs/prometheus.log
     command: ./start-prometheus.sh
     working_dir: ./relay/process-compose-scripts/
     depends_on:
-      setup:
+      downloadZkAndDatFiles:
         condition: process_completed
     availability:
       restart: always
@@ -73,86 +78,86 @@ processes:
     command: yarn ts ./workers/cleaner.ts
     working_dir: ./relay/workers
     depends_on:
-      setup:
+      downloadZkAndDatFiles:
         condition: process_completed
 
   sepolia:
-    description: sepolia
+    description: Start generating proofs for the contract on ${LC_SEPOLIA} and update it with them
     log_location: ./logs/sepolia.log
     command: yarn hardhat start-publishing --light-client ${LC_SEPOLIA} --network sepolia --follow-network ${FOLLOW_NETWORK_SEPOLIA} --slots-jump ${SLOTS_JUMP} --hashi ${SEPOLIA_HASHI} --prometheus-port 3004
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   fantom:
-    description: fantom
+    description: Start generating proofs for the contract on ${LC_FANTOM} and update it with them
     log_location: ./logs/fantom.log
     command: yarn hardhat start-publishing --light-client ${LC_FANTOM} --network fantom --follow-network ${FOLLOW_NETWORK_FANTOM} --slots-jump ${SLOTS_JUMP} --prometheus-port 3007
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   alfajores:
-    description: alfajores-celo
+    description: Start generating proofs for the contract on ${LC_ALFAJORES} and update it with them
     log_location: ./logs/alfajores.log
     command: yarn hardhat start-publishing --light-client ${LC_ALFAJORES} --network celo --follow-network ${FOLLOW_NETWORK_CELO} --slots-jump ${SLOTS_JUMP} --prometheus-port 3008
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   bsc:
-    description: bsc
+    description: Start generating proofs for the contract on ${LC_BSC} and update it with them
     log_location: ./logs/bsc.log
     command: yarn hardhat start-publishing --light-client ${LC_BSC} --network bsc --follow-network ${FOLLOW_NETWORK_BSC} --slots-jump ${SLOTS_JUMP} --prometheus-port 3009
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   chiado:
-    description: chiado
+    description: Start generating proofs for the contract on ${LC_CHIADO} and update it with them
     log_location: ./logs/chiado.log
     command: yarn hardhat start-publishing --light-client ${LC_CHIADO} --network chiado --follow-network ${FOLLOW_NETWORK_CHIADO} --slots-jump ${SLOTS_JUMP} --hashi ${CHIADO_HASHI}  --prometheus-port 3010
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   aurora:
-    description: aurora
+    description: Start generating proofs for the contract on ${LC_AURORA} and update it with them
     log_location: ./logs/aurora.log
     command: yarn hardhat start-publishing --light-client ${LC_AURORA} --network aurora --follow-network ${FOLLOW_NETWORK_AURORA} --slots-jump ${SLOTS_JUMP} --prometheus-port 3013
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   gnosis:
-    description: gnosis
+    description: Start generating proofs for the contract on ${LC_GNOSIS} and update it with them
     log_location: ./logs/gnosis.log
     command: yarn hardhat start-publishing --light-client ${LC_GNOSIS} --network gnosis --follow-network ${FOLLOW_NETWORK_GNOSIS} --slots-jump ${SLOTS_JUMP} --prometheus-port 3014
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   lukso:
-    description: lukso
+    description: Start generating proofs for the contract on ${LC_LUKSO} and update it with them
     log_location: ./logs/lukso.log
     command: yarn hardhat start-publishing --light-client ${LC_LUKSO} --network lukso --follow-network ${FOLLOW_NETWORK_LUKSO} --slots-jump ${SLOTS_JUMP} --hashi ${LUKSO_HASHI} --prometheus-port 3015
     working_dir: ./beacon-light-client/solidity
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy
 
   general_logs:
     description: general_logs
     log_location: ./logs/general_logs.log
     command: yarn ts relayer_logger.ts
     working_dir: ./relay
     depends_on:
-      proverserver_check:
-        condition: process_completed
+      proverserver:
+        condition: process_healthy

relay/process-compose-scripts/start-setup.sh → relay/process-compose-scripts/download-zk-and-dat-files.sh

@@ -16,31 +16,48 @@ calculate_checksum() {
 }
 
 download_zkey_file() {
-  echo "Downloading zkey file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey ..."
 
-  curl https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey >"${GIT_ROOT}/data/light_client.zkey"
+if [[ -z "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}" ]]; then
+  echo "Light_Client_ZKEY_DOWNLOAD_LOCATION  environment variables are not set. Using default values."
+  LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION="https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey"
+  echo "This might take a while as the file is 52G"
+else
+  echo "Using download zkey settings from environment variables"
+fi
 
-  CALCULATED_ZKEY_SUM=$(calculate_checksum "${GIT_ROOT}/data/light_client.zkey")
+  echo "Downloading zkey file from "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}" ..."
+
+  curl "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}" >"data/light_client.zkey"
+
+  CALCULATED_ZKEY_SUM=$(calculate_checksum data/light_client.zkey)
 
   if [ "${ZKEY_B3SUM_SUM}" = "${CALCULATED_ZKEY_SUM}" ]; then
-    echo "Zkey file downloaded successfully to ${GIT_ROOT}/data/light_client.zkey"
+    echo "Zkey file downloaded successfully to data/light_client.zkey"
   else
-    echo "Failed to download zkey file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey"
+    echo "Failed to download zkey file from "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}
     exit 1
   fi
 }
 
 download_dat_file() {
-  echo "Downloading .dat file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.dat ..."
 
-  curl -k https://dendrethstorage.blob.core.windows.net/light-client/light-client.dat >"data/light_client.dat"
+if [[ -z "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}" ]]; then
+  echo "LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION  environment variables are not set. Using default values."
+  LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION="https://dendrethstorage.blob.core.windows.net/light-client/light-client.dat"
+else
+  echo "Using download dat settings from environment variables"
+fi
 
-  CALCULATED_DAT_SUM=$(calculate_checksum "${GIT_ROOT}/data/light_client.dat")
+  echo "Downloading .dat file from "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}" ..."
+
+  curl -k "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}" >"data/light_client.dat"
+
+  CALCULATED_DAT_SUM=$(calculate_checksum data/light_client.dat)
 
   if [ "${DAT_B3SUM_SUM}" = "${CALCULATED_DAT_SUM}" ]; then
-    echo ".dat file downloaded successfully to ${GIT_ROOT}/data/light_client.dat"
+    echo ".dat file downloaded successfully to data/light_client.dat"
   else
-    echo "Failed to download .dat file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.dat"
+    echo "Failed to download .dat file from "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}""
     exit 1
   fi
 }

relay/run-relay.sh

@@ -13,31 +13,48 @@ calculate_checksum() {
 }
 
 download_zkey_file() {
-  echo "Downloading zkey file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey ..."
 
-  curl https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey >"data/light_client.zkey"
+if [[ -z "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}" ]]; then
+  echo "Light_Client_ZKEY_DOWNLOAD_LOCATION  environment variables are not set. Using default values."
+  LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION="https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey"
+  echo "This might take a while as the file is 52G"
+else
+  echo "Using download zkey settings from environment variables"
+fi
+
+  echo "Downloading zkey file from "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}" ..."
+
+  curl "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}" >"data/light_client.zkey"
 
   CALCULATED_ZKEY_SUM=$(calculate_checksum data/light_client.zkey)
 
   if [ "${ZKEY_B3SUM_SUM}" = "${CALCULATED_ZKEY_SUM}" ]; then
     echo "Zkey file downloaded successfully to data/light_client.zkey"
   else
-    echo "Failed to download zkey file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey"
+    echo "Failed to download zkey file from "${LIGHT_CLIENT_ZKEY_DOWNLOAD_LOCATION}
     exit 1
   fi
 }
 
 download_dat_file() {
-  echo "Downloading .dat file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.dat ..."
 
-  curl -k https://dendrethstorage.blob.core.windows.net/light-client/light-client.dat >"data/light_client.dat"
+if [[ -z "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}" ]]; then
+  echo "LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION  environment variables are not set. Using default values."
+  LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION="https://dendrethstorage.blob.core.windows.net/light-client/light-client.zkey"
+else
+  echo "Using download dat settings from environment variables"
+fi
+
+  echo "Downloading .dat file from "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}" ..."
+
+  curl -k "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}" >"data/light_client.dat"
 
   CALCULATED_DAT_SUM=$(calculate_checksum data/light_client.dat)
 
   if [ "${DAT_B3SUM_SUM}" = "${CALCULATED_DAT_SUM}" ]; then
     echo ".dat file downloaded successfully to data/light_client.dat"
   else
-    echo "Failed to download .dat file from https://dendrethstorage.blob.core.windows.net/light-client/light-client.dat"
+    echo "Failed to download .dat file from "${LIGHT_CLIENT_DAT_DOWNLOAD_LOCATION}""
     exit 1
   fi
 }