diff --git a/beacon-chain/rpc/eth/events/BUILD.bazel b/beacon-chain/rpc/eth/events/BUILD.bazel index 8a549d05f872..caa311b6b515 100644 --- a/beacon-chain/rpc/eth/events/BUILD.bazel +++ b/beacon-chain/rpc/eth/events/BUILD.bazel @@ -20,6 +20,7 @@ go_library( "//beacon-chain/core/time:go_default_library", "//beacon-chain/core/transition:go_default_library", "//config/params:go_default_library", + "//consensus-types/primitives:go_default_library", "//monitoring/tracing/trace:go_default_library", "//network/httputil:go_default_library", "//proto/eth/v1:go_default_library", diff --git a/beacon-chain/rpc/eth/events/events.go b/beacon-chain/rpc/eth/events/events.go index e9d2f74d8428..28e31fc9840f 100644 --- a/beacon-chain/rpc/eth/events/events.go +++ b/beacon-chain/rpc/eth/events/events.go @@ -13,7 +13,6 @@ import ( "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/v5/api" "github.com/prysmaticlabs/prysm/v5/api/server/structs" - "github.com/prysmaticlabs/prysm/v5/beacon-chain/blockchain" "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed" "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed/operation" statefeed "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed/state" diff --git a/beacon-chain/state/state-native/getters_state.go b/beacon-chain/state/state-native/getters_state.go index 816021bdffa1..c8b3224c9b87 100644 --- a/beacon-chain/state/state-native/getters_state.go +++ b/beacon-chain/state/state-native/getters_state.go @@ -247,7 +247,7 @@ func (b *BeaconState) ToProtoUnsafe() interface{} { EarliestExitEpoch: b.earliestExitEpoch, ConsolidationBalanceToConsume: b.consolidationBalanceToConsume, EarliestConsolidationEpoch: b.earliestConsolidationEpoch, - PendingBalanceDeposits: b.pendingBalanceDeposits, + PendingDeposits: b.pendingDeposits, PendingPartialWithdrawals: b.pendingPartialWithdrawals, PendingConsolidations: b.pendingConsolidations, LatestBlockHash: b.latestBlockHash[:], @@ -499,7 +499,7 @@ func (b *BeaconState) ToProto() interface{} { EarliestExitEpoch: b.earliestExitEpoch, ConsolidationBalanceToConsume: b.consolidationBalanceToConsume, EarliestConsolidationEpoch: b.earliestConsolidationEpoch, - PendingBalanceDeposits: b.pendingBalanceDepositsVal(), + PendingDeposits: b.pendingDepositsVal(), PendingPartialWithdrawals: b.pendingPartialWithdrawalsVal(), PendingConsolidations: b.pendingConsolidationsVal(), LatestBlockHash: LatestBlockHashCopy[:], diff --git a/beacon-chain/state/state-native/state_trie.go b/beacon-chain/state/state-native/state_trie.go index 4a84e03102aa..9de1aa5c259b 100644 --- a/beacon-chain/state/state-native/state_trie.go +++ b/beacon-chain/state/state-native/state_trie.go @@ -123,7 +123,7 @@ var epbsFields = append( types.EarliestExitEpoch, types.ConsolidationBalanceToConsume, types.EarliestConsolidationEpoch, - types.PendingBalanceDeposits, + types.PendingDeposits, types.PendingPartialWithdrawals, types.PendingConsolidations, types.LatestBlockHash, // ePBS fields start here diff --git a/beacon-chain/state/state-native/state_trie_epbs.go b/beacon-chain/state/state-native/state_trie_epbs.go index 37784be02589..53297e9363cf 100644 --- a/beacon-chain/state/state-native/state_trie_epbs.go +++ b/beacon-chain/state/state-native/state_trie_epbs.go @@ -59,7 +59,7 @@ func InitializeFromProtoUnsafeEpbs(st *ethpb.BeaconStateEPBS) (*BeaconState, err earliestExitEpoch: st.EarliestExitEpoch, consolidationBalanceToConsume: st.ConsolidationBalanceToConsume, earliestConsolidationEpoch: st.EarliestConsolidationEpoch, - pendingBalanceDeposits: st.PendingBalanceDeposits, + pendingDeposits: st.PendingDeposits, pendingPartialWithdrawals: st.PendingPartialWithdrawals, pendingConsolidations: st.PendingConsolidations, @@ -69,12 +69,11 @@ func InitializeFromProtoUnsafeEpbs(st *ethpb.BeaconStateEPBS) (*BeaconState, err latestExecutionPayloadHeaderEPBS: st.LatestExecutionPayloadHeader, lastWithdrawalsRoot: bytesutil.ToBytes32(st.LastWithdrawalsRoot), - dirtyFields: make(map[types.FieldIndex]bool, fieldCount), - dirtyIndices: make(map[types.FieldIndex][]uint64, fieldCount), - stateFieldLeaves: make(map[types.FieldIndex]*fieldtrie.FieldTrie, fieldCount), - rebuildTrie: make(map[types.FieldIndex]bool, fieldCount), - valMapHandler: stateutil.NewValMapHandler(st.Validators), - validatorIndexCache: newFinalizedValidatorIndexCache(), // only used in post-electra and only populates when finalizing, otherwise it falls back to processing the full validator set + dirtyFields: make(map[types.FieldIndex]bool, fieldCount), + dirtyIndices: make(map[types.FieldIndex][]uint64, fieldCount), + stateFieldLeaves: make(map[types.FieldIndex]*fieldtrie.FieldTrie, fieldCount), + rebuildTrie: make(map[types.FieldIndex]bool, fieldCount), + valMapHandler: stateutil.NewValMapHandler(st.Validators), } if features.Get().EnableExperimentalState { @@ -129,7 +128,7 @@ func InitializeFromProtoUnsafeEpbs(st *ethpb.BeaconStateEPBS) (*BeaconState, err b.sharedFieldReferences[types.PreviousEpochParticipationBits] = stateutil.NewRef(1) b.sharedFieldReferences[types.CurrentEpochParticipationBits] = stateutil.NewRef(1) b.sharedFieldReferences[types.HistoricalSummaries] = stateutil.NewRef(1) - b.sharedFieldReferences[types.PendingBalanceDeposits] = stateutil.NewRef(1) + b.sharedFieldReferences[types.PendingDeposits] = stateutil.NewRef(1) b.sharedFieldReferences[types.PendingPartialWithdrawals] = stateutil.NewRef(1) b.sharedFieldReferences[types.PendingConsolidations] = stateutil.NewRef(1) if !features.Get().EnableExperimentalState { diff --git a/consensus-types/interfaces/BUILD.bazel b/consensus-types/interfaces/BUILD.bazel index 92d8dd3c47da..467182171af2 100644 --- a/consensus-types/interfaces/BUILD.bazel +++ b/consensus-types/interfaces/BUILD.bazel @@ -5,8 +5,8 @@ go_library( srcs = [ "beacon_block.go", "error.go", - "light_client.go", "execution_payload_envelope.go", + "light_client.go", "signed_execution_payload_header.go", "utils.go", "validator.go", diff --git a/testing/util/epbs_state.go b/testing/util/epbs_state.go index 486fef2bce3a..b1d0bab602ef 100644 --- a/testing/util/epbs_state.go +++ b/testing/util/epbs_state.go @@ -179,7 +179,7 @@ func buildGenesisBeaconStateEpbs(genesisTime uint64, preState state.BeaconState, ExitBalanceToConsume: helpers.ActivationExitChurnLimit(primitives.Gwei(tab)), EarliestConsolidationEpoch: helpers.ActivationExitEpoch(slots.ToEpoch(preState.Slot())), ConsolidationBalanceToConsume: helpers.ConsolidationChurnLimit(primitives.Gwei(tab)), - PendingBalanceDeposits: make([]*ethpb.PendingBalanceDeposit, 0), + PendingDeposits: make([]*ethpb.PendingDeposit, 0), PendingPartialWithdrawals: make([]*ethpb.PendingPartialWithdrawal, 0), PendingConsolidations: make([]*ethpb.PendingConsolidation, 0), } diff --git a/testing/util/random/epbs.go b/testing/util/random/epbs.go index 110d701f4448..9fce454ebbcd 100644 --- a/testing/util/random/epbs.go +++ b/testing/util/random/epbs.go @@ -247,10 +247,13 @@ func BeaconState(t *testing.T) *ethpb.BeaconStateEPBS { EarliestExitEpoch: primitives.Epoch(randomUint64(t)), ConsolidationBalanceToConsume: primitives.Gwei(randomUint64(t)), EarliestConsolidationEpoch: primitives.Epoch(randomUint64(t)), - PendingBalanceDeposits: []*ethpb.PendingBalanceDeposit{ + PendingDeposits: []*ethpb.PendingDeposit{ { - Index: primitives.ValidatorIndex(randomUint64(t)), - Amount: randomUint64(t), + PublicKey: randomBytes(48, t), + WithdrawalCredentials: randomBytes(32, t), + Amount: randomUint64(t), + Signature: randomBytes(96, t), + Slot: primitives.Slot(randomUint64(t)), }, }, PendingPartialWithdrawals: []*ethpb.PendingPartialWithdrawal{