From 9fd0cf41e7f6752925828da706d0696b53b81a35 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Thu, 16 Jul 2020 15:16:07 +1000
Subject: [PATCH] Tweak prepackaged configs

The Byron mainnet config has been tested, but Byron testnet has not.

Also delete config for a component that has been moved out of this
repo some time ago.
---
 config/mainnet-config.yaml           |  12 +++-
 config/testnet-config.yaml           |  11 ++-
 config/tx-submit-mainnet-config.yaml | 103 ---------------------------
 3 files changed, 20 insertions(+), 106 deletions(-)
 delete mode 100644 config/tx-submit-mainnet-config.yaml

diff --git a/config/mainnet-config.yaml b/config/mainnet-config.yaml
index 302faf746..9beeb3abf 100644
--- a/config/mainnet-config.yaml
+++ b/config/mainnet-config.yaml
@@ -1,11 +1,19 @@
 # Explorer DB Node configuration
 
 NetworkName: mainnet
-RequiresNetworkMagic: RequiresNoMagic
-GenesisHash: 5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb
 EnableLogMetrics: False
 EnableLogging: True
 
+Protocol: Byron
+
+RequiresNetworkMagic: RequiresNoMagic
+
+ByronGenesisFile: ../cardano-node/mainnet-genesis.json
+ByronGenesisHash: 5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb
+
+ShelleyGenesisFile: not/applicable
+ShelleyGenesisHash: not/applicable
+
 # ------------------------------------------------------------------------------
 # Logging configuration follows.
 
diff --git a/config/testnet-config.yaml b/config/testnet-config.yaml
index 9379ad477..2b75464eb 100644
--- a/config/testnet-config.yaml
+++ b/config/testnet-config.yaml
@@ -2,10 +2,19 @@
 
 NetworkName: testnet
 RequiresNetworkMagic: RequiresMagic
-GenesisHash: 96fceff972c2c06bd3bb5243c39215333be6d56aaf4823073dca31afe5038471
 EnableLogMetrics: False
 EnableLogging: True
 
+Protocol: Byron
+
+RequiresNetworkMagic: RequiresMagic
+
+ByronGenesisFile: ../cardano-node/configuration/defaults/byron-testnet/genesis.json
+ByronGenesisHash: 96fceff972c2c06bd3bb5243c39215333be6d56aaf4823073dca31afe5038471
+
+ShelleyGenesisFile: not/applicable
+ShelleyGenesisHash: not/applicable
+
 # ------------------------------------------------------------------------------
 # Logging configuration follows.
 
diff --git a/config/tx-submit-mainnet-config.yaml b/config/tx-submit-mainnet-config.yaml
deleted file mode 100644
index 0b5635290..000000000
--- a/config/tx-submit-mainnet-config.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-# Explorer DB Node configuration
-
-RequiresNetworkMagic: RequiresNoMagic
-GenesisHash: 5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb
-EnableLogMetrics: False
-EnableLogging: True
-
-# ------------------------------------------------------------------------------
-# Logging configuration follows.
-
-# global filter; messages must have at least this severity to pass:
-minSeverity: Info
-
-# global file rotation settings:
-rotation:
-  rpLogLimitBytes: 5000000
-  rpKeepFilesNum:  10
-  rpMaxAgeHours:   24
-
-# these backends are initialized:
-setupBackends:
-  - AggregationBK
-  - KatipBK
-  # - EditorBK
-  # - EKGViewBK
-
-# if not indicated otherwise, then messages are passed to these backends:
-defaultBackends:
-  - KatipBK
-
-# if wanted, the GUI is listening on this port:
-# hasGUI: 12787
-
-# if wanted, the EKG interface is listening on this port:
-# hasEKG: 12788
-
-# here we set up outputs of logging in 'katip':
-setupScribes:
-  - scKind: StdoutSK
-    scName: stdout
-    scFormat: ScText
-    scRotation: null
-
-# if not indicated otherwise, then log output is directed to this:
-defaultScribes:
-  - - StdoutSK
-    - stdout
-
-# more options which can be passed as key-value pairs:
-options:
-  cfokey:
-    value: "Release-1.0.0"
-  mapSubtrace:
-    benchmark:
-      contents:
-        - GhcRtsStats
-        - MonotonicClock
-      subtrace: ObservableTrace
-    '#ekgview':
-      contents:
-      - - tag: Contains
-          contents: 'cardano.epoch-validation.benchmark'
-        - - tag: Contains
-            contents: .monoclock.basic.
-      - - tag: Contains
-          contents: 'cardano.epoch-validation.benchmark'
-        - - tag: Contains
-            contents: diff.RTS.cpuNs.timed.
-      - - tag: StartsWith
-          contents: '#ekgview.#aggregation.cardano.epoch-validation.benchmark'
-        - - tag: Contains
-            contents: diff.RTS.gcNum.timed.
-      subtrace: FilterTrace
-    'cardano.epoch-validation.utxo-stats':
-      # Change the `subtrace` value to `Neutral` in order to log
-      # `UTxO`-related messages during epoch validation.
-      subtrace: NoTrace
-    '#messagecounters.aggregation':
-      subtrace: NoTrace
-    '#messagecounters.ekgview':
-      subtrace: NoTrace
-    '#messagecounters.switchboard':
-      subtrace: NoTrace
-    '#messagecounters.katip':
-      subtrace: NoTrace
-    '#messagecounters.monitoring':
-      subtrace: NoTrace
-    'cardano.#messagecounters.aggregation':
-      subtrace: NoTrace
-    'cardano.#messagecounters.ekgview':
-      subtrace: NoTrace
-    'cardano.#messagecounters.switchboard':
-      subtrace: NoTrace
-    'cardano.#messagecounters.katip':
-      subtrace: NoTrace
-    'cardano.#messagecounters.monitoring':
-      subtrace: NoTrace
-  mapBackends:
-    cardano.epoch-validation.benchmark:
-      - AggregationBK
-    '#aggregation.cardano.epoch-validation.benchmark':
-      - EKGViewBK
-