Merge pull request #54 from blinklabs-io/chore/update-network-configs

chore: update network configs

Author: wolf31o2

Dockerfile

@@ -57,9 +57,9 @@ RUN curl -sLo /usr/local/bin/gLiveView.sh \
   sed \
     -e "s|#CNODE_HOME=.*|CNODE_HOME=/opt/cardano |" \
     -e "s|#CNODE_PORT=.*|CNODE_PORT=\${CARDANO_PORT:-3001} |" \
-    -e "s|#CONFIG=.*|CONFIG=\${CARDANO_CONFIG:-/opt/cardano/config/\${CARDANO_NETWORK:-mainnet}-config.json} |" \
+    -e "s|#CONFIG=.*|CONFIG=\${CARDANO_CONFIG:-/opt/cardano/config/\${CARDANO_NETWORK:-\${NETWORK:-mainnet}}/config.json} |" \
     -e "s|#SOCKET=.*|SOCKET=\${CARDANO_SOCKET_PATH:-/opt/cardano/ipc/socket} |" \
-    -e "s|#TOPOLOGY=.*|TOPOLOGY=\${CARDANO_TOPOLOGY:-/opt/cardano/config/\${CARDANO_NETWORK:-mainnet}-topology.json} |" \
+    -e "s|#TOPOLOGY=.*|TOPOLOGY=\${CARDANO_TOPOLOGY:-/opt/cardano/config/\${CARDANO_NETWORK:-\${NETWORK:-mainnet}}/topology.json} |" \
     -e "s|#LOG_DIR=.*|LOG_DIR=\${CARDANO_LOG_DIR:-/opt/cardano/logs} |" \
     -e "s|#DB_DIR=.*|DB_DIR=\${CARDANO_DATABASE_PATH:-/opt/cardano/data} |" > \
     /usr/local/bin/env && \

README.md

