Refactor contrib/rpc and contrib/docker-scripts to use snapshots API (#…

…2724) Co-authored-by: Julian Rubino <julian@zetachain.com>
zeta-chain · Aug 16, 2024 · a4c1b18 · a4c1b18
1 parent 2252e5e
commit a4c1b18
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/contrib/docker-scripts/start.sh b/contrib/docker-scripts/start.sh
@@ -10,7 +10,7 @@ function load_defaults {
   export DAEMON_HOME=${DAEMON_HOME:=/root/.zetacored}
   export NETWORK=${NETWORK:=mainnet}
   export RESTORE_TYPE=${RESTORE_TYPE:=statesync}
-  export SNAPSHOT_API=${SNAPSHOT_API:=https://snapshots.zetachain.com}
+  export SNAPSHOT_API=${SNAPSHOT_API:=https://snapshots.rpc.zetachain.com}
   export TRUST_HEIGHT_DIFFERENCE_STATE_SYNC=${TRUST_HEIGHT_DIFFERENCE_STATE_SYNC:=40000}
   export COSMOVISOR_VERSION=${COSMOVISOR_VERSION:=v1.5.0}
   export CHAIN_ID=${CHAIN_ID:=zetachain_7000-1}
@@ -109,8 +109,8 @@ function setup_restore_type {
   elif [ "${RESTORE_TYPE}" == "snapshot"  ]; then
     if [ "${NETWORK}" == "mainnet" ]; then
       logt "Get Latest Snapshot URL"
-      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/latest-snapshot?network=mainnet | jq -r .latest_snapshot)
-      SNAPSHOT_FILENAME=$(basename "${SNAPSHOT_URL}")
+      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/mainnet/fullnode/latest.json | jq -r '.snapshots[0].link')
+      SNAPSHOT_FILENAME=$(curl -s ${SNAPSHOT_API}/mainnet/fullnode/latest.json | jq -r '.snapshots[0].filename')
       SNAPSHOT_DIR=$(pwd)
       logt "Download Snapshot from url: ${SNAPSHOT_URL}"
       curl -o "${SNAPSHOT_FILENAME}" "${SNAPSHOT_URL}"
@@ -120,8 +120,8 @@ function setup_restore_type {
       logt " Cleanup Snapshot"
       rm -rf ${SNAPSHOT_DIR}/${SNAPSHOT_FILENAME}
     elif [ "${NETWORK}" == "athens3" ]; then
-      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/latest-snapshot?network=athens3 | jq -r .latest_snapshot)
-      SNAPSHOT_FILENAME=$(basename "${SNAPSHOT_URL}")
+      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/testnet/fullnode/latest.json | jq -r '.snapshots[0].link')
+      SNAPSHOT_FILENAME=$(curl -s ${SNAPSHOT_API}/testnet/fullnode/latest.json | jq -r '.snapshots[0].filename')
       SNAPSHOT_DIR=$(pwd)
       logt "Download Snapshot from url: ${SNAPSHOT_URL}"
       curl -o "${SNAPSHOT_FILENAME}" "${SNAPSHOT_URL}"
@@ -134,8 +134,8 @@ function setup_restore_type {
   elif [ "${RESTORE_TYPE}" == "snapshot-archive"  ]; then
     if [ "${NETWORK}" == "mainnet" ]; then
       logt "Get Latest Snapshot URL"
-      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/latest-archive-snapshot?network=mainnet | jq -r .latest_snapshot)
-      SNAPSHOT_FILENAME=$(basename "${SNAPSHOT_URL}")
+      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/mainnet/archive/latest.json | jq -r '.snapshots[0].link')
+      SNAPSHOT_FILENAME=$(curl -s ${SNAPSHOT_API}/mainnet/archive/latest.json | jq -r '.snapshots[0].filename')
       SNAPSHOT_DIR=$(pwd)
       logt "Download Snapshot from url: ${SNAPSHOT_URL}"
       curl -o "${SNAPSHOT_FILENAME}" "${SNAPSHOT_URL}"
@@ -145,8 +145,8 @@ function setup_restore_type {
       logt " Cleanup Snapshot"
       rm -rf ${SNAPSHOT_DIR}/${SNAPSHOT_FILENAME}
     elif [ "${NETWORK}" == "athens3" ]; then
-      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/latest-archive-snapshot?network=athens3 | jq -r .latest_snapshot)
-      SNAPSHOT_FILENAME=$(basename "${SNAPSHOT_URL}")
+      SNAPSHOT_URL=$(curl -s ${SNAPSHOT_API}/testnet/archive/latest.json | jq -r '.snapshots[0].link')
+      SNAPSHOT_FILENAME=$(curl -s ${SNAPSHOT_API}/testnet/archive/latest.json | jq -r '.snapshots[0].filename')
       SNAPSHOT_DIR=$(pwd)
       logt "Download Snapshot from url: ${SNAPSHOT_URL}"
       curl -o "${SNAPSHOT_FILENAME}" "${SNAPSHOT_URL}"
@@ -332,4 +332,4 @@ else
 
   logt "Start Network"
   start_network
