AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 13:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Beacon State V2 Interface Definition With Semantic Version Paths (#9125)

Browse Source 
* v2 state initialize and semantic paths

* ensure build

* gaz changes to ignored build files

* gaz
This commit is contained in:
Raul Jordan
2021-06-30 10:06:19 -05:00
committed by GitHub
parent 4fb3e05124
commit b23f63a064
155 changed files with 1029 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon-chain/blockchain/BUILD.bazel
View File

@@ -106,8 +106,8 @@ go_test(
"//beacon-chain/db/testing:go_default_library",
"//beacon-chain/p2p:go_default_library",
"//beacon-chain/powchain:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/stateutil:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/db:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",

14
beacon-chain/blockchain/chain_info_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -105,7 +105,7 @@ func TestPrevJustifiedCheckpt_GenesisRootOk(t *testing.T) {
func TestHeadSlot_CanRetrieve(t *testing.T) {
c := &Service{}
s, err := stateV0.InitializeFromProto(&pb.BeaconState{})
s, err := v1.InitializeFromProto(&pb.BeaconState{})
require.NoError(t, err)
c.head = &head{slot: 100, state: s}
assert.Equal(t, types.Slot(100), c.HeadSlot())
@@ -137,7 +137,7 @@ func TestHeadRoot_UseDB(t *testing.T) {
func TestHeadBlock_CanRetrieve(t *testing.T) {
b := testutil.NewBeaconBlock()
b.Block.Slot = 1
s, err := stateV0.InitializeFromProto(&pb.BeaconState{})
s, err := v1.InitializeFromProto(&pb.BeaconState{})
require.NoError(t, err)
c := &Service{}
c.head = &head{block: interfaces.WrappedPhase0SignedBeaconBlock(b), state: s}
@@ -148,7 +148,7 @@ func TestHeadBlock_CanRetrieve(t *testing.T) {
}
func TestHeadState_CanRetrieve(t *testing.T) {
s, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: 2, GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:]})
s, err := v1.InitializeFromProto(&pb.BeaconState{Slot: 2, GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:]})
require.NoError(t, err)
c := &Service{}
c.head = &head{state: s}
@@ -165,7 +165,7 @@ func TestGenesisTime_CanRetrieve(t *testing.T) {
func TestCurrentFork_CanRetrieve(t *testing.T) {
f := &pb.Fork{Epoch: 999}
s, err := stateV0.InitializeFromProto(&pb.BeaconState{Fork: f})
s, err := v1.InitializeFromProto(&pb.BeaconState{Fork: f})
require.NoError(t, err)
c := &Service{}
c.head = &head{state: s}
@@ -190,7 +190,7 @@ func TestGenesisValidatorRoot_CanRetrieve(t *testing.T) {
c := &Service{}
assert.Equal(t, [32]byte{}, c.GenesisValidatorRoot(), "Did not get correct genesis validator root")
s, err := stateV0.InitializeFromProto(&pb.BeaconState{GenesisValidatorsRoot: []byte{'a'}})
s, err := v1.InitializeFromProto(&pb.BeaconState{GenesisValidatorsRoot: []byte{'a'}})
require.NoError(t, err)
c.head = &head{state: s}
assert.Equal(t, [32]byte{'a'}, c.GenesisValidatorRoot(), "Did not get correct genesis validator root")
@@ -204,7 +204,7 @@ func TestHeadETH1Data_Nil(t *testing.T) {
func TestHeadETH1Data_CanRetrieve(t *testing.T) {
d := &ethpb.Eth1Data{DepositCount: 999}
s, err := stateV0.InitializeFromProto(&pb.BeaconState{Eth1Data: d})
s, err := v1.InitializeFromProto(&pb.BeaconState{Eth1Data: d})
require.NoError(t, err)
c := &Service{}
c.head = &head{state: s}

8
beacon-chain/blockchain/process_block_test.go
View File

@@ -18,8 +18,8 @@ import (
testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/attestationutil"
@@ -255,7 +255,7 @@ func TestCachedPreState_CanGetFromStateSummary(t *testing.T) {
service, err := NewService(ctx, cfg)
require.NoError(t, err)
s, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: 1, GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:]})
s, err := v1.InitializeFromProto(&pb.BeaconState{Slot: 1, GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:]})
require.NoError(t, err)
genesisStateRoot := [32]byte{}
@@ -307,7 +307,7 @@ func TestCachedPreState_CanGetFromDB(t *testing.T) {
assert.ErrorContains(t, wanted, err)
b.Block.ParentRoot = gRoot[:]
s, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: 1})
s, err := v1.InitializeFromProto(&pb.BeaconState{Slot: 1})
require.NoError(t, err)
require.NoError(t, service.cfg.BeaconDB.SaveStateSummary(ctx, &pb.StateSummary{Slot: 1, Root: gRoot[:]}))
require.NoError(t, service.cfg.StateGen.SaveState(ctx, gRoot, s))
@@ -903,7 +903,7 @@ func TestHandleEpochBoundary_BadMetrics(t *testing.T) {
s, err := testutil.NewBeaconState()
require.NoError(t, err)
require.NoError(t, s.SetSlot(1))
service.head = &head{state: (*stateV0.BeaconState)(nil)}
service.head = &head{state: (*v1.BeaconState)(nil)}
require.ErrorContains(t, "failed to initialize precompute: nil inner state", service.handleEpochBoundary(ctx, s))
}

6
beacon-chain/blockchain/service_test.go
View File

@@ -20,8 +20,8 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations"
"github.com/prysmaticlabs/prysm/beacon-chain/p2p"
"github.com/prysmaticlabs/prysm/beacon-chain/powchain"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
"github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags"
protodb "github.com/prysmaticlabs/prysm/proto/beacon/db"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
@@ -71,7 +71,7 @@ func setupBeaconChain(t *testing.T, beaconDB db.Database) *Service {
var web3Service *powchain.Service
var err error
bState, _ := testutil.DeterministicGenesisState(t, 10)
pbState, err := stateV0.ProtobufBeaconState(bState.InnerStateUnsafe())
pbState, err := v1.ProtobufBeaconState(bState.InnerStateUnsafe())
require.NoError(t, err)
err = beaconDB.SavePowchainData(ctx, &protodb.ETH1ChainData{
BeaconState: pbState,
@@ -507,7 +507,7 @@ func BenchmarkHasBlockForkChoiceStore(b *testing.B) {
r, err := block.Block.HashTreeRoot()
require.NoError(b, err)
bs := &pb.BeaconState{FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)}, CurrentJustifiedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)}}
beaconState, err := stateV0.InitializeFromProto(bs)
beaconState, err := v1.InitializeFromProto(bs)
require.NoError(b, err)
require.NoError(b, s.insertBlockAndAttestationsToForkChoiceStore(ctx, interfaces.WrappedPhase0SignedBeaconBlock(block).Block(), r, beaconState))

2
beacon-chain/blockchain/testing/BUILD.bazel
View File

@@ -19,7 +19,7 @@ go_library(
"//beacon-chain/db:go_default_library",
"//beacon-chain/forkchoice/protoarray:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bytesutil:go_default_library",

8
beacon-chain/blockchain/testing/mock.go
View File

@@ -19,7 +19,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -152,7 +152,7 @@ func (mon *MockOperationNotifier) OperationFeed() *event.Feed {
// ReceiveBlockInitialSync mocks ReceiveBlockInitialSync method in chain service.
func (s *ChainService) ReceiveBlockInitialSync(ctx context.Context, block interfaces.SignedBeaconBlock, _ [32]byte) error {
if s.State == nil {
s.State = &stateV0.BeaconState{}
s.State = &v1.BeaconState{}
}
if !bytes.Equal(s.Root, block.Block().ParentRoot()) {
return errors.Errorf("wanted %#x but got %#x", s.Root, block.Block().ParentRoot())
@@ -179,7 +179,7 @@ func (s *ChainService) ReceiveBlockInitialSync(ctx context.Context, block interf
// ReceiveBlockBatch processes blocks in batches from initial-sync.
func (s *ChainService) ReceiveBlockBatch(ctx context.Context, blks []interfaces.SignedBeaconBlock, _ [][32]byte) error {
if s.State == nil {
s.State = &stateV0.BeaconState{}
s.State = &v1.BeaconState{}
}
for _, block := range blks {
if !bytes.Equal(s.Root, block.Block().ParentRoot()) {
@@ -208,7 +208,7 @@ func (s *ChainService) ReceiveBlockBatch(ctx context.Context, blks []interfaces.
// ReceiveBlock mocks ReceiveBlock method in chain service.
func (s *ChainService) ReceiveBlock(ctx context.Context, block interfaces.SignedBeaconBlock, _ [32]byte) error {
if s.State == nil {
s.State = &stateV0.BeaconState{}
s.State = &v1.BeaconState{}
}
if !bytes.Equal(s.Root, block.Block().ParentRoot()) {
return errors.Errorf("wanted %#x but got %#x", s.Root, block.Block().ParentRoot())

2
beacon-chain/cache/BUILD.bazel vendored
View File

@@ -63,7 +63,7 @@ go_test(
embed = [":go_default_library"],
deps = [
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bytesutil:go_default_library",

12
beacon-chain/cache/checkpoint_state_test.go vendored
View File

@@ -5,7 +5,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -19,7 +19,7 @@ func TestCheckpointStateCache_StateByCheckpoint(t *testing.T) {
cache := NewCheckpointStateCache()
cp1 := &ethpb.Checkpoint{Epoch: 1, Root: bytesutil.PadTo([]byte{'A'}, 32)}
st, err := stateV0.InitializeFromProto(&pb.BeaconState{
st, err := v1.InitializeFromProto(&pb.BeaconState{
GenesisValidatorsRoot: params.BeaconConfig().ZeroHash[:],
Slot: 64,
})
@@ -34,16 +34,16 @@ func TestCheckpointStateCache_StateByCheckpoint(t *testing.T) {
state, err = cache.StateByCheckpoint(cp1)
require.NoError(t, err)
pbState1, err := stateV0.ProtobufBeaconState(state.InnerStateUnsafe())
pbState1, err := v1.ProtobufBeaconState(state.InnerStateUnsafe())
require.NoError(t, err)
pbState2, err := stateV0.ProtobufBeaconState(st.InnerStateUnsafe())
pbState2, err := v1.ProtobufBeaconState(st.InnerStateUnsafe())
require.NoError(t, err)
if !proto.Equal(pbState1, pbState2) {
t.Error("incorrectly cached state")
}
cp2 := &ethpb.Checkpoint{Epoch: 2, Root: bytesutil.PadTo([]byte{'B'}, 32)}
st2, err := stateV0.InitializeFromProto(&pb.BeaconState{
st2, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 128,
})
require.NoError(t, err)
@@ -60,7 +60,7 @@ func TestCheckpointStateCache_StateByCheckpoint(t *testing.T) {
func TestCheckpointStateCache_MaxSize(t *testing.T) {
c := NewCheckpointStateCache()
st, err := stateV0.InitializeFromProto(&pb.BeaconState{
st, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 0,
})
require.NoError(t, err)

4
beacon-chain/cache/skip_slot_cache_test.go vendored
View File

@@ -6,7 +6,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/cache"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
"github.com/prysmaticlabs/prysm/shared/testutil/require"
@@ -23,7 +23,7 @@ func TestSkipSlotCache_RoundTrip(t *testing.T) {
require.NoError(t, c.MarkInProgress(r))
state, err = stateV0.InitializeFromProto(&pb.BeaconState{
state, err = v1.InitializeFromProto(&pb.BeaconState{
Slot: 10,
})
require.NoError(t, err)

2
beacon-chain/core/blocks/BUILD.bazel
View File

@@ -76,7 +76,7 @@ go_test(
"//beacon-chain/core/validators:go_default_library",
"//beacon-chain/p2p/types:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/aggregation:go_default_library",

4
beacon-chain/core/blocks/attestation_regression_test.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -37,7 +37,7 @@ func TestProcessAttestationNoVerifySignature_BeaconFuzzIssue78(t *testing.T) {
if err := spb.UnmarshalSSZ(stateData); err != nil {
t.Fatal(err)
}
st, err := stateV0.InitializeFromProtoUnsafe(spb)
st, err := v1.InitializeFromProtoUnsafe(spb)
if err != nil {
t.Fatal(err)
}

8
beacon-chain/core/blocks/attestation_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/aggregation"
@@ -467,7 +467,7 @@ func TestConvertToIndexed_OK(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 5,
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -525,7 +525,7 @@ func TestVerifyIndexedAttestation_OK(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 5,
Validators: validators,
Fork: &pb.Fork{
@@ -612,7 +612,7 @@ func TestValidateIndexedAttestation_AboveMaxLength(t *testing.T) {
}
want := "validator indices count exceeds MAX_VALIDATORS_PER_COMMITTEE"
err := blocks.VerifyIndexedAttestation(context.Background(), &stateV0.BeaconState{}, indexedAtt1)
err := blocks.VerifyIndexedAttestation(context.Background(), &v1.BeaconState{}, indexedAtt1)
assert.ErrorContains(t, want, err)
}

6
beacon-chain/core/blocks/attester_slashing_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
@@ -47,7 +47,7 @@ func TestProcessAttesterSlashings_DataNotSlashable(t *testing.T) {
var registry []*ethpb.Validator
currentSlot := types.Slot(0)
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Slot: currentSlot,
})
@@ -66,7 +66,7 @@ func TestProcessAttesterSlashings_IndexedAttestationFailedToVerify(t *testing.T)
var registry []*ethpb.Validator
currentSlot := types.Slot(0)
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Slot: currentSlot,
})

48
beacon-chain/core/blocks/block_operations_fuzz_test.go
View File

@@ -7,7 +7,7 @@ import (
fuzz "github.com/google/gofuzz"
types "github.com/prysmaticlabs/eth2-types"
v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
eth "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/interfaces"
@@ -24,7 +24,7 @@ func TestFuzzProcessAttestationNoVerify_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(att)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
_, err = ProcessAttestationNoVerifySignature(ctx, s, att)
_ = err
@@ -40,7 +40,7 @@ func TestFuzzProcessBlockHeader_10000(t *testing.T) {
fuzzer.Fuzz(state)
fuzzer.Fuzz(block)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
_, err = ProcessBlockHeader(context.Background(), s, interfaces.WrappedPhase0SignedBeaconBlock(block))
_ = err
@@ -74,7 +74,7 @@ func TestFuzzverifyDepositDataSigningRoot_10000(t *testing.T) {
func TestFuzzProcessEth1DataInBlock_10000(t *testing.T) {
fuzzer := fuzz.NewWithSeed(0)
e := &eth.Eth1Data{}
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(e)
@@ -105,7 +105,7 @@ func TestFuzzEth1DataHasEnoughSupport_10000(t *testing.T) {
for i := 0; i < 100000; i++ {
fuzzer.Fuzz(eth1data)
fuzzer.Fuzz(&stateVotes)
s, err := stateV0.InitializeFromProto(&pb.BeaconState{
s, err := v1.InitializeFromProto(&pb.BeaconState{
Eth1DataVotes: stateVotes,
})
require.NoError(t, err)
@@ -123,7 +123,7 @@ func TestFuzzProcessBlockHeaderNoVerify_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(block)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
_, err = ProcessBlockHeaderNoVerify(s, block.Slot, block.ProposerIndex, block.ParentRoot, []byte{})
_ = err
@@ -138,7 +138,7 @@ func TestFuzzProcessRandao_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(b)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessRandao(context.Background(), s, interfaces.WrappedPhase0SignedBeaconBlock(b))
if err != nil && r != nil {
@@ -155,7 +155,7 @@ func TestFuzzProcessRandaoNoVerify_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(blockBody)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessRandaoNoVerify(s, blockBody.RandaoReveal)
if err != nil && r != nil {
@@ -172,7 +172,7 @@ func TestFuzzProcessProposerSlashings_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(p)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessProposerSlashings(ctx, s, []*eth.ProposerSlashing{p}, v.SlashValidator)
if err != nil && r != nil {
@@ -188,7 +188,7 @@ func TestFuzzVerifyProposerSlashing_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(proposerSlashing)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
err = VerifyProposerSlashing(s, proposerSlashing)
_ = err
@@ -203,7 +203,7 @@ func TestFuzzProcessAttesterSlashings_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(a)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessAttesterSlashings(ctx, s, []*eth.AttesterSlashing{a}, v.SlashValidator)
if err != nil && r != nil {
@@ -220,7 +220,7 @@ func TestFuzzVerifyAttesterSlashing_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(attesterSlashing)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
err = VerifyAttesterSlashing(ctx, s, attesterSlashing)
_ = err
@@ -257,7 +257,7 @@ func TestFuzzProcessAttestations_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(b)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessAttestations(ctx, s, interfaces.WrappedPhase0SignedBeaconBlock(b))
if err != nil && r != nil {
@@ -274,7 +274,7 @@ func TestFuzzProcessAttestationsNoVerify_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(b)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessAttestationsNoVerifySignature(ctx, s, interfaces.WrappedPhase0SignedBeaconBlock(b))
if err != nil && r != nil {
@@ -291,7 +291,7 @@ func TestFuzzProcessAttestation_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(attestation)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessAttestation(ctx, s, attestation)
if err != nil && r != nil {
@@ -308,7 +308,7 @@ func TestFuzzVerifyIndexedAttestationn_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(idxAttestation)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
err = VerifyIndexedAttestation(ctx, s, idxAttestation)
_ = err
@@ -323,7 +323,7 @@ func TestFuzzVerifyAttestation_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(attestation)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
err = VerifyAttestationSignature(ctx, s, attestation)
_ = err
@@ -340,7 +340,7 @@ func TestFuzzProcessDeposits_10000(t *testing.T) {
for i := range deposits {
fuzzer.Fuzz(deposits[i])
}
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessDeposits(ctx, s, deposits)
if err != nil && r != nil {
@@ -358,7 +358,7 @@ func TestFuzzProcessPreGenesisDeposit_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(deposit)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessPreGenesisDeposits(ctx, s, []*eth.Deposit{deposit})
if err != nil && r != nil {
@@ -375,7 +375,7 @@ func TestFuzzProcessDeposit_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(deposit)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessDeposit(s, deposit, true)
if err != nil && r != nil {
@@ -391,7 +391,7 @@ func TestFuzzverifyDeposit_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(deposit)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
err = verifyDeposit(s, deposit)
_ = err
@@ -406,7 +406,7 @@ func TestFuzzProcessVoluntaryExits_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(e)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessVoluntaryExits(ctx, s, []*eth.SignedVoluntaryExit{e})
if err != nil && r != nil {
@@ -422,7 +422,7 @@ func TestFuzzProcessVoluntaryExitsNoVerify_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(state)
fuzzer.Fuzz(e)
s, err := stateV0.InitializeFromProtoUnsafe(state)
s, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
r, err := ProcessVoluntaryExits(context.Background(), s, []*eth.SignedVoluntaryExit{e})
if err != nil && r != nil {
@@ -434,7 +434,7 @@ func TestFuzzProcessVoluntaryExitsNoVerify_10000(t *testing.T) {
func TestFuzzVerifyExit_10000(t *testing.T) {
fuzzer := fuzz.NewWithSeed(0)
ve := &eth.SignedVoluntaryExit{}
val := stateV0.ReadOnlyValidator{}
val := v1.ReadOnlyValidator{}
fork := &pb.Fork{}
var slot types.Slot

16
beacon-chain/core/blocks/deposit_test.go
View File

@@ -7,7 +7,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
@@ -40,7 +40,7 @@ func TestProcessDeposits_SameValidatorMultipleDepositsSameBlock(t *testing.T) {
},
}
balances := []uint64{0}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Balances: balances,
Eth1Data: eth1Data,
@@ -80,7 +80,7 @@ func TestProcessDeposits_MerkleBranchFailsVerification(t *testing.T) {
Deposits: []*ethpb.Deposit{deposit},
},
}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Eth1Data: &ethpb.Eth1Data{
DepositRoot: []byte{0},
BlockHash: []byte{1},
@@ -111,7 +111,7 @@ func TestProcessDeposits_AddsNewValidatorDeposit(t *testing.T) {
},
}
balances := []uint64{0}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Balances: balances,
Eth1Data: eth1Data,
@@ -174,7 +174,7 @@ func TestProcessDeposits_RepeatedDeposit_IncreasesValidatorBalance(t *testing.T)
}
balances := []uint64{0, 50}
root := depositTrie.Root()
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Balances: balances,
Eth1Data: &ethpb.Eth1Data{
@@ -202,7 +202,7 @@ func TestProcessDeposit_AddsNewValidatorDeposit(t *testing.T) {
},
}
balances := []uint64{0}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Balances: balances,
Eth1Data: eth1Data,
@@ -244,7 +244,7 @@ func TestProcessDeposit_SkipsInvalidDeposit(t *testing.T) {
},
}
balances := []uint64{0}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Balances: balances,
Eth1Data: eth1Data,
@@ -299,7 +299,7 @@ func TestPreGenesisDeposits_SkipInvalidDeposit(t *testing.T) {
},
}
balances := []uint64{0}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Balances: balances,
Eth1Data: eth1Data,

8
beacon-chain/core/blocks/eth1_data_test.go
View File

@@ -7,7 +7,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -71,7 +71,7 @@ func TestEth1DataHasEnoughSupport(t *testing.T) {
c.EpochsPerEth1VotingPeriod = tt.votingPeriodLength
params.OverrideBeaconConfig(c)
s, err := stateV0.InitializeFromProto(&pb.BeaconState{
s, err := v1.InitializeFromProto(&pb.BeaconState{
Eth1DataVotes: tt.stateVotes,
})
require.NoError(t, err)
@@ -161,7 +161,7 @@ func TestAreEth1DataEqual(t *testing.T) {
}
func TestProcessEth1Data_SetsCorrectly(t *testing.T) {
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Eth1DataVotes: []*ethpb.Eth1Data{},
})
require.NoError(t, err)
@@ -181,7 +181,7 @@ func TestProcessEth1Data_SetsCorrectly(t *testing.T) {
for i := uint64(0); i < period; i++ {
processedState, err := blocks.ProcessEth1DataInBlock(context.Background(), beaconState, b.Block.Body.Eth1Data)
require.NoError(t, err)
beaconState, ok = processedState.(*stateV0.BeaconState)
beaconState, ok = processedState.(*v1.BeaconState)
require.Equal(t, true, ok)
}

8
beacon-chain/core/blocks/exit_test.go
View File

@@ -7,7 +7,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
@@ -31,7 +31,7 @@ func TestProcessVoluntaryExits_NotActiveLongEnoughToExit(t *testing.T) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
},
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Slot: 10,
})
@@ -61,7 +61,7 @@ func TestProcessVoluntaryExits_ExitAlreadySubmitted(t *testing.T) {
ExitEpoch: 10,
},
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Slot: 0,
})
@@ -93,7 +93,7 @@ func TestProcessVoluntaryExits_AppliesCorrectStatus(t *testing.T) {
ActivationEpoch: 0,
},
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Fork: &pb.Fork{
CurrentVersion: params.BeaconConfig().GenesisForkVersion,

4
beacon-chain/core/blocks/proposer_slashing_regression_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -24,7 +24,7 @@ func TestVerifyProposerSlashing_BeaconFuzzIssue91(t *testing.T) {
err = rawState.UnmarshalSSZ(file)
require.NoError(t, err)
st, err := stateV0.InitializeFromProtoUnsafe(rawState)
st, err := v1.InitializeFromProtoUnsafe(rawState)
require.NoError(t, err)
file, err = ioutil.ReadFile("testdata/beaconfuzz_91_proposer_slashing.ssz")

4
beacon-chain/core/blocks/proposer_slashing_test.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
@@ -118,7 +118,7 @@ func TestProcessProposerSlashings_ValidatorNotSlashable(t *testing.T) {
},
}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: registry,
Slot: currentSlot,
})

2
beacon-chain/core/epoch/BUILD.bazel
View File

@@ -36,7 +36,7 @@ go_test(
deps = [
"//beacon-chain/core/helpers:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/params:go_default_library",

4
beacon-chain/core/epoch/epoch_processing_fuzz_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
fuzz "github.com/google/gofuzz"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
ethereum_beacon_p2p_v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/testutil/require"
)
@@ -15,7 +15,7 @@ func TestFuzzFinalUpdates_10000(t *testing.T) {
for i := 0; i < 10000; i++ {
fuzzer.Fuzz(base)
s, err := stateV0.InitializeFromProtoUnsafe(base)
s, err := v1.InitializeFromProtoUnsafe(base)
require.NoError(t, err)
_, err = ProcessFinalUpdates(s)
_ = err

24
beacon-chain/core/epoch/epoch_processing_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/epoch"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -43,7 +43,7 @@ func TestUnslashedAttestingIndices_CanSortAndFilter(t *testing.T) {
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
indices, err := epoch.UnslashedAttestingIndices(beaconState, atts)
@@ -89,7 +89,7 @@ func TestUnslashedAttestingIndices_DuplicatedAttestations(t *testing.T) {
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
indices, err := epoch.UnslashedAttestingIndices(beaconState, atts)
@@ -135,7 +135,7 @@ func TestAttestingBalance_CorrectBalance(t *testing.T) {
Validators: validators,
Balances: balances,
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
balance, err := epoch.AttestingBalance(beaconState, atts)
@@ -161,7 +161,7 @@ func TestBaseReward_AccurateRewards(t *testing.T) {
{ExitEpoch: params.BeaconConfig().FarFutureEpoch, EffectiveBalance: tt.b}},
Balances: []uint64{tt.a},
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
c, err := epoch.BaseReward(beaconState, 0)
require.NoError(t, err)
@@ -176,7 +176,7 @@ func TestProcessSlashings_NotSlashed(t *testing.T) {
Balances: []uint64{params.BeaconConfig().MaxEffectiveBalance},
Slashings: []uint64{0, 1e9},
}
s, err := stateV0.InitializeFromProto(base)
s, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := epoch.ProcessSlashings(s)
require.NoError(t, err)
@@ -254,7 +254,7 @@ func TestProcessSlashings_SlashedLess(t *testing.T) {
for i, tt := range tests {
t.Run(fmt.Sprint(i), func(t *testing.T) {
original := proto.Clone(tt.state)
s, err := stateV0.InitializeFromProto(tt.state)
s, err := v1.InitializeFromProto(tt.state)
require.NoError(t, err)
newState, err := epoch.ProcessSlashings(s)
require.NoError(t, err)
@@ -314,7 +314,7 @@ func TestProcessRegistryUpdates_NoRotation(t *testing.T) {
},
FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)},
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := epoch.ProcessRegistryUpdates(beaconState)
require.NoError(t, err)
@@ -337,7 +337,7 @@ func TestProcessRegistryUpdates_EligibleToActivate(t *testing.T) {
ActivationEpoch: params.BeaconConfig().FarFutureEpoch,
})
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
currentEpoch := helpers.CurrentEpoch(beaconState)
newState, err := epoch.ProcessRegistryUpdates(beaconState)
@@ -366,7 +366,7 @@ func TestProcessRegistryUpdates_ActivationCompletes(t *testing.T) {
},
FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)},
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := epoch.ProcessRegistryUpdates(beaconState)
require.NoError(t, err)
@@ -390,7 +390,7 @@ func TestProcessRegistryUpdates_ValidatorsEjected(t *testing.T) {
},
FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)},
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := epoch.ProcessRegistryUpdates(beaconState)
require.NoError(t, err)
@@ -415,7 +415,7 @@ func TestProcessRegistryUpdates_CanExits(t *testing.T) {
},
FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)},
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := epoch.ProcessRegistryUpdates(beaconState)
require.NoError(t, err)

2
beacon-chain/core/epoch/precompute/BUILD.bazel
View File

@@ -44,7 +44,7 @@ go_test(
deps = [
"//beacon-chain/core/epoch:go_default_library",
"//beacon-chain/core/helpers:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/attestationutil:go_default_library",

8
beacon-chain/core/epoch/precompute/justification_finalization_test.go
View File

@@ -6,7 +6,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -37,7 +37,7 @@ func TestProcessJustificationAndFinalizationPreCompute_ConsecutiveEpochs(t *test
Balances: []uint64{a, a, a, a}, // validator total balance should be 128000000000
BlockRoots: blockRoots,
}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
attestedBalance := 4 * uint64(e) * 3 / 2
b := &precompute.Balance{PrevEpochTargetAttested: attestedBalance}
@@ -74,7 +74,7 @@ func TestProcessJustificationAndFinalizationPreCompute_JustifyCurrentEpoch(t *te
Balances: []uint64{a, a, a, a}, // validator total balance should be 128000000000
BlockRoots: blockRoots,
}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
attestedBalance := 4 * uint64(e) * 3 / 2
b := &precompute.Balance{PrevEpochTargetAttested: attestedBalance}
@@ -110,7 +110,7 @@ func TestProcessJustificationAndFinalizationPreCompute_JustifyPrevEpoch(t *testi
Balances: []uint64{a, a, a, a}, // validator total balance should be 128000000000
BlockRoots: blockRoots, FinalizedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)},
}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
attestedBalance := 4 * uint64(e) * 3 / 2
b := &precompute.Balance{PrevEpochTargetAttested: attestedBalance}

4
beacon-chain/core/epoch/precompute/new_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -15,7 +15,7 @@ import (
func TestNew(t *testing.T) {
ffe := params.BeaconConfig().FarFutureEpoch
s, err := stateV0.InitializeFromProto(&pb.BeaconState{
s, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: params.BeaconConfig().SlotsPerEpoch,
// Validator 0 is slashed
// Validator 1 is withdrawable

20
beacon-chain/core/epoch/precompute/reward_penalty_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/core/epoch"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/mathutil"
@@ -34,7 +34,7 @@ func TestProcessRewardsAndPenaltiesPrecompute(t *testing.T) {
}
base.PreviousEpochAttestations = atts
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
vp, bp, err := New(context.Background(), beaconState)
@@ -44,7 +44,7 @@ func TestProcessRewardsAndPenaltiesPrecompute(t *testing.T) {
processedState, err := ProcessRewardsAndPenaltiesPrecompute(beaconState, bp, vp, AttestationsDelta, ProposersDelta)
require.NoError(t, err)
beaconState, ok := processedState.(*stateV0.BeaconState)
beaconState, ok := processedState.(*v1.BeaconState)
require.Equal(t, true, ok)
// Indices that voted everything except for head, lost a bit money
@@ -78,7 +78,7 @@ func TestAttestationDeltaPrecompute(t *testing.T) {
}
}
base.PreviousEpochAttestations = atts
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
slashedAttestedIndices := []types.ValidatorIndex{1413}
for _, i := range slashedAttestedIndices {
@@ -162,7 +162,7 @@ func TestAttestationDeltas_ZeroEpoch(t *testing.T) {
}
}
base.PreviousEpochAttestations = atts
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
pVals, pBal, err := New(context.Background(), beaconState)
@@ -200,7 +200,7 @@ func TestAttestationDeltas_ZeroInclusionDelay(t *testing.T) {
}
}
base.PreviousEpochAttestations = atts
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
pVals, pBal, err := New(context.Background(), beaconState)
@@ -226,7 +226,7 @@ func TestProcessRewardsAndPenaltiesPrecompute_SlashedInactivePenalty(t *testing.
}
base.PreviousEpochAttestations = atts
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
require.NoError(t, beaconState.SetSlot(params.BeaconConfig().SlotsPerEpoch*10))
@@ -300,7 +300,7 @@ func TestProposerDeltaPrecompute_HappyCase(t *testing.T) {
e := params.BeaconConfig().SlotsPerEpoch
validatorCount := uint64(10)
base := buildState(e, validatorCount)
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
proposerIndex := types.ValidatorIndex(1)
@@ -322,7 +322,7 @@ func TestProposerDeltaPrecompute_ValidatorIndexOutOfRange(t *testing.T) {
e := params.BeaconConfig().SlotsPerEpoch
validatorCount := uint64(10)
base := buildState(e, validatorCount)
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
proposerIndex := types.ValidatorIndex(validatorCount)
@@ -338,7 +338,7 @@ func TestProposerDeltaPrecompute_SlashedCase(t *testing.T) {
e := params.BeaconConfig().SlotsPerEpoch
validatorCount := uint64(10)
base := buildState(e, validatorCount)
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
proposerIndex := types.ValidatorIndex(1)

8
beacon-chain/core/epoch/precompute/slashing_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -15,7 +15,7 @@ import (
)
func TestProcessSlashingsPrecompute_NotSlashedWithSlashedTrue(t *testing.T) {
s, err := stateV0.InitializeFromProto(&pb.BeaconState{
s, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 0,
Validators: []*ethpb.Validator{{Slashed: true}},
Balances: []uint64{params.BeaconConfig().MaxEffectiveBalance},
@@ -30,7 +30,7 @@ func TestProcessSlashingsPrecompute_NotSlashedWithSlashedTrue(t *testing.T) {
}
func TestProcessSlashingsPrecompute_NotSlashedWithSlashedFalse(t *testing.T) {
s, err := stateV0.InitializeFromProto(&pb.BeaconState{
s, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 0,
Validators: []*ethpb.Validator{{}},
Balances: []uint64{params.BeaconConfig().MaxEffectiveBalance},
@@ -124,7 +124,7 @@ func TestProcessSlashingsPrecompute_SlashedLess(t *testing.T) {
pBal := &precompute.Balance{ActiveCurrentEpoch: ab}
original := proto.Clone(tt.state)
state, err := stateV0.InitializeFromProto(tt.state)
state, err := v1.InitializeFromProto(tt.state)
require.NoError(t, err)
require.NoError(t, precompute.ProcessSlashingsPrecompute(state, pBal))
assert.Equal(t, tt.want, state.Balances()[0], "ProcessSlashings({%v}) = newState; newState.Balances[0] = %d; wanted %d", original, state.Balances()[0])

2
beacon-chain/core/helpers/BUILD.bazel
View File

@@ -75,7 +75,7 @@ go_test(
deps = [
"//beacon-chain/cache:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bls:go_default_library",

4
beacon-chain/core/helpers/attestation_test.go
View File

@@ -7,7 +7,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
@@ -98,7 +98,7 @@ func TestAttestation_ComputeSubnetForAttestation(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 200,
BlockRoots: make([][]byte, params.BeaconConfig().SlotsPerHistoricalRoot),

6
beacon-chain/core/helpers/block_test.go
View File

@@ -7,7 +7,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
@@ -61,7 +61,7 @@ func TestBlockRootAtSlot_CorrectBlockRoot(t *testing.T) {
for i, tt := range tests {
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
s.Slot = tt.stateSlot
state, err := stateV0.InitializeFromProto(s)
state, err := v1.InitializeFromProto(s)
require.NoError(t, err)
wantedSlot := tt.slot
result, err := helpers.BlockRootAtSlot(state, wantedSlot)
@@ -111,7 +111,7 @@ func TestBlockRootAtSlot_OutOfBounds(t *testing.T) {
}
for _, tt := range tests {
state.Slot = tt.stateSlot
s, err := stateV0.InitializeFromProto(state)
s, err := v1.InitializeFromProto(state)
require.NoError(t, err)
_, err = helpers.BlockRootAtSlot(s, tt.slot)
assert.ErrorContains(t, tt.expectedErr, err)

34
beacon-chain/core/helpers/committee_test.go
View File

@@ -8,7 +8,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/go-bitfield"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -35,7 +35,7 @@ func TestComputeCommittee_WithoutCache(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 200,
BlockRoots: make([][]byte, params.BeaconConfig().SlotsPerHistoricalRoot),
@@ -91,7 +91,7 @@ func TestVerifyBitfieldLength_OK(t *testing.T) {
func TestCommitteeAssignments_CannotRetrieveFutureEpoch(t *testing.T) {
ClearCache()
epoch := types.Epoch(1)
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 0, // Epoch 0.
})
require.NoError(t, err)
@@ -111,7 +111,7 @@ func TestCommitteeAssignments_NoProposerForSlot0(t *testing.T) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 2 * params.BeaconConfig().SlotsPerEpoch, // epoch 2
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -142,7 +142,7 @@ func TestCommitteeAssignments_CanRetrieve(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 2 * params.BeaconConfig().SlotsPerEpoch, // epoch 2
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -219,7 +219,7 @@ func TestCommitteeAssignments_CannotRetrieveFuture(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 2 * params.BeaconConfig().SlotsPerEpoch, // epoch 2
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -243,7 +243,7 @@ func TestCommitteeAssignments_EverySlotHasMin1Proposer(t *testing.T) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 2 * params.BeaconConfig().SlotsPerEpoch, // epoch 2
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -280,7 +280,7 @@ func TestVerifyAttestationBitfieldLengths_OK(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: activeRoots,
})
@@ -378,7 +378,7 @@ func TestShuffledIndices_ShuffleRightLength(t *testing.T) {
}
indices[i] = uint64(i)
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -411,7 +411,7 @@ func TestUpdateCommitteeCache_CanUpdate(t *testing.T) {
}
indices[i] = i
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -435,7 +435,7 @@ func BenchmarkComputeCommittee300000_WithPreCache(b *testing.B) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -469,7 +469,7 @@ func BenchmarkComputeCommittee3000000_WithPreCache(b *testing.B) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -503,7 +503,7 @@ func BenchmarkComputeCommittee128000_WithOutPreCache(b *testing.B) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -538,7 +538,7 @@ func BenchmarkComputeCommittee1000000_WithOutCache(b *testing.B) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -573,7 +573,7 @@ func BenchmarkComputeCommittee4000000_WithOutCache(b *testing.B) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -610,7 +610,7 @@ func TestBeaconCommitteeFromState_UpdateCacheForPreviousEpoch(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: params.BeaconConfig().SlotsPerEpoch,
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -635,7 +635,7 @@ func TestPrecomputeProposerIndices_Ok(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})

8
beacon-chain/core/helpers/randao_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -20,7 +20,7 @@ func TestRandaoMix_OK(t *testing.T) {
binary.LittleEndian.PutUint64(intInBytes, uint64(i))
randaoMixes[i] = intInBytes
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{RandaoMixes: randaoMixes})
state, err := v1.InitializeFromProto(&pb.BeaconState{RandaoMixes: randaoMixes})
require.NoError(t, err)
tests := []struct {
epoch types.Epoch
@@ -54,7 +54,7 @@ func TestRandaoMix_CopyOK(t *testing.T) {
binary.LittleEndian.PutUint64(intInBytes, uint64(i))
randaoMixes[i] = intInBytes
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{RandaoMixes: randaoMixes})
state, err := v1.InitializeFromProto(&pb.BeaconState{RandaoMixes: randaoMixes})
require.NoError(t, err)
tests := []struct {
epoch types.Epoch
@@ -95,7 +95,7 @@ func TestGenerateSeed_OK(t *testing.T) {
randaoMixes[i] = intInBytes
}
slot := params.BeaconConfig().SlotsPerEpoch.Mul(uint64(params.BeaconConfig().MinSeedLookahead * 10))
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
RandaoMixes: randaoMixes,
Slot: slot,
})

18
beacon-chain/core/helpers/rewards_penalties_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -13,7 +13,7 @@ import (
)
func TestTotalBalance_OK(t *testing.T) {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{
state, err := v1.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{
{EffectiveBalance: 27 * 1e9}, {EffectiveBalance: 28 * 1e9},
{EffectiveBalance: 32 * 1e9}, {EffectiveBalance: 40 * 1e9},
}})
@@ -26,7 +26,7 @@ func TestTotalBalance_OK(t *testing.T) {
}
func TestTotalBalance_ReturnsEffectiveBalanceIncrement(t *testing.T) {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{}})
state, err := v1.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{}})
require.NoError(t, err)
balance := TotalBalance(state, []types.ValidatorIndex{})
@@ -35,7 +35,7 @@ func TestTotalBalance_ReturnsEffectiveBalanceIncrement(t *testing.T) {
}
func TestTotalActiveBalance_OK(t *testing.T) {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{
state, err := v1.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{
{
EffectiveBalance: 32 * 1e9,
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
@@ -74,7 +74,7 @@ func TestGetBalance_OK(t *testing.T) {
{i: 2, b: []uint64{0, 0, 0}},
}
for _, test := range tests {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{Balances: test.b})
state, err := v1.InitializeFromProto(&pb.BeaconState{Balances: test.b})
require.NoError(t, err)
assert.Equal(t, test.b[test.i], state.Balances()[test.i], "Incorrect Validator balance")
}
@@ -92,7 +92,7 @@ func TestIncreaseBalance_OK(t *testing.T) {
{i: 2, b: []uint64{27 * 1e9, 28 * 1e9, 32 * 1e9}, nb: 33 * 1e9, eb: 65 * 1e9},
}
for _, test := range tests {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: []*ethpb.Validator{
{EffectiveBalance: 4}, {EffectiveBalance: 4}, {EffectiveBalance: 4}},
Balances: test.b,
@@ -116,7 +116,7 @@ func TestDecreaseBalance_OK(t *testing.T) {
{i: 3, b: []uint64{27 * 1e9, 28 * 1e9, 1, 28 * 1e9}, nb: 28 * 1e9, eb: 0},
}
for _, test := range tests {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: []*ethpb.Validator{
{EffectiveBalance: 4}, {EffectiveBalance: 4}, {EffectiveBalance: 4}, {EffectiveBalance: 3}},
Balances: test.b,
@@ -130,7 +130,7 @@ func TestDecreaseBalance_OK(t *testing.T) {
func TestFinalityDelay(t *testing.T) {
base := buildState(params.BeaconConfig().SlotsPerEpoch*10, 1)
base.FinalizedCheckpoint = &ethpb.Checkpoint{Epoch: 3}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
prevEpoch := types.Epoch(0)
finalizedEpoch := types.Epoch(0)
@@ -160,7 +160,7 @@ func TestFinalityDelay(t *testing.T) {
func TestIsInInactivityLeak(t *testing.T) {
base := buildState(params.BeaconConfig().SlotsPerEpoch*10, 1)
base.FinalizedCheckpoint = &ethpb.Checkpoint{Epoch: 3}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
prevEpoch := types.Epoch(0)
finalizedEpoch := types.Epoch(0)

8
beacon-chain/core/helpers/slot_epoch_test.go
View File

@@ -6,7 +6,7 @@ import (
"time"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
@@ -42,7 +42,7 @@ func TestCurrentEpoch_OK(t *testing.T) {
{slot: 200, epoch: 6},
}
for _, tt := range tests {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: tt.slot})
state, err := v1.InitializeFromProto(&pb.BeaconState{Slot: tt.slot})
require.NoError(t, err)
assert.Equal(t, tt.epoch, CurrentEpoch(state), "ActiveCurrentEpoch(%d)", state.Slot())
}
@@ -58,7 +58,7 @@ func TestPrevEpoch_OK(t *testing.T) {
{slot: 2 * params.BeaconConfig().SlotsPerEpoch, epoch: 1},
}
for _, tt := range tests {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: tt.slot})
state, err := v1.InitializeFromProto(&pb.BeaconState{Slot: tt.slot})
require.NoError(t, err)
assert.Equal(t, tt.epoch, PrevEpoch(state), "ActivePrevEpoch(%d)", state.Slot())
}
@@ -76,7 +76,7 @@ func TestNextEpoch_OK(t *testing.T) {
{slot: 200, epoch: types.Epoch(200/params.BeaconConfig().SlotsPerEpoch + 1)},
}
for _, tt := range tests {
state, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: tt.slot})
state, err := v1.InitializeFromProto(&pb.BeaconState{Slot: tt.slot})
require.NoError(t, err)
assert.Equal(t, tt.epoch, NextEpoch(state), "NextEpoch(%d)", state.Slot())
}

22
beacon-chain/core/helpers/validators_test.go
View File

@@ -6,7 +6,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/cache"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -45,7 +45,7 @@ func TestIsActiveValidatorUsingTrie_OK(t *testing.T) {
{a: 64, b: true},
}
val := &ethpb.Validator{ActivationEpoch: 10, ExitEpoch: 100}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{val}})
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{val}})
require.NoError(t, err)
for _, test := range tests {
readOnlyVal, err := beaconState.ValidatorAtIndexReadOnly(0)
@@ -210,7 +210,7 @@ func TestIsSlashableValidatorUsingTrie_OK(t *testing.T) {
}
for _, test := range tests {
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{test.validator}})
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{Validators: []*ethpb.Validator{test.validator}})
require.NoError(t, err)
readOnlyVal, err := beaconState.ValidatorAtIndexReadOnly(0)
require.NoError(t, err)
@@ -234,7 +234,7 @@ func TestBeaconProposerIndex_OK(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 0,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -293,7 +293,7 @@ func TestBeaconProposerIndex_BadState(t *testing.T) {
roots[i] = make([]byte, 32)
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
Slot: 0,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -317,7 +317,7 @@ func TestComputeProposerIndex_Compatibility(t *testing.T) {
}
}
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
@@ -364,7 +364,7 @@ func TestActiveValidatorCount_Genesis(t *testing.T) {
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 0,
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -400,7 +400,7 @@ func TestChurnLimit_OK(t *testing.T) {
}
}
beaconState, err := stateV0.InitializeFromProto(&pb.BeaconState{
beaconState, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 1,
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@@ -589,7 +589,7 @@ func TestActiveValidatorIndices(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
s, err := stateV0.InitializeFromProto(tt.args.state)
s, err := v1.InitializeFromProto(tt.args.state)
require.NoError(t, err)
got, err := ActiveValidatorIndices(s, tt.args.epoch)
if tt.wantedErr != "" {
@@ -714,7 +714,7 @@ func TestComputeProposerIndex(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bState := &pb.BeaconState{Validators: tt.args.validators}
stTrie, err := stateV0.InitializeFromProtoUnsafe(bState)
stTrie, err := v1.InitializeFromProtoUnsafe(bState)
require.NoError(t, err)
got, err := ComputeProposerIndex(stTrie, tt.args.indices, tt.args.seed)
if tt.wantedErr != "" {
@@ -771,7 +771,7 @@ func TestIsIsEligibleForActivation(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
s, err := stateV0.InitializeFromProto(tt.state)
s, err := v1.InitializeFromProto(tt.state)
require.NoError(t, err)
assert.Equal(t, tt.want, IsEligibleForActivation(s, tt.validator), "IsEligibleForActivation()")
})

6
beacon-chain/core/state/BUILD.bazel
View File

@@ -34,7 +34,7 @@ go_library(
"//beacon-chain/core/state/interop:go_default_library",
"//beacon-chain/core/validators:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bls:go_default_library",
@@ -76,7 +76,7 @@ go_test(
"//beacon-chain/core/blocks:go_default_library",
"//beacon-chain/core/helpers:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/attestationutil:go_default_library",
@@ -117,7 +117,7 @@ go_test(
"//beacon-chain/core/blocks:go_default_library",
"//beacon-chain/core/helpers:go_default_library",
"//beacon-chain/core/state:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//shared/benchutil:go_default_library",
"//shared/params:go_default_library",

6
beacon-chain/core/state/benchmarks_test.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/state"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/benchutil"
"github.com/prysmaticlabs/prysm/shared/interfaces"
@@ -111,7 +111,7 @@ func BenchmarkHashTreeRootState_FullState(b *testing.B) {
func BenchmarkMarshalState_FullState(b *testing.B) {
beaconState, err := benchutil.PreGenState2FullEpochs()
require.NoError(b, err)
natState, err := stateV0.ProtobufBeaconState(beaconState.InnerStateUnsafe())
natState, err := v1.ProtobufBeaconState(beaconState.InnerStateUnsafe())
require.NoError(b, err)
b.Run("Proto_Marshal", func(b *testing.B) {
b.ResetTimer()
@@ -135,7 +135,7 @@ func BenchmarkMarshalState_FullState(b *testing.B) {
func BenchmarkUnmarshalState_FullState(b *testing.B) {
beaconState, err := benchutil.PreGenState2FullEpochs()
require.NoError(b, err)
natState, err := stateV0.ProtobufBeaconState(beaconState.InnerStateUnsafe())
natState, err := v1.ProtobufBeaconState(beaconState.InnerStateUnsafe())
require.NoError(b, err)
protoObject, err := proto.Marshal(natState)
require.NoError(b, err)

14
beacon-chain/core/state/skip_slot_cache_test.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
"github.com/prysmaticlabs/prysm/shared/interfaces"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil"
@@ -19,9 +19,9 @@ func TestSkipSlotCache_OK(t *testing.T) {
state.SkipSlotCache.Enable()
defer state.SkipSlotCache.Disable()
bState, privs := testutil.DeterministicGenesisState(t, params.MinimalSpecConfig().MinGenesisActiveValidatorCount)
pbState, err := stateV0.ProtobufBeaconState(bState.CloneInnerState())
pbState, err := v1.ProtobufBeaconState(bState.CloneInnerState())
require.NoError(t, err)
originalState, err := stateV0.InitializeFromProto(pbState)
originalState, err := v1.InitializeFromProto(pbState)
require.NoError(t, err)
blkCfg := testutil.DefaultBlockGenConfig()
@@ -33,7 +33,7 @@ func TestSkipSlotCache_OK(t *testing.T) {
require.NoError(t, err)
executedState, err := state.ExecuteStateTransition(context.Background(), originalState, interfaces.WrappedPhase0SignedBeaconBlock(blk))
require.NoError(t, err, "Could not run state transition")
originalState, ok := executedState.(*stateV0.BeaconState)
originalState, ok := executedState.(*v1.BeaconState)
require.Equal(t, true, ok)
bState, err = state.ExecuteStateTransition(context.Background(), bState, interfaces.WrappedPhase0SignedBeaconBlock(blk))
require.NoError(t, err, "Could not process state transition")
@@ -43,9 +43,9 @@ func TestSkipSlotCache_OK(t *testing.T) {
func TestSkipSlotCache_ConcurrentMixup(t *testing.T) {
bState, privs := testutil.DeterministicGenesisState(t, params.MinimalSpecConfig().MinGenesisActiveValidatorCount)
pbState, err := stateV0.ProtobufBeaconState(bState.CloneInnerState())
pbState, err := v1.ProtobufBeaconState(bState.CloneInnerState())
require.NoError(t, err)
originalState, err := stateV0.InitializeFromProto(pbState)
originalState, err := v1.InitializeFromProto(pbState)
require.NoError(t, err)
blkCfg := testutil.DefaultBlockGenConfig()
@@ -59,7 +59,7 @@ func TestSkipSlotCache_ConcurrentMixup(t *testing.T) {
require.NoError(t, err)
executedState, err := state.ExecuteStateTransition(context.Background(), originalState, interfaces.WrappedPhase0SignedBeaconBlock(blk))
require.NoError(t, err, "Could not run state transition")
originalState, ok := executedState.(*stateV0.BeaconState)
originalState, ok := executedState.(*v1.BeaconState)
require.Equal(t, true, ok)
// Create two shallow but different forks

8
beacon-chain/core/state/state.go
View File

@@ -10,7 +10,7 @@ import (
b "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -109,7 +109,7 @@ func OptimizedGenesisBeaconState(genesisTime uint64, preState iface.BeaconState,
slashings := make([]uint64, params.BeaconConfig().EpochsPerSlashingsVector)
genesisValidatorsRoot, err := stateV0.ValidatorRegistryRoot(preState.Validators())
genesisValidatorsRoot, err := v1.ValidatorRegistryRoot(preState.Validators())
if err != nil {
return nil, errors.Wrapf(err, "could not hash tree root genesis validators %v", err)
}
@@ -179,7 +179,7 @@ func OptimizedGenesisBeaconState(genesisTime uint64, preState iface.BeaconState,
BodyRoot: bodyRoot[:],
}
return stateV0.InitializeFromProto(state)
return v1.InitializeFromProto(state)
}
// EmptyGenesisState returns an empty beacon state object.
@@ -206,7 +206,7 @@ func EmptyGenesisState() (iface.BeaconState, error) {
Eth1DataVotes: []*ethpb.Eth1Data{},
Eth1DepositIndex: 0,
}
return stateV0.InitializeFromProto(state)
return v1.InitializeFromProto(state)
}
// IsValidGenesisState gets called whenever there's a deposit event,

4
beacon-chain/core/state/state_fuzz_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
fuzz "github.com/google/gofuzz"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
)
@@ -37,7 +37,7 @@ func TestOptimizedGenesisBeaconState_1000(t *testing.T) {
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
var genesisTime uint64
preState := &stateV0.BeaconState{}
preState := &v1.BeaconState{}
eth1Data := &ethpb.Eth1Data{}
for i := 0; i < 1000; i++ {
fuzzer.Fuzz(&genesisTime)

6
beacon-chain/core/state/state_test.go
View File

@@ -6,7 +6,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/hashutil"
@@ -99,9 +99,9 @@ func TestGenesisState_HashEquality(t *testing.T) {
state2, err := state.GenesisBeaconState(context.Background(), deposits, 0, &ethpb.Eth1Data{BlockHash: make([]byte, 32)})
require.NoError(t, err)
pbState1, err := stateV0.ProtobufBeaconState(state1.CloneInnerState())
pbState1, err := v1.ProtobufBeaconState(state1.CloneInnerState())
require.NoError(t, err)
pbState2, err := stateV0.ProtobufBeaconState(state2.CloneInnerState())
pbState2, err := v1.ProtobufBeaconState(state2.CloneInnerState())
require.NoError(t, err)
root1, err1 := hashutil.HashProto(pbState1)

2
beacon-chain/core/state/stateutils/BUILD.bazel
View File

@@ -22,7 +22,7 @@ go_test(
srcs = ["validator_index_map_test.go"],
deps = [
":go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bytesutil:go_default_library",

4
beacon-chain/core/state/stateutils/validator_index_map_test.go
View File

@@ -5,7 +5,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -24,7 +24,7 @@ func TestValidatorIndexMap_OK(t *testing.T) {
},
},
}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
tests := []struct {

24
beacon-chain/core/state/transition_fuzz_test.go
View File

@@ -6,7 +6,7 @@ import (
fuzz "github.com/google/gofuzz"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/interfaces"
)
@@ -15,7 +15,7 @@ func TestFuzzExecuteStateTransition_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
sb := &ethpb.SignedBeaconBlock{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
@@ -33,7 +33,7 @@ func TestFuzzCalculateStateRoot_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
sb := &ethpb.SignedBeaconBlock{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
@@ -51,7 +51,7 @@ func TestFuzzProcessSlot_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
for i := 0; i < 1000; i++ {
@@ -67,7 +67,7 @@ func TestFuzzProcessSlots_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
slot := types.Slot(0)
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
@@ -85,7 +85,7 @@ func TestFuzzProcessBlock_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
sb := &ethpb.SignedBeaconBlock{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
@@ -103,7 +103,7 @@ func TestFuzzProcessOperations_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
bb := &ethpb.SignedBeaconBlock{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
@@ -121,7 +121,7 @@ func TestFuzzprocessOperationsNoVerify_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
bb := &ethpb.SignedBeaconBlock{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
@@ -138,7 +138,7 @@ func TestFuzzprocessOperationsNoVerify_1000(t *testing.T) {
func TestFuzzverifyOperationLengths_10000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
bb := &ethpb.SignedBeaconBlock{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
@@ -153,7 +153,7 @@ func TestFuzzverifyOperationLengths_10000(t *testing.T) {
func TestFuzzCanProcessEpoch_10000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
for i := 0; i < 10000; i++ {
@@ -166,7 +166,7 @@ func TestFuzzProcessEpochPrecompute_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)
for i := 0; i < 1000; i++ {
@@ -182,7 +182,7 @@ func TestFuzzProcessBlockForStateRoot_1000(t *testing.T) {
SkipSlotCache.Disable()
defer SkipSlotCache.Enable()
ctx := context.Background()
state := &stateV0.BeaconState{}
state := &v1.BeaconState{}
sb := &ethpb.SignedBeaconBlock{}
fuzzer := fuzz.NewWithSeed(0)
fuzzer.NilChance(0.1)

24
beacon-chain/core/state/transition_test.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/attestationutil"
@@ -36,7 +36,7 @@ func TestExecuteStateTransition_IncorrectSlot(t *testing.T) {
base := &pb.BeaconState{
Slot: 5,
}
beaconState, err := stateV0.InitializeFromProto(base)
beaconState, err := v1.InitializeFromProto(base)
require.NoError(t, err)
block := &ethpb.SignedBeaconBlock{
Block: &ethpb.BeaconBlock{
@@ -457,7 +457,7 @@ func TestProcessEpochPrecompute_CanProcess(t *testing.T) {
JustificationBits: bitfield.Bitvector4{0x00},
CurrentJustifiedCheckpoint: &ethpb.Checkpoint{Root: make([]byte, 32)},
}
s, err := stateV0.InitializeFromProto(base)
s, err := v1.InitializeFromProto(base)
require.NoError(t, err)
require.NoError(t, s.SetValidators([]*ethpb.Validator{}))
newState, err := state.ProcessEpochPrecompute(context.Background(), s)
@@ -505,7 +505,7 @@ func BenchmarkProcessBlk_65536Validators_FullBlock(b *testing.B) {
CurrentVersion: []byte{0, 0, 0, 0},
},
}
s, err := stateV0.InitializeFromProto(base)
s, err := v1.InitializeFromProto(base)
require.NoError(b, err)
// Set up proposer slashing object for block
@@ -731,7 +731,7 @@ func TestCanProcessEpoch_TrueOnEpochs(t *testing.T) {
for _, tt := range tests {
b := &pb.BeaconState{Slot: tt.slot}
s, err := stateV0.InitializeFromProto(b)
s, err := v1.InitializeFromProto(b)
require.NoError(t, err)
assert.Equal(t, tt.canProcessEpoch, state.CanProcessEpoch(s), "CanProcessEpoch(%d)", tt.slot)
}
@@ -748,7 +748,7 @@ func TestProcessBlock_OverMaxProposerSlashings(t *testing.T) {
}
want := fmt.Sprintf("number of proposer slashings (%d) in block body exceeds allowed threshold of %d",
len(b.Block.Body.ProposerSlashings), params.BeaconConfig().MaxProposerSlashings)
_, err := state.VerifyOperationLengths(context.Background(), &stateV0.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
_, err := state.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
assert.ErrorContains(t, want, err)
}
@@ -763,7 +763,7 @@ func TestProcessBlock_OverMaxAttesterSlashings(t *testing.T) {
}
want := fmt.Sprintf("number of attester slashings (%d) in block body exceeds allowed threshold of %d",
len(b.Block.Body.AttesterSlashings), params.BeaconConfig().MaxAttesterSlashings)
_, err := state.VerifyOperationLengths(context.Background(), &stateV0.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
_, err := state.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
assert.ErrorContains(t, want, err)
}
@@ -777,7 +777,7 @@ func TestProcessBlock_OverMaxAttestations(t *testing.T) {
}
want := fmt.Sprintf("number of attestations (%d) in block body exceeds allowed threshold of %d",
len(b.Block.Body.Attestations), params.BeaconConfig().MaxAttestations)
_, err := state.VerifyOperationLengths(context.Background(), &stateV0.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
_, err := state.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
assert.ErrorContains(t, want, err)
}
@@ -792,7 +792,7 @@ func TestProcessBlock_OverMaxVoluntaryExits(t *testing.T) {
}
want := fmt.Sprintf("number of voluntary exits (%d) in block body exceeds allowed threshold of %d",
len(b.Block.Body.VoluntaryExits), maxExits)
_, err := state.VerifyOperationLengths(context.Background(), &stateV0.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
_, err := state.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, interfaces.WrappedPhase0SignedBeaconBlock(b))
assert.ErrorContains(t, want, err)
}
@@ -801,7 +801,7 @@ func TestProcessBlock_IncorrectDeposits(t *testing.T) {
Eth1Data: &ethpb.Eth1Data{DepositCount: 100},
Eth1DepositIndex: 98,
}
s, err := stateV0.InitializeFromProto(base)
s, err := v1.InitializeFromProto(base)
require.NoError(t, err)
b := &ethpb.SignedBeaconBlock{
Block: &ethpb.BeaconBlock{
@@ -818,7 +818,7 @@ func TestProcessBlock_IncorrectDeposits(t *testing.T) {
func TestProcessSlots_SameSlotAsParentState(t *testing.T) {
slot := types.Slot(2)
parentState, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: slot})
parentState, err := v1.InitializeFromProto(&pb.BeaconState{Slot: slot})
require.NoError(t, err)
_, err = state.ProcessSlots(context.Background(), parentState, slot)
@@ -827,7 +827,7 @@ func TestProcessSlots_SameSlotAsParentState(t *testing.T) {
func TestProcessSlots_LowerSlotAsParentState(t *testing.T) {
slot := types.Slot(2)
parentState, err := stateV0.InitializeFromProto(&pb.BeaconState{Slot: slot})
parentState, err := v1.InitializeFromProto(&pb.BeaconState{Slot: slot})
require.NoError(t, err)
_, err = state.ProcessSlots(context.Background(), parentState, slot-1)

2
beacon-chain/core/validators/BUILD.bazel
View File

@@ -26,7 +26,7 @@ go_test(
embed = [":go_default_library"],
deps = [
"//beacon-chain/core/helpers:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/params:go_default_library",

18
beacon-chain/core/validators/validator_test.go
View File

@@ -5,7 +5,7 @@ import (
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -44,7 +44,7 @@ func TestInitiateValidatorExit_AlreadyExited(t *testing.T) {
base := &pb.BeaconState{Validators: []*ethpb.Validator{{
ExitEpoch: exitEpoch},
}}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := InitiateValidatorExit(state, 0)
require.NoError(t, err)
@@ -62,7 +62,7 @@ func TestInitiateValidatorExit_ProperExit(t *testing.T) {
{ExitEpoch: exitedEpoch + 2},
{ExitEpoch: params.BeaconConfig().FarFutureEpoch},
}}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := InitiateValidatorExit(state, idx)
require.NoError(t, err)
@@ -81,7 +81,7 @@ func TestInitiateValidatorExit_ChurnOverflow(t *testing.T) {
{ExitEpoch: exitedEpoch + 2}, // overflow here
{ExitEpoch: params.BeaconConfig().FarFutureEpoch},
}}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
newState, err := InitiateValidatorExit(state, idx)
require.NoError(t, err)
@@ -116,7 +116,7 @@ func TestSlashValidator_OK(t *testing.T) {
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
Balances: balances,
}
state, err := stateV0.InitializeFromProto(base)
state, err := v1.InitializeFromProto(base)
require.NoError(t, err)
slashedIdx := types.ValidatorIndex(2)
@@ -127,7 +127,7 @@ func TestSlashValidator_OK(t *testing.T) {
require.NoError(t, err)
slashedState, err := SlashValidator(state, slashedIdx)
require.NoError(t, err, "Could not slash validator")
state, ok := slashedState.(*stateV0.BeaconState)
state, ok := slashedState.(*v1.BeaconState)
require.Equal(t, true, ok)
v, err := state.ValidatorAtIndex(slashedIdx)
@@ -201,7 +201,7 @@ func TestActivatedValidatorIndices(t *testing.T) {
},
}
for _, tt := range tests {
s, err := stateV0.InitializeFromProto(tt.state)
s, err := v1.InitializeFromProto(tt.state)
require.NoError(t, err)
activatedIndices := ActivatedValidatorIndices(helpers.CurrentEpoch(s), tt.state.Validators)
assert.DeepEqual(t, tt.wanted, activatedIndices)
@@ -255,7 +255,7 @@ func TestSlashedValidatorIndices(t *testing.T) {
},
}
for _, tt := range tests {
s, err := stateV0.InitializeFromProto(tt.state)
s, err := v1.InitializeFromProto(tt.state)
require.NoError(t, err)
slashedIndices := SlashedValidatorIndices(helpers.CurrentEpoch(s), tt.state.Validators)
assert.DeepEqual(t, tt.wanted, slashedIndices)
@@ -315,7 +315,7 @@ func TestExitedValidatorIndices(t *testing.T) {
},
}
for _, tt := range tests {
s, err := stateV0.InitializeFromProto(tt.state)
s, err := v1.InitializeFromProto(tt.state)
require.NoError(t, err)
activeCount, err := helpers.ActiveValidatorCount(s, helpers.PrevEpoch(s))
require.NoError(t, err)

2
beacon-chain/db/kv/BUILD.bazel
View File

@@ -39,7 +39,7 @@ go_library(
"//beacon-chain/db/iface:go_default_library",
"//beacon-chain/state/genesis:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/db:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",

2
beacon-chain/db/kv/genesis.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/blocks"
dbIface "github.com/prysmaticlabs/prysm/beacon-chain/db/iface"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
state "github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
state "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/interfaces"
"github.com/prysmaticlabs/prysm/shared/params"

8
beacon-chain/db/kv/state.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/state/genesis"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -39,7 +39,7 @@ func (s *Store) State(ctx context.Context, blockRoot [32]byte) (iface.BeaconStat
if err != nil {
return nil, err
}
return stateV0.InitializeFromProtoUnsafe(st)
return v1.InitializeFromProtoUnsafe(st)
}
// GenesisState returns the genesis state in beacon chain.
@@ -80,7 +80,7 @@ func (s *Store) GenesisState(ctx context.Context) (iface.BeaconState, error) {
if st == nil {
return nil, nil
}
return stateV0.InitializeFromProtoUnsafe(st)
return v1.InitializeFromProtoUnsafe(st)
}
// SaveState stores a state to the db using block's signing root which was used to generate the state.
@@ -100,7 +100,7 @@ func (s *Store) SaveStates(ctx context.Context, states []iface.ReadOnlyBeaconSta
}
multipleEncs := make([][]byte, len(states))
for i, st := range states {
pbState, err := stateV0.ProtobufBeaconState(st.InnerStateUnsafe())
pbState, err := v1.ProtobufBeaconState(st.InnerStateUnsafe())
if err != nil {
return err
}

2
beacon-chain/interop-cold-start/BUILD.bazel
View File

@@ -13,7 +13,7 @@ go_library(
"//beacon-chain/db:go_default_library",
"//beacon-chain/powchain:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared:go_default_library",

8
beacon-chain/interop-cold-start/service.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/powchain"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared"
@@ -66,7 +66,7 @@ func NewService(ctx context.Context, cfg *Config) *Service {
if err := genesisState.UnmarshalSSZ(data); err != nil {
log.Fatalf("Could not unmarshal pre-loaded state: %v", err)
}
genesisTrie, err := stateV0.InitializeFromProto(genesisState)
genesisTrie, err := v1.InitializeFromProto(genesisState)
if err != nil {
log.Fatalf("Could not get state trie: %v", err)
}
@@ -81,7 +81,7 @@ func NewService(ctx context.Context, cfg *Config) *Service {
if err != nil {
log.Fatalf("Could not generate interop genesis state: %v", err)
}
genesisTrie, err := stateV0.InitializeFromProto(genesisState)
genesisTrie, err := v1.InitializeFromProto(genesisState)
if err != nil {
log.Fatalf("Could not get state trie: %v", err)
}
@@ -133,7 +133,7 @@ func (s *Service) ChainStartEth1Data() *ethpb.Eth1Data {
// PreGenesisState returns an empty beacon state.
func (s *Service) PreGenesisState() iface.BeaconState {
return &stateV0.BeaconState{}
return &v1.BeaconState{}
}
// ClearPreGenesisData --

2
beacon-chain/operations/voluntaryexits/BUILD.bazel
View File

@@ -29,7 +29,7 @@ go_test(
srcs = ["service_test.go"],
embed = [":go_default_library"],
deps = [
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/params:go_default_library",

6
beacon-chain/operations/voluntaryexits/service_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
@@ -270,7 +270,7 @@ func TestPool_InsertVoluntaryExit(t *testing.T) {
p := &Pool{
pending: tt.fields.pending,
}
s, err := stateV0.InitializeFromProtoUnsafe(&p2ppb.BeaconState{Validators: validators})
s, err := v1.InitializeFromProtoUnsafe(&p2ppb.BeaconState{Validators: validators})
require.NoError(t, err)
p.InsertVoluntaryExit(ctx, s, tt.args.exit)
if len(p.pending) != len(tt.want) {
@@ -521,7 +521,7 @@ func TestPool_PendingExits(t *testing.T) {
p := &Pool{
pending: tt.fields.pending,
}
s, err := stateV0.InitializeFromProtoUnsafe(&p2ppb.BeaconState{Validators: []*ethpb.Validator{{ExitEpoch: params.BeaconConfig().FarFutureEpoch}}})
s, err := v1.InitializeFromProtoUnsafe(&p2ppb.BeaconState{Validators: []*ethpb.Validator{{ExitEpoch: params.BeaconConfig().FarFutureEpoch}}})
require.NoError(t, err)
if got := p.PendingExits(s, tt.args.slot, tt.fields.noLimit); !reflect.DeepEqual(got, tt.want) {
t.Errorf("PendingExits() = %v, want %v", got, tt.want)

2
beacon-chain/powchain/BUILD.bazel
View File

@@ -28,8 +28,8 @@ go_library(
"//beacon-chain/db:go_default_library",
"//beacon-chain/powchain/types:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/stategen:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//contracts/deposit-contract:go_default_library",
"//proto/beacon/db:go_default_library",
"//proto/eth/v1alpha1:go_default_library",

4
beacon-chain/powchain/log_processing.go
View File

@@ -16,7 +16,7 @@ import (
statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/state"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract"
protodb "github.com/prysmaticlabs/prysm/proto/beacon/db"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -487,7 +487,7 @@ func (s *Service) checkForChainstart(blockHash [32]byte, blockNumber *big.Int, b
// save all powchain related metadata to disk.
func (s *Service) savePowchainData(ctx context.Context) error {
pbState, err := stateV0.ProtobufBeaconState(s.preGenesisState.InnerStateUnsafe())
pbState, err := v1.ProtobufBeaconState(s.preGenesisState.InnerStateUnsafe())
if err != nil {
return err
}

8
beacon-chain/powchain/service.go
View File

@@ -30,8 +30,8 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/powchain/types"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract"
protodb "github.com/prysmaticlabs/prysm/proto/beacon/db"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -285,7 +285,7 @@ func (s *Service) ChainStartDeposits() []*ethpb.Deposit {
// ClearPreGenesisData clears out the stored chainstart deposits and beacon state.
func (s *Service) ClearPreGenesisData() {
s.chainStartData.ChainstartDeposits = []*ethpb.Deposit{}
s.preGenesisState = &stateV0.BeaconState{}
s.preGenesisState = &v1.BeaconState{}
}
// ChainStartEth1Data returns the eth1 data at chainstart.
@@ -969,7 +969,7 @@ func (s *Service) initializeEth1Data(ctx context.Context, eth1DataInDB *protodb.
s.chainStartData = eth1DataInDB.ChainstartData
var err error
if !reflect.ValueOf(eth1DataInDB.BeaconState).IsZero() {
s.preGenesisState, err = stateV0.InitializeFromProto(eth1DataInDB.BeaconState)
s.preGenesisState, err = v1.InitializeFromProto(eth1DataInDB.BeaconState)
if err != nil {
return errors.Wrap(err, "Could not initialize state trie")
}
@@ -1022,7 +1022,7 @@ func (s *Service) ensureValidPowchainData(ctx context.Context) error {
return errors.Wrap(err, "unable to retrieve eth1 data")
}
if eth1Data == nil || !eth1Data.ChainstartData.Chainstarted || !s.validateDepositContainers(eth1Data.DepositContainers) {
pbState, err := stateV0.ProtobufBeaconState(s.preGenesisState.InnerStateUnsafe())
pbState, err := v1.ProtobufBeaconState(s.preGenesisState.InnerStateUnsafe())
if err != nil {
return err
}

2
beacon-chain/powchain/testing/BUILD.bazel
View File

@@ -15,7 +15,7 @@ go_library(
deps = [
"//beacon-chain/powchain/types:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bytesutil:go_default_library",
"//shared/event:go_default_library",

4
beacon-chain/powchain/testing/mock_faulty_powchain.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/prysmaticlabs/prysm/beacon-chain/powchain/types"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/event"
"github.com/prysmaticlabs/prysm/shared/trieutil"
@@ -76,7 +76,7 @@ func (f *FaultyMockPOWChain) ChainStartEth1Data() *ethpb.Eth1Data {
// PreGenesisState --
func (f *FaultyMockPOWChain) PreGenesisState() iface.BeaconState {
return &stateV0.BeaconState{}
return &v1.BeaconState{}
}
// ClearPreGenesisData --

2
beacon-chain/rpc/beacon/BUILD.bazel
View File

@@ -92,8 +92,8 @@ go_test(
"//beacon-chain/operations/slashings:go_default_library",
"//beacon-chain/p2p/testing:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/stategen:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//beacon-chain/sync/initial-sync/testing:go_default_library",
"//cmd/beacon-chain/flags:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",

6
beacon-chain/rpc/beacon/attestations_test.go
View File

@@ -17,8 +17,8 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
attaggregation "github.com/prysmaticlabs/prysm/shared/aggregation/attestations"
@@ -39,7 +39,7 @@ func TestServer_ListAttestations_NoResults(t *testing.T) {
db := dbTest.SetupDB(t)
ctx := context.Background()
st, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
st, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: 0,
})
require.NoError(t, err)
@@ -67,7 +67,7 @@ func TestServer_ListAttestations_Genesis(t *testing.T) {
db := dbTest.SetupDB(t)
ctx := context.Background()
st, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
st, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: 0,
})
require.NoError(t, err)

6
beacon-chain/rpc/beacon/blocks_test.go
View File

@@ -14,8 +14,8 @@ import (
statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -393,7 +393,7 @@ func TestServer_GetChainHead(t *testing.T) {
pjRoot, err := prevJustifiedBlock.Block.HashTreeRoot()
require.NoError(t, err)
s, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
s, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: 1,
PreviousJustifiedCheckpoint: &ethpb.Checkpoint{Epoch: 3, Root: pjRoot[:]},
CurrentJustifiedCheckpoint: &ethpb.Checkpoint{Epoch: 2, Root: jRoot[:]},
@@ -483,7 +483,7 @@ func TestServer_StreamChainHead_OnHeadUpdated(t *testing.T) {
pjRoot, err := prevJustifiedBlock.Block.HashTreeRoot()
require.NoError(t, err)
s, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
s, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: 1,
PreviousJustifiedCheckpoint: &ethpb.Checkpoint{Epoch: 3, Root: pjRoot[:]},
CurrentJustifiedCheckpoint: &ethpb.Checkpoint{Epoch: 2, Root: jRoot[:]},

8
beacon-chain/rpc/beacon/validators_test.go
View File

@@ -17,8 +17,8 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/db"
dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -1274,7 +1274,7 @@ func TestServer_GetValidatorActiveSetChanges(t *testing.T) {
}
func TestServer_GetValidatorQueue_PendingActivation(t *testing.T) {
headState, err := stateV0.InitializeFromProto(&pb.BeaconState{
headState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: []*ethpb.Validator{
{
ActivationEpoch: helpers.ActivationExitEpoch(0),
@@ -1373,7 +1373,7 @@ func TestServer_GetValidatorQueue_ExitedValidatorLeavesQueue(t *testing.T) {
}
func TestServer_GetValidatorQueue_PendingExit(t *testing.T) {
headState, err := stateV0.InitializeFromProto(&pb.BeaconState{
headState, err := v1.InitializeFromProto(&pb.BeaconState{
Validators: []*ethpb.Validator{
{
ActivationEpoch: 0,
@@ -1462,7 +1462,7 @@ func TestServer_GetValidatorParticipation_UnknownState(t *testing.T) {
slots := params.BeaconConfig().SlotsPerEpoch.Mul(uint64(epoch))
mockStateGen := &stategen.MockStateManager{
StatesBySlot: map[types.Slot]iface.BeaconState{
0: (*stateV0.BeaconState)(nil),
0: (*v1.BeaconState)(nil),
},
}
bs := &Server{

2
beacon-chain/rpc/beaconv1/BUILD.bazel
View File

@@ -28,8 +28,8 @@ go_library(
"//beacon-chain/p2p:go_default_library",
"//beacon-chain/rpc/statefetcher:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/stategen:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/eth/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//proto/migration:go_default_library",

6
beacon-chain/rpc/beaconv1/validator.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/rpc/statefetcher"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1"
"github.com/prysmaticlabs/prysm/proto/migration"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -230,7 +230,7 @@ func valContainersByRequestIds(state iface.BeaconState, validatorIds [][]byte) (
valIndex = types.ValidatorIndex(index)
}
validator, err := state.ValidatorAtIndex(valIndex)
if _, ok := err.(*stateV0.ValidatorIndexOutOfRangeError); ok {
if _, ok := err.(*v1.ValidatorIndexOutOfRangeError); ok {
// Ignore well-formed yet unknown indexes.
continue
}
@@ -316,7 +316,7 @@ func validatorSubStatus(validator *ethpb.Validator, epoch types.Epoch) (ethpb.Va
}
func handleValContainerErr(err error) error {
if outOfRangeErr, ok := err.(*stateV0.ValidatorIndexOutOfRangeError); ok {
if outOfRangeErr, ok := err.(*v1.ValidatorIndexOutOfRangeError); ok {
return status.Errorf(codes.InvalidArgument, "Invalid validator ID: %v", outOfRangeErr)
}
if invalidIdErr, ok := err.(*invalidValidatorIdError); ok {

2
beacon-chain/rpc/validator/BUILD.bazel
View File

@@ -104,8 +104,8 @@ go_test(
"//beacon-chain/p2p/testing:go_default_library",
"//beacon-chain/powchain/testing:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/stategen:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//beacon-chain/sync/initial-sync/testing:go_default_library",
"//proto/beacon/db:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",

8
beacon-chain/rpc/validator/aggregator_test.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations"
mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -31,7 +31,7 @@ func TestSubmitAggregateAndProof_Syncing(t *testing.T) {
db := dbutil.SetupDB(t)
ctx := context.Background()
s := &stateV0.BeaconState{}
s := &v1.BeaconState{}
aggregatorServer := &Server{
HeadFetcher: &mock.ChainService{State: s},
@@ -49,7 +49,7 @@ func TestSubmitAggregateAndProof_CantFindValidatorIndex(t *testing.T) {
db := dbutil.SetupDB(t)
ctx := context.Background()
s, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
s, err := v1.InitializeFromProto(&pbp2p.BeaconState{
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
})
require.NoError(t, err)
@@ -73,7 +73,7 @@ func TestSubmitAggregateAndProof_IsAggregatorAndNoAtts(t *testing.T) {
db := dbutil.SetupDB(t)
ctx := context.Background()
s, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
s, err := v1.InitializeFromProto(&pbp2p.BeaconState{
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
Validators: []*ethpb.Validator{
{PublicKey: pubKey(0)},

4
beacon-chain/rpc/validator/attester_test.go
View File

@@ -14,8 +14,8 @@ import (
dbutil "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations"
mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -282,7 +282,7 @@ func TestAttestationDataAtSlot_HandlesFarAwayJustifiedEpoch(t *testing.T) {
func TestAttestationDataSlot_handlesInProgressRequest(t *testing.T) {
s := &pbp2p.BeaconState{Slot: 100}
state, err := stateV0.InitializeFromProto(s)
state, err := v1.InitializeFromProto(s)
require.NoError(t, err)
ctx := context.Background()
chainService := &mock.ChainService{

46
beacon-chain/rpc/validator/proposer_test.go
View File

@@ -17,8 +17,8 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/operations/voluntaryexits"
mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing"
mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing"
dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
@@ -377,7 +377,7 @@ func TestProposer_PendingDeposits_OutsideEth1FollowWindow(t *testing.T) {
},
}
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Eth1Data: &ethpb.Eth1Data{
BlockHash: bytesutil.PadTo([]byte("0x0"), 32),
DepositRoot: make([]byte, 32),
@@ -505,7 +505,7 @@ func TestProposer_PendingDeposits_FollowsCorrectEth1Block(t *testing.T) {
votes = append(votes, vote)
}
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Eth1Data: &ethpb.Eth1Data{
BlockHash: []byte("0x0"),
DepositRoot: make([]byte, 32),
@@ -716,7 +716,7 @@ func TestProposer_PendingDeposits_CantReturnMoreThanMax(t *testing.T) {
},
}
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Eth1Data: &ethpb.Eth1Data{
BlockHash: bytesutil.PadTo([]byte("0x0"), 32),
DepositRoot: make([]byte, 32),
@@ -810,7 +810,7 @@ func TestProposer_PendingDeposits_CantReturnMoreThanDepositCount(t *testing.T) {
},
}
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Eth1Data: &ethpb.Eth1Data{
BlockHash: bytesutil.PadTo([]byte("0x0"), 32),
DepositRoot: make([]byte, 32),
@@ -904,7 +904,7 @@ func TestProposer_DepositTrie_UtilizesCachedFinalizedDeposits(t *testing.T) {
},
}
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Eth1Data: &ethpb.Eth1Data{
BlockHash: bytesutil.PadTo([]byte("0x0"), 32),
DepositRoot: make([]byte, 32),
@@ -1014,7 +1014,7 @@ func TestProposer_DepositTrie_RebuildTrie(t *testing.T) {
},
}
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Eth1Data: &ethpb.Eth1Data{
BlockHash: bytesutil.PadTo([]byte("0x0"), 32),
DepositRoot: make([]byte, 32),
@@ -1295,7 +1295,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(52, earliestValidTime+2, []byte("second")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("first"), DepositCount: 1},
@@ -1331,7 +1331,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(52, earliestValidTime+2, []byte("second")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("earliest"), DepositCount: 1},
@@ -1367,7 +1367,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(51, earliestValidTime+1, []byte("first")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("first"), DepositCount: 1},
@@ -1404,7 +1404,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(51, earliestValidTime+1, []byte("first")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("before_range"), DepositCount: 1},
@@ -1441,7 +1441,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(100, latestValidTime, []byte("latest")).
InsertBlock(101, latestValidTime+1, []byte("after_range"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("first"), DepositCount: 1},
@@ -1478,7 +1478,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(52, earliestValidTime+2, []byte("second")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("unknown"), DepositCount: 1},
@@ -1512,7 +1512,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(49, earliestValidTime-1, []byte("before_range")).
InsertBlock(101, latestValidTime+1, []byte("after_range"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
})
require.NoError(t, err)
@@ -1544,7 +1544,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(52, earliestValidTime+2, []byte("second")).
InsertBlock(101, latestValidTime+1, []byte("after_range"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("before_range"), DepositCount: 1},
@@ -1578,7 +1578,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(50, earliestValidTime, []byte("earliest")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{}})
require.NoError(t, err)
@@ -1608,7 +1608,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(50, earliestValidTime, []byte("earliest")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
})
require.NoError(t, err)
@@ -1642,7 +1642,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(52, earliestValidTime+2, []byte("second")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("first"), DepositCount: 1},
@@ -1678,7 +1678,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
InsertBlock(52, earliestValidTime+2, []byte("second")).
InsertBlock(100, latestValidTime, []byte("latest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("no_new_deposits"), DepositCount: 0},
@@ -1711,7 +1711,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
t.Skip()
p := mockPOW.NewPOWChain().InsertBlock(50, earliestValidTime, []byte("earliest"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("earliest"), DepositCount: 1},
@@ -1745,7 +1745,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
// because of earliest block increment in the algorithm.
InsertBlock(50, earliestValidTime+1, []byte("first"))
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("before_range"), DepositCount: 1},
@@ -1784,7 +1784,7 @@ func TestProposer_Eth1Data_MajorityVote(t *testing.T) {
depositCache, err := depositcache.New()
require.NoError(t, err)
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: slot,
Eth1DataVotes: []*ethpb.Eth1Data{
{BlockHash: []byte("earliest"), DepositCount: 1},
@@ -1935,7 +1935,7 @@ func TestProposer_Deposits_ReturnsEmptyList_IfLatestEth1DataEqGenesisEth1Block(t
GenesisEth1Block: height,
}
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Eth1Data: &ethpb.Eth1Data{
BlockHash: bytesutil.PadTo([]byte("0x0"), 32),
DepositRoot: make([]byte, 32),

8
beacon-chain/rpc/validator/server_test.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
dbutil "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
@@ -59,7 +59,7 @@ func TestWaitForActivation_ContextClosed(t *testing.T) {
db := dbutil.SetupDB(t)
ctx := context.Background()
beaconState, err := stateV0.InitializeFromProto(&pbp2p.BeaconState{
beaconState, err := v1.InitializeFromProto(&pbp2p.BeaconState{
Slot: 0,
Validators: []*ethpb.Validator{},
})
@@ -152,7 +152,7 @@ func TestWaitForActivation_ValidatorOriginallyExists(t *testing.T) {
require.NoError(t, err)
assert.NoError(t, depositCache.InsertDeposit(ctx, deposit, 10 /*blockNum*/, 0, depositTrie.Root()))
trie, err := stateV0.InitializeFromProtoUnsafe(beaconState)
trie, err := v1.InitializeFromProtoUnsafe(beaconState)
require.NoError(t, err)
vs := &Server{
BeaconDB: db,
@@ -235,7 +235,7 @@ func TestWaitForActivation_MultipleStatuses(t *testing.T) {
block := testutil.NewBeaconBlock()
genesisRoot, err := block.Block.HashTreeRoot()
require.NoError(t, err, "Could not get signing root")
trie, err := stateV0.InitializeFromProtoUnsafe(beaconState)
trie, err := v1.InitializeFromProtoUnsafe(beaconState)
require.NoError(t, err)
vs := &Server{
BeaconDB: db,

24
beacon-chain/rpc/validator/status_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
dbutil "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -44,7 +44,7 @@ func TestValidatorStatus_DepositedEth1(t *testing.T) {
0: uint64(height),
},
}
stateObj, err := stateV0.InitializeFromProtoUnsafe(&pbp2p.BeaconState{})
stateObj, err := v1.InitializeFromProtoUnsafe(&pbp2p.BeaconState{})
require.NoError(t, err)
vs := &Server{
BeaconDB: db,
@@ -89,7 +89,7 @@ func TestValidatorStatus_Deposited(t *testing.T) {
0: uint64(height),
},
}
stateObj, err := stateV0.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
stateObj, err := v1.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
Validators: []*ethpb.Validator{
{
PublicKey: pubKey1,
@@ -141,7 +141,7 @@ func TestValidatorStatus_PartiallyDeposited(t *testing.T) {
0: uint64(height),
},
}
stateObj, err := stateV0.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
stateObj, err := v1.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
Validators: []*ethpb.Validator{
{
PublicKey: pubKey1,
@@ -273,7 +273,7 @@ func TestValidatorStatus_Active(t *testing.T) {
WithdrawableEpoch: params.BeaconConfig().FarFutureEpoch,
PublicKey: pubKey},
}}
stateObj, err := stateV0.InitializeFromProtoUnsafe(state)
stateObj, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
timestamp := time.Unix(int64(params.BeaconConfig().Eth1FollowDistance), 0).Unix()
@@ -329,7 +329,7 @@ func TestValidatorStatus_Exiting(t *testing.T) {
ExitEpoch: exitEpoch,
WithdrawableEpoch: withdrawableEpoch},
}}
stateObj, err := stateV0.InitializeFromProtoUnsafe(state)
stateObj, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
depData := &ethpb.Deposit_Data{
PublicKey: pubKey,
@@ -389,7 +389,7 @@ func TestValidatorStatus_Slashing(t *testing.T) {
PublicKey: pubKey,
WithdrawableEpoch: epoch + 1},
}}
stateObj, err := stateV0.InitializeFromProtoUnsafe(state)
stateObj, err := v1.InitializeFromProtoUnsafe(state)
require.NoError(t, err)
depData := &ethpb.Deposit_Data{
PublicKey: pubKey,
@@ -499,7 +499,7 @@ func TestValidatorStatus_UnknownStatus(t *testing.T) {
depositCache, err := depositcache.New()
require.NoError(t, err)
stateObj, err := stateV0.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
stateObj, err := v1.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
Slot: 0,
})
require.NoError(t, err)
@@ -526,7 +526,7 @@ func TestActivationStatus_OK(t *testing.T) {
deposits, _, err := testutil.DeterministicDepositsAndKeys(4)
require.NoError(t, err)
pubKeys := [][]byte{deposits[0].Data.PublicKey, deposits[1].Data.PublicKey, deposits[2].Data.PublicKey, deposits[3].Data.PublicKey}
stateObj, err := stateV0.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
stateObj, err := v1.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
Slot: 4000,
Validators: []*ethpb.Validator{
{
@@ -727,7 +727,7 @@ func TestMultipleValidatorStatus_Pubkeys(t *testing.T) {
deposits[4].Data.PublicKey,
deposits[5].Data.PublicKey,
}
stateObj, err := stateV0.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
stateObj, err := v1.InitializeFromProtoUnsafe(&pbp2p.BeaconState{
Slot: 4000,
Validators: []*ethpb.Validator{
{
@@ -866,7 +866,7 @@ func TestMultipleValidatorStatus_Indices(t *testing.T) {
},
},
}
stateObj, err := stateV0.InitializeFromProtoUnsafe(beaconState)
stateObj, err := v1.InitializeFromProtoUnsafe(beaconState)
require.NoError(t, err)
block := testutil.NewBeaconBlock()
genesisRoot, err := block.Block.HashTreeRoot()
@@ -942,7 +942,7 @@ func TestValidatorStatus_Invalid(t *testing.T) {
0: uint64(height),
},
}
stateObj, err := stateV0.InitializeFromProtoUnsafe(&pbp2p.BeaconState{})
stateObj, err := v1.InitializeFromProtoUnsafe(&pbp2p.BeaconState{})
require.NoError(t, err)
vs := &Server{
BeaconDB: db,

2
beacon-chain/state/genesis/BUILD.bazel
View File

@@ -8,7 +8,7 @@ go_library(
importpath = "github.com/prysmaticlabs/prysm/beacon-chain/state/genesis",
visibility = ["//beacon-chain/db:__subpackages__"],
deps = [
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//shared/params:go_default_library",
"@com_github_golang_snappy//:go_default_library",

2
beacon-chain/state/genesis/genesis.go
View File

@@ -4,7 +4,7 @@ import (
_ "embed"
"github.com/golang/snappy"
state "github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
state "github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/params"
)

5
beacon-chain/state/interface/BUILD.bazel
View File

@@ -2,7 +2,10 @@ load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["phase0.go"],
srcs = [
"altair.go",
"phase0.go",
],
importpath = "github.com/prysmaticlabs/prysm/beacon-chain/state/interface",
visibility = [
"//beacon-chain:__subpackages__",

21
beacon-chain/state/interface/altair.go Normal file
View File

@@ -0,0 +1,21 @@
package iface
import pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
// BeaconStateAltair has read and write access to beacon state methods.
type BeaconStateAltair interface {
BeaconState
CurrentSyncCommittee() (*pbp2p.SyncCommittee, error)
NextSyncCommittee() (*pbp2p.SyncCommittee, error)
SetCurrentSyncCommittee(val *pbp2p.SyncCommittee) error
SetNextSyncCommittee(val *pbp2p.SyncCommittee) error
CurrentEpochParticipation() ([]byte, error)
PreviousEpochParticipation() ([]byte, error)
InactivityScores() ([]uint64, error)
AppendCurrentParticipationBits(val byte) error
AppendPreviousParticipationBits(val byte) error
AppendInactivityScore(s uint64) error
SetInactivityScores(val []uint64) error
SetPreviousParticipationBits(val []byte) error
SetCurrentParticipationBits(val []byte) error
}

20
beacon-chain/state/interface/phase0.go
View File

@@ -20,6 +20,8 @@ type BeaconState interface {
Copy() BeaconState
HashTreeRoot(ctx context.Context) ([32]byte, error)
ToProto() (*v1.BeaconState, error)
Version() int
FutureForkStub
}
// ReadOnlyBeaconState defines a struct which only has read access to beacon state methods.
@@ -196,3 +198,21 @@ type WriteOnlyAttestations interface {
AppendPreviousEpochAttestations(val *pbp2p.PendingAttestation) error
RotateAttestations() error
}
// FutureForkStub defines methods that are used for future forks. This is a low cost solution to enable
// various state casting of interface to work.
type FutureForkStub interface {
AppendCurrentParticipationBits(val byte) error
AppendPreviousParticipationBits(val byte) error
AppendInactivityScore(s uint64) error
CurrentEpochParticipation() ([]byte, error)
PreviousEpochParticipation() ([]byte, error)
InactivityScores() ([]uint64, error)
SetInactivityScores(val []uint64) error
CurrentSyncCommittee() (*pbp2p.SyncCommittee, error)
SetCurrentSyncCommittee(val *pbp2p.SyncCommittee) error
SetPreviousParticipationBits(val []byte) error
SetCurrentParticipationBits(val []byte) error
NextSyncCommittee() (*pbp2p.SyncCommittee, error)
SetNextSyncCommittee(val *pbp2p.SyncCommittee) error
}

2
beacon-chain/state/stategen/BUILD.bazel
View File

@@ -60,7 +60,7 @@ go_test(
"//beacon-chain/db:go_default_library",
"//beacon-chain/db/testing:go_default_library",
"//beacon-chain/state/interface:go_default_library",
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bytesutil:go_default_library",

4
beacon-chain/state/stategen/hot_state_cache_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
iface "github.com/prysmaticlabs/prysm/beacon-chain/state/interface"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
"github.com/prysmaticlabs/prysm/shared/testutil/require"
@@ -17,7 +17,7 @@ func TestHotStateCache_RoundTrip(t *testing.T) {
assert.Equal(t, iface.BeaconState(nil), state)
assert.Equal(t, false, c.has(root), "Empty cache has an object")
state, err := stateV0.InitializeFromProto(&pb.BeaconState{
state, err := v1.InitializeFromProto(&pb.BeaconState{
Slot: 10,
})
require.NoError(t, err)

2
beacon-chain/state/stateutil/BUILD.bazel
View File

@@ -52,7 +52,7 @@ go_test(
],
embed = [":go_default_library"],
deps = [
"//beacon-chain/state/stateV0:go_default_library",
"//beacon-chain/state/v1:go_default_library",
"//proto/beacon/p2p/v1:go_default_library",
"//proto/eth/v1alpha1:go_default_library",
"//shared/bytesutil:go_default_library",

10
beacon-chain/state/stateutil/trie_helpers_test.go
View File

@@ -4,8 +4,8 @@ import (
"testing"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/hashutil"
@@ -17,7 +17,7 @@ import (
func TestReturnTrieLayer_OK(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 32)
root, err := stateV0.RootsArrayHashTreeRoot(newState.BlockRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "BlockRoots")
root, err := v1.RootsArrayHashTreeRoot(newState.BlockRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "BlockRoots")
require.NoError(t, err)
blockRts := newState.BlockRoots()
roots := make([][32]byte, 0, len(blockRts))
@@ -31,7 +31,7 @@ func TestReturnTrieLayer_OK(t *testing.T) {
func TestReturnTrieLayerVariable_OK(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 32)
root, err := stateV0.ValidatorRegistryRoot(newState.Validators())
root, err := v1.ValidatorRegistryRoot(newState.Validators())
require.NoError(t, err)
hasher := hashutil.CustomSHA256Hasher()
validators := newState.Validators()
@@ -62,7 +62,7 @@ func TestRecomputeFromLayer_FixedSizedArray(t *testing.T) {
require.NoError(t, newState.UpdateBlockRootAtIndex(changedIdx[0], changedRoots[0]))
require.NoError(t, newState.UpdateBlockRootAtIndex(changedIdx[1], changedRoots[1]))
expectedRoot, err := stateV0.RootsArrayHashTreeRoot(newState.BlockRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "BlockRoots")
expectedRoot, err := v1.RootsArrayHashTreeRoot(newState.BlockRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "BlockRoots")
require.NoError(t, err)
root, _, err := stateutil.RecomputeFromLayer(changedRoots, changedIdx, layers)
require.NoError(t, err)
@@ -96,7 +96,7 @@ func TestRecomputeFromLayer_VariableSizedArray(t *testing.T) {
require.NoError(t, newState.UpdateValidatorAtIndex(types.ValidatorIndex(changedIdx[0]), changedVals[0]))
require.NoError(t, newState.UpdateValidatorAtIndex(types.ValidatorIndex(changedIdx[1]), changedVals[1]))
expectedRoot, err := stateV0.ValidatorRegistryRoot(newState.Validators())
expectedRoot, err := v1.ValidatorRegistryRoot(newState.Validators())
require.NoError(t, err)
roots = make([][32]byte, 0, len(changedVals))
for _, val := range changedVals {

5
beacon-chain/state/stateV0/BUILD.bazel → beacon-chain/state/v1/BUILD.bazel
View File

@@ -26,9 +26,11 @@ go_library(
"setters_validator.go",
"state_trie.go",
"types.go",
"unsupported_getters.go",
"unsupported_setters.go",
"validator_getters.go",
],
importpath = "github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0",
importpath = "github.com/prysmaticlabs/prysm/beacon-chain/state/v1",
visibility = [
"//beacon-chain:__subpackages__",
"//fuzz:__pkg__",
@@ -54,6 +56,7 @@ go_library(
"//shared/featureconfig:go_default_library",
"//shared/hashutil:go_default_library",
"//shared/htrutils:go_default_library",
"//shared/interfaces/version:go_default_library",
"//shared/params:go_default_library",
"//shared/sliceutil:go_default_library",
"@com_github_dgraph_io_ristretto//:go_default_library",

4
beacon-chain/state/stateV0/doc.go → beacon-chain/state/v1/doc.go
View File

@@ -1,4 +1,4 @@
// Package stateV0 defines how the beacon chain state for Ethereum
// Package v1 defines how the beacon chain state for Ethereum
// functions in the running beacon node, using an advanced,
// immutable implementation of the state data structure.
//
@@ -37,4 +37,4 @@
// Although it is technically possible to remove the short-circuit conditions
// from the external function, that would require every read to obtain a lock
// even if the data was not present, leading to potential slowdowns.
package stateV0
package v1

2
beacon-chain/state/stateV0/field_roots.go → beacon-chain/state/v1/field_roots.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"context"

2
beacon-chain/state/stateV0/field_trie.go → beacon-chain/state/v1/field_trie.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"reflect"

2
beacon-chain/state/stateV0/field_trie_helpers.go → beacon-chain/state/v1/field_trie_helpers.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"fmt"

14
beacon-chain/state/stateV0/field_trie_test.go → beacon-chain/state/v1/field_trie_test.go
View File

@@ -1,10 +1,10 @@
package stateV0_test
package v1_test
import (
"testing"
types "github.com/prysmaticlabs/eth2-types"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateV0"
"github.com/prysmaticlabs/prysm/beacon-chain/state/v1"
ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil"
@@ -16,9 +16,9 @@ func TestFieldTrie_NewTrie(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 40)
// 5 represents the enum value of state roots
trie, err := stateV0.NewFieldTrie(5, newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot))
trie, err := v1.NewFieldTrie(5, newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot))
require.NoError(t, err)
root, err := stateV0.RootsArrayHashTreeRoot(newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "StateRoots")
root, err := v1.RootsArrayHashTreeRoot(newState.StateRoots(), uint64(params.BeaconConfig().SlotsPerHistoricalRoot), "StateRoots")
require.NoError(t, err)
newRoot, err := trie.TrieRoot()
require.NoError(t, err)
@@ -28,7 +28,7 @@ func TestFieldTrie_NewTrie(t *testing.T) {
func TestFieldTrie_RecomputeTrie(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 32)
// 10 represents the enum value of validators
trie, err := stateV0.NewFieldTrie(11, newState.Validators(), params.BeaconConfig().ValidatorRegistryLimit)
trie, err := v1.NewFieldTrie(11, newState.Validators(), params.BeaconConfig().ValidatorRegistryLimit)
require.NoError(t, err)
changedIdx := []uint64{2, 29}
@@ -46,7 +46,7 @@ func TestFieldTrie_RecomputeTrie(t *testing.T) {
require.NoError(t, newState.UpdateValidatorAtIndex(types.ValidatorIndex(changedIdx[0]), changedVals[0]))
require.NoError(t, newState.UpdateValidatorAtIndex(types.ValidatorIndex(changedIdx[1]), changedVals[1]))
expectedRoot, err := stateV0.ValidatorRegistryRoot(newState.Validators())
expectedRoot, err := v1.ValidatorRegistryRoot(newState.Validators())
require.NoError(t, err)
root, err := trie.RecomputeTrie(changedIdx, newState.Validators())
require.NoError(t, err)
@@ -56,7 +56,7 @@ func TestFieldTrie_RecomputeTrie(t *testing.T) {
func TestFieldTrie_CopyTrieImmutable(t *testing.T) {
newState, _ := testutil.DeterministicGenesisState(t, 32)
// 12 represents the enum value of randao mixes.
trie, err := stateV0.NewFieldTrie(13, newState.RandaoMixes(), uint64(params.BeaconConfig().EpochsPerHistoricalVector))
trie, err := v1.NewFieldTrie(13, newState.RandaoMixes(), uint64(params.BeaconConfig().EpochsPerHistoricalVector))
require.NoError(t, err)
newTrie := trie.CopyTrie()

2
beacon-chain/state/stateV0/getters_attestation.go → beacon-chain/state/v1/getters_attestation.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"bytes"

2
beacon-chain/state/stateV0/getters_block.go → beacon-chain/state/v1/getters_block.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"

2
beacon-chain/state/stateV0/getters_checkpoint.go → beacon-chain/state/v1/getters_checkpoint.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"bytes"

2
beacon-chain/state/stateV0/getters_eth1.go → beacon-chain/state/v1/getters_eth1.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"github.com/pkg/errors"

8
beacon-chain/state/stateV0/getters_misc.go → beacon-chain/state/v1/getters_misc.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"github.com/pkg/errors"
@@ -8,6 +8,7 @@ import (
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/hashutil"
"github.com/prysmaticlabs/prysm/shared/htrutils"
"github.com/prysmaticlabs/prysm/shared/interfaces/version"
"github.com/prysmaticlabs/prysm/shared/params"
)
@@ -63,6 +64,11 @@ func (b *BeaconState) genesisValidatorRoot() []byte {
return root
}
// Version of the beacon state.
func (b *BeaconState) Version() int {
return version.Phase0
}
// Slot of the current beacon chain state.
func (b *BeaconState) Slot() types.Slot {
if !b.hasInnerState() {

2
beacon-chain/state/stateV0/getters_randao.go → beacon-chain/state/v1/getters_randao.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
// RandaoMixes of block proposers on the beacon chain.
func (b *BeaconState) RandaoMixes() [][]byte {

2
beacon-chain/state/stateV0/getters_state.go → beacon-chain/state/v1/getters_state.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"fmt"

2
beacon-chain/state/stateV0/getters_test.go → beacon-chain/state/v1/getters_test.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"runtime/debug"

2
beacon-chain/state/stateV0/getters_validator.go → beacon-chain/state/v1/getters_validator.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"bytes"

2
beacon-chain/state/stateV0/helpers_test.go → beacon-chain/state/v1/helpers_test.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"testing"

2
beacon-chain/state/stateV0/references_test.go → beacon-chain/state/v1/references_test.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"reflect"

2
beacon-chain/state/stateV0/setters_attestation.go → beacon-chain/state/v1/setters_attestation.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"fmt"

2
beacon-chain/state/stateV0/setters_attestation_test.go → beacon-chain/state/v1/setters_attestation_test.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"context"

2
beacon-chain/state/stateV0/setters_block.go → beacon-chain/state/v1/setters_block.go
View File

@@ -1,4 +1,4 @@
package stateV0
package v1
import (
"fmt"

Some files were not shown because too many files have changed in this diff Show More