diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel index aabcaa7562..2c57e47274 100644 --- a/beacon-chain/blockchain/BUILD.bazel +++ b/beacon-chain/blockchain/BUILD.bazel @@ -33,7 +33,7 @@ go_library( "//beacon-chain/core/feed:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/filters:go_default_library", "//beacon-chain/forkchoice:go_default_library", @@ -104,7 +104,7 @@ go_test( "//beacon-chain/cache/depositcache:go_default_library", "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/testing:go_default_library", "//beacon-chain/p2p:go_default_library", @@ -155,7 +155,7 @@ go_test( "//beacon-chain/cache/depositcache:go_default_library", "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/testing:go_default_library", "//beacon-chain/p2p:go_default_library", diff --git a/beacon-chain/blockchain/head_sync_committee_info.go b/beacon-chain/blockchain/head_sync_committee_info.go index e26c75d05b..c2c3a35c6d 100644 --- a/beacon-chain/blockchain/head_sync_committee_info.go +++ b/beacon-chain/blockchain/head_sync_committee_info.go @@ -6,10 +6,10 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/cache" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/params" @@ -77,11 +77,11 @@ func (s *Service) HeadSyncCommitteePubKeys(ctx context.Context, slot types.Slot, return nil, err } - nextSlotEpoch := core2.SlotToEpoch(headState.Slot() + 1) - currEpoch := core2.SlotToEpoch(headState.Slot()) + nextSlotEpoch := core.SlotToEpoch(headState.Slot() + 1) + currEpoch := core.SlotToEpoch(headState.Slot()) var syncCommittee *ethpb.SyncCommittee - if currEpoch == nextSlotEpoch || core2.SyncCommitteePeriod(currEpoch) == core2.SyncCommitteePeriod(nextSlotEpoch) { + if currEpoch == nextSlotEpoch || core.SyncCommitteePeriod(currEpoch) == core.SyncCommitteePeriod(nextSlotEpoch) { syncCommittee, err = headState.CurrentSyncCommittee() if err != nil { return nil, err @@ -102,7 +102,7 @@ func (s *Service) domainWithHeadState(ctx context.Context, slot types.Slot, doma if err != nil { return nil, err } - return helpers.Domain(headState.Fork(), core2.SlotToEpoch(headState.Slot()), domain, headState.GenesisValidatorRoot()) + return helpers.Domain(headState.Fork(), core.SlotToEpoch(headState.Slot()), domain, headState.GenesisValidatorRoot()) } // returns the head state that is advanced up to `slot`. It utilizes the cache `syncCommitteeHeadState` by retrieving using `slot` as key. @@ -127,7 +127,7 @@ func (s *Service) getSyncCommitteeHeadState(ctx context.Context, slot types.Slot return nil, errors.New("nil state") } if slot > headState.Slot() { - headState, err = core.ProcessSlots(ctx, headState, slot) + headState, err = transition.ProcessSlots(ctx, headState, slot) if err != nil { return nil, err } diff --git a/beacon-chain/blockchain/process_attestation_helpers.go b/beacon-chain/blockchain/process_attestation_helpers.go index 2b50554ec7..9b1c8aed85 100644 --- a/beacon-chain/blockchain/process_attestation_helpers.go +++ b/beacon-chain/blockchain/process_attestation_helpers.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" @@ -39,18 +39,18 @@ func (s *Service) getAttPreState(ctx context.Context, c *ethpb.Checkpoint) (stat return nil, errors.Wrapf(err, "could not get pre state for epoch %d", c.Epoch) } - epochStartSlot, err := core2.StartSlot(c.Epoch) + epochStartSlot, err := core.StartSlot(c.Epoch) if err != nil { return nil, err } if epochStartSlot > baseState.Slot() { if featureconfig.Get().EnableNextSlotStateCache { - baseState, err = core.ProcessSlotsUsingNextSlotCache(ctx, baseState, c.Root, epochStartSlot) + baseState, err = transition.ProcessSlotsUsingNextSlotCache(ctx, baseState, c.Root, epochStartSlot) if err != nil { return nil, errors.Wrapf(err, "could not process slots up to epoch %d", c.Epoch) } } else { - baseState, err = core.ProcessSlots(ctx, baseState, epochStartSlot) + baseState, err = transition.ProcessSlots(ctx, baseState, epochStartSlot) if err != nil { return nil, errors.Wrapf(err, "could not process slots up to epoch %d", c.Epoch) } @@ -70,7 +70,7 @@ func (s *Service) getAttPreState(ctx context.Context, c *ethpb.Checkpoint) (stat // verifyAttTargetEpoch validates attestation is from the current or previous epoch. func (s *Service) verifyAttTargetEpoch(_ context.Context, genesisTime, nowTime uint64, c *ethpb.Checkpoint) error { currentSlot := types.Slot((nowTime - genesisTime) / params.BeaconConfig().SecondsPerSlot) - currentEpoch := core2.SlotToEpoch(currentSlot) + currentEpoch := core.SlotToEpoch(currentSlot) var prevEpoch types.Epoch // Prevents previous epoch under flow if currentEpoch > 1 { diff --git a/beacon-chain/blockchain/process_attestation_test.go b/beacon-chain/blockchain/process_attestation_test.go index a68bf65179..52b3167c18 100644 --- a/beacon-chain/blockchain/process_attestation_test.go +++ b/beacon-chain/blockchain/process_attestation_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" @@ -144,7 +144,7 @@ func TestStore_OnAttestation_Ok(t *testing.T) { require.NoError(t, err) tRoot := bytesutil.ToBytes32(att[0].Data.Target.Root) copied := genesisState.Copy() - copied, err = state.ProcessSlots(ctx, copied, 1) + copied, err = transition.ProcessSlots(ctx, copied, 1) require.NoError(t, err) require.NoError(t, service.cfg.BeaconDB.SaveState(ctx, copied, tRoot)) require.NoError(t, service.cfg.ForkChoiceStore.ProcessBlock(ctx, 0, tRoot, tRoot, tRoot, 1, 1)) @@ -253,7 +253,7 @@ func TestStore_UpdateCheckpointState(t *testing.T) { require.NoError(t, err) s, err := core.StartSlot(newCheckpoint.Epoch) require.NoError(t, err) - baseState, err = state.ProcessSlots(ctx, baseState, s) + baseState, err = transition.ProcessSlots(ctx, baseState, s) require.NoError(t, err) assert.Equal(t, returned.Slot(), baseState.Slot(), "Incorrectly returned base state") diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go index 4f730d3364..235b9ee2c6 100644 --- a/beacon-chain/blockchain/process_block.go +++ b/beacon-chain/blockchain/process_block.go @@ -6,11 +6,11 @@ import ( "time" "github.com/pkg/errors" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -97,7 +97,7 @@ func (s *Service) onBlock(ctx context.Context, signed block.SignedBeaconBlock, b return err } - postState, err := core.ExecuteStateTransition(ctx, preState, signed) + postState, err := transition.ExecuteStateTransition(ctx, preState, signed) if err != nil { return err } @@ -114,7 +114,7 @@ func (s *Service) onBlock(ctx context.Context, signed block.SignedBeaconBlock, b // with a custom deadline, therefore using the background context instead. slotCtx, cancel := context.WithTimeout(context.Background(), slotDeadline) defer cancel() - if err := core.UpdateNextSlotCache(slotCtx, blockRoot[:], postState); err != nil { + if err := transition.UpdateNextSlotCache(slotCtx, blockRoot[:], postState); err != nil { log.WithError(err).Debug("could not update next slot state cache") } }() @@ -234,12 +234,12 @@ func (s *Service) onBlockBatch(ctx context.Context, blks []block.SignedBeaconBlo var set *bls.SignatureSet boundaries := make(map[[32]byte]state.BeaconState) for i, b := range blks { - set, preState, err = core.ExecuteStateTransitionNoVerifyAnySig(ctx, preState, b) + set, preState, err = transition.ExecuteStateTransitionNoVerifyAnySig(ctx, preState, b) if err != nil { return nil, nil, err } // Save potential boundary states. - if core2.IsEpochStart(preState.Slot()) { + if core.IsEpochStart(preState.Slot()) { boundaries[blockRoots[i]] = preState.Copy() if err := s.handleEpochBoundary(ctx, preState); err != nil { return nil, nil, errors.Wrap(err, "could not handle epoch boundary state") @@ -324,11 +324,11 @@ func (s *Service) handleEpochBoundary(ctx context.Context, postState state.Beaco if postState.Slot()+1 == s.nextEpochBoundarySlot { // Update caches for the next epoch at epoch boundary slot - 1. - if err := helpers.UpdateCommitteeCache(postState, core2.NextEpoch(postState)); err != nil { + if err := helpers.UpdateCommitteeCache(postState, core.NextEpoch(postState)); err != nil { return err } copied := postState.Copy() - copied, err := core.ProcessSlots(ctx, copied, copied.Slot()+1) + copied, err := transition.ProcessSlots(ctx, copied, copied.Slot()+1) if err != nil { return err } @@ -340,14 +340,14 @@ func (s *Service) handleEpochBoundary(ctx context.Context, postState state.Beaco return err } var err error - s.nextEpochBoundarySlot, err = core2.StartSlot(core2.NextEpoch(postState)) + s.nextEpochBoundarySlot, err = core.StartSlot(core.NextEpoch(postState)) if err != nil { return err } // Update caches at epoch boundary slot. // The following updates have short cut to return nil cheaply if fulfilled during boundary slot - 1. - if err := helpers.UpdateCommitteeCache(postState, core2.CurrentEpoch(postState)); err != nil { + if err := helpers.UpdateCommitteeCache(postState, core.CurrentEpoch(postState)); err != nil { return err } if err := helpers.UpdateProposerIndicesInCache(postState); err != nil { diff --git a/beacon-chain/blockchain/process_block_test.go b/beacon-chain/blockchain/process_block_test.go index 897739d556..6ba2551b5c 100644 --- a/beacon-chain/blockchain/process_block_test.go +++ b/beacon-chain/blockchain/process_block_test.go @@ -13,7 +13,7 @@ import ( mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" "github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" @@ -161,7 +161,7 @@ func TestStore_OnBlockBatch(t *testing.T) { for i := 1; i < 10; i++ { b, err := testutil.GenerateFullBlock(bState, keys, testutil.DefaultBlockGenConfig(), types.Slot(i)) require.NoError(t, err) - bState, err = core.ExecuteStateTransition(ctx, bState, wrapper.WrappedPhase0SignedBeaconBlock(b)) + bState, err = transition.ExecuteStateTransition(ctx, bState, wrapper.WrappedPhase0SignedBeaconBlock(b)) require.NoError(t, err) if i == 1 { firstState = bState.Copy() diff --git a/beacon-chain/blockchain/receive_attestation_test.go b/beacon-chain/blockchain/receive_attestation_test.go index 4a466d3609..97d5af8d76 100644 --- a/beacon-chain/blockchain/receive_attestation_test.go +++ b/beacon-chain/blockchain/receive_attestation_test.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" @@ -112,7 +112,7 @@ func TestProcessAttestations_Ok(t *testing.T) { require.NoError(t, err) tRoot := bytesutil.ToBytes32(atts[0].Data.Target.Root) copied := genesisState.Copy() - copied, err = state.ProcessSlots(ctx, copied, 1) + copied, err = transition.ProcessSlots(ctx, copied, 1) require.NoError(t, err) require.NoError(t, service.cfg.BeaconDB.SaveState(ctx, copied, tRoot)) require.NoError(t, service.cfg.ForkChoiceStore.ProcessBlock(ctx, 0, tRoot, tRoot, tRoot, 1, 1)) diff --git a/beacon-chain/blockchain/receive_block_test.go b/beacon-chain/blockchain/receive_block_test.go index 744aac8dae..c48052c97a 100644 --- a/beacon-chain/blockchain/receive_block_test.go +++ b/beacon-chain/blockchain/receive_block_test.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" blockchainTesting "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" @@ -302,7 +302,7 @@ func TestService_ReceiveBlockBatch_UpdateFinalizedCheckpoint(t *testing.T) { for i := types.Slot(1); i < params.BeaconConfig().SlotsPerEpoch*5; i++ { b, err := testutil.GenerateFullBlock(copied, keys, testutil.DefaultBlockGenConfig(), i) assert.NoError(t, err) - copied, err = state.ExecuteStateTransition(context.Background(), copied, wrapper.WrappedPhase0SignedBeaconBlock(b)) + copied, err = transition.ExecuteStateTransition(context.Background(), copied, wrapper.WrappedPhase0SignedBeaconBlock(b)) assert.NoError(t, err) r, err := b.Block.HashTreeRoot() require.NoError(t, err) diff --git a/beacon-chain/blockchain/service.go b/beacon-chain/blockchain/service.go index 99be7ac215..68ec034fe6 100644 --- a/beacon-chain/blockchain/service.go +++ b/beacon-chain/blockchain/service.go @@ -13,11 +13,11 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db" f "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" @@ -174,7 +174,7 @@ func (s *Service) Start() { s.prevFinalizedCheckpt = ethpb.CopyCheckpoint(finalizedCheckpoint) s.resumeForkChoice(justifiedCheckpoint, finalizedCheckpoint) - ss, err := core2.StartSlot(s.finalizedCheckpt.Epoch) + ss, err := core.StartSlot(s.finalizedCheckpt.Epoch) if err != nil { log.Fatalf("Could not get start slot of finalized epoch: %v", err) } @@ -278,7 +278,7 @@ func (s *Service) initializeBeaconChain( s.genesisTime = genesisTime unixTime := uint64(genesisTime.Unix()) - genesisState, err := core.OptimizedGenesisBeaconState(unixTime, preGenesisState, eth1data) + genesisState, err := transition.OptimizedGenesisBeaconState(unixTime, preGenesisState, eth1data) if err != nil { return nil, errors.Wrap(err, "could not initialize genesis state") } @@ -411,7 +411,7 @@ func (s *Service) initializeChainInfo(ctx context.Context) error { if err != nil { return errors.Wrap(err, "could not retrieve head block") } - headEpoch := core2.SlotToEpoch(headBlock.Block().Slot()) + headEpoch := core.SlotToEpoch(headBlock.Block().Slot()) var epochsSinceFinality types.Epoch if headEpoch > finalized.Epoch { epochsSinceFinality = headEpoch - finalized.Epoch diff --git a/beacon-chain/blockchain/service_test.go b/beacon-chain/blockchain/service_test.go index 2359af07d8..6fd77969f9 100644 --- a/beacon-chain/blockchain/service_test.go +++ b/beacon-chain/blockchain/service_test.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db" testDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" @@ -202,7 +202,7 @@ func TestChainService_InitializeBeaconChain(t *testing.T) { trie, _, err := testutil.DepositTrieFromDeposits(deposits) require.NoError(t, err) hashTreeRoot := trie.HashTreeRoot() - genState, err := state.EmptyGenesisState() + genState, err := transition.EmptyGenesisState() require.NoError(t, err) err = genState.SetEth1Data(ðpb.Eth1Data{ DepositRoot: hashTreeRoot[:], diff --git a/beacon-chain/cache/skip_slot_cache.go b/beacon-chain/cache/skip_slot_cache.go index f9d3f6e1b3..f119615722 100644 --- a/beacon-chain/cache/skip_slot_cache.go +++ b/beacon-chain/cache/skip_slot_cache.go @@ -26,7 +26,7 @@ var ( }) ) -// SkipSlotCache is used to store the cached results of processing skip slots in state.ProcessSlots. +// SkipSlotCache is used to store the cached results of processing skip slots in transition.ProcessSlots. type SkipSlotCache struct { cache *lru.Cache lock sync.RWMutex diff --git a/beacon-chain/core/state/BUILD.bazel b/beacon-chain/core/transition/BUILD.bazel similarity index 97% rename from beacon-chain/core/state/BUILD.bazel rename to beacon-chain/core/transition/BUILD.bazel index ffd949d4dd..591b7e99ec 100644 --- a/beacon-chain/core/state/BUILD.bazel +++ b/beacon-chain/core/transition/BUILD.bazel @@ -12,7 +12,7 @@ go_library( "transition.go", "transition_no_verify_sig.go", ], - importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/state", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/transition", visibility = [ "//beacon-chain:__subpackages__", "//endtoend:__pkg__", @@ -32,7 +32,7 @@ go_library( "//beacon-chain/core/epoch:go_default_library", "//beacon-chain/core/epoch/precompute:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state/interop:go_default_library", + "//beacon-chain/core/transition/interop:go_default_library", "//beacon-chain/core/validators:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", @@ -119,7 +119,7 @@ go_test( deps = [ "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/benchutil:go_default_library", diff --git a/beacon-chain/core/state/altair_transition_no_verify_sig_test.go b/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go similarity index 86% rename from beacon-chain/core/state/altair_transition_no_verify_sig_test.go rename to beacon-chain/core/transition/altair_transition_no_verify_sig_test.go index 97c10ca8fe..56f04811a9 100644 --- a/beacon-chain/core/state/altair_transition_no_verify_sig_test.go +++ b/beacon-chain/core/transition/altair_transition_no_verify_sig_test.go @@ -1,14 +1,14 @@ -package state_test +package transition_test import ( "context" "testing" "github.com/prysmaticlabs/go-bitfield" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" p2pType "github.com/prysmaticlabs/prysm/beacon-chain/p2p/types" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -43,12 +43,12 @@ func TestExecuteAltairStateTransitionNoVerify_FullProcess(t *testing.T) { require.NoError(t, beaconState.SetEth1DataVotes([]*ethpb.Eth1Data{eth1Data})) require.NoError(t, beaconState.SetSlot(beaconState.Slot()+1)) - epoch := core2.CurrentEpoch(beaconState) + epoch := core.CurrentEpoch(beaconState) randaoReveal, err := testutil.RandaoReveal(beaconState, epoch, privKeys) require.NoError(t, err) require.NoError(t, beaconState.SetSlot(beaconState.Slot()-1)) - nextSlotState, err := core.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) + nextSlotState, err := transition.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) require.NoError(t, err) parentRoot, err := nextSlotState.LatestBlockHeader().HashTreeRoot() require.NoError(t, err) @@ -76,7 +76,7 @@ func TestExecuteAltairStateTransitionNoVerify_FullProcess(t *testing.T) { syncSigs := make([]bls.Signature, len(indices)) for i, indice := range indices { b := p2pType.SSZBytes(pbr[:]) - sb, err := helpers.ComputeDomainAndSign(beaconState, core2.CurrentEpoch(beaconState), &b, params.BeaconConfig().DomainSyncCommittee, privKeys[indice]) + sb, err := helpers.ComputeDomainAndSign(beaconState, core.CurrentEpoch(beaconState), &b, params.BeaconConfig().DomainSyncCommittee, privKeys[indice]) require.NoError(t, err) sig, err := bls.SignatureFromBytes(sb) require.NoError(t, err) @@ -90,7 +90,7 @@ func TestExecuteAltairStateTransitionNoVerify_FullProcess(t *testing.T) { block.Block.Body.SyncAggregate = syncAggregate wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - stateRoot, err := core.CalculateStateRoot(context.Background(), beaconState, wsb) + stateRoot, err := transition.CalculateStateRoot(context.Background(), beaconState, wsb) require.NoError(t, err) block.Block.StateRoot = stateRoot[:] @@ -101,7 +101,7 @@ func TestExecuteAltairStateTransitionNoVerify_FullProcess(t *testing.T) { wsb, err = wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - set, _, err := core.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wsb) + set, _, err := transition.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wsb) require.NoError(t, err) verified, err := set.Verify() require.NoError(t, err) @@ -130,12 +130,12 @@ func TestExecuteAltairStateTransitionNoVerifySignature_CouldNotVerifyStateRoot(t require.NoError(t, beaconState.SetEth1DataVotes([]*ethpb.Eth1Data{eth1Data})) require.NoError(t, beaconState.SetSlot(beaconState.Slot()+1)) - epoch := core2.CurrentEpoch(beaconState) + epoch := core.CurrentEpoch(beaconState) randaoReveal, err := testutil.RandaoReveal(beaconState, epoch, privKeys) require.NoError(t, err) require.NoError(t, beaconState.SetSlot(beaconState.Slot()-1)) - nextSlotState, err := core.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) + nextSlotState, err := transition.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) require.NoError(t, err) parentRoot, err := nextSlotState.LatestBlockHeader().HashTreeRoot() require.NoError(t, err) @@ -163,7 +163,7 @@ func TestExecuteAltairStateTransitionNoVerifySignature_CouldNotVerifyStateRoot(t syncSigs := make([]bls.Signature, len(indices)) for i, indice := range indices { b := p2pType.SSZBytes(pbr[:]) - sb, err := helpers.ComputeDomainAndSign(beaconState, core2.CurrentEpoch(beaconState), &b, params.BeaconConfig().DomainSyncCommittee, privKeys[indice]) + sb, err := helpers.ComputeDomainAndSign(beaconState, core.CurrentEpoch(beaconState), &b, params.BeaconConfig().DomainSyncCommittee, privKeys[indice]) require.NoError(t, err) sig, err := bls.SignatureFromBytes(sb) require.NoError(t, err) @@ -178,7 +178,7 @@ func TestExecuteAltairStateTransitionNoVerifySignature_CouldNotVerifyStateRoot(t wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - stateRoot, err := core.CalculateStateRoot(context.Background(), beaconState, wsb) + stateRoot, err := transition.CalculateStateRoot(context.Background(), beaconState, wsb) require.NoError(t, err) block.Block.StateRoot = stateRoot[:] @@ -190,7 +190,7 @@ func TestExecuteAltairStateTransitionNoVerifySignature_CouldNotVerifyStateRoot(t block.Block.StateRoot = bytesutil.PadTo([]byte{'a'}, 32) wsb, err = wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - _, _, err = core.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wsb) + _, _, err = transition.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wsb) require.ErrorContains(t, "could not validate state root", err) } @@ -198,7 +198,7 @@ func TestExecuteStateTransitionNoVerifyAnySig_PassesProcessingConditions(t *test beaconState, block := createFullAltairBlockWithOperations(t) wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - set, _, err := core.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wsb) + set, _, err := transition.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wsb) require.NoError(t, err) // Test Signature set verifies. verified, err := set.Verify() diff --git a/beacon-chain/core/state/benchmarks_test.go b/beacon-chain/core/transition/benchmarks_test.go similarity index 98% rename from beacon-chain/core/state/benchmarks_test.go rename to beacon-chain/core/transition/benchmarks_test.go index b8df282594..db38e01ff0 100644 --- a/beacon-chain/core/state/benchmarks_test.go +++ b/beacon-chain/core/transition/benchmarks_test.go @@ -1,4 +1,4 @@ -package state_test +package transition_test import ( "context" @@ -6,7 +6,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/beacon-chain/core/state/interop/BUILD.bazel b/beacon-chain/core/transition/interop/BUILD.bazel similarity index 96% rename from beacon-chain/core/state/interop/BUILD.bazel rename to beacon-chain/core/transition/interop/BUILD.bazel index b8347580d8..46634eef89 100644 --- a/beacon-chain/core/state/interop/BUILD.bazel +++ b/beacon-chain/core/transition/interop/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "write_block_to_disk.go", "write_state_to_disk.go", ], - importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/interop", visibility = [ "//beacon-chain:__subpackages__", "//tools:__subpackages__", diff --git a/beacon-chain/core/state/interop/log.go b/beacon-chain/core/transition/interop/log.go similarity index 100% rename from beacon-chain/core/state/interop/log.go rename to beacon-chain/core/transition/interop/log.go diff --git a/beacon-chain/core/state/interop/write_block_to_disk.go b/beacon-chain/core/transition/interop/write_block_to_disk.go similarity index 100% rename from beacon-chain/core/state/interop/write_block_to_disk.go rename to beacon-chain/core/transition/interop/write_block_to_disk.go diff --git a/beacon-chain/core/state/interop/write_state_to_disk.go b/beacon-chain/core/transition/interop/write_state_to_disk.go similarity index 100% rename from beacon-chain/core/state/interop/write_state_to_disk.go rename to beacon-chain/core/transition/interop/write_state_to_disk.go diff --git a/beacon-chain/core/state/log.go b/beacon-chain/core/transition/log.go similarity index 81% rename from beacon-chain/core/state/log.go rename to beacon-chain/core/transition/log.go index 81f15d6e53..090b6224a5 100644 --- a/beacon-chain/core/state/log.go +++ b/beacon-chain/core/transition/log.go @@ -1,4 +1,4 @@ -package state +package transition import "github.com/sirupsen/logrus" diff --git a/beacon-chain/core/state/skip_slot_cache.go b/beacon-chain/core/transition/skip_slot_cache.go similarity index 98% rename from beacon-chain/core/state/skip_slot_cache.go rename to beacon-chain/core/transition/skip_slot_cache.go index c0bf6939b1..d38d787abf 100644 --- a/beacon-chain/core/state/skip_slot_cache.go +++ b/beacon-chain/core/transition/skip_slot_cache.go @@ -1,4 +1,4 @@ -package state +package transition import ( "context" diff --git a/beacon-chain/core/state/skip_slot_cache_test.go b/beacon-chain/core/transition/skip_slot_cache_test.go similarity index 78% rename from beacon-chain/core/state/skip_slot_cache_test.go rename to beacon-chain/core/transition/skip_slot_cache_test.go index a0800cda9a..b4dbe97bed 100644 --- a/beacon-chain/core/state/skip_slot_cache_test.go +++ b/beacon-chain/core/transition/skip_slot_cache_test.go @@ -1,11 +1,11 @@ -package state_test +package transition_test import ( "context" "sync" "testing" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" @@ -16,8 +16,8 @@ import ( ) func TestSkipSlotCache_OK(t *testing.T) { - core.SkipSlotCache.Enable() - defer core.SkipSlotCache.Disable() + transition.SkipSlotCache.Enable() + defer transition.SkipSlotCache.Disable() bState, privs := testutil.DeterministicGenesisState(t, params.MinimalSpecConfig().MinGenesisActiveValidatorCount) pbState, err := v1.ProtobufBeaconState(bState.CloneInnerState()) require.NoError(t, err) @@ -31,11 +31,11 @@ func TestSkipSlotCache_OK(t *testing.T) { // with the state blk, err := testutil.GenerateFullBlock(bState, privs, blkCfg, originalState.Slot()+10) require.NoError(t, err) - executedState, err := core.ExecuteStateTransition(context.Background(), originalState, wrapper.WrappedPhase0SignedBeaconBlock(blk)) + executedState, err := transition.ExecuteStateTransition(context.Background(), originalState, wrapper.WrappedPhase0SignedBeaconBlock(blk)) require.NoError(t, err, "Could not run state transition") originalState, ok := executedState.(*v1.BeaconState) require.Equal(t, true, ok) - bState, err = core.ExecuteStateTransition(context.Background(), bState, wrapper.WrappedPhase0SignedBeaconBlock(blk)) + bState, err = transition.ExecuteStateTransition(context.Background(), bState, wrapper.WrappedPhase0SignedBeaconBlock(blk)) require.NoError(t, err, "Could not process state transition") assert.DeepEqual(t, originalState.CloneInnerState(), bState.CloneInnerState(), "Skipped slots cache leads to different states") @@ -51,13 +51,13 @@ func TestSkipSlotCache_ConcurrentMixup(t *testing.T) { blkCfg := testutil.DefaultBlockGenConfig() blkCfg.NumAttestations = 1 - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() // First transition will be with an empty cache, so the cache becomes populated // with the state blk, err := testutil.GenerateFullBlock(bState, privs, blkCfg, originalState.Slot()+10) require.NoError(t, err) - executedState, err := core.ExecuteStateTransition(context.Background(), originalState, wrapper.WrappedPhase0SignedBeaconBlock(blk)) + executedState, err := transition.ExecuteStateTransition(context.Background(), originalState, wrapper.WrappedPhase0SignedBeaconBlock(blk)) require.NoError(t, err, "Could not run state transition") originalState, ok := executedState.(*v1.BeaconState) require.Equal(t, true, ok) @@ -71,7 +71,7 @@ func TestSkipSlotCache_ConcurrentMixup(t *testing.T) { signature, err := testutil.BlockSignature(originalState, blk.Block, privs) require.NoError(t, err) blk.Signature = signature.Marshal() - s1, err = core.ExecuteStateTransition(context.Background(), originalState.Copy(), wrapper.WrappedPhase0SignedBeaconBlock(blk)) + s1, err = transition.ExecuteStateTransition(context.Background(), originalState.Copy(), wrapper.WrappedPhase0SignedBeaconBlock(blk)) require.NoError(t, err, "Could not run state transition") } @@ -82,7 +82,7 @@ func TestSkipSlotCache_ConcurrentMixup(t *testing.T) { signature, err := testutil.BlockSignature(originalState, blk.Block, privs) require.NoError(t, err) blk.Signature = signature.Marshal() - s0, err = core.ExecuteStateTransition(context.Background(), originalState.Copy(), wrapper.WrappedPhase0SignedBeaconBlock(blk)) + s0, err = transition.ExecuteStateTransition(context.Background(), originalState.Copy(), wrapper.WrappedPhase0SignedBeaconBlock(blk)) require.NoError(t, err, "Could not run state transition") } @@ -111,24 +111,24 @@ func TestSkipSlotCache_ConcurrentMixup(t *testing.T) { } problemSlot := s1.Slot() + 2 - expected1, err := core.ProcessSlots(context.Background(), s1.Copy(), problemSlot) + expected1, err := transition.ProcessSlots(context.Background(), s1.Copy(), problemSlot) require.NoError(t, err) expectedRoot1, err := expected1.HashTreeRoot(context.Background()) require.NoError(t, err) t.Logf("chain 1 (even i) expected root %x at slot %d", expectedRoot1[:], problemSlot) - tmp1, err := core.ProcessSlots(context.Background(), expected1.Copy(), problemSlot+1) + tmp1, err := transition.ProcessSlots(context.Background(), expected1.Copy(), problemSlot+1) require.NoError(t, err) gotRoot := tmp1.StateRoots()[problemSlot] require.DeepEqual(t, expectedRoot1[:], gotRoot, "State roots for chain 1 are bad, expected root doesn't match") - expected2, err := core.ProcessSlots(context.Background(), s0.Copy(), problemSlot) + expected2, err := transition.ProcessSlots(context.Background(), s0.Copy(), problemSlot) require.NoError(t, err) expectedRoot2, err := expected2.HashTreeRoot(context.Background()) require.NoError(t, err) t.Logf("chain 2 (odd i) expected root %x at slot %d", expectedRoot2[:], problemSlot) - tmp2, err := core.ProcessSlots(context.Background(), expected2.Copy(), problemSlot+1) + tmp2, err := transition.ProcessSlots(context.Background(), expected2.Copy(), problemSlot+1) require.NoError(t, err) gotRoot = tmp2.StateRoots()[problemSlot] require.DeepEqual(t, expectedRoot2[:], gotRoot, "State roots for chain 2 are bad, expected root doesn't match") @@ -138,7 +138,7 @@ func TestSkipSlotCache_ConcurrentMixup(t *testing.T) { step := func(i int, setup state.BeaconState) { // go at least 1 past problemSlot, to ensure problem slot state root is available - outState, err := core.ProcessSlots(context.Background(), setup, problemSlot.Add(1+uint64(i))) // keep increasing, to hit and extend the cache + outState, err := transition.ProcessSlots(context.Background(), setup, problemSlot.Add(1+uint64(i))) // keep increasing, to hit and extend the cache require.NoError(t, err, "Could not process state transition") roots := outState.StateRoots() gotRoot := roots[problemSlot] @@ -150,7 +150,7 @@ func TestSkipSlotCache_ConcurrentMixup(t *testing.T) { wg.Done() } - core.SkipSlotCache.Enable() + transition.SkipSlotCache.Enable() // now concurrently apply the blocks (alternating between states, and increasing skip slots) for i, setup := range setups { go step(i, setup) diff --git a/beacon-chain/core/state/state.go b/beacon-chain/core/transition/state.go similarity index 99% rename from beacon-chain/core/state/state.go rename to beacon-chain/core/transition/state.go index 2fd919d205..895ce0cd01 100644 --- a/beacon-chain/core/state/state.go +++ b/beacon-chain/core/transition/state.go @@ -1,7 +1,7 @@ // Package state implements the whole state transition // function which consists of per slot, per-epoch transitions, and // bootstrapping the genesis state according to the Ethereum Beacon chain spec. -package state +package transition import ( "context" diff --git a/beacon-chain/core/state/state_fuzz_test.go b/beacon-chain/core/transition/state_fuzz_test.go similarity index 99% rename from beacon-chain/core/state/state_fuzz_test.go rename to beacon-chain/core/transition/state_fuzz_test.go index 087c90d5e9..d4d976c3a9 100644 --- a/beacon-chain/core/state/state_fuzz_test.go +++ b/beacon-chain/core/transition/state_fuzz_test.go @@ -1,4 +1,4 @@ -package state +package transition import ( "context" diff --git a/beacon-chain/core/state/state_test.go b/beacon-chain/core/transition/state_test.go similarity index 90% rename from beacon-chain/core/state/state_test.go rename to beacon-chain/core/transition/state_test.go index d58b5d3c93..e7ec1dbb8e 100644 --- a/beacon-chain/core/state/state_test.go +++ b/beacon-chain/core/transition/state_test.go @@ -1,11 +1,11 @@ -package state_test +package transition_test import ( "context" "testing" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/hashutil" @@ -36,7 +36,7 @@ func TestGenesisBeaconState_OK(t *testing.T) { require.NoError(t, err) eth1Data, err := testutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - newState, err := state.GenesisBeaconState(context.Background(), deposits, genesisTime, eth1Data) + newState, err := transition.GenesisBeaconState(context.Background(), deposits, genesisTime, eth1Data) require.NoError(t, err, "Could not execute GenesisBeaconState") // Misc fields checks. @@ -93,9 +93,9 @@ func TestGenesisBeaconState_OK(t *testing.T) { func TestGenesisState_HashEquality(t *testing.T) { deposits, _, err := testutil.DeterministicDepositsAndKeys(100) require.NoError(t, err) - state1, err := state.GenesisBeaconState(context.Background(), deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) + state1, err := transition.GenesisBeaconState(context.Background(), deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) require.NoError(t, err) - state, err := state.GenesisBeaconState(context.Background(), deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) + state, err := transition.GenesisBeaconState(context.Background(), deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) require.NoError(t, err) pbState1, err := v1.ProtobufBeaconState(state1.CloneInnerState()) @@ -113,7 +113,7 @@ func TestGenesisState_HashEquality(t *testing.T) { } func TestGenesisState_InitializesLatestBlockHashes(t *testing.T) { - s, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) + s, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) require.NoError(t, err) got, want := uint64(len(s.BlockRoots())), uint64(params.BeaconConfig().SlotsPerHistoricalRoot) assert.Equal(t, want, got, "Wrong number of recent block hashes") @@ -127,6 +127,6 @@ func TestGenesisState_InitializesLatestBlockHashes(t *testing.T) { } func TestGenesisState_FailsWithoutEth1data(t *testing.T) { - _, err := state.GenesisBeaconState(context.Background(), nil, 0, nil) + _, err := transition.GenesisBeaconState(context.Background(), nil, 0, nil) assert.ErrorContains(t, "no eth1data provided for genesis state", err) } diff --git a/beacon-chain/core/state/stateutils/BUILD.bazel b/beacon-chain/core/transition/stateutils/BUILD.bazel similarity index 97% rename from beacon-chain/core/state/stateutils/BUILD.bazel rename to beacon-chain/core/transition/stateutils/BUILD.bazel index dbd462ea47..badc31c0a8 100644 --- a/beacon-chain/core/state/stateutils/BUILD.bazel +++ b/beacon-chain/core/transition/stateutils/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["validator_index_map.go"], - importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/stateutils", visibility = [ "//beacon-chain:__subpackages__", "//shared/testutil:__pkg__", diff --git a/beacon-chain/core/state/stateutils/validator_index_map.go b/beacon-chain/core/transition/stateutils/validator_index_map.go similarity index 100% rename from beacon-chain/core/state/stateutils/validator_index_map.go rename to beacon-chain/core/transition/stateutils/validator_index_map.go diff --git a/beacon-chain/core/state/stateutils/validator_index_map_test.go b/beacon-chain/core/transition/stateutils/validator_index_map_test.go similarity index 93% rename from beacon-chain/core/state/stateutils/validator_index_map_test.go rename to beacon-chain/core/transition/stateutils/validator_index_map_test.go index 863185d9f3..de49f0a30f 100644 --- a/beacon-chain/core/state/stateutils/validator_index_map_test.go +++ b/beacon-chain/core/transition/stateutils/validator_index_map_test.go @@ -4,7 +4,7 @@ import ( "testing" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/stateutils" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" diff --git a/beacon-chain/core/state/trailing_slot_state_cache.go b/beacon-chain/core/transition/trailing_slot_state_cache.go similarity index 98% rename from beacon-chain/core/state/trailing_slot_state_cache.go rename to beacon-chain/core/transition/trailing_slot_state_cache.go index e8a700f8d7..5b2e029149 100644 --- a/beacon-chain/core/state/trailing_slot_state_cache.go +++ b/beacon-chain/core/transition/trailing_slot_state_cache.go @@ -1,4 +1,4 @@ -package state +package transition import ( "bytes" diff --git a/beacon-chain/core/state/trailing_slot_state_cache_test.go b/beacon-chain/core/transition/trailing_slot_state_cache_test.go similarity index 60% rename from beacon-chain/core/state/trailing_slot_state_cache_test.go rename to beacon-chain/core/transition/trailing_slot_state_cache_test.go index 198406fd3e..7fb4f95607 100644 --- a/beacon-chain/core/state/trailing_slot_state_cache_test.go +++ b/beacon-chain/core/transition/trailing_slot_state_cache_test.go @@ -1,11 +1,11 @@ -package state_test +package transition_test import ( "context" "testing" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) @@ -13,18 +13,18 @@ import ( func TestTrailingSlotState_RoundTrip(t *testing.T) { ctx := context.Background() r := []byte{'a'} - s, err := state.NextSlotState(ctx, r) + s, err := transition.NextSlotState(ctx, r) require.NoError(t, err) require.Equal(t, nil, s) s, _ = testutil.DeterministicGenesisState(t, 1) - require.NoError(t, state.UpdateNextSlotCache(ctx, r, s)) - s, err = state.NextSlotState(ctx, r) + require.NoError(t, transition.UpdateNextSlotCache(ctx, r, s)) + s, err = transition.NextSlotState(ctx, r) require.NoError(t, err) require.Equal(t, types.Slot(1), s.Slot()) - require.NoError(t, state.UpdateNextSlotCache(ctx, r, s)) - s, err = state.NextSlotState(ctx, r) + require.NoError(t, transition.UpdateNextSlotCache(ctx, r, s)) + s, err = transition.NextSlotState(ctx, r) require.NoError(t, err) require.Equal(t, types.Slot(2), s.Slot()) } diff --git a/beacon-chain/core/state/transition.go b/beacon-chain/core/transition/transition.go similarity index 99% rename from beacon-chain/core/state/transition.go rename to beacon-chain/core/transition/transition.go index d1551feac3..b50ddc9051 100644 --- a/beacon-chain/core/state/transition.go +++ b/beacon-chain/core/transition/transition.go @@ -1,7 +1,7 @@ // Package state implements the whole state transition // function which consists of per slot, per-epoch transitions. // It also bootstraps the genesis beacon state for slot 0. -package state +package transition import ( "bytes" diff --git a/beacon-chain/core/state/transition_fuzz_test.go b/beacon-chain/core/transition/transition_fuzz_test.go similarity index 99% rename from beacon-chain/core/state/transition_fuzz_test.go rename to beacon-chain/core/transition/transition_fuzz_test.go index 997db9d38f..f7466feca1 100644 --- a/beacon-chain/core/state/transition_fuzz_test.go +++ b/beacon-chain/core/transition/transition_fuzz_test.go @@ -1,4 +1,4 @@ -package state +package transition import ( "context" diff --git a/beacon-chain/core/state/transition_no_verify_sig.go b/beacon-chain/core/transition/transition_no_verify_sig.go similarity index 99% rename from beacon-chain/core/state/transition_no_verify_sig.go rename to beacon-chain/core/transition/transition_no_verify_sig.go index f5faf7d6da..67d271dec4 100644 --- a/beacon-chain/core/state/transition_no_verify_sig.go +++ b/beacon-chain/core/transition/transition_no_verify_sig.go @@ -1,4 +1,4 @@ -package state +package transition import ( "bytes" @@ -9,7 +9,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" b "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/interop" v "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" diff --git a/beacon-chain/core/state/transition_no_verify_sig_test.go b/beacon-chain/core/transition/transition_no_verify_sig_test.go similarity index 79% rename from beacon-chain/core/state/transition_no_verify_sig_test.go rename to beacon-chain/core/transition/transition_no_verify_sig_test.go index de80cf7cd3..21299569a4 100644 --- a/beacon-chain/core/state/transition_no_verify_sig_test.go +++ b/beacon-chain/core/transition/transition_no_verify_sig_test.go @@ -1,4 +1,4 @@ -package state_test +package transition_test import ( "context" @@ -6,7 +6,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/bytesutil" @@ -39,7 +39,7 @@ func TestExecuteStateTransitionNoVerify_FullProcess(t *testing.T) { require.NoError(t, err) require.NoError(t, beaconState.SetSlot(beaconState.Slot()-1)) - nextSlotState, err := state.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) + nextSlotState, err := transition.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) require.NoError(t, err) parentRoot, err := nextSlotState.LatestBlockHeader().HashTreeRoot() require.NoError(t, err) @@ -52,7 +52,7 @@ func TestExecuteStateTransitionNoVerify_FullProcess(t *testing.T) { block.Block.Body.RandaoReveal = randaoReveal block.Block.Body.Eth1Data = eth1Data - stateRoot, err := state.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + stateRoot, err := transition.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) block.Block.StateRoot = stateRoot[:] @@ -61,7 +61,7 @@ func TestExecuteStateTransitionNoVerify_FullProcess(t *testing.T) { require.NoError(t, err) block.Signature = sig.Marshal() - set, _, err := state.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + set, _, err := transition.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) assert.NoError(t, err) verified, err := set.Verify() assert.NoError(t, err) @@ -91,7 +91,7 @@ func TestExecuteStateTransitionNoVerifySignature_CouldNotVerifyStateRoot(t *test require.NoError(t, err) require.NoError(t, beaconState.SetSlot(beaconState.Slot()-1)) - nextSlotState, err := state.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) + nextSlotState, err := transition.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) require.NoError(t, err) parentRoot, err := nextSlotState.LatestBlockHeader().HashTreeRoot() require.NoError(t, err) @@ -104,7 +104,7 @@ func TestExecuteStateTransitionNoVerifySignature_CouldNotVerifyStateRoot(t *test block.Block.Body.RandaoReveal = randaoReveal block.Block.Body.Eth1Data = eth1Data - stateRoot, err := state.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + stateRoot, err := transition.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) block.Block.StateRoot = stateRoot[:] @@ -114,13 +114,13 @@ func TestExecuteStateTransitionNoVerifySignature_CouldNotVerifyStateRoot(t *test block.Signature = sig.Marshal() block.Block.StateRoot = bytesutil.PadTo([]byte{'a'}, 32) - _, _, err = state.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + _, _, err = transition.ExecuteStateTransitionNoVerifyAnySig(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.ErrorContains(t, "could not validate state root", err) } func TestProcessBlockNoVerify_PassesProcessingConditions(t *testing.T) { beaconState, block, _, _, _ := createFullBlockWithOperations(t) - set, _, err := state.ProcessBlockNoVerifyAnySig(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + set, _, err := transition.ProcessBlockNoVerifyAnySig(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) // Test Signature set verifies. verified, err := set.Verify() @@ -132,9 +132,9 @@ func TestProcessBlockNoVerifyAnySigAltair_OK(t *testing.T) { beaconState, block := createFullAltairBlockWithOperations(t) wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - beaconState, err = state.ProcessSlots(context.Background(), beaconState, wsb.Block().Slot()) + beaconState, err = transition.ProcessSlots(context.Background(), beaconState, wsb.Block().Slot()) require.NoError(t, err) - set, _, err := state.ProcessBlockNoVerifyAnySig(context.Background(), beaconState, wsb) + set, _, err := transition.ProcessBlockNoVerifyAnySig(context.Background(), beaconState, wsb) require.NoError(t, err) verified, err := set.Verify() require.NoError(t, err) @@ -145,9 +145,9 @@ func TestProcessOperationsNoVerifyAttsSigs_OK(t *testing.T) { beaconState, block := createFullAltairBlockWithOperations(t) wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - beaconState, err = state.ProcessSlots(context.Background(), beaconState, wsb.Block().Slot()) + beaconState, err = transition.ProcessSlots(context.Background(), beaconState, wsb.Block().Slot()) require.NoError(t, err) - _, err = state.ProcessOperationsNoVerifyAttsSigs(context.Background(), beaconState, wsb) + _, err = transition.ProcessOperationsNoVerifyAttsSigs(context.Background(), beaconState, wsb) require.NoError(t, err) } @@ -155,7 +155,7 @@ func TestCalculateStateRootAltair_OK(t *testing.T) { beaconState, block := createFullAltairBlockWithOperations(t) wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - r, err := state.CalculateStateRoot(context.Background(), beaconState, wsb) + r, err := transition.CalculateStateRoot(context.Background(), beaconState, wsb) require.NoError(t, err) require.DeepNotEqual(t, params.BeaconConfig().ZeroHash, r) } diff --git a/beacon-chain/core/state/transition_test.go b/beacon-chain/core/transition/transition_test.go similarity index 89% rename from beacon-chain/core/state/transition_test.go rename to beacon-chain/core/transition/transition_test.go index 17648594fd..2cf53533f0 100644 --- a/beacon-chain/core/state/transition_test.go +++ b/beacon-chain/core/transition/transition_test.go @@ -1,4 +1,4 @@ -package state_test +package transition_test import ( "context" @@ -7,10 +7,10 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -26,7 +26,7 @@ import ( ) func init() { - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } func TestExecuteStateTransition_IncorrectSlot(t *testing.T) { @@ -42,7 +42,7 @@ func TestExecuteStateTransition_IncorrectSlot(t *testing.T) { }, } want := "expected state.slot" - _, err = core.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + _, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) assert.ErrorContains(t, want, err) } @@ -67,12 +67,12 @@ func TestExecuteStateTransition_FullProcess(t *testing.T) { require.NoError(t, err) require.NoError(t, beaconState.SetSlot(beaconState.Slot()+1)) - epoch := core2.CurrentEpoch(beaconState) + epoch := core.CurrentEpoch(beaconState) randaoReveal, err := testutil.RandaoReveal(beaconState, epoch, privKeys) require.NoError(t, err) require.NoError(t, beaconState.SetSlot(beaconState.Slot()-1)) - nextSlotState, err := core.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) + nextSlotState, err := transition.ProcessSlots(context.Background(), beaconState.Copy(), beaconState.Slot()+1) require.NoError(t, err) parentRoot, err := nextSlotState.LatestBlockHeader().HashTreeRoot() require.NoError(t, err) @@ -85,7 +85,7 @@ func TestExecuteStateTransition_FullProcess(t *testing.T) { block.Block.Body.RandaoReveal = randaoReveal block.Block.Body.Eth1Data = eth1Data - stateRoot, err := core.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + stateRoot, err := transition.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) block.Block.StateRoot = stateRoot[:] @@ -94,7 +94,7 @@ func TestExecuteStateTransition_FullProcess(t *testing.T) { require.NoError(t, err) block.Signature = sig.Marshal() - beaconState, err = core.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) assert.Equal(t, params.BeaconConfig().SlotsPerEpoch, beaconState.Slot(), "Unexpected Slot number") @@ -181,7 +181,7 @@ func TestProcessBlock_IncorrectProcessExits(t *testing.T) { cp.Root = []byte("hello-world") require.NoError(t, beaconState.SetCurrentJustifiedCheckpoint(cp)) require.NoError(t, beaconState.AppendCurrentEpochAttestations(ðpb.PendingAttestation{})) - _, err = core.VerifyOperationLengths(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + _, err = transition.VerifyOperationLengths(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) wanted := "number of voluntary exits (17) in block body exceeds allowed threshold of 16" assert.ErrorContains(t, wanted, err) } @@ -213,7 +213,7 @@ func createFullBlockWithOperations(t *testing.T) (state.BeaconState, err = beaconState.SetSlot(slotsPerEpoch.Mul(uint64(params.BeaconConfig().ShardCommitteePeriod)) + params.BeaconConfig().MinAttestationInclusionDelay) require.NoError(t, err) - currentEpoch := core2.CurrentEpoch(beaconState) + currentEpoch := core.CurrentEpoch(beaconState) header1 := testutil.HydrateSignedBeaconHeader(ðpb.SignedBeaconBlockHeader{ Header: ðpb.BeaconBlockHeader{ ProposerIndex: proposerSlashIdx, @@ -231,7 +231,7 @@ func createFullBlockWithOperations(t *testing.T) (state.BeaconState, StateRoot: bytesutil.PadTo([]byte("B"), 32), }, }) - header2.Signature, err = helpers.ComputeDomainAndSign(beaconState, core2.CurrentEpoch(beaconState), header2.Header, params.BeaconConfig().DomainBeaconProposer, privKeys[proposerSlashIdx]) + header2.Signature, err = helpers.ComputeDomainAndSign(beaconState, core.CurrentEpoch(beaconState), header2.Header, params.BeaconConfig().DomainBeaconProposer, privKeys[proposerSlashIdx]) require.NoError(t, err) proposerSlashings := []*ethpb.ProposerSlashing{ @@ -294,7 +294,7 @@ func createFullBlockWithOperations(t *testing.T) (state.BeaconState, blockAtt := testutil.HydrateAttestation(ðpb.Attestation{ Data: ðpb.AttestationData{ Slot: beaconState.Slot(), - Target: ðpb.Checkpoint{Epoch: core2.CurrentEpoch(beaconState)}, + Target: ðpb.Checkpoint{Epoch: core.CurrentEpoch(beaconState)}, Source: ðpb.Checkpoint{Root: mockRoot[:]}}, AggregationBits: aggBits, }) @@ -376,7 +376,7 @@ func TestProcessEpochPrecompute_CanProcess(t *testing.T) { s, err := v1.InitializeFromProto(base) require.NoError(t, err) require.NoError(t, s.SetValidators([]*ethpb.Validator{})) - newState, err := core.ProcessEpochPrecompute(context.Background(), s) + newState, err := transition.ProcessEpochPrecompute(context.Background(), s) require.NoError(t, err) assert.Equal(t, uint64(0), newState.Slashings()[2], "Unexpected slashed balance") } @@ -409,7 +409,7 @@ func TestCanProcessEpoch_TrueOnEpochs(t *testing.T) { b := ðpb.BeaconState{Slot: tt.slot} s, err := v1.InitializeFromProto(b) require.NoError(t, err) - assert.Equal(t, tt.canProcessEpoch, core.CanProcessEpoch(s), "CanProcessEpoch(%d)", tt.slot) + assert.Equal(t, tt.canProcessEpoch, transition.CanProcessEpoch(s), "CanProcessEpoch(%d)", tt.slot) } } @@ -424,7 +424,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 := core.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) + _, err := transition.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) assert.ErrorContains(t, want, err) } @@ -439,7 +439,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 := core.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) + _, err := transition.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) assert.ErrorContains(t, want, err) } @@ -453,7 +453,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 := core.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) + _, err := transition.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) assert.ErrorContains(t, want, err) } @@ -468,7 +468,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 := core.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) + _, err := transition.VerifyOperationLengths(context.Background(), &v1.BeaconState{}, wrapper.WrappedPhase0SignedBeaconBlock(b)) assert.ErrorContains(t, want, err) } @@ -488,7 +488,7 @@ func TestProcessBlock_IncorrectDeposits(t *testing.T) { } want := fmt.Sprintf("incorrect outstanding deposits in block body, wanted: %d, got: %d", s.Eth1Data().DepositCount-s.Eth1DepositIndex(), len(b.Block.Body.Deposits)) - _, err = core.VerifyOperationLengths(context.Background(), s, wrapper.WrappedPhase0SignedBeaconBlock(b)) + _, err = transition.VerifyOperationLengths(context.Background(), s, wrapper.WrappedPhase0SignedBeaconBlock(b)) assert.ErrorContains(t, want, err) } @@ -497,7 +497,7 @@ func TestProcessSlots_SameSlotAsParentState(t *testing.T) { parentState, err := v1.InitializeFromProto(ðpb.BeaconState{Slot: slot}) require.NoError(t, err) - _, err = core.ProcessSlots(context.Background(), parentState, slot) + _, err = transition.ProcessSlots(context.Background(), parentState, slot) assert.ErrorContains(t, "expected state.slot 2 < slot 2", err) } @@ -506,19 +506,19 @@ func TestProcessSlots_LowerSlotAsParentState(t *testing.T) { parentState, err := v1.InitializeFromProto(ðpb.BeaconState{Slot: slot}) require.NoError(t, err) - _, err = core.ProcessSlots(context.Background(), parentState, slot-1) + _, err = transition.ProcessSlots(context.Background(), parentState, slot-1) assert.ErrorContains(t, "expected state.slot 2 < slot 1", err) } func TestProcessSlots_ThroughAltairEpoch(t *testing.T) { - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() conf := params.BeaconConfig() conf.AltairForkEpoch = 5 params.OverrideBeaconConfig(conf) defer params.UseMainnetConfig() st, _ := testutil.DeterministicGenesisState(t, params.BeaconConfig().MaxValidatorsPerCommittee) - st, err := core.ProcessSlots(context.Background(), st, params.BeaconConfig().SlotsPerEpoch*10) + st, err := transition.ProcessSlots(context.Background(), st, params.BeaconConfig().SlotsPerEpoch*10) require.NoError(t, err) require.Equal(t, version.Altair, st.Version()) @@ -546,7 +546,7 @@ func TestProcessSlots_ThroughAltairEpoch(t *testing.T) { } func TestProcessSlots_OnlyAltairEpoch(t *testing.T) { - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() conf := params.BeaconConfig() conf.AltairForkEpoch = 5 params.OverrideBeaconConfig(conf) @@ -554,7 +554,7 @@ func TestProcessSlots_OnlyAltairEpoch(t *testing.T) { st, _ := testutil.DeterministicGenesisStateAltair(t, params.BeaconConfig().MaxValidatorsPerCommittee) require.NoError(t, st.SetSlot(params.BeaconConfig().SlotsPerEpoch*6)) - st, err := core.ProcessSlots(context.Background(), st, params.BeaconConfig().SlotsPerEpoch*10) + st, err := transition.ProcessSlots(context.Background(), st, params.BeaconConfig().SlotsPerEpoch*10) require.NoError(t, err) require.Equal(t, version.Altair, st.Version()) @@ -585,7 +585,7 @@ func TestProcessSlotsUsingNextSlotCache(t *testing.T) { ctx := context.Background() s, _ := testutil.DeterministicGenesisState(t, 1) r := []byte{'a'} - s, err := core.ProcessSlotsUsingNextSlotCache(ctx, s, r, 5) + s, err := transition.ProcessSlotsUsingNextSlotCache(ctx, s, r, 5) require.NoError(t, err) require.Equal(t, types.Slot(5), s.Slot()) } @@ -617,7 +617,7 @@ func TestCanUpgradeToAltair(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if got := core.CanUpgradeToAltair(tt.slot); got != tt.want { + if got := transition.CanUpgradeToAltair(tt.slot); got != tt.want { t.Errorf("canUpgradeToAltair() = %v, want %v", got, tt.want) } }) diff --git a/beacon-chain/powchain/BUILD.bazel b/beacon-chain/powchain/BUILD.bazel index ac20d63108..f9cca31a36 100644 --- a/beacon-chain/powchain/BUILD.bazel +++ b/beacon-chain/powchain/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "//beacon-chain/core/feed:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/powchain/types:go_default_library", "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/powchain/log_processing.go b/beacon-chain/powchain/log_processing.go index 8584ee2b76..0e5c4f930d 100644 --- a/beacon-chain/powchain/log_processing.go +++ b/beacon-chain/powchain/log_processing.go @@ -15,7 +15,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" 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" + coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" contracts "github.com/prysmaticlabs/prysm/contracts/deposit-contract" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" diff --git a/beacon-chain/powchain/service.go b/beacon-chain/powchain/service.go index cad151380c..967d520b50 100644 --- a/beacon-chain/powchain/service.go +++ b/beacon-chain/powchain/service.go @@ -24,9 +24,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db" "github.com/prysmaticlabs/prysm/beacon-chain/powchain/types" "github.com/prysmaticlabs/prysm/beacon-chain/state" @@ -172,7 +172,7 @@ func NewService(ctx context.Context, config *Web3ServiceConfig) (*Service, error cancel() return nil, errors.Wrap(err, "could not setup deposit trie") } - genState, err := core.EmptyGenesisState() + genState, err := transition.EmptyGenesisState() if err != nil { return nil, errors.Wrap(err, "could not setup genesis state") } @@ -881,7 +881,7 @@ func (s *Service) cacheHeadersForEth1DataVote(ctx context.Context) error { // determines the earliest voting block from which to start caching all our previous headers from. func (s *Service) determineEarliestVotingBlock(ctx context.Context, followBlock uint64) (uint64, error) { genesisTime := s.chainStartData.GenesisTime - currSlot := core2.CurrentSlot(genesisTime) + currSlot := core.CurrentSlot(genesisTime) // In the event genesis has not occurred yet, we just request go back follow_distance blocks. if genesisTime == 0 || currSlot == 0 { @@ -891,7 +891,7 @@ func (s *Service) determineEarliestVotingBlock(ctx context.Context, followBlock } return earliestBlk, nil } - votingTime := core2.VotingPeriodStartTime(genesisTime, currSlot) + votingTime := core.VotingPeriodStartTime(genesisTime, currSlot) followBackDist := 2 * params.BeaconConfig().SecondsPerETH1Block * params.BeaconConfig().Eth1FollowDistance if followBackDist > votingTime { return 0, errors.Errorf("invalid genesis time provided. %d > %d", followBackDist, votingTime) diff --git a/beacon-chain/rpc/eth/validator/BUILD.bazel b/beacon-chain/rpc/eth/validator/BUILD.bazel index 8e2215ef56..64ba5391d7 100644 --- a/beacon-chain/rpc/eth/validator/BUILD.bazel +++ b/beacon-chain/rpc/eth/validator/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//beacon-chain/cache:go_default_library", "//beacon-chain/core:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/operations/attestations:go_default_library", "//beacon-chain/operations/synccommittee:go_default_library", "//beacon-chain/p2p:go_default_library", @@ -49,7 +49,7 @@ go_test( "//beacon-chain/cache:go_default_library", "//beacon-chain/core:go_default_library", "//beacon-chain/core/blocks:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db/testing:go_default_library", "//beacon-chain/operations/attestations:go_default_library", "//beacon-chain/operations/slashings:go_default_library", diff --git a/beacon-chain/rpc/eth/validator/validator.go b/beacon-chain/rpc/eth/validator/validator.go index 2ca21a55cb..8731f0f006 100644 --- a/beacon-chain/rpc/eth/validator/validator.go +++ b/beacon-chain/rpc/eth/validator/validator.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/cache" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" rpchelpers "github.com/prysmaticlabs/prysm/beacon-chain/rpc/eth/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" statev1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" @@ -41,7 +41,7 @@ func (vs *Server) GetAttesterDuties(ctx context.Context, req *ethpbv1.AttesterDu } cs := vs.TimeFetcher.CurrentSlot() - currentEpoch := core2.SlotToEpoch(cs) + currentEpoch := core.SlotToEpoch(cs) if req.Epoch > currentEpoch+1 { return nil, status.Errorf(codes.InvalidArgument, "Request epoch %d can not be greater than next epoch %d", req.Epoch, currentEpoch+1) } @@ -115,7 +115,7 @@ func (vs *Server) GetProposerDuties(ctx context.Context, req *ethpbv1.ProposerDu } cs := vs.TimeFetcher.CurrentSlot() - currentEpoch := core2.SlotToEpoch(cs) + currentEpoch := core.SlotToEpoch(cs) if req.Epoch > currentEpoch { return nil, status.Errorf(codes.InvalidArgument, "Request epoch %d can not be greater than current epoch %d", req.Epoch, currentEpoch) } @@ -175,7 +175,7 @@ func (vs *Server) GetSyncCommitteeDuties(ctx context.Context, req *ethpbv2.SyncC return nil, status.Error(codes.Unavailable, "Syncing to latest head, not ready to respond") } - slot, err := core2.StartSlot(req.Epoch) + slot, err := core.StartSlot(req.Epoch) if err != nil { return nil, status.Errorf(codes.Internal, "Could not get sync committee slot: %v", err) } @@ -374,7 +374,7 @@ func (vs *Server) SubmitBeaconCommitteeSubscription(ctx context.Context, req *et } fetchValsLen := func(slot types.Slot) (uint64, error) { - wantedEpoch := core2.SlotToEpoch(slot) + wantedEpoch := core.SlotToEpoch(slot) vals, err := vs.HeadFetcher.HeadValidatorsIndices(ctx, wantedEpoch) if err != nil { return 0, err @@ -387,16 +387,16 @@ func (vs *Server) SubmitBeaconCommitteeSubscription(ctx context.Context, req *et if err != nil { return nil, status.Errorf(codes.Internal, "Could not retrieve head validator length: %v", err) } - currEpoch := core2.SlotToEpoch(req.Data[0].Slot) + currEpoch := core.SlotToEpoch(req.Data[0].Slot) for _, sub := range req.Data { // If epoch has changed, re-request active validators length - if currEpoch != core2.SlotToEpoch(sub.Slot) { + if currEpoch != core.SlotToEpoch(sub.Slot) { currValsLen, err = fetchValsLen(sub.Slot) if err != nil { return nil, status.Errorf(codes.Internal, "Could not retrieve head validator length: %v", err) } - currEpoch = core2.SlotToEpoch(sub.Slot) + currEpoch = core.SlotToEpoch(sub.Slot) } subnet := helpers.ComputeSubnetFromCommitteeAndSlot(currValsLen, sub.CommitteeIndex, sub.Slot) cache.SubnetIDs.AddAttesterSubnetID(sub.Slot, subnet) @@ -436,7 +436,7 @@ func (vs *Server) SubmitSyncCommitteeSubscription(ctx context.Context, req *ethp if err != nil { return nil, status.Errorf(codes.Internal, "Could not get head state: %v", err) } - currEpoch := core2.SlotToEpoch(s.Slot()) + currEpoch := core.SlotToEpoch(s.Slot()) validators := make([]state.ReadOnlyValidator, len(req.Data)) for i, sub := range req.Data { val, err := s.ValidatorAtIndexReadOnly(sub.ValidatorIndex) @@ -453,7 +453,7 @@ func (vs *Server) SubmitSyncCommitteeSubscription(ctx context.Context, req *ethp validators[i] = val } - currPeriod := core2.SyncCommitteePeriod(currEpoch) + currPeriod := core.SyncCommitteePeriod(currEpoch) startEpoch := types.Epoch(currPeriod * uint64(params.BeaconConfig().EpochsPerSyncCommitteePeriod)) for i, sub := range req.Data { @@ -528,7 +528,7 @@ func attestationDependentRoot(s state.BeaconState, epoch types.Epoch) ([]byte, e if epoch <= 1 { dependentRootSlot = 0 } else { - prevEpochStartSlot, err := core2.StartSlot(epoch.Sub(1)) + prevEpochStartSlot, err := core.StartSlot(epoch.Sub(1)) if err != nil { return nil, status.Errorf(codes.Internal, "Could not obtain epoch's start slot: %v", err) } @@ -548,7 +548,7 @@ func proposalDependentRoot(s state.BeaconState, epoch types.Epoch) ([]byte, erro if epoch == 0 { dependentRootSlot = 0 } else { - epochStartSlot, err := core2.StartSlot(epoch) + epochStartSlot, err := core.StartSlot(epoch) if err != nil { return nil, status.Errorf(codes.Internal, "Could not obtain epoch's start slot: %v", err) } @@ -563,23 +563,23 @@ func proposalDependentRoot(s state.BeaconState, epoch types.Epoch) ([]byte, erro // advanceState advances state with empty transitions up to the requested epoch start slot. // In case 1 epoch ahead was requested, we take the start slot of the current epoch. -// Taking the start slot of the next epoch would result in an error inside state.ProcessSlots. +// Taking the start slot of the next epoch would result in an error inside transition.ProcessSlots. func advanceState(ctx context.Context, s state.BeaconState, requestedEpoch, currentEpoch types.Epoch) (state.BeaconState, error) { var epochStartSlot types.Slot var err error if requestedEpoch == currentEpoch+1 { - epochStartSlot, err = core2.StartSlot(requestedEpoch.Sub(1)) + epochStartSlot, err = core.StartSlot(requestedEpoch.Sub(1)) if err != nil { return nil, errors.Wrap(err, "Could not obtain epoch's start slot") } } else { - epochStartSlot, err = core2.StartSlot(requestedEpoch) + epochStartSlot, err = core.StartSlot(requestedEpoch) if err != nil { return nil, errors.Wrap(err, "Could not obtain epoch's start slot") } } if s.Slot() < epochStartSlot { - s, err = core.ProcessSlots(ctx, s, epochStartSlot) + s, err = transition.ProcessSlots(ctx, s, epochStartSlot) if err != nil { return nil, errors.Wrapf(err, "Could not process slots up to %d", epochStartSlot) } diff --git a/beacon-chain/rpc/eth/validator/validator_test.go b/beacon-chain/rpc/eth/validator/validator_test.go index 089fef7ef2..094b89a9d6 100644 --- a/beacon-chain/rpc/eth/validator/validator_test.go +++ b/beacon-chain/rpc/eth/validator/validator_test.go @@ -13,7 +13,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/core" b "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" dbutil "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" "github.com/prysmaticlabs/prysm/beacon-chain/operations/slashings" @@ -47,7 +47,7 @@ func TestGetAttesterDuties(t *testing.T) { require.NoError(t, err) eth1Data, err := sharedtestutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not set up genesis state") // Set state to non-epoch start slot. require.NoError(t, bs.SetSlot(5)) @@ -124,7 +124,7 @@ func TestGetAttesterDuties(t *testing.T) { // We create local variables to not interfere with other tests. // Slot processing might have unexpected side-effects. - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not set up genesis state") // Set state to non-epoch start slot. require.NoError(t, bs.SetSlot(5)) @@ -206,7 +206,7 @@ func TestGetProposerDuties(t *testing.T) { require.NoError(t, err) eth1Data, err := sharedtestutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not set up genesis state") // Set state to non-epoch start slot. require.NoError(t, bs.SetSlot(5)) @@ -255,7 +255,7 @@ func TestGetProposerDuties(t *testing.T) { // We create local variables to not interfere with other tests. // Slot processing might have unexpected side-effects. - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not set up genesis state") // Set state to non-epoch start slot. require.NoError(t, bs.SetSlot(5)) @@ -721,7 +721,7 @@ func TestSubmitBeaconCommitteeSubscription(t *testing.T) { require.NoError(t, err) eth1Data, err := sharedtestutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not set up genesis state") // Set state to non-epoch start slot. require.NoError(t, bs.SetSlot(5)) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel index 174fc39df9..a33c0e6b67 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel @@ -28,7 +28,7 @@ go_library( "//beacon-chain/core/feed/operation:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/core/validators:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/filters:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go index 418ea7bd18..3567454bee 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go @@ -7,11 +7,11 @@ import ( "time" types "github.com/prysmaticlabs/eth2-types" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/core/validators" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -45,7 +45,7 @@ func (bs *Server) ListValidatorBalances( if bs.GenesisTimeFetcher == nil { return nil, status.Errorf(codes.Internal, "Nil genesis time fetcher") } - currentEpoch := core2.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + currentEpoch := core.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) requestedEpoch := currentEpoch switch q := req.QueryFilter.(type) { case *ethpb.ListValidatorBalancesRequest_Epoch: @@ -65,7 +65,7 @@ func (bs *Server) ListValidatorBalances( res := make([]*ethpb.ValidatorBalances_Balance, 0) filtered := map[types.ValidatorIndex]bool{} // Track filtered validators to prevent duplication in the response. - startSlot, err := core2.StartSlot(requestedEpoch) + startSlot, err := core.StartSlot(requestedEpoch) if err != nil { return nil, err } @@ -197,7 +197,7 @@ func (bs *Server) ListValidators( req.PageSize, cmd.Get().MaxRPCPageSize) } - currentEpoch := core2.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + currentEpoch := core.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) requestedEpoch := currentEpoch switch q := req.QueryFilter.(type) { @@ -220,7 +220,7 @@ func (bs *Server) ListValidators( var err error if requestedEpoch != currentEpoch { var s types.Slot - s, err = core2.StartSlot(requestedEpoch) + s, err = core.StartSlot(requestedEpoch) if err != nil { return nil, err } @@ -235,13 +235,13 @@ func (bs *Server) ListValidators( return nil, status.Error(codes.Internal, "Requested state is nil") } - s, err := core2.StartSlot(requestedEpoch) + s, err := core.StartSlot(requestedEpoch) if err != nil { return nil, err } if s > reqState.Slot() { reqState = reqState.Copy() - reqState, err = core.ProcessSlots(ctx, reqState, s) + reqState, err = transition.ProcessSlots(ctx, reqState, s) if err != nil { return nil, status.Errorf( codes.Internal, @@ -392,7 +392,7 @@ func (bs *Server) GetValidator( func (bs *Server) GetValidatorActiveSetChanges( ctx context.Context, req *ethpb.GetValidatorActiveSetChangesRequest, ) (*ethpb.ActiveSetChanges, error) { - currentEpoch := core2.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + currentEpoch := core.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) var requestedEpoch types.Epoch switch q := req.QueryFilter.(type) { @@ -412,7 +412,7 @@ func (bs *Server) GetValidatorActiveSetChanges( ) } - s, err := core2.StartSlot(requestedEpoch) + s, err := core.StartSlot(requestedEpoch) if err != nil { return nil, err } @@ -421,18 +421,18 @@ func (bs *Server) GetValidatorActiveSetChanges( return nil, status.Errorf(codes.Internal, "Could not get state: %v", err) } - activeValidatorCount, err := helpers.ActiveValidatorCount(requestedState, core2.CurrentEpoch(requestedState)) + activeValidatorCount, err := helpers.ActiveValidatorCount(requestedState, core.CurrentEpoch(requestedState)) if err != nil { return nil, status.Errorf(codes.Internal, "Could not get active validator count: %v", err) } vs := requestedState.Validators() - activatedIndices := validators.ActivatedValidatorIndices(core2.CurrentEpoch(requestedState), vs) - exitedIndices, err := validators.ExitedValidatorIndices(core2.CurrentEpoch(requestedState), vs, activeValidatorCount) + activatedIndices := validators.ActivatedValidatorIndices(core.CurrentEpoch(requestedState), vs) + exitedIndices, err := validators.ExitedValidatorIndices(core.CurrentEpoch(requestedState), vs, activeValidatorCount) if err != nil { return nil, status.Errorf(codes.Internal, "Could not determine exited validator indices: %v", err) } - slashedIndices := validators.SlashedValidatorIndices(core2.CurrentEpoch(requestedState), vs) - ejectedIndices, err := validators.EjectedValidatorIndices(core2.CurrentEpoch(requestedState), vs, activeValidatorCount) + slashedIndices := validators.SlashedValidatorIndices(core.CurrentEpoch(requestedState), vs) + ejectedIndices, err := validators.EjectedValidatorIndices(core.CurrentEpoch(requestedState), vs, activeValidatorCount) if err != nil { return nil, status.Errorf(codes.Internal, "Could not determine ejected validator indices: %v", err) } @@ -478,7 +478,7 @@ func (bs *Server) GetValidatorParticipation( ctx context.Context, req *ethpb.GetValidatorParticipationRequest, ) (*ethpb.ValidatorParticipationResponse, error) { currentSlot := bs.GenesisTimeFetcher.CurrentSlot() - currentEpoch := core2.SlotToEpoch(currentSlot) + currentEpoch := core.SlotToEpoch(currentSlot) var requestedEpoch types.Epoch switch q := req.QueryFilter.(type) { @@ -500,7 +500,7 @@ func (bs *Server) GetValidatorParticipation( } // Get current slot state for current epoch attestations. - startSlot, err := core2.StartSlot(requestedEpoch) + startSlot, err := core.StartSlot(requestedEpoch) if err != nil { return nil, err } @@ -603,7 +603,7 @@ func (bs *Server) GetValidatorQueue( }) // Only activate just enough validators according to the activation churn limit. - activeValidatorCount, err := helpers.ActiveValidatorCount(headState, core2.CurrentEpoch(headState)) + activeValidatorCount, err := helpers.ActiveValidatorCount(headState, core.CurrentEpoch(headState)) if err != nil { return nil, status.Errorf(codes.Internal, "Could not get active validator count: %v", err) } @@ -636,7 +636,7 @@ func (bs *Server) GetValidatorQueue( for _, valIdx := range awaitingExit { val := vals[valIdx] // Ensure the validator has not yet exited before adding its index to the exit queue. - if val.WithdrawableEpoch < minEpoch && !validatorHasExited(val, core2.CurrentEpoch(headState)) { + if val.WithdrawableEpoch < minEpoch && !validatorHasExited(val, core.CurrentEpoch(headState)) { exitQueueIndices = append(exitQueueIndices, valIdx) } } @@ -675,7 +675,7 @@ func (bs *Server) GetValidatorPerformance( } if bs.GenesisTimeFetcher.CurrentSlot() > headState.Slot() { - headState, err = core.ProcessSlots(ctx, headState, bs.GenesisTimeFetcher.CurrentSlot()) + headState, err = transition.ProcessSlots(ctx, headState, bs.GenesisTimeFetcher.CurrentSlot()) if err != nil { return nil, status.Errorf(codes.Internal, "Could not process slots: %v", err) } @@ -751,7 +751,7 @@ func (bs *Server) GetValidatorPerformance( return validatorIndices[i] < validatorIndices[j] }) - currentEpoch := core2.CurrentEpoch(headState) + currentEpoch := core.CurrentEpoch(headState) responseCap = len(validatorIndices) pubKeys := make([][]byte, 0, responseCap) beforeTransitionBalances := make([]uint64, 0, responseCap) @@ -812,7 +812,7 @@ func (bs *Server) GetIndividualVotes( ctx context.Context, req *ethpb.IndividualVotesRequest, ) (*ethpb.IndividualVotesRespond, error) { - currentEpoch := core2.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + currentEpoch := core.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) if req.Epoch > currentEpoch { return nil, status.Errorf( codes.InvalidArgument, @@ -822,7 +822,7 @@ func (bs *Server) GetIndividualVotes( ) } - s, err := core2.StartSlot(req.Epoch) + s, err := core.StartSlot(req.Epoch) if err != nil { return nil, err } diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel index ec4887a724..bd11d8c835 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/BUILD.bazel @@ -30,8 +30,8 @@ go_library( "//beacon-chain/core/feed/operation:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", - "//beacon-chain/core/state/interop:go_default_library", + "//beacon-chain/core/transition:go_default_library", + "//beacon-chain/core/transition/interop:go_default_library", "//beacon-chain/operations/attestations:go_default_library", "//beacon-chain/operations/slashings:go_default_library", "//beacon-chain/operations/synccommittee:go_default_library", @@ -104,7 +104,7 @@ go_test( "//beacon-chain/core/feed/operation:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db/testing:go_default_library", "//beacon-chain/operations/attestations:go_default_library", "//beacon-chain/operations/slashings:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go index 7a0d18b8e7..a43c8f2328 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments.go @@ -11,7 +11,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" beaconState "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -124,7 +124,7 @@ func (vs *Server) duties(ctx context.Context, req *ethpb.DutiesRequest) (*ethpb. return nil, err } if s.Slot() < epochStartSlot { - s, err = state.ProcessSlots(ctx, s, epochStartSlot) + s, err = transition.ProcessSlots(ctx, s, epochStartSlot) if err != nil { return nil, status.Errorf(codes.Internal, "Could not process slots up to %d: %v", epochStartSlot, err) } diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go index bddb35366f..5c00afec28 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/assignments_test.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" @@ -41,7 +41,7 @@ func TestGetDuties_OK(t *testing.T) { require.NoError(t, err) eth1Data, err := testutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not setup genesis bs") genesisRoot, err := genesis.Block.HashTreeRoot() require.NoError(t, err, "Could not get signing root") @@ -221,7 +221,7 @@ func TestGetDuties_CurrentEpoch_ShouldNotFail(t *testing.T) { require.NoError(t, err) eth1Data, err := testutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bState, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bState, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not setup genesis state") // Set state to non-epoch start slot. require.NoError(t, bState.SetSlot(5)) @@ -262,7 +262,7 @@ func TestGetDuties_MultipleKeys_OK(t *testing.T) { require.NoError(t, err) eth1Data, err := testutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not setup genesis bs") genesisRoot, err := genesis.Block.HashTreeRoot() require.NoError(t, err, "Could not get signing root") @@ -322,7 +322,7 @@ func TestStreamDuties_OK(t *testing.T) { require.NoError(t, err) eth1Data, err := testutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not setup genesis bs") genesisRoot, err := genesis.Block.HashTreeRoot() require.NoError(t, err, "Could not get signing root") @@ -379,7 +379,7 @@ func TestStreamDuties_OK_ChainReorg(t *testing.T) { require.NoError(t, err) eth1Data, err := testutil.DeterministicEth1Data(len(deposits)) require.NoError(t, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(t, err, "Could not setup genesis bs") genesisRoot, err := genesis.Block.HashTreeRoot() require.NoError(t, err, "Could not get signing root") @@ -484,7 +484,7 @@ func BenchmarkCommitteeAssignment(b *testing.B) { require.NoError(b, err) eth1Data, err := testutil.DeterministicEth1Data(len(deposits)) require.NoError(b, err) - bs, err := state.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) + bs, err := transition.GenesisBeaconState(context.Background(), deposits, 0, eth1Data) require.NoError(b, err, "Could not setup genesis bs") genesisRoot, err := genesis.Block.HashTreeRoot() require.NoError(b, err, "Could not get signing root") diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go index 81cdc7d157..7f989c8362 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/attester.go @@ -11,7 +11,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" @@ -97,12 +97,12 @@ func (vs *Server) GetAttestationData(ctx context.Context, req *ethpb.Attestation if core.CurrentEpoch(headState) < core.SlotToEpoch(req.Slot) { if featureconfig.Get().EnableNextSlotStateCache { - headState, err = state.ProcessSlotsUsingNextSlotCache(ctx, headState, headRoot, req.Slot) + headState, err = transition.ProcessSlotsUsingNextSlotCache(ctx, headState, headRoot, req.Slot) if err != nil { return nil, status.Errorf(codes.Internal, "Could not process slots up to %d: %v", req.Slot, err) } } else { - headState, err = state.ProcessSlots(ctx, headState, req.Slot) + headState, err = transition.ProcessSlots(ctx, headState, req.Slot) if err != nil { return nil, status.Errorf(codes.Internal, "Could not process slots up to %d: %v", req.Slot, err) } diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go index d98975d441..7f38a7aab3 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/exit_test.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" opfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/operations/voluntaryexits" mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" mockSync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync/testing" @@ -27,7 +27,7 @@ func TestProposeExit_Notification(t *testing.T) { deposits, keys, err := testutil.DeterministicDepositsAndKeys(params.BeaconConfig().MinGenesisActiveValidatorCount) require.NoError(t, err) - beaconState, err := state.GenesisBeaconState(ctx, deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) + beaconState, err := transition.GenesisBeaconState(ctx, deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) require.NoError(t, err) epoch := types.Epoch(2048) require.NoError(t, beaconState.SetSlot(params.BeaconConfig().SlotsPerEpoch.Mul(uint64(epoch)))) @@ -95,7 +95,7 @@ func TestProposeExit_NoPanic(t *testing.T) { deposits, keys, err := testutil.DeterministicDepositsAndKeys(params.BeaconConfig().MinGenesisActiveValidatorCount) require.NoError(t, err) - beaconState, err := state.GenesisBeaconState(ctx, deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) + beaconState, err := transition.GenesisBeaconState(ctx, deposits, 0, ðpb.Eth1Data{BlockHash: make([]byte, 32)}) require.NoError(t, err) epoch := types.Epoch(2048) require.NoError(t, beaconState.SetSlot(params.BeaconConfig().SlotsPerEpoch.Mul(uint64(epoch)))) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go index 0ec6e295e5..424401e72e 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go @@ -12,13 +12,13 @@ import ( fastssz "github.com/ferranbt/fastssz" "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" blockfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/block" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/interop" "github.com/prysmaticlabs/prysm/beacon-chain/state" dbpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -82,12 +82,12 @@ func (vs *Server) GetBlock(ctx context.Context, req *ethpb.BlockRequest) (*ethpb } if featureconfig.Get().EnableNextSlotStateCache { - head, err = core.ProcessSlotsUsingNextSlotCache(ctx, head, parentRoot, req.Slot) + head, err = transition.ProcessSlotsUsingNextSlotCache(ctx, head, parentRoot, req.Slot) if err != nil { return nil, status.Errorf(codes.Internal, "Could not advance slots to calculate proposer index: %v", err) } } else { - head, err = core.ProcessSlots(ctx, head, req.Slot) + head, err = transition.ProcessSlots(ctx, head, req.Slot) if err != nil { return nil, status.Errorf(codes.Internal, "Could not advance slot to calculate proposer index: %v", err) } @@ -265,7 +265,7 @@ func (vs *Server) eth1DataMajorityVote(ctx context.Context, beaconState state.Be func (vs *Server) slotStartTime(slot types.Slot) uint64 { startTime, _ := vs.Eth1InfoFetcher.Eth2GenesisPowchainInfo() - return core2.VotingPeriodStartTime(startTime, slot) + return core.VotingPeriodStartTime(startTime, slot) } func (vs *Server) inRangeVotes(ctx context.Context, @@ -348,7 +348,7 @@ func (vs *Server) mockETH1DataVote(ctx context.Context, slot types.Slot) (*ethpb return nil, err } var enc []byte - enc = fastssz.MarshalUint64(enc, uint64(core2.SlotToEpoch(slot))+uint64(slotInVotingPeriod)) + enc = fastssz.MarshalUint64(enc, uint64(core.SlotToEpoch(slot))+uint64(slotInVotingPeriod)) depRoot := hashutil.Hash(enc) blockHash := hashutil.Hash(depRoot[:]) return ðpb.Eth1Data{ @@ -387,7 +387,7 @@ func (vs *Server) computeStateRoot(ctx context.Context, block block.SignedBeacon if err != nil { return nil, errors.Wrap(err, "could not retrieve beacon state") } - root, err := core.CalculateStateRoot( + root, err := transition.CalculateStateRoot( ctx, beaconState, block, diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go index 7dfa9cab56..319be6b174 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/sync_committee_test.go @@ -6,7 +6,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/operations/synccommittee" mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -49,8 +49,8 @@ func TestSubmitSyncMessage_OK(t *testing.T) { func TestGetSyncSubcommitteeIndex_Ok(t *testing.T) { params.SetupTestConfigCleanup(t) params.OverrideBeaconConfig(params.MainnetConfig()) - state.SkipSlotCache.Disable() - defer state.SkipSlotCache.Enable() + transition.SkipSlotCache.Disable() + defer transition.SkipSlotCache.Enable() server := &Server{ HeadFetcher: &mock.ChainService{ diff --git a/beacon-chain/state/stategen/BUILD.bazel b/beacon-chain/state/stategen/BUILD.bazel index cfedfff3fe..7fb7d02287 100644 --- a/beacon-chain/state/stategen/BUILD.bazel +++ b/beacon-chain/state/stategen/BUILD.bazel @@ -23,7 +23,7 @@ go_library( deps = [ "//beacon-chain/core:go_default_library", "//beacon-chain/core/altair:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/filters:go_default_library", "//beacon-chain/state:go_default_library", diff --git a/beacon-chain/state/stategen/replay.go b/beacon-chain/state/stategen/replay.go index d5b6d309fc..1611983a7b 100644 --- a/beacon-chain/state/stategen/replay.go +++ b/beacon-chain/state/stategen/replay.go @@ -8,7 +8,7 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" - transition "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + transition "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db/filters" "github.com/prysmaticlabs/prysm/beacon-chain/state" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" diff --git a/beacon-chain/state/stateutil/BUILD.bazel b/beacon-chain/state/stateutil/BUILD.bazel index e6bfd2a4f9..c599b81299 100644 --- a/beacon-chain/state/stateutil/BUILD.bazel +++ b/beacon-chain/state/stateutil/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "//validator/client:__pkg__", ], deps = [ - "//beacon-chain/core/state/stateutils:go_default_library", + "//beacon-chain/core/transition/stateutils:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bytesutil:go_default_library", "//shared/hashutil:go_default_library", diff --git a/beacon-chain/state/stateutil/validator_map_handler.go b/beacon-chain/state/stateutil/validator_map_handler.go index 2da28870d0..1a741b15dc 100644 --- a/beacon-chain/state/stateutil/validator_map_handler.go +++ b/beacon-chain/state/stateutil/validator_map_handler.go @@ -4,7 +4,7 @@ import ( "sync" types "github.com/prysmaticlabs/eth2-types" - coreutils "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils" + coreutils "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/stateutils" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" ) diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/sync/BUILD.bazel index aed4f87db0..20e09ffa9b 100644 --- a/beacon-chain/sync/BUILD.bazel +++ b/beacon-chain/sync/BUILD.bazel @@ -56,8 +56,8 @@ go_library( "//beacon-chain/core/feed/operation:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", - "//beacon-chain/core/state/interop:go_default_library", + "//beacon-chain/core/transition:go_default_library", + "//beacon-chain/core/transition/interop:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/filters:go_default_library", "//beacon-chain/operations/attestations:go_default_library", @@ -159,7 +159,7 @@ go_test( "//beacon-chain/core/feed:go_default_library", "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/kv:go_default_library", "//beacon-chain/db/testing:go_default_library", diff --git a/beacon-chain/sync/initial-sync/BUILD.bazel b/beacon-chain/sync/initial-sync/BUILD.bazel index 89dab2af76..43e41b7a94 100644 --- a/beacon-chain/sync/initial-sync/BUILD.bazel +++ b/beacon-chain/sync/initial-sync/BUILD.bazel @@ -21,7 +21,7 @@ go_library( "//beacon-chain/core/feed:go_default_library", "//beacon-chain/core/feed/block:go_default_library", "//beacon-chain/core/feed/state:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/p2p:go_default_library", "//beacon-chain/p2p/peers/scorers:go_default_library", diff --git a/beacon-chain/sync/initial-sync/blocks_fetcher_test.go b/beacon-chain/sync/initial-sync/blocks_fetcher_test.go index bb5bb48949..3c57a2a1df 100644 --- a/beacon-chain/sync/initial-sync/blocks_fetcher_test.go +++ b/beacon-chain/sync/initial-sync/blocks_fetcher_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/kevinms/leakybucket-go" - core "github.com/libp2p/go-libp2p-core" + libp2pcore "github.com/libp2p/go-libp2p-core" "github.com/libp2p/go-libp2p-core/network" types "github.com/prysmaticlabs/eth2-types" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" p2pm "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2pt "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" @@ -124,7 +124,7 @@ func TestBlocksFetcher_RoundRobin(t *testing.T) { peers: []*peerData{ { blocks: makeSequence(1, 3*slotsInBatch), - finalizedEpoch: core2.SlotToEpoch(3 * slotsInBatch), + finalizedEpoch: core.SlotToEpoch(3 * slotsInBatch), headSlot: 3 * slotsInBatch, }, }, @@ -136,7 +136,7 @@ func TestBlocksFetcher_RoundRobin(t *testing.T) { peers: []*peerData{ { blocks: makeSequence(1, 3*slotsInBatch), - finalizedEpoch: core2.SlotToEpoch(3 * slotsInBatch), + finalizedEpoch: core.SlotToEpoch(3 * slotsInBatch), headSlot: 3 * slotsInBatch, }, }, @@ -148,17 +148,17 @@ func TestBlocksFetcher_RoundRobin(t *testing.T) { peers: []*peerData{ { blocks: makeSequence(1, 3*slotsInBatch), - finalizedEpoch: core2.SlotToEpoch(3 * slotsInBatch), + finalizedEpoch: core.SlotToEpoch(3 * slotsInBatch), headSlot: 3 * slotsInBatch, }, { blocks: makeSequence(1, 3*slotsInBatch), - finalizedEpoch: core2.SlotToEpoch(3 * slotsInBatch), + finalizedEpoch: core.SlotToEpoch(3 * slotsInBatch), headSlot: 3 * slotsInBatch, }, { blocks: makeSequence(1, 3*slotsInBatch), - finalizedEpoch: core2.SlotToEpoch(3 * slotsInBatch), + finalizedEpoch: core.SlotToEpoch(3 * slotsInBatch), headSlot: 3 * slotsInBatch, }, }, @@ -506,7 +506,7 @@ func TestBlocksFetcher_requestBeaconBlocksByRange(t *testing.T) { p2p: p2p, }) - _, peerIDs := p2p.Peers().BestFinalized(params.BeaconConfig().MaxPeersToSync, core2.SlotToEpoch(mc.HeadSlot())) + _, peerIDs := p2p.Peers().BestFinalized(params.BeaconConfig().MaxPeersToSync, core.SlotToEpoch(mc.HeadSlot())) req := &p2ppb.BeaconBlocksByRangeRequest{ StartSlot: 1, Step: 1, @@ -537,7 +537,7 @@ func TestBlocksFetcher_RequestBlocksRateLimitingLocks(t *testing.T) { } topic := p2pm.RPCBlocksByRangeTopicV1 - protocol := core.ProtocolID(topic + p2.Encoding().ProtocolSuffix()) + protocol := libp2pcore.ProtocolID(topic + p2.Encoding().ProtocolSuffix()) streamHandlerFn := func(stream network.Stream) { assert.NoError(t, stream.Close()) } @@ -813,7 +813,7 @@ func TestBlocksFetcher_requestBlocksFromPeerReturningInvalidBlocks(t *testing.T) } topic := p2pm.RPCBlocksByRangeTopicV1 - protocol := core.ProtocolID(topic + p1.Encoding().ProtocolSuffix()) + protocol := libp2pcore.ProtocolID(topic + p1.Encoding().ProtocolSuffix()) ctx, cancel := context.WithCancel(context.Background()) defer cancel() diff --git a/beacon-chain/sync/initial-sync/round_robin.go b/beacon-chain/sync/initial-sync/round_robin.go index 05a78e3394..2174936bef 100644 --- a/beacon-chain/sync/initial-sync/round_robin.go +++ b/beacon-chain/sync/initial-sync/round_robin.go @@ -12,7 +12,7 @@ import ( "github.com/paulbellamy/ratecounter" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/sirupsen/logrus" @@ -40,8 +40,8 @@ type batchBlockReceiverFn func(ctx context.Context, blks []block.SignedBeaconBlo func (s *Service) roundRobinSync(genesis time.Time) error { ctx, cancel := context.WithCancel(s.ctx) defer cancel() - state.SkipSlotCache.Disable() - defer state.SkipSlotCache.Enable() + transition.SkipSlotCache.Disable() + defer transition.SkipSlotCache.Enable() s.counter = ratecounter.NewRateCounter(counterSeconds * time.Second) diff --git a/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go b/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go index 29e6dd768e..c1bd253900 100644 --- a/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go +++ b/beacon-chain/sync/rpc_beacon_blocks_by_root_test.go @@ -12,7 +12,7 @@ import ( gcache "github.com/patrickmn/go-cache" types "github.com/prysmaticlabs/eth2-types" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" db "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" @@ -87,7 +87,7 @@ func TestRecentBeaconBlocks_RPCRequestSent(t *testing.T) { require.NoError(t, err) blockBRoot, err := blockB.Block.HashTreeRoot() require.NoError(t, err) - genesisState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) + genesisState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) require.NoError(t, err) require.NoError(t, genesisState.SetSlot(111)) require.NoError(t, genesisState.UpdateBlockRootAtIndex(111%uint64(params.BeaconConfig().SlotsPerHistoricalRoot), blockARoot)) diff --git a/beacon-chain/sync/rpc_status_test.go b/beacon-chain/sync/rpc_status_test.go index 0adbe32619..b48b6368fe 100644 --- a/beacon-chain/sync/rpc_status_test.go +++ b/beacon-chain/sync/rpc_status_test.go @@ -12,7 +12,7 @@ import ( "github.com/libp2p/go-libp2p-core/protocol" types "github.com/prysmaticlabs/eth2-types" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db/kv" testingDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" @@ -175,7 +175,7 @@ func TestStatusRPCHandler_ReturnsHelloMessage(t *testing.T) { finalized.Block.Slot = blkSlot finalizedRoot, err := finalized.Block.HashTreeRoot() require.NoError(t, err) - genesisState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) + genesisState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) require.NoError(t, err) require.NoError(t, genesisState.SetSlot(111)) require.NoError(t, genesisState.UpdateBlockRootAtIndex(111%uint64(params.BeaconConfig().SlotsPerHistoricalRoot), headRoot)) @@ -398,7 +398,7 @@ func TestStatusRPCRequest_RequestSent(t *testing.T) { finalized.Block.Slot = 40 finalizedRoot, err := finalized.Block.HashTreeRoot() require.NoError(t, err) - genesisState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) + genesisState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) require.NoError(t, err) require.NoError(t, genesisState.SetSlot(111)) require.NoError(t, genesisState.UpdateBlockRootAtIndex(111%uint64(params.BeaconConfig().SlotsPerHistoricalRoot), headRoot)) @@ -475,7 +475,7 @@ func TestStatusRPCRequest_FinalizedBlockExists(t *testing.T) { finalized.Block.Slot = blkSlot finalizedRoot, err := finalized.Block.HashTreeRoot() require.NoError(t, err) - genesisState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{DepositRoot: make([]byte, 32), BlockHash: make([]byte, 32)}) + genesisState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{DepositRoot: make([]byte, 32), BlockHash: make([]byte, 32)}) require.NoError(t, err) require.NoError(t, genesisState.SetSlot(111)) require.NoError(t, genesisState.UpdateBlockRootAtIndex(111%uint64(params.BeaconConfig().SlotsPerHistoricalRoot), headRoot)) @@ -554,7 +554,7 @@ func TestStatusRPCRequest_FinalizedBlockExists(t *testing.T) { func TestStatusRPCRequest_FinalizedBlockSkippedSlots(t *testing.T) { db, err := kv.NewKVStore(context.Background(), t.TempDir(), &kv.Config{}) require.NoError(t, err) - bState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{DepositRoot: make([]byte, 32), BlockHash: make([]byte, 32)}) + bState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{DepositRoot: make([]byte, 32), BlockHash: make([]byte, 32)}) require.NoError(t, err) blk := testutil.NewBeaconBlock() @@ -740,7 +740,7 @@ func TestStatusRPCRequest_BadPeerHandshake(t *testing.T) { finalized := testutil.NewBeaconBlock() finalizedRoot, err := finalized.Block.HashTreeRoot() require.NoError(t, err) - genesisState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) + genesisState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) require.NoError(t, err) require.NoError(t, genesisState.SetSlot(111)) require.NoError(t, genesisState.UpdateBlockRootAtIndex(111%uint64(params.BeaconConfig().SlotsPerHistoricalRoot), headRoot)) @@ -821,7 +821,7 @@ func TestStatusRPC_ValidGenesisMessage(t *testing.T) { finalized.Block.Slot = blkSlot finalizedRoot, err := finalized.Block.HashTreeRoot() require.NoError(t, err) - genesisState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) + genesisState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) require.NoError(t, err) require.NoError(t, genesisState.SetSlot(111)) require.NoError(t, genesisState.UpdateBlockRootAtIndex(111%uint64(params.BeaconConfig().SlotsPerHistoricalRoot), headRoot)) @@ -908,7 +908,7 @@ func TestShouldResync(t *testing.T) { }, } for _, tt := range tests { - headState, err := state.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) + headState, err := transition.GenesisBeaconState(context.Background(), nil, 0, ðpb.Eth1Data{}) require.NoError(t, err) require.NoError(t, headState.SetSlot(tt.args.headSlot)) r := &Service{ diff --git a/beacon-chain/sync/rpc_test.go b/beacon-chain/sync/rpc_test.go index f53a716f5e..eb81b5fb2b 100644 --- a/beacon-chain/sync/rpc_test.go +++ b/beacon-chain/sync/rpc_test.go @@ -8,7 +8,7 @@ import ( libp2pcore "github.com/libp2p/go-libp2p-core" "github.com/libp2p/go-libp2p-core/network" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" prysmP2P "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder" p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" @@ -19,7 +19,7 @@ import ( ) func init() { - state.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } // expectSuccess status code from a stream in regular sync. diff --git a/beacon-chain/sync/subscriber_beacon_blocks.go b/beacon-chain/sync/subscriber_beacon_blocks.go index 67bb515881..1a46245f01 100644 --- a/beacon-chain/sync/subscriber_beacon_blocks.go +++ b/beacon-chain/sync/subscriber_beacon_blocks.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/interop" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/beacon-chain/sync/validate_aggregate_proof.go b/beacon-chain/sync/validate_aggregate_proof.go index dc471634af..712815150d 100644 --- a/beacon-chain/sync/validate_aggregate_proof.go +++ b/beacon-chain/sync/validate_aggregate_proof.go @@ -8,12 +8,12 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" @@ -140,12 +140,12 @@ func (s *Service) validateAggregatedAtt(ctx context.Context, signed *ethpb.Signe attSlot := signed.Message.Aggregate.Data.Slot // Only advance state if different epoch as the committee can only change on an epoch transition. - if core2.SlotToEpoch(attSlot) > core2.SlotToEpoch(bs.Slot()) { - startSlot, err := core2.StartSlot(core2.SlotToEpoch(attSlot)) + if core.SlotToEpoch(attSlot) > core.SlotToEpoch(bs.Slot()) { + startSlot, err := core.StartSlot(core.SlotToEpoch(attSlot)) if err != nil { return pubsub.ValidationIgnore } - bs, err = core.ProcessSlots(ctx, bs, startSlot) + bs, err = transition.ProcessSlots(ctx, bs, startSlot) if err != nil { traceutil.AnnotateError(span, err) return pubsub.ValidationIgnore @@ -269,7 +269,7 @@ func validateSelectionIndex( } domain := params.BeaconConfig().DomainSelectionProof - epoch := core2.SlotToEpoch(data.Slot) + epoch := core.SlotToEpoch(data.Slot) v, err := bs.ValidatorAtIndex(validatorIndex) if err != nil { @@ -307,7 +307,7 @@ func aggSigSet(s state.ReadOnlyBeaconState, a *ethpb.SignedAggregateAttestationA return nil, err } - epoch := core2.SlotToEpoch(a.Message.Aggregate.Data.Slot) + epoch := core.SlotToEpoch(a.Message.Aggregate.Data.Slot) d, err := helpers.Domain(s.Fork(), epoch, params.BeaconConfig().DomainAggregateAndProof, s.GenesisValidatorRoot()) if err != nil { return nil, err diff --git a/beacon-chain/sync/validate_beacon_blocks.go b/beacon-chain/sync/validate_beacon_blocks.go index 32ee0d320a..934ec27be7 100644 --- a/beacon-chain/sync/validate_beacon_blocks.go +++ b/beacon-chain/sync/validate_beacon_blocks.go @@ -14,7 +14,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" blockfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/block" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" @@ -219,7 +219,7 @@ func (s *Service) validateBeaconBlock(ctx context.Context, blk block.SignedBeaco } else { // In the event the block is more than an epoch ahead from its // parent state, we have to advance the state forward. - parentState, err = state.ProcessSlots(ctx, parentState, blk.Block().Slot()) + parentState, err = transition.ProcessSlots(ctx, parentState, blk.Block().Slot()) if err != nil { return err } diff --git a/beacon-chain/sync/validate_beacon_blocks_test.go b/beacon-chain/sync/validate_beacon_blocks_test.go index aa3106d0f7..1a595d40ad 100644 --- a/beacon-chain/sync/validate_beacon_blocks_test.go +++ b/beacon-chain/sync/validate_beacon_blocks_test.go @@ -15,7 +15,7 @@ import ( mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" dbtest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" @@ -263,7 +263,7 @@ func TestValidateBeaconBlockPubSub_WithLookahead(t *testing.T) { copied := beaconState.Copy() // The next block is only 1 epoch ahead so as to not induce a new seed. blkSlot := params.BeaconConfig().SlotsPerEpoch.Mul(uint64(core.NextEpoch(copied))) - copied, err = state.ProcessSlots(context.Background(), copied, blkSlot) + copied, err = transition.ProcessSlots(context.Background(), copied, blkSlot) require.NoError(t, err) proposerIdx, err := helpers.BeaconProposerIndex(copied) require.NoError(t, err) @@ -324,7 +324,7 @@ func TestValidateBeaconBlockPubSub_AdvanceEpochsForState(t *testing.T) { copied := beaconState.Copy() // The next block is at least 2 epochs ahead to induce shuffling and a new seed. blkSlot := params.BeaconConfig().SlotsPerEpoch * 2 - copied, err = state.ProcessSlots(context.Background(), copied, blkSlot) + copied, err = transition.ProcessSlots(context.Background(), copied, blkSlot) require.NoError(t, err) proposerIdx, err := helpers.BeaconProposerIndex(copied) require.NoError(t, err) @@ -838,7 +838,7 @@ func TestValidateBeaconBlockPubSub_RejectEvilBlocksFromFuture(t *testing.T) { copied := beaconState.Copy() // The next block is at least 2 epochs ahead to induce shuffling and a new seed. blkSlot := params.BeaconConfig().SlotsPerEpoch * 2 - copied, err = state.ProcessSlots(context.Background(), copied, blkSlot) + copied, err = transition.ProcessSlots(context.Background(), copied, blkSlot) require.NoError(t, err) proposerIdx, err := helpers.BeaconProposerIndex(copied) require.NoError(t, err) diff --git a/beacon-chain/sync/validate_sync_committee_message_test.go b/beacon-chain/sync/validate_sync_committee_message_test.go index 47199d84ed..3f45183554 100644 --- a/beacon-chain/sync/validate_sync_committee_message_test.go +++ b/beacon-chain/sync/validate_sync_committee_message_test.go @@ -13,7 +13,7 @@ import ( pubsub_pb "github.com/libp2p/go-libp2p-pubsub/pb" types "github.com/prysmaticlabs/eth2-types" mockChain "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" testingDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" @@ -226,7 +226,7 @@ func TestService_ValidateSyncCommitteeMessage(t *testing.T) { msg.Signature = emptySig[:] msg.BlockRoot = headRoot[:] msg.ValidatorIndex = types.ValidatorIndex(chosenVal) - msg.Slot = core2.PrevSlot(hState.Slot()) + msg.Slot = core.PrevSlot(hState.Slot()) // Set Bad Topic and Subnet digest, err := s.currentForkDigest() @@ -274,7 +274,7 @@ func TestService_ValidateSyncCommitteeMessage(t *testing.T) { msg.Signature = emptySig[:] msg.BlockRoot = headRoot[:] msg.ValidatorIndex = types.ValidatorIndex(chosenVal) - msg.Slot = core2.PrevSlot(hState.Slot()) + msg.Slot = core.PrevSlot(hState.Slot()) return s, topic }, @@ -313,9 +313,9 @@ func TestService_ValidateSyncCommitteeMessage(t *testing.T) { msg.Signature = emptySig[:] msg.BlockRoot = headRoot[:] msg.ValidatorIndex = types.ValidatorIndex(chosenVal) - msg.Slot = core2.PrevSlot(hState.Slot()) + msg.Slot = core.PrevSlot(hState.Slot()) - d, err := helpers.Domain(hState.Fork(), core2.SlotToEpoch(hState.Slot()), params.BeaconConfig().DomainSyncCommittee, hState.GenesisValidatorRoot()) + d, err := helpers.Domain(hState.Fork(), core.SlotToEpoch(hState.Slot()), params.BeaconConfig().DomainSyncCommittee, hState.GenesisValidatorRoot()) assert.NoError(t, err) subCommitteeSize := params.BeaconConfig().SyncCommitteeSize / params.BeaconConfig().SyncCommitteeSubnetCount s.cfg.Chain = &mockChain.ChainService{ @@ -366,7 +366,7 @@ func TestService_ValidateSyncCommitteeMessage(t *testing.T) { numOfVals := hState.NumValidators() chosenVal := numOfVals - 10 - d, err := helpers.Domain(hState.Fork(), core2.SlotToEpoch(hState.Slot()), params.BeaconConfig().DomainSyncCommittee, hState.GenesisValidatorRoot()) + d, err := helpers.Domain(hState.Fork(), core.SlotToEpoch(hState.Slot()), params.BeaconConfig().DomainSyncCommittee, hState.GenesisValidatorRoot()) assert.NoError(t, err) rawBytes := p2ptypes.SSZBytes(headRoot[:]) sigRoot, err := helpers.ComputeSigningRoot(&rawBytes, d) @@ -383,7 +383,7 @@ func TestService_ValidateSyncCommitteeMessage(t *testing.T) { msg.Signature = keys[chosenVal].Sign(sigRoot[:]).Marshal() msg.BlockRoot = headRoot[:] msg.ValidatorIndex = types.ValidatorIndex(chosenVal) - msg.Slot = core2.PrevSlot(hState.Slot()) + msg.Slot = core.PrevSlot(hState.Slot()) // Set Topic and Subnet digest, err := s.currentForkDigest() diff --git a/beacon-chain/sync/validate_sync_contribution_proof_test.go b/beacon-chain/sync/validate_sync_contribution_proof_test.go index 677f981a7f..4339ec1492 100644 --- a/beacon-chain/sync/validate_sync_contribution_proof_test.go +++ b/beacon-chain/sync/validate_sync_contribution_proof_test.go @@ -16,7 +16,7 @@ import ( "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - transition "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db" testingDB "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" diff --git a/endtoend/BUILD.bazel b/endtoend/BUILD.bazel index 2eb2de3524..6f2042ea48 100644 --- a/endtoend/BUILD.bazel +++ b/endtoend/BUILD.bazel @@ -29,7 +29,7 @@ go_test( "requires-network", ], deps = [ - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//endtoend/components:go_default_library", "//endtoend/evaluators:go_default_library", "//endtoend/helpers:go_default_library", diff --git a/endtoend/endtoend_test.go b/endtoend/endtoend_test.go index c9d3f0b8e4..c750e69f51 100644 --- a/endtoend/endtoend_test.go +++ b/endtoend/endtoend_test.go @@ -15,7 +15,7 @@ import ( "time" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/endtoend/components" ev "github.com/prysmaticlabs/prysm/endtoend/evaluators" "github.com/prysmaticlabs/prysm/endtoend/helpers" @@ -41,7 +41,7 @@ const ( ) func init() { - state.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } // testRunner abstracts E2E test configuration and running. diff --git a/fuzz/BUILD.bazel b/fuzz/BUILD.bazel index 38de7936bc..4269d6f4e0 100644 --- a/fuzz/BUILD.bazel +++ b/fuzz/BUILD.bazel @@ -60,7 +60,7 @@ go_fuzz_test( max_len = 30000000, deps = [ "//beacon-chain/core/blocks:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//fuzz/testing:go_default_library", "//shared/params:go_default_library", "//proto/prysm/v1alpha1:go_default_library", @@ -144,7 +144,7 @@ go_fuzz_test( max_len = 30000000, deps = [ "//proto/prysm/v1alpha1:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core:go_default_library", "//shared/params:go_default_library", @@ -171,7 +171,7 @@ go_library( "//beacon-chain/core:go_default_library", "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/kv:go_default_library", "//beacon-chain/forkchoice/protoarray:go_default_library", diff --git a/fuzz/block_fuzz.go b/fuzz/block_fuzz.go index ebbb57e12a..5ed1c9503a 100644 --- a/fuzz/block_fuzz.go +++ b/fuzz/block_fuzz.go @@ -15,7 +15,7 @@ import ( pubsub_pb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/prysmaticlabs/prysm/beacon-chain/blockchain" "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/db" beaconkv "github.com/prysmaticlabs/prysm/beacon-chain/db/kv" "github.com/prysmaticlabs/prysm/beacon-chain/forkchoice/protoarray" @@ -197,7 +197,7 @@ func BeaconFuzzBlock(b []byte) { _ = err } - if _, _, err := state.ProcessBlockNoVerifyAnySig(ctx, st, wrapper.WrappedPhase0SignedBeaconBlock(input.Block)); err != nil { + if _, _, err := transition.ProcessBlockNoVerifyAnySig(ctx, st, wrapper.WrappedPhase0SignedBeaconBlock(input.Block)); err != nil { _ = err } } diff --git a/fuzz/state_fuzz.go b/fuzz/state_fuzz.go index 02539f9caf..7c8cee01a6 100644 --- a/fuzz/state_fuzz.go +++ b/fuzz/state_fuzz.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/prysmaticlabs/prysm/beacon-chain/core" - stateutil "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + stateutil "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/shared/benchutil/benchmark_files/BUILD.bazel b/shared/benchutil/benchmark_files/BUILD.bazel index 9d44310705..bdd98a2d57 100644 --- a/shared/benchutil/benchmark_files/BUILD.bazel +++ b/shared/benchutil/benchmark_files/BUILD.bazel @@ -4,7 +4,7 @@ filegroup( "*.ssz", ]), visibility = [ - "//beacon-chain/core/state:__pkg__", + "//beacon-chain/core/transition:__pkg__", "//shared/benchutil:__subpackages__", ], ) diff --git a/shared/interop/BUILD.bazel b/shared/interop/BUILD.bazel index 163a82401c..0f64403036 100644 --- a/shared/interop/BUILD.bazel +++ b/shared/interop/BUILD.bazel @@ -10,7 +10,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/bls:go_default_library", @@ -34,7 +34,7 @@ go_test( ], deps = [ ":go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/params:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/shared/interop/generate_genesis_state.go b/shared/interop/generate_genesis_state.go index 7ff1d13def..05f5562259 100644 --- a/shared/interop/generate_genesis_state.go +++ b/shared/interop/generate_genesis_state.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + coreState "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" diff --git a/shared/interop/generate_genesis_state_test.go b/shared/interop/generate_genesis_state_test.go index b9458ea490..6d7e86ef1c 100644 --- a/shared/interop/generate_genesis_state_test.go +++ b/shared/interop/generate_genesis_state_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/interop" "github.com/prysmaticlabs/prysm/shared/params" @@ -24,7 +24,7 @@ func TestGenerateGenesisState(t *testing.T) { deposits, err := interop.GenerateDepositsFromData(depositDataItems, trie) require.NoError(t, err) root := trie.HashTreeRoot() - genesisState, err := state.GenesisBeaconState(context.Background(), deposits, 0, ð.Eth1Data{ + genesisState, err := transition.GenesisBeaconState(context.Background(), deposits, 0, ð.Eth1Data{ DepositRoot: root[:], DepositCount: uint64(len(deposits)), }) diff --git a/shared/testutil/BUILD.bazel b/shared/testutil/BUILD.bazel index ffcde5eac4..8db82be163 100644 --- a/shared/testutil/BUILD.bazel +++ b/shared/testutil/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "//beacon-chain/core/altair:go_default_library", "//beacon-chain/core/blocks:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/p2p/types:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", @@ -60,8 +60,8 @@ go_test( deps = [ "//beacon-chain/core:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", - "//beacon-chain/core/state/stateutils:go_default_library", + "//beacon-chain/core/transition:go_default_library", + "//beacon-chain/core/transition/stateutils:go_default_library", "//proto/eth/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", diff --git a/shared/testutil/altair.go b/shared/testutil/altair.go index 1dae83a064..dcaf565672 100644 --- a/shared/testutil/altair.go +++ b/shared/testutil/altair.go @@ -8,11 +8,11 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" @@ -280,12 +280,12 @@ func BlockSignatureAltair( if err != nil { return nil, err } - s, err := core.CalculateStateRoot(context.Background(), bState, wsb) + s, err := transition.CalculateStateRoot(context.Background(), bState, wsb) if err != nil { return nil, err } block.StateRoot = s[:] - domain, err := helpers.Domain(bState.Fork(), core2.CurrentEpoch(bState), params.BeaconConfig().DomainBeaconProposer, bState.GenesisValidatorRoot()) + domain, err := helpers.Domain(bState.Fork(), core.CurrentEpoch(bState), params.BeaconConfig().DomainBeaconProposer, bState.GenesisValidatorRoot()) if err != nil { return nil, err } @@ -400,7 +400,7 @@ func GenerateFullBlockAltair( if err := bState.SetSlot(slot); err != nil { return nil, err } - reveal, err := RandaoReveal(bState, core2.CurrentEpoch(bState), privs) + reveal, err := RandaoReveal(bState, core.CurrentEpoch(bState), privs) if err != nil { return nil, err } diff --git a/shared/testutil/attestation.go b/shared/testutil/attestation.go index c58f372b17..b8f0047f0c 100644 --- a/shared/testutil/attestation.go +++ b/shared/testutil/attestation.go @@ -8,9 +8,9 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" v2 "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" @@ -58,7 +58,7 @@ func GenerateAttestations( slot-- generateHeadState = true } - currentEpoch := core2.SlotToEpoch(slot) + currentEpoch := core.SlotToEpoch(slot) targetRoot := make([]byte, 32) var headRoot []byte @@ -91,7 +91,7 @@ func GenerateAttestations( return nil, errors.New("state type isn't supported") } - headState, err = core.ProcessSlots(context.Background(), headState, slot+1) + headState, err = transition.ProcessSlots(context.Background(), headState, slot+1) if err != nil { return nil, err } diff --git a/shared/testutil/block_test.go b/shared/testutil/block_test.go index d2de5c7479..b84a60d393 100644 --- a/shared/testutil/block_test.go +++ b/shared/testutil/block_test.go @@ -6,8 +6,8 @@ import ( types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/stateutils" v1 "github.com/prysmaticlabs/prysm/proto/eth/v1" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" v2 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -24,7 +24,7 @@ func TestGenerateFullBlock_PassesStateTransition(t *testing.T) { } block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()) require.NoError(t, err) - _, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + _, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) } @@ -37,7 +37,7 @@ func TestGenerateFullBlock_ThousandValidators(t *testing.T) { } block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()) require.NoError(t, err) - _, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + _, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) } @@ -55,7 +55,7 @@ func TestGenerateFullBlock_Passes4Epochs(t *testing.T) { helpers.ClearCache() block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()) require.NoError(t, err) - beaconState, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) } @@ -80,7 +80,7 @@ func TestGenerateFullBlock_ValidProposerSlashings(t *testing.T) { } block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()+1) require.NoError(t, err) - beaconState, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) slashableIndice := block.Block.Body.ProposerSlashings[0].Header_1.Header.ProposerIndex @@ -99,7 +99,7 @@ func TestGenerateFullBlock_ValidAttesterSlashings(t *testing.T) { } block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()) require.NoError(t, err) - beaconState, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) slashableIndices := block.Block.Body.AttesterSlashings[0].Attestation_1.AttestingIndices @@ -119,7 +119,7 @@ func TestGenerateFullBlock_ValidAttestations(t *testing.T) { } block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()) require.NoError(t, err) - beaconState, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) atts, err := beaconState.CurrentEpochAttestations() require.NoError(t, err) @@ -140,7 +140,7 @@ func TestGenerateFullBlock_ValidDeposits(t *testing.T) { } block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()) require.NoError(t, err) - beaconState, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) depositedPubkey := block.Block.Body.Deposits[0].Data.PublicKey @@ -166,7 +166,7 @@ func TestGenerateFullBlock_ValidVoluntaryExits(t *testing.T) { } block, err := GenerateFullBlock(beaconState, privs, conf, beaconState.Slot()) require.NoError(t, err) - beaconState, err = state.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) exitedIndex := block.Block.Body.VoluntaryExits[0].Exit.ValidatorIndex diff --git a/shared/testutil/deposits.go b/shared/testutil/deposits.go index a0eebf03a4..777d427de2 100644 --- a/shared/testutil/deposits.go +++ b/shared/testutil/deposits.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bls" @@ -256,7 +256,7 @@ func DeterministicGenesisState(t testing.TB, numValidators uint64) (state.Beacon if err != nil { t.Fatal(errors.Wrapf(err, "failed to get eth1data for %d deposits", numValidators)) } - beaconState, err := core.GenesisBeaconState(context.Background(), deposits, uint64(0), eth1Data) + beaconState, err := transition.GenesisBeaconState(context.Background(), deposits, uint64(0), eth1Data) if err != nil { t.Fatal(errors.Wrapf(err, "failed to get genesis beacon state of %d validators", numValidators)) } diff --git a/shared/testutil/helpers.go b/shared/testutil/helpers.go index 32b4700c9d..15ef3e8368 100644 --- a/shared/testutil/helpers.go +++ b/shared/testutil/helpers.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" @@ -40,12 +40,12 @@ func BlockSignature( privKeys []bls.SecretKey, ) (bls.Signature, error) { var err error - s, err := core.CalculateStateRoot(context.Background(), bState, wrapper.WrappedPhase0SignedBeaconBlock(ðpb.SignedBeaconBlock{Block: block})) + s, err := transition.CalculateStateRoot(context.Background(), bState, wrapper.WrappedPhase0SignedBeaconBlock(ðpb.SignedBeaconBlock{Block: block})) if err != nil { return nil, err } block.StateRoot = s[:] - domain, err := helpers.Domain(bState.Fork(), core2.CurrentEpoch(bState), params.BeaconConfig().DomainBeaconProposer, bState.GenesisValidatorRoot()) + domain, err := helpers.Domain(bState.Fork(), core.CurrentEpoch(bState), params.BeaconConfig().DomainBeaconProposer, bState.GenesisValidatorRoot()) if err != nil { return nil, err } diff --git a/spectest/shared/altair/finality/BUILD.bazel b/spectest/shared/altair/finality/BUILD.bazel index 68fce5b627..66294a547e 100644 --- a/spectest/shared/altair/finality/BUILD.bazel +++ b/spectest/shared/altair/finality/BUILD.bazel @@ -8,7 +8,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v2:go_default_library", "//proto/prysm/v1alpha1:go_default_library", diff --git a/spectest/shared/altair/finality/finality.go b/spectest/shared/altair/finality/finality.go index b077bcad91..e67637cc41 100644 --- a/spectest/shared/altair/finality/finality.go +++ b/spectest/shared/altair/finality/finality.go @@ -7,7 +7,7 @@ import ( "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -19,7 +19,7 @@ import ( ) func init() { - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } type Config struct { @@ -61,7 +61,7 @@ func RunFinalityTest(t *testing.T, config string) { require.NoError(t, block.UnmarshalSSZ(blockSSZ), "Failed to unmarshal") wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - processedState, err = core.ExecuteStateTransition(context.Background(), beaconState, wsb) + processedState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wsb) require.NoError(t, err) beaconState, ok = processedState.(*stateAltair.BeaconState) require.Equal(t, true, ok) diff --git a/spectest/shared/altair/fork/BUILD.bazel b/spectest/shared/altair/fork/BUILD.bazel index 5570523a47..3c26da7450 100644 --- a/spectest/shared/altair/fork/BUILD.bazel +++ b/spectest/shared/altair/fork/BUILD.bazel @@ -12,7 +12,7 @@ go_library( deps = [ "//beacon-chain/core/altair:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//beacon-chain/state/v2:go_default_library", diff --git a/spectest/shared/altair/fork/transition.go b/spectest/shared/altair/fork/transition.go index c43cf940ce..9b16006669 100644 --- a/spectest/shared/altair/fork/transition.go +++ b/spectest/shared/altair/fork/transition.go @@ -8,7 +8,7 @@ import ( "github.com/golang/snappy" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" @@ -95,7 +95,7 @@ func RunForkTransitionTest(t *testing.T, config string) { ctx := context.Background() var ok bool for _, b := range preforkBlocks { - st, err := core.ExecuteStateTransition(ctx, beaconState, wrapperv1.WrappedPhase0SignedBeaconBlock(b)) + st, err := transition.ExecuteStateTransition(ctx, beaconState, wrapperv1.WrappedPhase0SignedBeaconBlock(b)) require.NoError(t, err) beaconState, ok = st.(*v1.BeaconState) require.Equal(t, true, ok) @@ -104,7 +104,7 @@ func RunForkTransitionTest(t *testing.T, config string) { for _, b := range postforkBlocks { wsb, err := wrapper.WrappedAltairSignedBeaconBlock(b) require.NoError(t, err) - st, err := core.ExecuteStateTransition(ctx, altairState, wsb) + st, err := transition.ExecuteStateTransition(ctx, altairState, wsb) require.NoError(t, err) altairState, ok = st.(*stateAltair.BeaconState) require.Equal(t, true, ok) diff --git a/spectest/shared/altair/sanity/BUILD.bazel b/spectest/shared/altair/sanity/BUILD.bazel index c8348bdb51..9517167cac 100644 --- a/spectest/shared/altair/sanity/BUILD.bazel +++ b/spectest/shared/altair/sanity/BUILD.bazel @@ -12,7 +12,7 @@ go_library( visibility = ["//spectest:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v2:go_default_library", "//proto/prysm/v1alpha1:go_default_library", diff --git a/spectest/shared/altair/sanity/block_processing.go b/spectest/shared/altair/sanity/block_processing.go index f425c15b2b..0a1eeeab44 100644 --- a/spectest/shared/altair/sanity/block_processing.go +++ b/spectest/shared/altair/sanity/block_processing.go @@ -12,7 +12,7 @@ import ( "github.com/d4l3k/messagediff" "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -24,7 +24,7 @@ import ( ) func init() { - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } // RunBlockProcessingTest executes "sanity/blocks" tests. @@ -63,7 +63,7 @@ func RunBlockProcessingTest(t *testing.T, config, folderPath string) { require.NoError(t, block.UnmarshalSSZ(blockSSZ), "Failed to unmarshal") wsb, err := wrapper.WrappedAltairSignedBeaconBlock(block) require.NoError(t, err) - processedState, transitionError = core.ExecuteStateTransition(context.Background(), beaconState, wsb) + processedState, transitionError = transition.ExecuteStateTransition(context.Background(), beaconState, wsb) if transitionError != nil { break } diff --git a/spectest/shared/altair/sanity/slot_processing.go b/spectest/shared/altair/sanity/slot_processing.go index f26be29051..5ef6bf6ae9 100644 --- a/spectest/shared/altair/sanity/slot_processing.go +++ b/spectest/shared/altair/sanity/slot_processing.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" stateAltair "github.com/prysmaticlabs/prysm/beacon-chain/state/v2" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" @@ -17,7 +17,7 @@ import ( ) func init() { - state.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } // RunSlotProcessingTests executes "sanity/slots" tests. @@ -49,7 +49,7 @@ func RunSlotProcessingTests(t *testing.T, config string) { require.NoError(t, err, "Failed to decompress") postBeaconState := ðpb.BeaconStateAltair{} require.NoError(t, postBeaconState.UnmarshalSSZ(postBeaconStateSSZ), "Failed to unmarshal") - postState, err := state.ProcessSlots(context.Background(), beaconState, beaconState.Slot().Add(uint64(slotsCount))) + postState, err := transition.ProcessSlots(context.Background(), beaconState, beaconState.Slot().Add(uint64(slotsCount))) require.NoError(t, err) pbState, err := stateAltair.ProtobufBeaconState(postState.CloneInnerState()) diff --git a/spectest/shared/phase0/finality/BUILD.bazel b/spectest/shared/phase0/finality/BUILD.bazel index 9162b72ce6..20ebb80422 100644 --- a/spectest/shared/phase0/finality/BUILD.bazel +++ b/spectest/shared/phase0/finality/BUILD.bazel @@ -8,7 +8,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", diff --git a/spectest/shared/phase0/finality/runner.go b/spectest/shared/phase0/finality/runner.go index 22f29d25b3..a060751c6d 100644 --- a/spectest/shared/phase0/finality/runner.go +++ b/spectest/shared/phase0/finality/runner.go @@ -7,7 +7,7 @@ import ( "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -20,7 +20,7 @@ import ( ) func init() { - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } type Config struct { @@ -60,7 +60,7 @@ func RunFinalityTest(t *testing.T, config string) { require.NoError(t, err, "Failed to decompress") block := ðpb.SignedBeaconBlock{} require.NoError(t, block.UnmarshalSSZ(blockSSZ), "Failed to unmarshal") - processedState, err = core.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + processedState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) require.NoError(t, err) beaconState, ok = processedState.(*v1.BeaconState) require.Equal(t, true, ok) diff --git a/spectest/shared/phase0/sanity/BUILD.bazel b/spectest/shared/phase0/sanity/BUILD.bazel index 8005c8f320..a00038d121 100644 --- a/spectest/shared/phase0/sanity/BUILD.bazel +++ b/spectest/shared/phase0/sanity/BUILD.bazel @@ -12,7 +12,7 @@ go_library( visibility = ["//spectest:__subpackages__"], deps = [ "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", diff --git a/spectest/shared/phase0/sanity/block_processing.go b/spectest/shared/phase0/sanity/block_processing.go index 6b8feb5ff4..414f872902 100644 --- a/spectest/shared/phase0/sanity/block_processing.go +++ b/spectest/shared/phase0/sanity/block_processing.go @@ -11,7 +11,7 @@ import ( "github.com/bazelbuild/rules_go/go/tools/bazel" "github.com/golang/snappy" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -24,7 +24,7 @@ import ( ) func init() { - core.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } // RunBlockProcessingTest executes "sanity/blocks" tests. @@ -61,7 +61,7 @@ func RunBlockProcessingTest(t *testing.T, config, folderPath string) { require.NoError(t, err, "Failed to decompress") block := ðpb.SignedBeaconBlock{} require.NoError(t, block.UnmarshalSSZ(blockSSZ), "Failed to unmarshal") - processedState, transitionError = core.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + processedState, transitionError = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) if transitionError != nil { break } diff --git a/spectest/shared/phase0/sanity/slot_processing.go b/spectest/shared/phase0/sanity/slot_processing.go index c156d50f9e..00a0ce60e7 100644 --- a/spectest/shared/phase0/sanity/slot_processing.go +++ b/spectest/shared/phase0/sanity/slot_processing.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/golang/snappy" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/testutil" @@ -17,7 +17,7 @@ import ( ) func init() { - state.SkipSlotCache.Disable() + transition.SkipSlotCache.Disable() } // RunSlotProcessingTests executes "sanity/slots" tests. @@ -49,7 +49,7 @@ func RunSlotProcessingTests(t *testing.T, config string) { require.NoError(t, err, "Failed to decompress") postBeaconState := ðpb.BeaconState{} require.NoError(t, postBeaconState.UnmarshalSSZ(postBeaconStateSSZ), "Failed to unmarshal") - postState, err := state.ProcessSlots(context.Background(), beaconState, beaconState.Slot().Add(uint64(slotsCount))) + postState, err := transition.ProcessSlots(context.Background(), beaconState, beaconState.Slot().Add(uint64(slotsCount))) require.NoError(t, err) pbState, err := v1.ProtobufBeaconState(postState.CloneInnerState()) diff --git a/tools/benchmark-files-gen/BUILD.bazel b/tools/benchmark-files-gen/BUILD.bazel index f2010723a8..ec4cfe994f 100644 --- a/tools/benchmark-files-gen/BUILD.bazel +++ b/tools/benchmark-files-gen/BUILD.bazel @@ -10,7 +10,7 @@ go_library( deps = [ "//beacon-chain/core:go_default_library", "//beacon-chain/core/helpers:go_default_library", - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", diff --git a/tools/benchmark-files-gen/main.go b/tools/benchmark-files-gen/main.go index cf00ac879b..217818598a 100644 --- a/tools/benchmark-files-gen/main.go +++ b/tools/benchmark-files-gen/main.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" - core2 "github.com/prysmaticlabs/prysm/beacon-chain/core" + "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" - core "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" "github.com/prysmaticlabs/prysm/beacon-chain/state" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" @@ -103,7 +103,7 @@ func generateMarshalledFullStateAndBlock() error { if err != nil { return err } - beaconState, err = core.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) if err != nil { return err } @@ -127,7 +127,7 @@ func generateMarshalledFullStateAndBlock() error { } block.Block.Body.Attestations = append(atts, block.Block.Body.Attestations...) - s, err := core.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + s, err := transition.CalculateStateRoot(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) if err != nil { return errors.Wrap(err, "could not calculate state root") } @@ -141,7 +141,7 @@ func generateMarshalledFullStateAndBlock() error { if err != nil { return err } - block.Signature, err = helpers.ComputeDomainAndSign(beaconState, core2.CurrentEpoch(beaconState), block.Block, params.BeaconConfig().DomainBeaconProposer, privs[proposerIdx]) + block.Signature, err = helpers.ComputeDomainAndSign(beaconState, core.CurrentEpoch(beaconState), block.Block, params.BeaconConfig().DomainBeaconProposer, privs[proposerIdx]) if err != nil { return err } @@ -158,7 +158,7 @@ func generateMarshalledFullStateAndBlock() error { } // Running a single state transition to make sure the generated files aren't broken. - _, err = core.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + _, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) if err != nil { return err } @@ -192,7 +192,7 @@ func generate2FullEpochState() error { if err != nil { return err } - beaconState, err = core.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) + beaconState, err = transition.ExecuteStateTransition(context.Background(), beaconState, wrapper.WrappedPhase0SignedBeaconBlock(block)) if err != nil { return err } diff --git a/tools/extractor/BUILD.bazel b/tools/extractor/BUILD.bazel index 27a988bdb6..a3f52f9d5c 100644 --- a/tools/extractor/BUILD.bazel +++ b/tools/extractor/BUILD.bazel @@ -7,7 +7,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/tools/extractor", visibility = ["//visibility:public"], deps = [ - "//beacon-chain/core/state/interop:go_default_library", + "//beacon-chain/core/transition/interop:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/db/kv:go_default_library", "//shared/featureconfig:go_default_library", diff --git a/tools/extractor/main.go b/tools/extractor/main.go index 0944b610e8..2bfcbc05ef 100644 --- a/tools/extractor/main.go +++ b/tools/extractor/main.go @@ -6,7 +6,7 @@ import ( "fmt" types "github.com/prysmaticlabs/eth2-types" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state/interop" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition/interop" "github.com/prysmaticlabs/prysm/beacon-chain/db" "github.com/prysmaticlabs/prysm/beacon-chain/db/kv" "github.com/prysmaticlabs/prysm/shared/featureconfig" diff --git a/tools/pcli/BUILD.bazel b/tools/pcli/BUILD.bazel index aef3350955..e11d0b028f 100644 --- a/tools/pcli/BUILD.bazel +++ b/tools/pcli/BUILD.bazel @@ -10,7 +10,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/tools/pcli", visibility = ["//visibility:private"], deps = [ - "//beacon-chain/core/state:go_default_library", + "//beacon-chain/core/transition:go_default_library", "//beacon-chain/state/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", diff --git a/tools/pcli/main.go b/tools/pcli/main.go index cd13d709b6..fd0d94f28d 100644 --- a/tools/pcli/main.go +++ b/tools/pcli/main.go @@ -11,7 +11,7 @@ import ( fssz "github.com/ferranbt/fastssz" "github.com/kr/pretty" - "github.com/prysmaticlabs/prysm/beacon-chain/core/state" + "github.com/prysmaticlabs/prysm/beacon-chain/core/transition" v1 "github.com/prysmaticlabs/prysm/beacon-chain/state/v1" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" @@ -175,7 +175,7 @@ func main() { blkRoot, preStateRoot, ) - postState, err := state.ExecuteStateTransition(context.Background(), stateObj, wrapper.WrappedPhase0SignedBeaconBlock(block)) + postState, err := transition.ExecuteStateTransition(context.Background(), stateObj, wrapper.WrappedPhase0SignedBeaconBlock(block)) if err != nil { log.Fatal(err) }