-fi
+fi
diff --git a/contrib/rpc/zetacored/docker-compose.yml b/contrib/rpc/zetacored/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       DAEMON_HOME: "${DAEMON_HOME:-/root/.zetacored}"
       NETWORK: ${NETWORK:-mainnet}
       RESTORE_TYPE: "${RESTORE_TYPE:-snapshot}"
-      SNAPSHOT_API: ${SNAPSHOT_API:-https://snapshots.zetachain.com}
+      SNAPSHOT_API: ${SNAPSHOT_API:-https://snapshots.rpc.zetachain.com}
       TRUST_HEIGHT_DIFFERENCE_STATE_SYNC: ${TRUST_HEIGHT_DIFFERENCE_STATE_SYNC:-40000}
       CHAIN_ID: "${CHAIN_ID:-zetachain_7000-1}"
       VISOR_NAME: "${VISOR_NAME:-cosmovisor}"

diff --git a/contrib/rpc/zetacored/networks/.athens3 b/contrib/rpc/zetacored/networks/.athens3
@@ -1,7 +1,7 @@
 export DAEMON_HOME="/root/.zetacored"
 export NETWORK=athens3
 export RESTORE_TYPE="snapshot"
-export SNAPSHOT_API=https://snapshots.zetachain.com
+export SNAPSHOT_API=https://snapshots.rpc.zetachain.com
 export TRUST_HEIGHT_DIFFERENCE_STATE_SYNC=40000
 export CHAIN_ID="athens_7001-1"
 export VISOR_NAME="cosmovisor"
@@ -11,4 +11,4 @@ export DAEMON_RESTART_AFTER_UPGRADE="true"
 export UNSAFE_SKIP_BACKUP="true"
 export MONIKER=testnet-docker-rpc
 export RE_DO_START_SEQUENCE="false"
-export IS_LOCAL_DEVELOPMENT="false"
+export IS_LOCAL_DEVELOPMENT="false"
diff --git a/contrib/rpc/zetacored/networks/.athens3-localbuild b/contrib/rpc/zetacored/networks/.athens3-localbuild
@@ -1,7 +1,7 @@
 export DAEMON_HOME="/root/.zetacored"
 export NETWORK=athens3
 export RESTORE_TYPE="snapshot"
-export SNAPSHOT_API=https://snapshots.zetachain.com
+export SNAPSHOT_API=https://snapshots.rpc.zetachain.com
 export TRUST_HEIGHT_DIFFERENCE_STATE_SYNC=40000
 export CHAIN_ID="athens_7001-1"
 export VISOR_NAME="cosmovisor"
@@ -11,4 +11,4 @@ export DAEMON_RESTART_AFTER_UPGRADE="false"
 export UNSAFE_SKIP_BACKUP="true"
 export MONIKER=testnet-docker-rpc
 export RE_DO_START_SEQUENCE="false"
-export IS_LOCAL_DEVELOPMENT="true"
+export IS_LOCAL_DEVELOPMENT="true"
diff --git a/contrib/rpc/zetacored/networks/.mainnet b/contrib/rpc/zetacored/networks/.mainnet
@@ -1,7 +1,7 @@
 export DAEMON_HOME="/root/.zetacored"
 export NETWORK=mainnet
 export RESTORE_TYPE="snapshot"
-export SNAPSHOT_API=https://snapshots.zetachain.com
+export SNAPSHOT_API=https://snapshots.rpc.zetachain.com
 export TRUST_HEIGHT_DIFFERENCE_STATE_SYNC=40000
 export CHAIN_ID="zetachain_7000-1"
 export VISOR_NAME="cosmovisor"

diff --git a/contrib/rpc/zetacored/networks/.mainnet-localbuild b/contrib/rpc/zetacored/networks/.mainnet-localbuild
@@ -1,7 +1,7 @@
 export DAEMON_HOME="/root/.zetacored"
 export NETWORK=mainnet
 export RESTORE_TYPE="snapshot"
-export SNAPSHOT_API=https://snapshots.zetachain.com
+export SNAPSHOT_API=https://snapshots.rpc.zetachain.com
 export TRUST_HEIGHT_DIFFERENCE_STATE_SYNC=40000
 export CHAIN_ID="zetachain_7000-1"
 export VISOR_NAME="cosmovisor"

diff --git a/docs/development/DEPLOY_NODES.md b/docs/development/DEPLOY_NODES.md
@@ -54,7 +54,7 @@ The environment variables for both Zetacored and Bitcoin nodes are defined in th
 | `NETWORK` | Network identifier | `mainnet`, `athens3` |
 | `CHAIN_ID` | Chain ID for the network | `zetachain_7000-1`, `athens_7001-1` |
 | `RESTORE_TYPE` | Node restoration method | `snapshot`, `statesync` |
-| `SNAPSHOT_API` | API URL for fetching snapshots | `https://snapshots.zetachain.com` |
+| `SNAPSHOT_API` | API URL for fetching snapshots | `https://snapshots.rpc.zetachain.com` |
 
 #### Example Environment Variables for Bitcoin