Add proof of custody placeholders

Author: hwwhww

eth/beacon/deposit_helpers.py

@@ -54,11 +54,13 @@ def validate_proof_of_possession(state: BeaconState,
                                  pubkey: BLSPubkey,
                                  proof_of_possession: BLSSignature,
                                  withdrawal_credentials: Hash32,
-                                 randao_commitment: Hash32) -> None:
+                                 randao_commitment: Hash32,
+                                 custody_commitment: Hash32) -> None:
     deposit_input = DepositInput(
         pubkey=pubkey,
         withdrawal_credentials=withdrawal_credentials,
         randao_commitment=randao_commitment,
+        custody_commitment=custody_commitment,
         proof_of_possession=EMPTY_SIGNATURE,
     )
 
@@ -119,6 +121,7 @@ def process_deposit(*,
                     proof_of_possession: BLSSignature,
                     withdrawal_credentials: Hash32,
                     randao_commitment: Hash32,
+                    custody_commitment: Hash32,
                     zero_balance_validator_ttl: int) -> Tuple[BeaconState, ValidatorIndex]:
     """
     Process a deposit from Ethereum 1.0.
@@ -129,6 +132,7 @@ def process_deposit(*,
         proof_of_possession,
         withdrawal_credentials,
         randao_commitment,
+        custody_commitment,
     )
 
     validator_pubkeys = tuple(v.pubkey for v in state.validator_registry)
@@ -138,6 +142,7 @@ def process_deposit(*,
             withdrawal_credentials=withdrawal_credentials,
             randao_commitment=randao_commitment,
             latest_status_change_slot=state.slot,
+            custody_commitment=custody_commitment,
         )
 
         state, index = add_pending_validator(

eth/beacon/types/blocks.py

@@ -39,10 +39,13 @@
 
 
 from .attestations import Attestation
-from .proposer_slashings import ProposerSlashing
+from .custody_challenges import CustodyChallenge
+from .custody_reseeds import CustodyReseed
+from .custody_responses import CustodyResponse
 from .casper_slashings import CasperSlashing
 from .deposits import Deposit
 from .exits import Exit
+from .proposer_slashings import ProposerSlashing
 
 if TYPE_CHECKING:
     from eth.beacon.db.chain import BaseBeaconChainDB  # noqa: F401
@@ -53,20 +56,29 @@ class BaseBeaconBlockBody(rlp.Serializable):
         ('proposer_slashings', CountableList(ProposerSlashing)),
         ('casper_slashings', CountableList(CasperSlashing)),
         ('attestations', CountableList(Attestation)),
+        ('custody_reseeds', CountableList(CustodyReseed)),
+        ('custody_challenges', CountableList(CustodyChallenge)),
+        ('custody_responses', CountableList(CustodyResponse)),
         ('deposits', CountableList(Deposit)),
         ('exits', CountableList(Exit)),
     ]
 
     def __init__(self,
-                 proposer_slashings: Sequence[int],
-                 casper_slashings: Sequence[int],
-                 attestations: Sequence[int],
-                 deposits: Sequence[int],
-                 exits: Sequence[int])-> None:
+                 proposer_slashings: Sequence[ProposerSlashing],
+                 casper_slashings: Sequence[CasperSlashing],
+                 attestations: Sequence[Attestation],
+                 custody_reseeds: Sequence[CustodyReseed],
+                 custody_challenges: Sequence[CustodyResponse],
+                 custody_responses: Sequence[CustodyResponse],
+                 deposits: Sequence[Deposit],
+                 exits: Sequence[Exit])-> None:
         super().__init__(
             proposer_slashings=proposer_slashings,
             casper_slashings=casper_slashings,
             attestations=attestations,
+            custody_reseeds=custody_reseeds,
+            custody_challenges=custody_challenges,
+            custody_responses=custody_responses,
             deposits=deposits,
             exits=exits,
         )
@@ -166,6 +178,9 @@ def from_root(cls, root: Hash32, chaindb: 'BaseBeaconChainDB') -> 'BeaconBlock':
             proposer_slashings=block.body.proposer_slashings,
             casper_slashings=block.body.casper_slashings,
             attestations=block.body.attestations,
+            custody_reseeds=block.body.custody_reseeds,
+            custody_challenges=block.body.custody_challenges,
+            custody_responses=block.body.custody_responses,
             deposits=block.body.deposits,
             exits=block.body.exits,
         )

eth/beacon/types/custody_challenges.py

@@ -0,0 +1,5 @@
+import rlp
+
+
+class CustodyChallenge(rlp.Serializable):
+    pass

eth/beacon/types/custody_reseeds.py

@@ -0,0 +1,5 @@
+import rlp
+
+
+class CustodyReseed(rlp.Serializable):
+    pass

eth/beacon/types/custody_responses.py

@@ -0,0 +1,5 @@
+import rlp
+
+
+class CustodyResponse(rlp.Serializable):
+    pass

eth/beacon/types/deposit_input.py

@@ -29,6 +29,8 @@ class DepositInput(rlp.Serializable):
         ('withdrawal_credentials', hash32),
         # Initial RANDAO commitment
         ('randao_commitment', hash32),
+        # Initial proof of custody commitment
+        ('custody_commitment', hash32),
         # BLS proof of possession (a BLS signature)
         ('proof_of_possession', CountableList(uint384)),
     ]
@@ -37,11 +39,13 @@ def __init__(self,
                  pubkey: BLSPubkey,
                  withdrawal_credentials: Hash32,
                  randao_commitment: Hash32,
+                 custody_commitment: Hash32,
                  proof_of_possession: BLSSignature=EMPTY_SIGNATURE) -> None:
         super().__init__(
             pubkey=pubkey,
             withdrawal_credentials=withdrawal_credentials,
             randao_commitment=randao_commitment,
+            custody_commitment=custody_commitment,
             proof_of_possession=proof_of_possession,
         )
 

eth/beacon/types/states.py

@@ -33,6 +33,7 @@
 
 from .pending_attestation_records import PendingAttestationRecord
 from .candidate_pow_receipt_root_records import CandidatePoWReceiptRootRecord
+from .custody_challenges import CustodyChallenge
 from .crosslink_records import CrosslinkRecord
 from .fork_data import ForkData
 from .shard_committees import ShardCommittee
@@ -64,6 +65,10 @@ class BeaconState(rlp.Serializable):
         ('persistent_committees', CountableList(CountableList(uint24))),
         ('persistent_committee_reassignments', CountableList(ShardReassignmentRecord)),
 
+
+        # Proof of custody
+        ('custody_challenges', CountableList(CustodyChallenge)),
+
         # Finality
         ('previous_justified_slot', uint64),
         ('justified_slot', uint64),
@@ -103,6 +108,7 @@ def __init__(
             shard_committees_at_slots: Sequence[Sequence[ShardCommittee]]=(),
             persistent_committees: Sequence[Sequence[ValidatorIndex]]=(),
             persistent_committee_reassignments: Sequence[ShardReassignmentRecord]=(),
+            custody_challenges: Sequence[CustodyChallenge]=(),
             latest_crosslinks: Sequence[CrosslinkRecord]=(),
             latest_block_roots: Sequence[Hash32]=(),
             latest_penalized_exit_balances: Sequence[Gwei]=(),
@@ -127,6 +133,8 @@ def __init__(
             shard_committees_at_slots=shard_committees_at_slots,
             persistent_committees=persistent_committees,
             persistent_committee_reassignments=persistent_committee_reassignments,
+            # Proof of Custody
+            custody_challenges=custody_challenges,
             # Finality
             previous_justified_slot=previous_justified_slot,
             justified_slot=justified_slot,

eth/beacon/types/validator_records.py

@@ -42,6 +42,11 @@ class ValidatorRecord(rlp.Serializable):
         ('latest_status_change_slot', uint64),
         # Sequence number when validator exited (or 0)
         ('exit_count', uint64),
+        # Proof of custody commitment
+        ('custody_commitment', hash32),
+        # Slot the proof of custody seed was last changed
+        ('latest_custody_reseed_slot', uint64),
+        ('penultimate_custody_reseed_slot', uint64),
     ]
 
     def __init__(self,
@@ -51,7 +56,10 @@ def __init__(self,
                  randao_layers: int,
                  status: ValidatorStatusCode,
                  latest_status_change_slot: SlotNumber,
-                 exit_count: int) -> None:
+                 exit_count: int,
+                 custody_commitment: Hash32,
+                 latest_custody_reseed_slot: SlotNumber,
+                 penultimate_custody_reseed_slot: SlotNumber) -> None:
         super().__init__(
             pubkey=pubkey,
             withdrawal_credentials=withdrawal_credentials,
@@ -60,6 +68,9 @@ def __init__(self,
             status=status,
             latest_status_change_slot=latest_status_change_slot,
             exit_count=exit_count,
+            custody_commitment=custody_commitment,
+            latest_custody_reseed_slot=latest_custody_reseed_slot,
+            penultimate_custody_reseed_slot=penultimate_custody_reseed_slot,
         )
 
     @property
@@ -74,7 +85,8 @@ def get_pending_validator(cls,
                               pubkey: BLSPubkey,
                               withdrawal_credentials: Hash32,
                               randao_commitment: Hash32,
-                              latest_status_change_slot: SlotNumber) -> 'ValidatorRecord':
+                              latest_status_change_slot: SlotNumber,
+                              custody_commitment: Hash32) -> 'ValidatorRecord':
         """
         Return a new pending ``ValidatorRecord`` with the given fields.
         """
@@ -86,4 +98,7 @@ def get_pending_validator(cls,
             status=ValidatorStatusCode.PENDING_ACTIVATION,
             latest_status_change_slot=latest_status_change_slot,
             exit_count=0,
+            custody_commitment=custody_commitment,
+            latest_custody_reseed_slot=SlotNumber(0),
+            penultimate_custody_reseed_slot=SlotNumber(0),
         )

tests/beacon/conftest.py

@@ -123,6 +123,9 @@ def sample_beacon_block_body_params():
         'proposer_slashings': (),
         'casper_slashings': (),
         'attestations': (),
+        'custody_reseeds': (),
+        'custody_challenges': (),
+        'custody_responses': (),
         'deposits': (),
         'exits': (),
     }
@@ -157,6 +160,7 @@ def sample_beacon_state_params(sample_fork_data_params):
         'shard_committees_at_slots': (),
         'persistent_committees': (),
         'persistent_committee_reassignments': (),
+        'custody_challenges': (),
         'previous_justified_slot': 0,
         'justified_slot': 0,
         'justification_bitfield': b'\x00',
@@ -191,9 +195,10 @@ def sample_crosslink_record_params():
 def sample_deposit_input_params():
     return {
         'pubkey': 123,
-        'proof_of_possession': (0, 0),
         'withdrawal_credentials': b'\11' * 32,
         'randao_commitment': b'\11' * 32,
+        'custody_commitment': ZERO_HASH32,
+        'proof_of_possession': (0, 0),
     }
 
 
@@ -307,7 +312,10 @@ def sample_validator_record_params():
         'randao_layers': 1,
         'status': 1,
         'latest_status_change_slot': 0,
-        'exit_count': 0
+        'exit_count': 0,
+        'custody_commitment': ZERO_HASH32,
+        'latest_custody_reseed_slot': 0,
+        'penultimate_custody_reseed_slot': 0,
     }
 
 
@@ -549,6 +557,9 @@ def genesis_validators(init_validator_keys,
             status=ValidatorStatusCode.ACTIVE,
             latest_status_change_slot=0,
             exit_count=0,
+            custody_commitment=ZERO_HASH32,
+            latest_custody_reseed_slot=0,
+            penultimate_custody_reseed_slot=0,
         ) for pub in init_validator_keys
     )
 

tests/beacon/helpers.py

@@ -17,6 +17,9 @@ def mock_validator_record(pubkey):
         status=ValidatorStatusCode.ACTIVE,
         latest_status_change_slot=0,
         exit_count=0,
+        custody_commitment=b'\x55' * 32,
+        latest_custody_reseed_slot=0,
+        penultimate_custody_reseed_slot=0,
     )