From a14c9eb563107c38a94999df5262af6e320fec75 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Wed, 1 Mar 2023 17:23:38 +0100
Subject: [PATCH] Switch to cometbft/cometbft:v0.37.0-rc3

---
 scripts/tendermint/all_start.sh | 24 ++++++++++++++++--------
 scripts/tendermint/all_stop.sh  |  7 +------
 scripts/tendermint/start.sh     | 10 +++++-----
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/scripts/tendermint/all_start.sh b/scripts/tendermint/all_start.sh
index 49f9501c..38aeaa0c 100755
--- a/scripts/tendermint/all_start.sh
+++ b/scripts/tendermint/all_start.sh
@@ -2,19 +2,27 @@
 set -o errexit -o nounset -o pipefail
 command -v shellcheck >/dev/null && shellcheck "$0"
 
-# Find latest patch releases at https://hub.docker.com/r/tendermint/tendermint/tags/
-declare -a TM_VERSIONS
-TM_VERSIONS[34]=v0.34.19
-TM_VERSIONS[35]=v0.35.6
-TM_VERSIONS[37]=v0.37.0-rc2
+# Find latest patch releases at
+# - https://hub.docker.com/r/tendermint/tendermint/tags/
+# - https://hub.docker.com/r/cometbft/cometbft/tags/
+declare -a TM_IMAGES
+TM_IMAGES[34]="tendermint/tendermint:v0.34.19"
+TM_IMAGES[35]="tendermint/tendermint:v0.35.6"
+TM_IMAGES[37]="cometbft/cometbft:v0.37.0-rc3"
+
+declare -a TM_ROOTS
+TM_ROOTS[34]="/tendermint"
+TM_ROOTS[35]="/tendermint"
+TM_ROOTS[37]="/cometbft"
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-for KEY in "${!TM_VERSIONS[@]}"; do
-  export TENDERMINT_VERSION="${TM_VERSIONS[$KEY]}"
+for KEY in "${!TM_IMAGES[@]}"; do
+  export TENDERMINT_IMAGE="${TM_IMAGES[$KEY]}"
+  export TENDERMINT_ROOT="${TM_ROOTS[$KEY]}"
   export TENDERMINT_PORT="111$KEY"
   export TENDERMINT_NAME="tendermint-$KEY"
 
-  echo "Starting $TENDERMINT_NAME ($TENDERMINT_VERSION) on port $TENDERMINT_PORT ..."
+  echo "Starting $TENDERMINT_NAME ($TENDERMINT_IMAGE) on port $TENDERMINT_PORT ..."
   "$SCRIPT_DIR/start.sh"
 done
diff --git a/scripts/tendermint/all_stop.sh b/scripts/tendermint/all_stop.sh
index f9f0e017..46246195 100755
--- a/scripts/tendermint/all_stop.sh
+++ b/scripts/tendermint/all_stop.sh
@@ -2,14 +2,9 @@
 set -o errexit -o nounset -o pipefail
 command -v shellcheck >/dev/null && shellcheck "$0"
 
-declare -a TM_VERSIONS
-TM_VERSIONS[34]=v0.34.19
-TM_VERSIONS[35]=v0.35.6
-TM_VERSIONS[37]=v0.37.0-rc2
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-for KEY in "${!TM_VERSIONS[@]}"; do
+for KEY in 34 35 37; do
   export TENDERMINT_NAME="tendermint-$KEY"
 
   echo "Stopping $TENDERMINT_NAME ..."
diff --git a/scripts/tendermint/start.sh b/scripts/tendermint/start.sh
index 00ae26e2..e871df8d 100755
--- a/scripts/tendermint/start.sh
+++ b/scripts/tendermint/start.sh
@@ -6,7 +6,7 @@ gnused="$(command -v gsed || echo sed)"
 
 # Tendermint settings must be specified
 # Choose version from https://hub.docker.com/r/tendermint/tendermint/tags/
-for SETTING in "TENDERMINT_VERSION" "TENDERMINT_PORT" "TENDERMINT_NAME"; do
+for SETTING in "TENDERMINT_IMAGE" "TENDERMINT_PORT" "TENDERMINT_NAME"; do
   if test -z "$(eval echo "\$$SETTING")"; then
     echo "\$$SETTING must be set when running this script"
     exit 1
@@ -20,8 +20,8 @@ LOGFILE="$TMP_DIR/tendermint.log"
 
 docker run --rm \
   --user="$UID" \
-  -v "${TMP_DIR}:/tendermint" \
-  "tendermint/tendermint:${TENDERMINT_VERSION}" \
+  -v "${TMP_DIR}:${TENDERMINT_ROOT}" \
+  "${TENDERMINT_IMAGE}" \
   init validator
 
 # make sure we allow cors origins, only possible by modifying the config file
@@ -36,11 +36,11 @@ docker run --rm \
 docker run --rm \
   --user="$UID" \
   --name "$TENDERMINT_NAME" \
-  -p "${TENDERMINT_PORT}:26657" -v "${TMP_DIR}:/tendermint" \
+  -p "${TENDERMINT_PORT}:26657" -v "${TMP_DIR}:${TENDERMINT_ROOT}" \
   -e "TM_TX_INDEX_INDEX_ALL_KEYS=true" \
   -e "PROXY_APP=kvstore" \
   -e "LOG_LEVEL=state:info,rpc:info,*:error" \
-  "tendermint/tendermint:${TENDERMINT_VERSION}" node \
+  "${TENDERMINT_IMAGE}" node \
   --rpc.laddr=tcp://0.0.0.0:26657 \
   >"$LOGFILE" 2>&1 &