Rename SHUTTER_CHAIN_DATA_DIR to SHUTTER_CHAIN_DIR

Author: dappnodedev

docker-compose.yml

@@ -16,7 +16,7 @@ services:
         ASSETS_VERSION: shutter-gnosis-1000-set-1v2 # $NETWORK-10*$CHAIN_ID-set-$VERSION
         UPSTREAM_VERSION: gnosis-v1.2.1
         KEYPER_CONFIG_DIR: /keyper/config
-        SHUTTER_CHAIN_DATA_DIR: /chain
+        SHUTTER_CHAIN_DIR: /chain
         STAKER_SCRIPTS_VERSION: v0.1.0
     restart: unless-stopped
     environment:

shutter/Dockerfile

@@ -10,7 +10,7 @@ FROM ghcr.io/shutter-network/rolling-shutter:${UPSTREAM_VERSION}
 
 ARG NETWORK
 ARG KEYPER_CONFIG_DIR
-ARG SHUTTER_CHAIN_DATA_DIR
+ARG SHUTTER_CHAIN_DIR
 ARG KEYPER_PORT
 ARG CHAIN_PORT
 ARG PROMETHEUS_LISTEN_PORT
@@ -31,16 +31,16 @@ ENV SHUTTER_GNOSIS_SM_BLOCKTIME=10 \
     SHUTTER_ENV_FILE=/shutter.env \
     SHUTTER_GENERATED_CONFIG_FILE=${KEYPER_CONFIG_DIR}/generated.toml \
     KEYPER_CONFIG_FILE=${KEYPER_CONFIG_DIR}/keyper.toml \
-    SHUTTER_CHAIN_DATA_DIR=${SHUTTER_CHAIN_DATA_DIR} \
-    SHUTTER_CHAIN_CONFIG_FILE=${SHUTTER_CHAIN_DATA_DIR}/config/config.toml \
+    SHUTTER_CHAIN_DIR=${SHUTTER_CHAIN_DIR} \
+    SHUTTER_CHAIN_CONFIG_FILE=${SHUTTER_CHAIN_DIR}/config/config.toml \
     ASSETS_DIR=/assets \
     STAKER_SCRIPTS_URL=https://github.com/dappnode/staker-package-scripts/releases/download/${STAKER_SCRIPTS_VERSION}
 
 ADD ${STAKER_SCRIPTS_URL}/dvt_lsd_tools.sh /etc/profile.d/
 
 COPY supervisord.conf /etc/supervisord.conf
 
-RUN mkdir -p ${KEYPER_CONFIG_DIR} ${SHUTTER_CHAIN_DATA_DIR} ${ASSETS_DIR} /opt/supervisor && \
+RUN mkdir -p ${KEYPER_CONFIG_DIR} ${SHUTTER_CHAIN_DIR} ${ASSETS_DIR} /opt/supervisor && \
     chmod +rx /etc/profile.d/dvt_lsd_tools.sh
 
 COPY scripts /usr/local/bin/

shutter/scripts/configure.sh

@@ -30,7 +30,7 @@ init_chain() {
 
     echo "[INFO | configure] Initializing chain..."
 
-    $SHUTTER_BIN chain init --root "${SHUTTER_CHAIN_DATA_DIR}" --genesis-keyper "${SHUTTER_GNOSIS_GENESIS_KEYPER}" --blocktime "${SHUTTER_GNOSIS_SM_BLOCKTIME}" --listen-address "tcp://0.0.0.0:${CHAIN_LISTEN_PORT}" --role validator
+    $SHUTTER_BIN chain init --root "${SHUTTER_CHAIN_DIR}" --genesis-keyper "${SHUTTER_GNOSIS_GENESIS_KEYPER}" --blocktime "${SHUTTER_GNOSIS_SM_BLOCKTIME}" --listen-address "tcp://0.0.0.0:${CHAIN_LISTEN_PORT}" --role validator
 }
 
 configure_keyper() {

shutter/scripts/configure_keyper.sh

@@ -56,7 +56,7 @@ sed -i "/^Sequencer/c\Sequencer = \"${_ASSETS_SEQUENCER}\"" "$KEYPER_CONFIG_FILE
 sed -i "/^ValidatorRegistry/c\ValidatorRegistry = \"${_ASSETS_VALIDATOR_REGISTRY}\"" "$KEYPER_CONFIG_FILE"
 sed -i "/^DiscoveryNamespace/c\DiscoveryNamespace = \"${_ASSETS_DISCOVERY_NAME_PREFIX}-${_ASSETS_INSTANCE_ID}\"" "$KEYPER_CONFIG_FILE"
 sed -i "/^ShuttermintURL/c\ShuttermintURL = \"${SHUTTER_SHUTTERMINT_SHUTTERMINTURL}\"" "$KEYPER_CONFIG_FILE"
-sed -i "/^ValidatorPublicKey/c\ValidatorPublicKey = \"$(cat "${SHUTTER_CHAIN_DATA_DIR}/config/priv_validator_pubkey.hex")\"" "$KEYPER_CONFIG_FILE"
+sed -i "/^ValidatorPublicKey/c\ValidatorPublicKey = \"$(cat "${SHUTTER_CHAIN_DIR}/config/priv_validator_pubkey.hex")\"" "$KEYPER_CONFIG_FILE"
 sed -i "/^ListenAddresses/c\ListenAddresses = \"${SHUTTER_P2P_LISTENADDRESSES}\"" "$KEYPER_CONFIG_FILE"
 sed -i "/^AdvertiseAddresses/c\AdvertiseAddresses = \"${SHUTTER_P2P_ADVERTISEADDRESSES}\"" "$KEYPER_CONFIG_FILE"
 sed -i "/^CustomBootstrapAddresses/c\CustomBootstrapAddresses = ${_ASSETS_CUSTOM_BOOTSTRAP_ADDRESSES}" "$KEYPER_CONFIG_FILE"

shutter/scripts/configure_shuttermint.sh

@@ -10,8 +10,8 @@ else
     exit 1
 fi
 
-rm "${SHUTTER_CHAIN_DATA_DIR}/config/genesis.json"
-ln -s /assets/genesis.json "${SHUTTER_CHAIN_DATA_DIR}/config/genesis.json"
+rm "${SHUTTER_CHAIN_DIR}/config/genesis.json"
+ln -s /assets/genesis.json "${SHUTTER_CHAIN_DIR}/config/genesis.json"
 
 SHUTTERMINT_MONIKER=${KEYPER_NAME:-$(openssl rand -hex 8)}