Don't Copy The Whole Validator Map each time (#5780)

* fix copying issues * revert some changes
prysmaticlabs · May 8, 2020 · 6fed51d · 6fed51d
1 parent c1a8b41
commit 6fed51d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/beacon-chain/core/blocks/block_operations.go b/beacon-chain/core/blocks/block_operations.go
@@ -945,7 +945,6 @@ func ProcessDeposit(
 	pubKey := deposit.Data.PublicKey
 	amount := deposit.Data.Amount
 	index, ok := beaconState.ValidatorIndexByPubkey(bytesutil.ToBytes48(pubKey))
-	numVals := beaconState.NumValidators()
 	if !ok {
 		domain, err := helpers.ComputeDomain(params.BeaconConfig().DomainDeposit, nil, nil)
 		if err != nil {
@@ -976,8 +975,6 @@ func ProcessDeposit(
 		if err := beaconState.AppendBalance(amount); err != nil {
 			return nil, err
 		}
-		numVals++
-		beaconState.SetValidatorIndexByPubkey(bytesutil.ToBytes48(pubKey), uint64(numVals-1))
 	} else {
 		if err := helpers.IncreaseBalance(beaconState, uint64(index), amount); err != nil {
 			return nil, err

diff --git a/beacon-chain/state/setters.go b/beacon-chain/state/setters.go
@@ -666,10 +666,15 @@ func (b *BeaconState) AppendValidator(val *ethpb.Validator) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
+	// append validator to slice and add
+	// it to the validator map
 	b.state.Validators = append(vals, val)
+	valIdx := uint64(len(b.state.Validators) - 1)
+	valMap := coreutils.ValidatorIndexMap(b.state.Validators)
+
 	b.markFieldAsDirty(validators)
-	b.AddDirtyIndices(validators, []uint64{uint64(len(b.state.Validators) - 1)})
-	b.valIdxMap = coreutils.ValidatorIndexMap(b.state.Validators)
+	b.AddDirtyIndices(validators, []uint64{valIdx})
+	b.valIdxMap = valMap
 	return nil
 }