Remove unused KEYSTORE_PATH (#79)

Other changes:

* Fix typo GENISIS > GENESIS
* Remove unnecessary square brackets

docker-compose.yml

@@ -47,13 +47,12 @@ services:
       - PORT=9545
       - NETWORK_ID=108
       - PRIVATE_KEY=0x29f3edee0ad3abf8e2699402e0e28cd6492c9be7eaab00d732a791c33552f797
-      - KEYSTORE_PATH_SUFFIX=/keystore
       - SEALER_PRIVATE_KEY_PATH_SUFFIX=/sealer_private_key.txt
       - PRIVATE_KEY_PATH_SUFFIX=/private_key.txt
       - ADDRESS_PATH_SUFFIX=/address.txt
       - SEALER_ADDRESS_PATH_SUFFIX=/sealer_address.txt
       - INITIAL_BALANCE=0x200000000000000000000000000000000000000000000000000000000000000
-      - GENISIS_PATH=etc/rollup-fullnode.json
+      - GENESIS_PATH=etc/rollup-fullnode.json
       - SETUP_RUN_PATH_SUFFIX=/setup_run.txt
     expose:
       - "9545"

docker/geth/entrypoint.sh

@@ -4,7 +4,6 @@
 # HOSTNAME=
 # PORT=8545
 # NETWORK_ID=108
-KEYSTORE_PATH="${VOLUME_PATH}${KEYSTORE_PATH_SUFFIX}"
 SEALER_PRIVATE_KEY_PATH="${VOLUME_PATH}${SEALER_PRIVATE_KEY_PATH_SUFFIX}"
 PRIVATE_KEY_PATH="${VOLUME_PATH}${PRIVATE_KEY_PATH_SUFFIX}"
 ADDRESS_PATH="${VOLUME_PATH}${ADDRESS_PATH_SUFFIX}"
@@ -39,12 +38,12 @@ generate_geneisis()
   ADDRESS=$2
   ADDRESS_BYTES=`echo $ADDRESS | sed 's/^0x//'`
   SEALER_ADDRESS_BYTES=`echo $SEALER_ADDRESS | sed 's/^0x//'`
-  EXTRA_DATA=`jq -r '.extraData' $GENISIS_PATH | sed "s/\\$SEALER_ADDRESSES/$SEALER_ADDRESS_BYTES/g"`
+  EXTRA_DATA=`jq -r '.extraData' $GENESIS_PATH | sed "s/\\$SEALER_ADDRESSES/$SEALER_ADDRESS_BYTES/g"`
   tmp=$(mktemp)
-  jq --arg address $ADDRESS_BYTES --arg balance $INITIAL_BALANCE '.alloc += {($address): {balance: $balance}}' $GENISIS_PATH > $tmp
-  mv $tmp $GENISIS_PATH
-  jq --arg extraData $EXTRA_DATA '.extraData = $extraData' $GENISIS_PATH > $tmp
-  mv $tmp $GENISIS_PATH
+  jq --arg address $ADDRESS_BYTES --arg balance $INITIAL_BALANCE '.alloc += {($address): {balance: $balance}}' $GENESIS_PATH > $tmp
+  mv $tmp $GENESIS_PATH
+  jq --arg extraData $EXTRA_DATA '.extraData = $extraData' $GENESIS_PATH > $tmp
+  mv $tmp $GENESIS_PATH
 }
 
 if [[ -n "$CLEAR_DATA_KEY" && ! -f "$CLEAR_DATA_FILE_PATH" ]]; then
@@ -57,7 +56,7 @@ if [[ -n "$CLEAR_DATA_KEY" && ! -f "$CLEAR_DATA_FILE_PATH" ]]; then
 fi
 
 ## One-time configuration to be run only on first startup
-if [[ ! -f $KEYSTORE_PATH && ! -f $SETUP_RUN_PATH ]]; then
+if [ ! -f $SETUP_RUN_PATH ]; then
   echo "Generating keys and initializing geth..."
 
   generate_private_key > $SEALER_PRIVATE_KEY_PATH
@@ -75,7 +74,7 @@ if [[ ! -f $KEYSTORE_PATH && ! -f $SETUP_RUN_PATH ]]; then
 
   generate_geneisis `cat $SEALER_ADDRESS_PATH` `cat $ADDRESS_PATH`
 
-  geth --datadir $VOLUME_PATH --nousb --verbosity 0 init $GENISIS_PATH 2> /dev/null;
+  geth --datadir $VOLUME_PATH --nousb --verbosity 0 init $GENESIS_PATH 2> /dev/null;
   echo "Ran Setup" > $SETUP_RUN_PATH
 
   echo "Setup Complete"