From 5d0e1c026d05624d43a2998dd58bc5b8238bf3b4 Mon Sep 17 00:00:00 2001
From: Dustin Brody <tersec@users.noreply.github.com>
Date: Mon, 28 Jan 2019 20:34:44 -0800
Subject: [PATCH] remove
 Validator.{custody_commitment,latest_custody_reseed_slot,penultimate_custody_reseed_slot}

---
 beacon_chain/spec/beaconstate.nim |  7 +------
 beacon_chain/spec/datatypes.nim   | 10 +---------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/beacon_chain/spec/beaconstate.nim b/beacon_chain/spec/beaconstate.nim
index 4b013b810..08ac0bfc0 100644
--- a/beacon_chain/spec/beaconstate.nim
+++ b/beacon_chain/spec/beaconstate.nim
@@ -50,8 +50,7 @@ func process_deposit(state: var BeaconState,
                      deposit: uint64,
                      proof_of_possession: ValidatorSig,
                      withdrawal_credentials: Eth2Digest,
-                     randao_commitment: Eth2Digest,
-                     custody_commitment: Eth2Digest) : ValidatorIndex =
+                     randao_commitment: Eth2Digest) : ValidatorIndex =
   ## Process a deposit from Ethereum 1.0.
 
   if false:
@@ -76,9 +75,6 @@ func process_deposit(state: var BeaconState,
       penalized_epoch: FAR_FUTURE_EPOCH,
       exit_count: 0,
       status_flags: 0,
-      custody_commitment: custody_commitment,
-      latest_custody_reseed_slot: GENESIS_SLOT,
-      penultimate_custody_reseed_slot: GENESIS_SLOT
     )
 
     let index = min_empty_validator_index(
@@ -231,7 +227,6 @@ func get_initial_beacon_state*(
       deposit.deposit_data.deposit_input.proof_of_possession,
       deposit.deposit_data.deposit_input.withdrawal_credentials,
       deposit.deposit_data.deposit_input.randao_commitment,
-      deposit.deposit_data.deposit_input.custody_commitment,
     )
 
     if state.validator_balances[validator_index] >= MAX_DEPOSIT_AMOUNT:
diff --git a/beacon_chain/spec/datatypes.nim b/beacon_chain/spec/datatypes.nim
index f46576989..59fbb4623 100644
--- a/beacon_chain/spec/datatypes.nim
+++ b/beacon_chain/spec/datatypes.nim
@@ -347,7 +347,7 @@ type
     pubkey*: ValidatorPubKey
     withdrawal_credentials*: Eth2Digest
 
-    # TODO remove randao_commitment, randao_layers, latest_status_change_slot, custody_commitment, latest_custody_reseed_slot, penultimate_custody_reseed_slot
+    # TODO remove randao_commitment, randao_layers, latest_status_change_slot
     randao_commitment*: Eth2Digest ##\
     ## RANDAO commitment created by repeatedly taking the hash of a secret value
     ## so as to create "onion layers" around it. For every block that a
@@ -380,14 +380,6 @@ type
 
     status_flags*: uint64
 
-    custody_commitment*: Eth2Digest
-
-    latest_custody_reseed_slot*: uint64 ##\
-    ## Slot of latest custody reseed
-
-    penultimate_custody_reseed_slot*: uint64 ##\
-    ## Slot of second-latest custody reseed
-
   Crosslink* = object
     epoch*: uint64
     shard_block_root*: Eth2Digest ##\