preparams caching and ssh config fix

Dockerfile-localnet

@@ -44,10 +44,11 @@ RUN mkdir -p /root/.zetacored/cosmovisor/genesis/bin && \
 ENV PATH /root/.zetacored/cosmovisor/current/bin/:/root/.zetaclientd/upgrades/current/:${PATH}
 
 COPY contrib/localnet/scripts /root
-COPY contrib/localnet/ssh_config /root/.ssh/config
+COPY contrib/localnet/ssh_config /etc/ssh/ssh_config.d/localnet
 COPY contrib/localnet/zetacored /root/zetacored
 
-RUN chmod 755 /root/*.sh
+RUN chmod 755 /root/*.sh && \
+    chmod 644 /etc/ssh/ssh_config.d/localnet
 
 WORKDIR /usr/local/bin
 EXPOSE 22

contrib/localnet/docker-compose.yml

@@ -86,6 +86,7 @@ services:
       - HOTKEY_PASSWORD=password # test purposes only
     volumes:
       - ssh:/root/.ssh
+      - preparams:/root/preparams
 
   zetaclient1:
     image: zetanode:latest
@@ -101,6 +102,7 @@ services:
       - HOTKEY_PASSWORD=password # test purposes only
     volumes:
       - ssh:/root/.ssh
+      - preparams:/root/preparams
 
   eth:
     image: ethereum/client-go:v1.10.26
@@ -147,4 +149,5 @@ services:
     volumes:
       - ssh:/root/.ssh
 volumes:
-  ssh:
+  ssh:
+  preparams:

contrib/localnet/scripts/start-zetaclientd.sh

@@ -16,10 +16,11 @@ set_sepolia_endpoint() {
 }
 
 # generate pre-params as early as possible
-# to reach keygen height in time
-#
-# consider caching these on a docker volume
-zetaclientd gen-pre-params ~/preParams.json
+# to reach keygen height on schedule
+PREPARAMS_PATH="/root/preparams/${HOSTNAME}.json"
+if [ ! -f "$PREPARAMS_PATH" ]; then
+  zetaclientd gen-pre-params "$PREPARAMS_PATH"
+fi
 
 # Wait for authorized_keys file to exist (generated by zetacore0)
 while [ ! -f ~/.ssh/authorized_keys ]; do
@@ -48,7 +49,7 @@ echo "Start zetaclientd"
 if [[ $HOSTNAME == "zetaclient0" && ! -f ~/.zetacored/config/zetaclient_config.json ]]
 then
     MYIP=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
-    zetaclientd init --zetacore-url zetacore0 --chain-id athens_101-1 --operator "$operatorAddress" --log-format=text --public-ip "$MYIP" --keyring-backend "$BACKEND"
+    zetaclientd init --zetacore-url zetacore0 --chain-id athens_101-1 --operator "$operatorAddress" --log-format=text --public-ip "$MYIP" --keyring-backend "$BACKEND" --pre-params "$PREPARAMS_PATH"
 
     # check if the option is additional-evm
     # in this case, the additional evm is represented with the sepolia chain, we set manually the eth2 endpoint to the sepolia chain (11155111 -> http://eth2:8545)
@@ -67,7 +68,7 @@ then
   do
     SEED=$(curl --retry 30 --retry-delay 1 --max-time 1 --retry-connrefused -s zetaclient0:8123/p2p)
   done
-  zetaclientd init --peer "/ip4/172.20.0.21/tcp/6668/p2p/${SEED}" --zetacore-url "$node" --chain-id athens_101-1 --operator "$operatorAddress" --log-format=text --public-ip "$MYIP" --log-level 1 --keyring-backend "$BACKEND"
+  zetaclientd init --peer "/ip4/172.20.0.21/tcp/6668/p2p/${SEED}" --zetacore-url "$node" --chain-id athens_101-1 --operator "$operatorAddress" --log-format=text --public-ip "$MYIP" --log-level 1 --keyring-backend "$BACKEND" --pre-params "$PREPARAMS_PATH"
 
   # check if the option is additional-evm
   # in this case, the additional evm is represented with the sepolia chain, we set manually the eth2 endpoint to the sepolia chain (11155111 -> http://eth2:8545)

zetaclient/config/config.go

@@ -91,9 +91,10 @@ func GetPath(inputPath string) string {
 				return ""
 			}
 			path[0] = home
+			return filepath.Join(path...)
 		}
 	}
-	return filepath.Join(path...)
+	return inputPath
 }
 
 // ContainRestrictedAddress returns true if any one of the addresses is restricted