Merge pull request #111 from HorizenLabs/gp/entrypoint_fix

Moved the data directory renaming before keys handling

docker/scripts/entrypoint.sh

@@ -84,6 +84,18 @@ while IFS='=' read -r -d '' var_name var_value; do
   fi
 done < <(env -0)
 
+if [ -n "${ZKV_CONF_BASE_PATH}" ]; then
+  BASE_CHAINS="${ZKV_CONF_BASE_PATH}/chains"
+
+  for chain in local testnet ; do
+    source_chain_dir="${BASE_CHAINS}/nh_${chain}";
+    dest_chain_dir="${BASE_CHAINS}/zkv_${chain}";
+    [ -d "$source_chain_dir" ] && [ ! -e "$dest_chain_dir" ] && \
+      echo "Move ${source_chain_dir} to ${dest_chain_dir}" && \
+      mv "${source_chain_dir}" "${dest_chain_dir}"
+  done
+fi
+
 # Keys handling
 if [ -f "${ZKV_SECRET_PHRASE_PATH}" ]; then
   injection_args=()
@@ -124,16 +136,5 @@ if [[ (-n "${ZKV_CONF_BASE_PATH:-}") && (-n "${ZKV_CONF_CHAIN:-}") && (-f "${ZKV
   cp "${ZKV_NODE_KEY_FILE}" "${destination}/secret_ed25519"
 fi
 
-BASE_CHAINS="/data/node/chains"
-
-for chain in local testnet ; do
-  source_chain_dir="${BASE_CHAINS}/nh_${chain}";
-  dest_chain_dir="${BASE_CHAINS}/zkv_${chain}";
-
-  [ -d "$source_chain_dir" ] && [ ! -e "$dest_chain_dir" ] && \
-    echo "Move ${source_chain_dir} to ${dest_chain_dir}" && \
-    mv "${source_chain_dir}" "${dest_chain_dir}"
-done
-
 echo "Launching ${ZKV_NODE} with args ${conf_args[*]}"
 exec "${ZKV_NODE}" "${conf_args[@]}"

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mainchain"
-version = "0.5.0"
+version = "0.5.1"
 description = "zkVerify Mainchain."
 authors.workspace = true
 homepage = "https://github.com/HorizenLabs/zkVerify"