RA-60: Network folders fixed

cardano-foundation · May 13, 2024 · 7988362 · 7988362
1 parent 2513898
commit 7988362
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/config/mainnet/config.json b/config/mainnet/config.json
@@ -1,9 +1,9 @@
 {
-  "AlonzoGenesisFile": "/current/alonzo-genesis.json",
+  "AlonzoGenesisFile": "/config/alonzo-genesis.json",
   "AlonzoGenesisHash": "0e44ea3a31d8e93c9c661b3a4d2ad57ff432e2c3e0341fb8954eb64f8f242613",
-  "ByronGenesisFile": "/current/byron-genesis.json",
+  "ByronGenesisFile": "/config/byron-genesis.json",
   "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
-  "ConwayGenesisFile": "/current/conway-genesis.json",
+  "ConwayGenesisFile": "/config/conway-genesis.json",
   "ConwayGenesisHash": "b84bce2d465bcdb38ebd873f126a866d7ebceb154357496396fb602104329299",
   "EnableP2P": true,
   "LastKnownBlockVersion-Alt": 0,
@@ -14,7 +14,7 @@
   "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresNoMagic",
-  "ShelleyGenesisFile": "/current/shelley-genesis.json",
+  "ShelleyGenesisFile": "/config/shelley-genesis.json",
   "ShelleyGenesisHash": "40710bcc4e024224641dc12fe1e5e478d2c3d3aa7ad4f032283ddcc73b2ddb03",
   "TargetNumberOfActivePeers": 20,
   "TargetNumberOfEstablishedPeers": 50,

diff --git a/config/preprod/config.json b/config/preprod/config.json
@@ -1,9 +1,9 @@
 {
-  "AlonzoGenesisFile": "/current/alonzo-genesis.json",
+  "AlonzoGenesisFile": "/config/alonzo-genesis.json",
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
-  "ByronGenesisFile": "/current/byron-genesis.json",
+  "ByronGenesisFile": "/config/byron-genesis.json",
   "ByronGenesisHash": "d4b8de7a11d929a323373cbab6c1a9bdc931beffff11db111cf9d57356ee1937",
-  "ConwayGenesisFile": "/current/conway-genesis.json",
+  "ConwayGenesisFile": "/config/conway-genesis.json",
   "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
   "EnableP2P": true,
   "LastKnownBlockVersion-Alt": 0,
@@ -13,7 +13,7 @@
   "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresMagic",
-  "ShelleyGenesisFile": "/current/shelley-genesis.json",
+  "ShelleyGenesisFile": "/config/shelley-genesis.json",
   "ShelleyGenesisHash": "162d29c4e1cf6b8a84f2d692e67a3ac6bc7851bc3e6e4afe64d15778bed8bd86",
   "TargetNumberOfActivePeers": 20,
   "TargetNumberOfEstablishedPeers": 50,

diff --git a/config/preview/config.json b/config/preview/config.json
@@ -1,9 +1,9 @@
 {
-  "AlonzoGenesisFile": "/current/alonzo-genesis.json",
+  "AlonzoGenesisFile": "/config/alonzo-genesis.json",
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
-  "ByronGenesisFile": "/current/byron-genesis.json",
+  "ByronGenesisFile": "/config/byron-genesis.json",
   "ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761",
-  "ConwayGenesisFile": "/current/conway-genesis.json",
+  "ConwayGenesisFile": "/config/conway-genesis.json",
   "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
   "EnableP2P": true,
   "ExperimentalHardForksEnabled": false,
@@ -15,7 +15,7 @@
   "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresMagic",
-  "ShelleyGenesisFile": "/current/shelley-genesis.json",
+  "ShelleyGenesisFile": "/config/shelley-genesis.json",
   "ShelleyGenesisHash": "363498d1024f84bb39d3fa9593ce391483cb40d479b87233f868d6e57c3a400d",
   "TargetNumberOfActivePeers": 20,
   "TargetNumberOfEstablishedPeers": 50,

diff --git a/config/sanchonet/config.json b/config/sanchonet/config.json
@@ -1,9 +1,9 @@
 {
-  "AlonzoGenesisFile": "/current/alonzo-genesis.json",
+  "AlonzoGenesisFile": "/config/alonzo-genesis.json",
   "AlonzoGenesisHash": "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec",
-  "ByronGenesisFile": "/current/byron-genesis.json",
+  "ByronGenesisFile": "/config/byron-genesis.json",
   "ByronGenesisHash": "785eb88427e136378a15b0a152a8bfbeec7a611529ccda29c43a1e60ffb48eaa",
-  "ConwayGenesisFile": "/current/conway-genesis.json",
+  "ConwayGenesisFile": "/config/conway-genesis.json",
   "ConwayGenesisHash": "49ef010ff0d13b090893a919bbc22022038a8b782faa0b1561a256b781672174",
   "EnableP2P": true,
   "ExperimentalHardForksEnabled": true,
@@ -15,7 +15,7 @@
   "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresMagic",
-  "ShelleyGenesisFile": "/current/shelley-genesis.json",
+  "ShelleyGenesisFile": "/config/shelley-genesis.json",
   "ShelleyGenesisHash": "f94457ec45a0c6773057a529533cf7ccf746cb44dabd56ae970e1dbfb55bfdb2",
   "TargetNumberOfActivePeers": 20,
   "TargetNumberOfEstablishedPeers": 50,

diff --git a/config/testnet/config.json b/config/testnet/config.json
@@ -1,9 +1,9 @@
 {
-  "AlonzoGenesisFile": "/current/alonzo-genesis.json",
+  "AlonzoGenesisFile": "/config/alonzo-genesis.json",
   "AlonzoGenesisHash": "6e39cafb2eda850e141e1d1aa6d6a72172a3b71a4ecb4c582d1aaff611635741",
-  "ByronGenesisFile": "/current/byron-genesis.json",
+  "ByronGenesisFile": "/config/byron-genesis.json",
   "ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761",
-  "ConwayGenesisFile": "/current/conway-genesis.json",
+  "ConwayGenesisFile": "/config/conway-genesis.json",
   "ConwayGenesisHash": "50d564452b77fadcf94a5e3130c1b53c62ed30e4dc6c4db1beb4dbc2c02f56ce",
   "EnableP2P": true,
   "ExperimentalHardForksEnabled": false,
@@ -13,7 +13,7 @@
   "LastKnownBlockVersion-Minor": 1,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresMagic",
-  "ShelleyGenesisFile": "/current/shelley-genesis.json",
+  "ShelleyGenesisFile": "/config/shelley-genesis.json",
   "ShelleyGenesisHash": "bc8e8982b147e4955a8c96ba88fef03853b9ee6901680dc7850a810b4883ca3a",
   "TargetNumberOfActivePeers": 20,
   "TargetNumberOfEstablishedPeers": 50,

diff --git a/docker/.env.dockerfile b/docker/.env.dockerfile
@@ -24,14 +24,14 @@ CARDANO_NODE_SOCKET=/node-ipc/node.socket
 ## Api env
 API_SPRING_PROFILES_ACTIVE=dev
 # staging, h2, test. Additional profiles: mempool (if mempool should be activated)
-API_PORT=8080
+API_PORT=8082
 
 ROSETTA_VERSION=1.4.13
-TOPOLOGY_FILEPATH=/current/topology.json
-GENESIS_SHELLEY_PATH=/current/shelley-genesis.json
-GENESIS_BYRON_PATH=/current/byron-genesis.json
-GENESIS_ALONZO_PATH=/current/alonzo-genesis.json
-GENESIS_CONWAY_PATH=/current/conway-genesis.json
+TOPOLOGY_FILEPATH=/config/topology.json
+GENESIS_SHELLEY_PATH=/config/shelley-genesis.json
+GENESIS_BYRON_PATH=/config/byron-genesis.json
+GENESIS_ALONZO_PATH=/config/alonzo-genesis.json
+GENESIS_CONWAY_PATH=/config/conway-genesis.json
 PRINT_EXCEPTION=true
 
 ## Yaci Indexer env

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -166,8 +166,8 @@ COPY --from=cardano-builder /root/src/cardano-node/cardano-submit-api/config/tx-
 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 ENV PATH=/usr/local/lib/:$PATH
 
-COPY ./config /config
-RUN mkdir /current
+COPY ./config /networks
+RUN mkdir /config
 
 RUN mkdir -p /data/db
 

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 echo "entrypoint - run node"
-cp -r /config/${NETWORK}/* /current/
+cp -r /networks/${NETWORK}/* /config/
 mkdir -p ${CARDANO_NODE_SOCKET_PATH}
-cardano-node run --database-path /data/db-${NETWORK} --host-addr 0.0.0.0 --port ${CARDANO_NODE_PORT} --socket-path ${CARDANO_NODE_SOCKET} --topology /current/topology.json --config /current/config.json > /logs/node.log &
+cardano-node run --database-path /data/db-${NETWORK} --host-addr 0.0.0.0 --port ${CARDANO_NODE_PORT} --socket-path ${CARDANO_NODE_SOCKET} --topology /config/topology.json --config /config/config.json > /logs/node.log &
 
 echo "entrypoint - run submit api"
 cardano-submit-api --config /root/cardano-submit-api/tx-submit-mainnet-config.yaml --socket-path ${CARDANO_NODE_SOCKET} --port ${NODE_SUBMIT_API_PORT} --testnet-magic ${PROTOCOL_MAGIC} > /logs/submit-api.log &