@@ -63,7 +63,7 @@ This behavior can be changes via the following environment variables:
   - Requires key files and node certificates to be present to start
 - `CARDANO_CONFIG`
   - Full path to the Cardano node configuration (default:
-    `${CARDANO_CONFIG_BASE}/mainnet-config.json`)
+    `${CARDANO_CONFIG_BASE}/mainnet/config.json`)
   - Use your own configuration file to modify the node behavior fully
 - `CARDANO_DATABASE_PATH`
   - A directory which contains the ledger database files (default:

bin/entrypoint

@@ -12,9 +12,9 @@ case ${1} in
 esac
 
 # variables
-CARDANO_NETWORK=${CARDANO_NETWORK:-mainnet}
+CARDANO_NETWORK=${CARDANO_NETWORK:-${NETWORK:-mainnet}}
 CARDANO_BLOCK_PRODUCER=${CARDANO_BLOCK_PRODUCER:-false}
-CARDANO_CONFIG=${CARDANO_CONFIG:-/opt/cardano/config/${CARDANO_NETWORK}-config.json}
+CARDANO_CONFIG=${CARDANO_CONFIG:-/opt/cardano/config/${CARDANO_NETWORK}/config.json}
 CARDANO_DATABASE_PATH=${CARDANO_DATABASE_PATH:-/opt/cardano/db}
 CARDANO_NODE_SOCKET_PATH=${CARDANO_NODE_SOCKET_PATH:-/opt/cardano/ipc/socket}
 CARDANO_PORT=${CARDANO_PORT:-3001}
@@ -23,7 +23,7 @@ CARDANO_SHELLEY_KES_KEY=${CARDANO_SHELLEY_KES_KEY:-/opt/cardano/keys/kes.skey}
 CARDANO_SHELLEY_OPERATIONAL_CERTIFICATE=${CARDANO_SHELLEY_OPERATIONAL_CERTIFICATE:-/opt/cardano/keys/node.cert}
 CARDANO_SHELLEY_VRF_KEY=${CARDANO_SHELLEY_VRF_KEY:-/opt/cardano/keys/vrf.skey}
 CARDANO_SOCKET_PATH=${CARDANO_SOCKET_PATH:-/opt/cardano/ipc/socket}
-CARDANO_TOPOLOGY=${CARDANO_TOPOLOGY:-/opt/cardano/config/${CARDANO_NETWORK}-topology.json}
+CARDANO_TOPOLOGY=${CARDANO_TOPOLOGY:-/opt/cardano/config/${CARDANO_NETWORK}/topology.json}
 
 exec cardano-node \
 	--config ${CARDANO_CONFIG} \

bin/run-network

@@ -13,12 +13,12 @@ case ${NETWORK} in
 esac
 
 echo "Starting: /usr/local/bin/cardano-node run"
-echo "--config /opt/cardano/config/${NETWORK}-config.json"
+echo "--config /opt/cardano/config/${NETWORK}/config.json"
 echo "--database-path /data/db"
 echo "--host-addr 0.0.0.0"
 echo "--port 3001"
 echo "--socket-path /ipc/node.socket"
-echo "--topology /opt/cardano/config/${NETWORK}-topology.json"
+echo "--topology /opt/cardano/config/${NETWORK}/topology.json"
 echo "+RTS"
 echo "-N2"
 echo "-I0"
@@ -28,5 +28,5 @@ echo "-qb"
 echo "--disable-delayed-os-memory-return"
 echo "-RTS"
 echo "..or, once again, in a single line:"
-echo "/usr/local/bin/cardano-node run --config /opt/cardano/config/${NETWORK}-config.json --database-path /data/db --host-addr 0.0.0.0 --port 3001 --socket-path /ipc/node.socket --topology /opt/cardano/config/${NETWORK}-topology.json +RTS -N2 -I0 -A16m -qg -qb --disable-delayed-os-memory-return -RTS"
-exec /usr/local/bin/cardano-node run --config /opt/cardano/config/${NETWORK}-config.json --database-path /data/db --host-addr 0.0.0.0 --port 3001 --socket-path /ipc/node.socket --topology /opt/cardano/config/${NETWORK}-topology.json +RTS -N2 -I0 -A16m -qg -qb --disable-delayed-os-memory-return -RTS ${@}
+echo "/usr/local/bin/cardano-node run --config /opt/cardano/config/${NETWORK}/config.json --database-path /data/db --host-addr 0.0.0.0 --port 3001 --socket-path /ipc/node.socket --topology /opt/cardano/config/${NETWORK}/topology.json +RTS -N2 -I0 -A16m -qg -qb --disable-delayed-os-memory-return -RTS"
+exec /usr/local/bin/cardano-node run --config /opt/cardano/config/${NETWORK}/config.json --database-path /data/db --host-addr 0.0.0.0 --port 3001 --socket-path /ipc/node.socket --topology /opt/cardano/config/${NETWORK}/topology.json +RTS -N2 -I0 -A16m -qg -qb --disable-delayed-os-memory-return -RTS ${@}

bin/run-node

@@ -31,22 +31,24 @@ done
 
 # variables
 CARDANO_CONFIG_BASE=${CARDANO_CONFIG_BASE:-/opt/cardano/config}
+CARDANO_NETWORK=${CARDANO_NETWORK:-mainnet}
 # common
 CARDANO_BIND_ADDR=${CARDANO_BIND_ADDR:-0.0.0.0}
 CARDANO_BLOCK_PRODUCER=${CARDANO_BLOCK_PRODUCER:-false}
-CARDANO_CONFIG=${CARDANO_CONFIG:-${CARDANO_CONFIG_BASE}/mainnet-config.json}
+CARDANO_CONFIG=${CARDANO_CONFIG:-${CARDANO_CONFIG_BASE}/${CARDANO_NETWORK}/config.json}
 CARDANO_DATABASE_PATH=${CARDANO_DATABASE_PATH:-/opt/cardano/data}
 CARDANO_LOG_DIR=${CARDANO_LOG_DIR:-/opt/cardano/logs}
 CARDANO_PORT=${CARDANO_PORT:-3001}
 CARDANO_RTS_OPTS=${CARDANO_RTS_OPTS:--N2 -A64m -I0 -qg -qb --disable-delayed-os-memory-return}
 CARDANO_SOCKET_PATH=${CARDANO_SOCKET_PATH:-/opt/cardano/ipc/socket}
-CARDANO_TOPOLOGY=${CARDANO_TOPOLOGY:-${CARDANO_CONFIG_BASE}/mainnet-topology.json}
+CARDANO_TOPOLOGY=${CARDANO_TOPOLOGY:-${CARDANO_CONFIG_BASE}/${CARDANO_NETWORK}/topology.json}
 
 echo CARDANO_BIND_ADDR=${CARDANO_BIND_ADDR}
 echo CARDANO_BLOCK_PRODUCER=${CARDANO_BLOCK_PRODUCER}
 echo CARDANO_CONFIG=${CARDANO_CONFIG}
 echo CARDANO_DATABASE_PATH=${CARDANO_DATABASE_PATH}
 echo CARDANO_LOG_DIR=${CARDANO_LOG_DIR}
+echo CARDANO_NETWORK=${CARDANO_NETWORK}
 echo CARDANO_PORT=${CARDANO_PORT}
 echo CARDANO_RTS_OPTS=${CARDANO_RTS_OPTS}
 echo CARDANO_SOCKET_PATH=${CARDANO_SOCKET_PATH}

config/mainnet-alonzo-genesis.json renamed to config/mainnet/alonzo-genesis.json

@@ -1,18 +1,20 @@
 {
-  "AlonzoGenesisFile": "/opt/cardano/config/mainnet-alonzo-genesis.json",
+  "AlonzoGenesisFile": "alonzo-genesis.json",
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
   "ApplicationName": "cardano-sl",
   "ApplicationVersion": 1,
-  "ByronGenesisFile": "/opt/cardano/config/mainnet-byron-genesis.json",
+  "ByronGenesisFile": "byron-genesis.json",
   "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
+  "ConwayGenesisFile": "conway-genesis.json",
+  "ConwayGenesisHash": "f28f1c1280ea0d32f8cd3143e268650d6c1a8e221522ce4a7d20d62fc09783e1",
   "EnableP2P": true,
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 0,
   "MaxKnownMajorProtocolVersion": 2,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresNoMagic",
-  "ShelleyGenesisFile": "/opt/cardano/config/mainnet-shelley-genesis.json",
+  "ShelleyGenesisFile": "shelley-genesis.json",
   "ShelleyGenesisHash": "1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81",
   "TargetNumberOfActivePeers": 20,
   "TargetNumberOfEstablishedPeers": 50,

config/mainnet-byron-genesis.json renamed to config/mainnet/byron-genesis.json

@@ -1,17 +1,19 @@
 {
-  "AlonzoGenesisFile": "/opt/cardano/config/mainnet-alonzo-genesis.json",
+  "AlonzoGenesisFile": "alonzo-genesis.json",
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
   "ApplicationName": "cardano-sl",
   "ApplicationVersion": 1,
-  "ByronGenesisFile": "/opt/cardano/config/mainnet-byron-genesis.json",
+  "ByronGenesisFile": "byron-genesis.json",
   "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
+  "ConwayGenesisFile": "conway-genesis.json",
+  "ConwayGenesisHash": "f28f1c1280ea0d32f8cd3143e268650d6c1a8e221522ce4a7d20d62fc09783e1",
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 0,
   "MaxKnownMajorProtocolVersion": 2,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresNoMagic",
-  "ShelleyGenesisFile": "/opt/cardano/config/mainnet-shelley-genesis.json",
+  "ShelleyGenesisFile": "shelley-genesis.json",
   "ShelleyGenesisHash": "1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81",
   "TraceAcceptPolicy": true,
   "TraceBlockFetchClient": false,

config/mainnet-p2p-config.json renamed to config/mainnet/config-p2p.json

@@ -0,0 +1,3 @@
+{
+  "genDelegs": {}
+}