Node 11.1.0 SRE prep

.github/workflows/check-mainnet-config.yml

@@ -43,7 +43,6 @@ jobs:
           'mainnet-byron-genesis.json'
           'mainnet-checkpoints.json'
           'mainnet-config.json'
-          'mainnet-config-legacy.json'
           'mainnet-peer-snapshot.json'
           'mainnet-shelley-genesis.json'
           'mainnet-topology.json'

configuration/cardano/mainnet-config.json

@@ -13,12 +13,14 @@
   "LastKnownBlockVersion-Minor": 0,
   "LedgerDB": {
     "Backend": "V2InMemory",
-    "NumOfDiskSnapshots": 2,
     "QueryBatchSize": 100000,
-    "SnapshotInterval": 4320
+    "Snapshots": {
+      "NumOfDiskSnapshots": 2,
+      "SnapshotInterval": 4320
+    }
   },
   "MaxKnownMajorProtocolVersion": 2,
-  "MinNodeVersion": "10.7.0",
+  "MinNodeVersion": "11.1.0",
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresNoMagic",
   "ShelleyGenesisFile": "mainnet-shelley-genesis.json",
@@ -107,14 +109,5 @@
     "Startup.DiffusionInit": {
       "severity": "Info"
     }
-  },
-  "TurnOnLogMetrics": true,
-  "TurnOnLogging": true,
-  "UseTraceDispatcher": true,
-  "defaultBackends": [],
-  "defaultScribes": [],
-  "minSeverity": "Critical",
-  "options": {},
-  "setupBackends": [],
-  "setupScribes": []
+  }
 }

configuration/cardano/mainnet-config.yaml

@@ -79,39 +79,44 @@ ConsensusMode: PraosMode
 
 # Additional configuration options can be found at:
 # https://ouroboros-consensus.cardano.intersectmbo.org/docs/for-developers/utxo-hd/migrating
-LedgerDB:
-  # The time interval between snapshots, in seconds.
-  SnapshotInterval: 4320
-
-  # The number of disk snapshots to keep.
-  NumOfDiskSnapshots: 2
 
+LedgerDB:
   # When querying the store for a big range of UTxOs (such as with
   # QueryUTxOByAddress), the store will be read in batches of this size.
   QueryBatchSize: 100000
 
   # The backend can either be in memory with `V2InMemory` or on disk with
-  # `V1LMDB`.
+  # `V2LSM`.
   Backend: V2InMemory
 
-##### Version Information #####
+  # Instead of an object with individual options, a predefined snapshot
+  # policy can be selected by name, e.g. `Snapshots: Mithril`.
+  Snapshots:
+    # The snapshot interval in slots.
+    SnapshotInterval: 4320
 
-# Min is currently 10.7.0 due to change of config bundled peer-snapshot
-# version.
-MinNodeVersion: "10.7.0"
+    # Start taking the snaphots at a slot offset.
+    # SlotOffset = 172800;
 
-##### Logging configuration #####
+    # A minimum duration between snapshots, in seconds (used to avoid excessive snapshots while syncing).
+    # Default is 10 minutes.
+    # RateLimit = 600;
 
-# Enable or disable logging overall
-TurnOnLogging: True
+    # Randomised snapshot delay range, in seconds.
+    # Both Min and Max need to be specified, otherwise the default delay of (5min, 10min) will be used.
+    # MinDelay = 300;
+    # MaxDelay = 600;
 
-# Enable the collection of various OS metrics such as memory and CPU use.
-# These metrics are traced in the context name: 'cardano.node.metrics' and can
-# be directed to the logs or monitoring backends.
-TurnOnLogMetrics: True
+    # The number of disk snapshots to keep.
+    NumOfDiskSnapshots: 2
 
-# Use the modern tracing system instead of the legacy tracing system.
-UseTraceDispatcher: True
+##### Version Information #####
+
+# Min is currently 11.1.0 due to removal of legacy tracing system and
+# introduction of deterministic snapshots.
+MinNodeVersion: "11.1.0"
+
+##### Logging configuration #####
 
 # Match the metrics prefix of the legacy tracing system to minimize breaking
 # changes.
@@ -255,17 +260,6 @@ TraceOptions:
   Mempool.SyncNotNeeded:
     severity: Silence
 
-# Required by the legacy tracing system, this key is still required for
-# cardano-node to start.
-minSeverity: Critical
-
-# Required by some legacy tests which may otherwise fail to start.
-defaultBackends: []
-defaultScribes: []
-options: {}
-setupBackends: []
-setupScribes: []
-
 # Set or unset the mempool capacity override in number of bytes.
 #
 # This is intended for testing, and for low-resource machines to run with a smaller mempool.

configuration/cardano/testnet-template-config.json

@@ -13,9 +13,11 @@
   "LastKnownBlockVersion-Minor": 1,
   "LedgerDB": {
     "Backend": "V2InMemory",
-    "NumOfDiskSnapshots": 2,
     "QueryBatchSize": 100000,
-    "SnapshotInterval": 216
+    "Snapshots": {
+      "NumOfDiskSnapshots": 2,
+      "SnapshotInterval": 216
+    }
   },
   "MaxConcurrencyDeadline": 4,
   "MaxKnownMajorProtocolVersion": 2,
@@ -111,14 +113,5 @@
     "Startup.DiffusionInit": {
       "severity": "Info"
     }
-  },
-  "TurnOnLogMetrics": true,
-  "TurnOnLogging": true,
-  "UseTraceDispatcher": true,
-  "defaultBackends": [],
-  "defaultScribes": [],
-  "minSeverity": "Critical",
-  "options": {},
-  "setupBackends": [],
-  "setupScribes": []
+  }
 }

configuration/cardano/update-config-files.sh

@@ -30,7 +30,6 @@ copyCfg "mainnet-alonzo-genesis.json"
 copyCfg "mainnet-byron-genesis.json"
 copyCfg "mainnet-checkpoints.json"
 copyCfg "mainnet-config.json"
-copyCfg "mainnet-config-legacy.json"
 copyCfg "mainnet-conway-genesis.json"
 copyCfg "mainnet-peer-snapshot.json"
 copyCfg "mainnet-shelley-genesis.json"
@@ -40,7 +39,6 @@ copyCfg "mainnet-topology.json"
 copyTmplCfg "alonzo.json"
 copyTmplCfg "byron.json"
 copyTmplCfg "config.json"
-copyTmplCfg "config-legacy.json"
 copyTmplCfg "conway.json"
 copyTmplCfg "dijkstra.json"
 copyTmplCfg "shelley.json"