Fix some issues in UpgradeToElectra

CHANGELOG.md

@@ -38,6 +38,7 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve
 - Simplified `ExitedValidatorIndices`.
 - Simplified `EjectedValidatorIndices`.
 - `engine_newPayloadV4`,`engine_getPayloadV4` are changes due to new execution request serialization decisions, [PR](https://github.com/prysmaticlabs/prysm/pull/14580)
+- Fix initial values for `ExitBalanceToConsume` and `ConsolidationBalanceToConsume` when upgrading to Electra.
 
 ### Deprecated
 

beacon-chain/core/electra/deposits.go

@@ -588,8 +588,8 @@ func processDepositRequest(beaconState state.BeaconState, request *enginev1.Depo
 	}
 	if err := beaconState.AppendPendingDeposit(&ethpb.PendingDeposit{
 		PublicKey:             bytesutil.SafeCopyBytes(request.Pubkey),
-		Amount:                request.Amount,
 		WithdrawalCredentials: bytesutil.SafeCopyBytes(request.WithdrawalCredentials),
+		Amount:                request.Amount,
 		Signature:             bytesutil.SafeCopyBytes(request.Signature),
 		Slot:                  beaconState.Slot(),
 	}); err != nil {

beacon-chain/core/electra/transition.go

@@ -29,7 +29,6 @@ var (
 	ProcessParticipationFlagUpdates      = altair.ProcessParticipationFlagUpdates
 	ProcessSyncCommitteeUpdates          = altair.ProcessSyncCommitteeUpdates
 	AttestationsDelta                    = altair.AttestationsDelta
-	ProcessSyncAggregate                 = altair.ProcessSyncAggregate
 )
 
 // ProcessEpoch describes the per epoch operations that are performed on the beacon state.

beacon-chain/core/electra/upgrade.go

@@ -207,13 +207,6 @@ func UpgradeToElectra(beaconState state.BeaconState) (state.BeaconState, error)
 
 	earliestExitEpoch++ // Increment to find the earliest possible exit epoch
 
-	// note: should be the same in prestate and post beaconState.
-	// we are deviating from the specs a bit as it calls for using the post beaconState
-	tab, err := helpers.TotalActiveBalance(beaconState)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get total active balance")
-	}
-
 	s := &ethpb.BeaconStateElectra{
 		GenesisTime:           beaconState.GenesisTime(),
 		GenesisValidatorsRoot: beaconState.GenesisValidatorsRoot(),
@@ -268,9 +261,9 @@ func UpgradeToElectra(beaconState state.BeaconState) (state.BeaconState, error)
 
 		DepositRequestsStartIndex:     params.BeaconConfig().UnsetDepositRequestsStartIndex,
 		DepositBalanceToConsume:       0,
-		ExitBalanceToConsume:          helpers.ActivationExitChurnLimit(primitives.Gwei(tab)),
+		ExitBalanceToConsume:          0,
 		EarliestExitEpoch:             earliestExitEpoch,
-		ConsolidationBalanceToConsume: helpers.ConsolidationChurnLimit(primitives.Gwei(tab)),
+		ConsolidationBalanceToConsume: 0,
 		EarliestConsolidationEpoch:    helpers.ActivationExitEpoch(slots.ToEpoch(beaconState.Slot())),
 		PendingDeposits:               make([]*ethpb.PendingDeposit, 0),
 		PendingPartialWithdrawals:     make([]*ethpb.PendingPartialWithdrawal, 0),

beacon-chain/core/electra/upgrade_test.go

@@ -130,40 +130,37 @@ func TestUpgradeToElectra(t *testing.T) {
 	}
 	require.DeepEqual(t, wanted, protoHeader)
 
-	nwi, err := mSt.NextWithdrawalIndex()
+	nextWithdrawalIndex, err := mSt.NextWithdrawalIndex()
 	require.NoError(t, err)
-	require.Equal(t, uint64(0), nwi)
+	require.Equal(t, uint64(0), nextWithdrawalIndex)
 
-	lwvi, err := mSt.NextWithdrawalValidatorIndex()
+	nextWithdrawalValidatorIndex, err := mSt.NextWithdrawalValidatorIndex()
 	require.NoError(t, err)
-	require.Equal(t, primitives.ValidatorIndex(0), lwvi)
+	require.Equal(t, primitives.ValidatorIndex(0), nextWithdrawalValidatorIndex)
 
 	summaries, err := mSt.HistoricalSummaries()
 	require.NoError(t, err)
 	require.Equal(t, 0, len(summaries))
 
-	startIndex, err := mSt.DepositRequestsStartIndex()
+	depositRequestsStartIndex, err := mSt.DepositRequestsStartIndex()
 	require.NoError(t, err)
-	require.Equal(t, params.BeaconConfig().UnsetDepositRequestsStartIndex, startIndex)
+	require.Equal(t, params.BeaconConfig().UnsetDepositRequestsStartIndex, depositRequestsStartIndex)
 
-	balance, err := mSt.DepositBalanceToConsume()
+	depositBalanceToConsume, err := mSt.DepositBalanceToConsume()
 	require.NoError(t, err)
-	require.Equal(t, primitives.Gwei(0), balance)
+	require.Equal(t, primitives.Gwei(0), depositBalanceToConsume)
 
-	tab, err := helpers.TotalActiveBalance(mSt)
+	exitBalanceToConsume, err := mSt.ExitBalanceToConsume()
 	require.NoError(t, err)
+	require.Equal(t, primitives.Gwei(0), exitBalanceToConsume)
 
-	ebtc, err := mSt.ExitBalanceToConsume()
+	earliestExitEpoch, err := mSt.EarliestExitEpoch()
 	require.NoError(t, err)
-	require.Equal(t, helpers.ActivationExitChurnLimit(primitives.Gwei(tab)), ebtc)
+	require.Equal(t, primitives.Epoch(1), earliestExitEpoch)
 
-	eee, err := mSt.EarliestExitEpoch()
+	consolidationBalanceToConsume, err := mSt.ConsolidationBalanceToConsume()
 	require.NoError(t, err)
-	require.Equal(t, primitives.Epoch(1), eee)
-
-	cbtc, err := mSt.ConsolidationBalanceToConsume()
-	require.NoError(t, err)
-	require.Equal(t, helpers.ConsolidationChurnLimit(primitives.Gwei(tab)), cbtc)
+	require.Equal(t, primitives.Gwei(0), consolidationBalanceToConsume)
 
 	earliestConsolidationEpoch, err := mSt.EarliestConsolidationEpoch()
 	require.NoError(t, err)
@@ -178,8 +175,8 @@ func TestUpgradeToElectra(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, uint64(0), numPendingPartialWithdrawals)
 
-	consolidations, err := mSt.PendingConsolidations()
+	pendingConsolidations, err := mSt.PendingConsolidations()
 	require.NoError(t, err)
-	require.Equal(t, 0, len(consolidations))
+	require.Equal(t, 0, len(pendingConsolidations))
 
 }