Resolve merge conflicts

ethereum · Nov 22, 2021 · 70667f7 · 70667f7
2 parents 60ab1fc + b58211f
commit 70667f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/eth2_node.py b/eth2_node.py
@@ -16,6 +16,7 @@ class AttestationDuty(Container):
     committees_at_slot: uint64
     validator_committee_index: ValidatorIndex # TODO: Is this the correct datatype?
     slot: Slot
+    validator_index: ValidatorIndex
 
 class ProposerDuty(Container):
     pubkey: BLSPubkey
@@ -90,4 +91,4 @@ def vc_sign_block(block: BeaconBlock, proposer_duty: ProposerDuty) -> SignedBeac
     """Returns a signed beacon block using the validator index given in the proposer duty.
     This endpoint does not exist in beacon-APIs.
     """
-    pass
+    pass
diff --git a/spec.py b/spec.py
@@ -102,4 +102,4 @@ def serve_proposer_duty(proposer_duty):
     # 4. Send complete signed block to BN for broadcast
     bn_submit_block(complete_signed_block)
 
-    # Release lock on consensus_on_block here.
+    # Release lock on consensus_on_block here.