Continue using the V1 Slashing DB by default

Author: zah

beacon_chain/conf.nim

@@ -51,6 +51,11 @@ type
     enabled # Always enabled
     disabled # Always disabled
 
+  SlashingDbKind* {.pure.} = enum
+    v1
+    v2
+    both
+
   BeaconNodeConf* = object
     logLevel* {.
       defaultValue: "INFO"
@@ -120,12 +125,11 @@ type
       desc: "Subscribe to all attestation subnet topics when gossiping"
       name: "subscribe-all-subnets" }: bool
 
-    # Can we use a set[enum]?
-    testDualSlashingProtectionDBs* {.
+    slashingDbKind* {.
       hidden
-      defaultValue: false
-      desc: "Use the the 2 slashing protection implementation at the same time to ensure no regression."
-      name: "slashing-test-dual-db" }: bool
+      defaultValue: SlashingDbKind.v1
+      desc: "The slashing DB flavour to use (v1, v2 or both)"
+      name: "slashing-db-kind" }: SlashingDbKind
 
     case cmd* {.
       command

beacon_chain/nimbus_beacon_node.nim

@@ -320,24 +320,35 @@ proc init*(T: type BeaconNode,
         topics &= getAttestationTopic(enrForkId.forkDigest, subnet)
       topics)
 
-  if conf.testDualSlashingProtectionDBs:
-    info "Loading slashing protection database (dual DB mode)", path = conf.validatorsDir()
+  case conf.slashingDbKind
+  of SlashingDbKind.v1:
+    info "Loading slashing protection database", path = conf.validatorsDir()
     res.attachedValidators = ValidatorPool.init(
       SlashingProtectionDB.init(
         chainDag.headState.data.data.genesis_validators_root,
         conf.validatorsDir(), "slashing_protection",
-        modes = {kCompleteArchiveV1, kCompleteArchiveV2},
-        disagreementBehavior = kChooseV2
+        modes = {kCompleteArchiveV1},
+        disagreementBehavior = kChooseV1
       )
     )
-  else:
-    info "Loading slashing protection database", path = conf.validatorsDir()
+  of SlashingDbKind.v2:
+    info "Loading slashing protection database (v2)", path = conf.validatorsDir()
     res.attachedValidators = ValidatorPool.init(
       SlashingProtectionDB.init(
         chainDag.headState.data.data.genesis_validators_root,
         conf.validatorsDir(), "slashing_protection"
       )
     )
+  of SlashingDbKind.both:
+    info "Loading slashing protection database (dual DB mode)", path = conf.validatorsDir()
+    res.attachedValidators = ValidatorPool.init(
+      SlashingProtectionDB.init(
+        chainDag.headState.data.data.genesis_validators_root,
+        conf.validatorsDir(), "slashing_protection",
+        modes = {kCompleteArchiveV1, kCompleteArchiveV2},
+        disagreementBehavior = kChooseV2
+      )
+    )
 
   proc getWallTime(): BeaconTime = res.beaconClock.now()