Add attestation slashing protection support

status-im · Sep 15, 2020 · e4ed246 · e4ed246
1 parent 3d194d5
commit e4ed246
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 31 deletions.
diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim
@@ -269,16 +269,15 @@ proc init*(T: type BeaconNode,
     topicAggregateAndProofs: topicAggregateAndProofs,
   )
 
-
-    res.attachedValidators = ValidatorPool.init(
-      SlashingProtectionDB.init(
-        chainDag.headState.data.data.genesis_validators_root,
-        when UseSlashingProtection:
-          kvStore SqStoreRef.init(conf.validatorsDir(), "slashing_protection").tryGet()
-        else:
-          KvStoreRef()
-      )
+  res.attachedValidators = ValidatorPool.init(
+    SlashingProtectionDB.init(
+      chainDag.headState.data.data.genesis_validators_root,
+      when UseSlashingProtection:
+        kvStore SqStoreRef.init(conf.validatorsDir(), "slashing_protection").tryGet()
+      else:
+        KvStoreRef()
     )
+  )
 
   proc getWallTime(): BeaconTime = res.beaconClock.now()
 

diff --git a/beacon_chain/validator_client.nim b/beacon_chain/validator_client.nim
@@ -148,7 +148,7 @@ proc onSlotStart(vc: ValidatorClient, lastSlot, scheduledSlot: Slot) {.gcsafe, a
           )
         newBlock.root = hash_tree_root(newBlock.message)
 
-        # TODO: recomputed in block proposal
+        # TODO: signing_root is recomputed in signBlockProposal just after
         let signing_root = compute_block_root(vc.fork, vc.beaconGenesis.genesis_validators_root, slot, newBlock.root)
         vc.attachedValidators
           .slashingProtection
@@ -159,7 +159,7 @@ proc onSlotStart(vc: ValidatorClient, lastSlot, scheduledSlot: Slot) {.gcsafe, a
 
         discard await vc.client.post_v1_validator_block(newBlock)
       else:
-        warn "Slashing protection activated",
+        warn "Slashing protection activated for block proposal",
           validator = public_key,
           slot = slot,
           existingProposal = notSlashable.error
@@ -182,12 +182,31 @@ proc onSlotStart(vc: ValidatorClient, lastSlot, scheduledSlot: Slot) {.gcsafe, a
         let validator = vc.attachedValidators.validators[a.public_key]
         let ad = await vc.client.get_v1_validator_attestation(slot, a.committee_index)
 
-        # TODO I don't like these (u)int64-to-int conversions...
-        let attestation = await validator.produceAndSignAttestation(
-          ad, a.committee_length.int, a.validator_committee_index.int,
-          vc.fork, vc.beaconGenesis.genesis_validators_root)
-
-        discard await vc.client.post_v1_beacon_pool_attestations(attestation)
+        let notSlashable = vc.attachedValidators
+                             .slashingProtection
+                             .notSlashableAttestation(
+                               a.public_key,
+                               ad.source.epoch,
+                               ad.target.epoch)
+        if notSlashable.isOk():
+          # TODO signing_root is recomputed in produceAndSignAttestation/signAttestation just after
+          let signing_root = compute_attestation_root(
+            vc.fork, vc.beaconGenesis.genesis_validators_root, ad)
+          vc.attachedValidators
+            .slashingProtection
+            .registerAttestation(
+              a.public_key, ad.source.epoch, ad.target.epoch, signing_root)
+
+          # TODO I don't like these (u)int64-to-int conversions...
+          let attestation = await validator.produceAndSignAttestation(
+            ad, a.committee_length.int, a.validator_committee_index.int,
+            vc.fork, vc.beaconGenesis.genesis_validators_root)
+
+          discard await vc.client.post_v1_beacon_pool_attestations(attestation)
+        else:
+          warn "Slashing protection activated for attestation",
+            validator = a.public_key,
+            badVoteDetails = $notSlashable.error
 
   except CatchableError as err:
     warn "Caught an unexpected error", err = err.msg, slot = shortLog(slot)

diff --git a/beacon_chain/validator_duties.nim b/beacon_chain/validator_duties.nim
@@ -7,7 +7,7 @@
 
 import
   # Standard library
-  std/[os, tables, strutils, sequtils, osproc, streams],
+  std/[os, tables, sequtils, osproc, streams],
 
   # Nimble packages
   stew/[objects], stew/shims/macros,
@@ -398,9 +398,21 @@ proc handleAttestations(node: BeaconNode, head: BlockRef, slot: Slot) =
         attestations.add((ad, committee.len, index_in_committee, validator))
 
   for a in attestations:
-    traceAsyncErrors createAndSendAttestation(
-      node, fork, genesis_validators_root, a.validator, a.data,
-      a.committeeLen, a.indexInCommittee, num_active_validators)
+    let notSlashable = node.attachedValidators
+                           .slashingProtection
+                           .notSlashableAttestation(
+                             a.validator.pubkey,
+                             a.data.source.epoch,
+                             a.data.target.epoch)
+
+    if notSlashable.isOk():
+      traceAsyncErrors createAndSendAttestation(
+        node, fork, genesis_validators_root, a.validator, a.data,
+        a.committeeLen, a.indexInCommittee, num_active_validators)
+    else:
+      warn "Slashing protection activated for attestation",
+        validator = a.validator.pubkey,
+        badVoteDetails = $notSlashable.error
 
 proc handleProposal(node: BeaconNode, head: BlockRef, slot: Slot):
     Future[BlockRef] {.async.} =

diff --git a/beacon_chain/validator_slashing_protection.nim b/beacon_chain/validator_slashing_protection.nim
@@ -160,10 +160,11 @@ type
   BadVote* = object
     case kind*: BadVoteKind
     of DoubleVote:
-      existingAttRoot*: Eth2Digest
+      existingAttestation*: Eth2Digest
     of SurroundedVote, SurroundingVote:
-      exampleAttRoot*: Eth2Digest # Many roots might be in conflict
-      source*, target*: Epoch
+      existingAttestationRoot*: Eth2Digest # Many roots might be in conflict
+      sourceExisting*, targetExisting*: Epoch
+      sourceSlashable*, targetSlashable*: Epoch
     of TargetPrecedesSource:
       discard
 
@@ -421,7 +422,7 @@ proc notSlashableAttestationImpl(
     # Logged by caller
     return err(BadVote(
       kind: DoubleVote,
-      existingAttRoot: foundAttestation.unsafeGet().attestation_root
+      existingAttestation: foundAttestation.unsafeGet().attestation_root
     ))
 
   # TODO: we hack KV-store range queries
@@ -494,9 +495,11 @@ proc notSlashableAttestationImpl(
       # Logged by caller
       return err(BadVote(
         kind: SurroundingVote,
-        exampleAttRoot: ar1,
-        source: s1,
-        target: t2
+        existingAttestationRoot: ar1,
+        sourceExisting: s1,
+        targetExisting: t1,
+        sourceSlashable: s2,
+        targetSlashable: t2
       ))
 
     # Next iteration
@@ -523,9 +526,11 @@ proc notSlashableAttestationImpl(
       # Logged by caller
       return err(BadVote(
         kind: SurroundedVote,
-        exampleAttRoot: ar1,
-        source: s1,
-        target: t2
+        existingAttestationRoot: ar1,
+        sourceExisting: s1,
+        targetExisting: t1,
+        sourceSlashable: s2,
+        targetSlashable: t2
       ))
 
     # Next iteration