Remove Deprecated Protobuf State Fields (#2713)

beacon-chain/blockchain/fork_choice_test.go

@@ -1528,7 +1528,7 @@ func setupFFGTest(t *testing.T) ([32]byte, *pb.BeaconBlock, *pb.BeaconState, []*
 		LatestRandaoMixes:      latestRandaoMixes,
 		LatestActiveIndexRoots: make([][]byte, params.BeaconConfig().LatestActiveIndexRootsLength),
 		LatestSlashedBalances:  make([]uint64, params.BeaconConfig().LatestSlashedExitLength),
-		LatestCrosslinks:       crosslinks,
+		CurrentCrosslinks:      crosslinks,
 		ValidatorRegistry:      validatorRegistry,
 		Balances:               validatorBalances,
 		LatestBlock:            gBlock,

beacon-chain/blockchain/service.go

@@ -149,9 +149,6 @@ func (c *ChainService) initializeBeaconChain(genesisTime time.Time, deposits []*
 		return nil, fmt.Errorf("could not hash beacon block: %v", err)
 	}
 
-	// TODO(#2011): Remove this in state caching.
-	beaconState.LatestBlock = genBlock
-
 	if err := c.beaconDB.SaveBlock(genBlock); err != nil {
 		return nil, fmt.Errorf("could not save genesis block to disk: %v", err)
 	}

beacon-chain/core/blocks/block.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/prysmaticlabs/prysm/beacon-chain/utils"
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
-	"github.com/prysmaticlabs/prysm/shared/hashutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 )
 
@@ -69,12 +68,7 @@ func BlockRoot(state *pb.BeaconState, slot uint64) ([]byte, error) {
 // Spec:
 //  Let previous_block_root be the tree_hash_root of the previous beacon block processed in the chain.
 //	Set state.latest_block_roots[(state.slot - 1) % LATEST_BLOCK_ROOTS_LENGTH] = previous_block_root.
-//	If state.slot % LATEST_BLOCK_ROOTS_LENGTH == 0 append merkle_root(state.latest_block_roots) to state.batched_block_roots.
 func ProcessBlockRoots(state *pb.BeaconState, parentRoot [32]byte) *pb.BeaconState {
 	state.LatestBlockRoots[(state.Slot-1)%params.BeaconConfig().LatestBlockRootsLength] = parentRoot[:]
-	if state.Slot%params.BeaconConfig().LatestBlockRootsLength == 0 {
-		merkleRoot := hashutil.MerkleRoot(state.LatestBlockRoots)
-		state.BatchedBlockRootHash32S = append(state.BatchedBlockRootHash32S, merkleRoot)
-	}
 	return state
 }

beacon-chain/core/blocks/block_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
-	"github.com/prysmaticlabs/prysm/shared/hashutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 )
 
@@ -154,18 +153,4 @@ func TestProcessBlockRoots_AccurateMerkleTree(t *testing.T) {
 		t.Fatalf("Latest Block root hash not saved."+
 			" Supposed to get %#x , but got %#x", testRoot, newState.LatestBlockRoots[0])
 	}
-
-	newState.Slot = newState.Slot - 1
-
-	newState = ProcessBlockRoots(newState, testRoot)
-	expectedHashes := make([][]byte, params.BeaconConfig().LatestBlockRootsLength)
-	expectedHashes[0] = testRoot[:]
-	expectedHashes[params.BeaconConfig().LatestBlockRootsLength-1] = testRoot[:]
-
-	expectedRoot := hashutil.MerkleRoot(expectedHashes)
-
-	if !bytes.Equal(newState.BatchedBlockRootHash32S[0], expectedRoot[:]) {
-		t.Errorf("saved merkle root is not equal to expected merkle root"+
-			"\n expected %#x but got %#x", expectedRoot, newState.BatchedBlockRootHash32S[0])
-	}
 }

beacon-chain/core/state/state.go

@@ -64,11 +64,10 @@ func GenesisBeaconState(
 		latestActiveIndexRoots[i] = zeroHash
 	}
 
-	latestCrosslinks := make([]*pb.Crosslink, params.BeaconConfig().ShardCount)
-	for i := 0; i < len(latestCrosslinks); i++ {
-		latestCrosslinks[i] = &pb.Crosslink{
-			Epoch:                   0,
-			CrosslinkDataRootHash32: zeroHash,
+	crosslinks := make([]*pb.Crosslink, params.BeaconConfig().ShardCount)
+	for i := 0; i < len(crosslinks); i++ {
+		crosslinks[i] = &pb.Crosslink{
+			Shard: uint64(i),
 		}
 	}
 
@@ -107,18 +106,11 @@ func GenesisBeaconState(
 		},
 
 		// Validator registry fields.
-		ValidatorRegistry:            validatorRegistry,
-		Balances:                     latestBalances,
-		ValidatorRegistryUpdateEpoch: 0,
+		ValidatorRegistry: validatorRegistry,
+		Balances:          latestBalances,
 
 		// Randomness and committees.
-		LatestRandaoMixes:           latestRandaoMixes,
-		PreviousShufflingStartShard: params.BeaconConfig().GenesisStartShard,
-		CurrentShufflingStartShard:  params.BeaconConfig().GenesisStartShard,
-		PreviousShufflingEpoch:      0,
-		CurrentShufflingEpoch:       0,
-		PreviousShufflingSeedHash32: zeroHash,
-		CurrentShufflingSeedHash32:  zeroHash,
+		LatestRandaoMixes: latestRandaoMixes,
 
 		// Finality.
 		PreviousJustifiedEpoch: 0,
@@ -130,12 +122,13 @@ func GenesisBeaconState(
 		FinalizedRoot:          params.BeaconConfig().ZeroHash[:],
 
 		// Recent state.
-		LatestCrosslinks:        latestCrosslinks,
-		LatestActiveIndexRoots:  latestActiveIndexRoots,
-		LatestBlockRoots:        latestBlockRoots,
-		LatestSlashedBalances:   latestSlashedExitBalances,
-		LatestAttestations:      []*pb.PendingAttestation{},
-		BatchedBlockRootHash32S: [][]byte{},
+		CurrentCrosslinks:         crosslinks,
+		PreviousCrosslinks:        crosslinks,
+		LatestActiveIndexRoots:    latestActiveIndexRoots,
+		LatestBlockRoots:          latestBlockRoots,
+		LatestSlashedBalances:     latestSlashedExitBalances,
+		CurrentEpochAttestations:  []*pb.PendingAttestation{},
+		PreviousEpochAttestations: []*pb.PendingAttestation{},
 
 		// Eth1 data.
 		LatestEth1Data: eth1Data,

beacon-chain/core/state/state_test.go

@@ -104,9 +104,6 @@ func TestGenesisBeaconState_OK(t *testing.T) {
 	}
 
 	// Validator registry fields checks.
-	if newState.ValidatorRegistryUpdateEpoch != 0 {
-		t.Error("ValidatorRegistryUpdateSlot was not correctly initialized")
-	}
 	if len(newState.ValidatorRegistry) != depositsForChainStart {
 		t.Error("ValidatorRegistry was not correctly initialized")
 	}
@@ -134,18 +131,22 @@ func TestGenesisBeaconState_OK(t *testing.T) {
 	}
 
 	// Recent state checks.
-	if len(newState.LatestCrosslinks) != shardCount {
-		t.Error("Length of LatestCrosslinks was not correctly initialized")
+	if len(newState.CurrentCrosslinks) != shardCount {
+		t.Error("Length of CurrentCrosslinks was not correctly initialized")
+	}
+	if len(newState.PreviousCrosslinks) != shardCount {
+		t.Error("Length of PreviousCrosslinks was not correctly initialized")
 	}
 	if !reflect.DeepEqual(newState.LatestSlashedBalances, make([]uint64, params.BeaconConfig().LatestSlashedExitLength)) {
 		t.Error("LatestSlashedBalances was not correctly initialized")
 	}
-	if !reflect.DeepEqual(newState.LatestAttestations, []*pb.PendingAttestation{}) {
-		t.Error("LatestAttestations was not correctly initialized")
+	if !reflect.DeepEqual(newState.CurrentEpochAttestations, []*pb.PendingAttestation{}) {
+		t.Error("CurrentEpochAttestations was not correctly initialized")
 	}
-	if !reflect.DeepEqual(newState.BatchedBlockRootHash32S, [][]byte{}) {
-		t.Error("BatchedBlockRootHash32S was not correctly initialized")
+	if !reflect.DeepEqual(newState.PreviousEpochAttestations, []*pb.PendingAttestation{}) {
+		t.Error("PreviousEpochAttestations was not correctly initialized")
 	}
+
 	activeValidators := helpers.ActiveValidatorIndices(newState, 0)
 	indicesBytes := []byte{}
 	for _, val := range activeValidators {

beacon-chain/core/state/transition.go

@@ -128,9 +128,6 @@ func ProcessBlock(
 		return nil, fmt.Errorf("could not hash block: %v", err)
 	}
 
-	// Save latest block.
-	state.LatestBlock = block
-
 	// Verify block RANDAO.
 	state, err = b.ProcessRandao(state, block.Body, config.VerifySignatures, config.Logging)
 	if err != nil {

beacon-chain/core/state/transition_test.go

@@ -262,9 +262,9 @@ func TestProcessBlock_IncorrectProcessExits(t *testing.T) {
 		blockRoots = append(blockRoots, []byte{byte(i)})
 	}
 	beaconState.LatestBlockRoots = blockRoots
-	beaconState.LatestCrosslinks = []*pb.Crosslink{
+	beaconState.CurrentCrosslinks = []*pb.Crosslink{
 		{
-			CrosslinkDataRootHash32: []byte{1},
+			DataRoot: []byte{1},
 		},
 	}
 	blockAtt := &pb.Attestation{
@@ -376,9 +376,9 @@ func TestProcessBlock_PassesProcessingConditions(t *testing.T) {
 		blockRoots = append(blockRoots, []byte{byte(i)})
 	}
 	beaconState.LatestBlockRoots = blockRoots
-	beaconState.LatestCrosslinks = []*pb.Crosslink{
+	beaconState.CurrentCrosslinks = []*pb.Crosslink{
 		{
-			CrosslinkDataRootHash32: []byte{1},
+			DataRoot: []byte{1},
 		},
 	}
 	slotsPerEpoch := params.BeaconConfig().SlotsPerEpoch

beacon-chain/operations/service_test.go

@@ -138,9 +138,9 @@ func TestRetrieveAttestations_OK(t *testing.T) {
 	if err := beaconDB.SaveState(context.Background(), &pb.BeaconState{
 		Slot:        64,
 		LatestBlock: &pb.BeaconBlock{Slot: 0},
-		LatestCrosslinks: []*pb.Crosslink{{
-			Epoch:                   0,
-			CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
+		CurrentCrosslinks: []*pb.Crosslink{{
+			Epoch:    0,
+			DataRoot: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
 		t.Fatal(err)
 	}
 	// Test we can retrieve attestations from slot1 - slot61.
@@ -176,9 +176,9 @@ func TestRetrieveAttestations_PruneInvalidAtts(t *testing.T) {
 	// At slot 200 only attestations up to from slot 137 to 139 are valid attestations.
 	if err := beaconDB.SaveState(context.Background(), &pb.BeaconState{
 		Slot: 200,
-		LatestCrosslinks: []*pb.Crosslink{{
-			Epoch:                   2,
-			CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
+		CurrentCrosslinks: []*pb.Crosslink{{
+			Epoch:    2,
+			DataRoot: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
 		t.Fatal(err)
 	}
 	attestations, err := service.PendingAttestations(context.Background())
@@ -218,9 +218,9 @@ func TestRemoveProcessedAttestations_Ok(t *testing.T) {
 	}
 	if err := db.SaveState(context.Background(), &pb.BeaconState{
 		Slot: 15,
-		LatestCrosslinks: []*pb.Crosslink{{
-			Epoch:                   0,
-			CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
+		CurrentCrosslinks: []*pb.Crosslink{{
+			Epoch:    0,
+			DataRoot: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
 		t.Fatal(err)
 	}
 
@@ -298,9 +298,9 @@ func TestReceiveBlkRemoveOps_Ok(t *testing.T) {
 
 	if err := db.SaveState(context.Background(), &pb.BeaconState{
 		Slot: 15,
-		LatestCrosslinks: []*pb.Crosslink{{
-			Epoch:                   0,
-			CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
+		CurrentCrosslinks: []*pb.Crosslink{{
+			Epoch:    0,
+			DataRoot: params.BeaconConfig().ZeroHash[:]}}}); err != nil {
 		t.Fatal(err)
 	}
 

beacon-chain/rpc/attester_server.go

@@ -137,7 +137,7 @@ func (as *AttesterServer) AttestationDataAtSlot(ctx context.Context, req *pb.Att
 		EpochBoundaryRootHash32:  epochBoundaryRoot,
 		JustifiedEpoch:           headState.CurrentJustifiedEpoch,
 		JustifiedBlockRootHash32: justifiedBlockRoot,
-		LatestCrosslink:          headState.LatestCrosslinks[req.Shard],
+		LatestCrosslink:          headState.CurrentCrosslinks[req.Shard],
 	}
 	if err := as.cache.Put(ctx, req, res); err != nil {
 		return nil, err

beacon-chain/rpc/attester_server_test.go

@@ -84,9 +84,9 @@ func TestAttestationDataAtSlot_OK(t *testing.T) {
 		Slot:                  3*params.BeaconConfig().SlotsPerEpoch + 1,
 		CurrentJustifiedEpoch: 2 + 0,
 		LatestBlockRoots:      make([][]byte, params.BeaconConfig().LatestBlockRootsLength),
-		LatestCrosslinks: []*pbp2p.Crosslink{
+		CurrentCrosslinks: []*pbp2p.Crosslink{
 			{
-				CrosslinkDataRootHash32: []byte("A"),
+				DataRoot: []byte("A"),
 			},
 		},
 		CurrentJustifiedRoot: justifiedBlockRoot[:],
@@ -130,7 +130,7 @@ func TestAttestationDataAtSlot_OK(t *testing.T) {
 		JustifiedEpoch:           2 + 0,
 		JustifiedBlockRootHash32: justifiedBlockRoot[:],
 		LatestCrosslink: &pbp2p.Crosslink{
-			CrosslinkDataRootHash32: []byte("A"),
+			DataRoot: []byte("A"),
 		},
 	}
 
@@ -181,9 +181,9 @@ func TestAttestationDataAtSlot_handlesFarAwayJustifiedEpoch(t *testing.T) {
 		Slot:                  10000,
 		CurrentJustifiedEpoch: helpers.SlotToEpoch(1500),
 		LatestBlockRoots:      make([][]byte, params.BeaconConfig().LatestBlockRootsLength),
-		LatestCrosslinks: []*pbp2p.Crosslink{
+		CurrentCrosslinks: []*pbp2p.Crosslink{
 			{
-				CrosslinkDataRootHash32: []byte("A"),
+				DataRoot: []byte("A"),
 			},
 		},
 		CurrentJustifiedRoot: justifiedBlockRoot[:],
@@ -227,7 +227,7 @@ func TestAttestationDataAtSlot_handlesFarAwayJustifiedEpoch(t *testing.T) {
 		JustifiedEpoch:           helpers.SlotToEpoch(1500),
 		JustifiedBlockRootHash32: justifiedBlockRoot[:],
 		LatestCrosslink: &pbp2p.Crosslink{
-			CrosslinkDataRootHash32: []byte("A"),
+			DataRoot: []byte("A"),
 		},
 	}
 

beacon-chain/rpc/proposer_server_test.go

@@ -146,7 +146,7 @@ func TestPendingAttestations_FiltersWithinInclusionDelay(t *testing.T) {
 	beaconState := &pbp2p.BeaconState{
 		Slot:              stateSlot,
 		ValidatorRegistry: validators,
-		LatestCrosslinks: []*pbp2p.Crosslink{{
+		CurrentCrosslinks: []*pbp2p.Crosslink{{
 			Epoch:    1,
 			DataRoot: params.BeaconConfig().ZeroHash[:],
 		}},
@@ -218,7 +218,7 @@ func TestPendingAttestations_FiltersExpiredAttestations(t *testing.T) {
 	) - 1
 
 	expectedEpoch := uint64(100)
-	crosslink := &pbp2p.Crosslink{Epoch: 9, CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:]}
+	crosslink := &pbp2p.Crosslink{Epoch: 9, DataRoot: params.BeaconConfig().ZeroHash[:]}
 	encoded, err := ssz.TreeHash(crosslink)
 	if err != nil {
 		t.Fatal(err)
@@ -315,8 +315,8 @@ func TestPendingAttestations_FiltersExpiredAttestations(t *testing.T) {
 		CurrentJustifiedEpoch:  expectedEpoch,
 		PreviousJustifiedEpoch: expectedEpoch,
 		CurrentCrosslinks: []*pbp2p.Crosslink{{
-			Epoch:                   9,
-			CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:],
+			Epoch:    9,
+			DataRoot: params.BeaconConfig().ZeroHash[:],
 		}},
 		LatestRandaoMixes:      make([][]byte, params.BeaconConfig().LatestRandaoMixesLength),
 		LatestActiveIndexRoots: make([][]byte, params.BeaconConfig().LatestActiveIndexRootsLength),