chore(boonet): Fork 3 handling

beacon/validator/block_builder.go

@@ -426,7 +426,12 @@ func convertAttestationData[
 	for i, d := range data {
 		val, ok := any(d).(AttestationDataT)
 		if !ok {
-			panic(fmt.Sprintf("failed to convert attestation data at index %d", i))
+			panic(
+				fmt.Sprintf(
+					"failed to convert attestation data at index %d",
+					i,
+				),
+			)
 		}
 		converted[i] = val
 	}

chain-spec/chain/chain_spec.go

@@ -36,7 +36,7 @@ type Spec[
 
 	// MaxEffectiveBalance returns the maximum balance counted in rewards
 	// calculations in Gwei.
-	MaxEffectiveBalance() uint64
+	MaxEffectiveBalance(isPostUpgrade bool) uint64
 
 	// EjectionBalance returns the balance below which a validator is ejected.
 	EjectionBalance() uint64
@@ -155,11 +155,7 @@ type Spec[
 
 	// MaxValidatorsPerWithdrawalsSweep returns the maximum number of validators
 	// per withdrawal sweep.
-	MaxValidatorsPerWithdrawalsSweep(
-		isPostUpgrade func(uint64, SlotT) bool,
-		chainID uint64,
-		slot SlotT,
-	) uint64
+	MaxValidatorsPerWithdrawalsSweep(isPostUpgrade bool) uint64
 
 	// Deneb Values
 
@@ -278,8 +274,12 @@ func (c chainSpec[
 // MaxEffectiveBalance returns the maximum effective balance.
 func (c chainSpec[
 	DomainTypeT, EpochT, ExecutionAddressT, SlotT, CometBFTConfigT,
-]) MaxEffectiveBalance() uint64 {
-	return c.Data.MaxEffectiveBalance
+]) MaxEffectiveBalance(isPostUpgrade bool) uint64 {
+	if isPostUpgrade {
+		return c.Data.MaxEffectiveBalancePostUpgrade
+	}
+
+	return c.Data.MaxEffectiveBalancePreUpgrade
 }
 
 // EjectionBalance returns the balance below which a validator is ejected.
@@ -497,11 +497,8 @@ func (c chainSpec[
 // withdrawals sweep.
 func (c chainSpec[
 	DomainTypeT, EpochT, ExecutionAddressT, SlotT, CometBFTConfigT,
-]) MaxValidatorsPerWithdrawalsSweep(
-	isPostUpgrade func(uint64, SlotT) bool,
-	chainID uint64, slot SlotT,
-) uint64 {
-	if isPostUpgrade(chainID, slot) {
+]) MaxValidatorsPerWithdrawalsSweep(isPostUpgrade bool) uint64 {
+	if isPostUpgrade {
 		return c.Data.MaxValidatorsPerWithdrawalsSweepPostUpgrade
 	}
 

chain-spec/chain/data.go

@@ -34,8 +34,11 @@ type SpecData[
 	// transaction.
 	MinDepositAmount uint64 `mapstructure:"min-deposit-amount"`
 	// MaxEffectiveBalance is the maximum effective balance allowed for a
-	// validator.
-	MaxEffectiveBalance uint64 `mapstructure:"max-effective-balance"`
+	// validator before the upgrade.
+	MaxEffectiveBalancePreUpgrade uint64 `mapstructure:"max-effective-balance-pre-upgrade"`
+	// MaxEffectiveBalancePostUpgrade is the maximum effective balance allowed
+	// for a validator after the upgrade.
+	MaxEffectiveBalancePostUpgrade uint64 `mapstructure:"max-effective-balance-post-upgrade"`
 	// EjectionBalance is the balance at which a validator is ejected.
 	EjectionBalance uint64 `mapstructure:"ejection-balance"`
 	// EffectiveBalanceIncrement is the effective balance increment.

cli/commands/genesis/root.go

@@ -76,7 +76,7 @@ func GetGenesisValidatorRootCmd(cs common.ChainSpec) *cobra.Command {
 					types.WithdrawalCredentials(deposit.Credentials),
 					deposit.Amount,
 					math.Gwei(cs.EffectiveBalanceIncrement()),
-					math.Gwei(cs.MaxEffectiveBalance()),
+					math.Gwei(cs.MaxEffectiveBalance(false)),
 				)
 			}
 

config/spec/base.go

@@ -55,10 +55,11 @@ func BaseSpec() chain.SpecData[
 		any,
 	]{
 		// Gwei value constants.
-		MinDepositAmount:          1e9,
-		MaxEffectiveBalance:       32e9,
-		EjectionBalance:           16e9,
-		EffectiveBalanceIncrement: 1e9,
+		MinDepositAmount:               1e9,
+		MaxEffectiveBalancePreUpgrade:  32e9,
+		MaxEffectiveBalancePostUpgrade: 32e9,
+		EjectionBalance:                16e9,
+		EffectiveBalanceIncrement:      1e9,
 
 		HysteresisQuotient:           4,
 		HysteresisDownwardMultiplier: 1,

config/spec/boonet.go

@@ -45,21 +45,21 @@ func BoonetChainSpec() (chain.Spec[
 	)
 
 	// BERA per block minting.
-	//
-	// TODO: Determine correct value for boonet upgrade.
 	boonetSpec.EVMInflationPerBlock = 2.5e9
 
 	// ValidatorSetCap is 256 on the Boonet chain.
-	//
-	// TODO: Determine correct value for boonet upgrade.
 	boonetSpec.ValidatorSetCap = 256
 
 	// MaxValidatorsPerWithdrawalsSweep is 43 because we expect at least 46
 	// validators in the total validators set. We choose a prime number smaller
 	// than the minimum amount of total validators possible.
-	//
-	// TODO: Determine correct value for boonet upgrade.
 	boonetSpec.MaxValidatorsPerWithdrawalsSweepPostUpgrade = 43
 
+	// MaxEffectiveBalancePostUpgrade is 5 million BERA after the boonet
+	// upgrade.
+	//
+	//nolint:mnd // ok.
+	boonetSpec.MaxEffectiveBalancePostUpgrade = 5_000_000 * 1e9
+
 	return chain.NewChainSpec(boonetSpec)
 }

config/spec/special_cases.go

@@ -20,8 +20,6 @@
 
 package spec
 
-import "math"
-
 // Special cased Bartio for some ad-hoc handling due to the way
 // some bugs were handled on Bartio. To be removed.
 const (
@@ -36,5 +34,5 @@ const (
 
 	BoonetFork2Height uint64 = 1722000
 
-	BoonetFork3Height uint64 = math.MaxUint64
+	BoonetFork3Height uint64 = 2235000
 )

state-transition/core/state/statedb.go

@@ -245,7 +245,7 @@ func (s *StateDB[
 
 	bound := min(
 		totalValidators, s.cs.MaxValidatorsPerWithdrawalsSweep(
-			IsPostUpgrade, s.cs.DepositEth1ChainID(), slot,
+			IsPostFork2(s.cs.DepositEth1ChainID(), slot),
 		),
 	)
 
@@ -281,7 +281,9 @@ func (s *StateDB[
 			// Increment the withdrawal index to process the next withdrawal.
 			withdrawalIndex++
 		} else if validator.IsPartiallyWithdrawable(
-			balance, math.Gwei(s.cs.MaxEffectiveBalance()),
+			balance, math.Gwei(s.cs.MaxEffectiveBalance(
+				IsPostFork3(s.cs.DepositEth1ChainID(), slot),
+			)),
 		) {
 			withdrawalAddress, err = validator.
 				GetWithdrawalCredentials().ToExecutionAddress()
@@ -293,7 +295,9 @@ func (s *StateDB[
 				math.U64(withdrawalIndex),
 				validatorIndex,
 				withdrawalAddress,
-				balance-math.Gwei(s.cs.MaxEffectiveBalance()),
+				balance-math.Gwei(s.cs.MaxEffectiveBalance(
+					IsPostFork3(s.cs.DepositEth1ChainID(), slot),
+				)),
 			))
 
 			// Increment the withdrawal index to process the next withdrawal.

state-transition/core/state/upgrade.go

@@ -25,10 +25,10 @@ import (
 	"github.com/berachain/beacon-kit/primitives/math"
 )
 
-// IsPostUpgrade returns true if the chain is post-upgrade (Fork2 on Boonet).
+// IsPostFork2 returns true if the chain is post-upgrade (Fork2 on Boonet).
 //
 // TODO: Jank. Refactor into better fork version management.
-func IsPostUpgrade(chainID uint64, slot math.Slot) bool {
+func IsPostFork2(chainID uint64, slot math.Slot) bool {
 	switch chainID {
 	case spec.BartioChainID:
 		return false
@@ -42,3 +42,21 @@ func IsPostUpgrade(chainID uint64, slot math.Slot) bool {
 		return true
 	}
 }
+
+// IsPostFork3 returns true if the chain is post-upgrade (Fork3 on Boonet).
+//
+// TODO: Jank. Refactor into better fork version management.
+func IsPostFork3(chainID uint64, slot math.Slot) bool {
+	switch chainID {
+	case spec.BartioChainID:
+		return false
+	case spec.BoonetEth1ChainID:
+		if slot < math.U64(spec.BoonetFork3Height) {
+			return false
+		}
+
+		return true
+	default:
+		return true
+	}
+}

state-transition/core/state_processor.go

@@ -32,6 +32,7 @@ import (
 	"github.com/berachain/beacon-kit/primitives/crypto"
 	"github.com/berachain/beacon-kit/primitives/math"
 	"github.com/berachain/beacon-kit/primitives/transition"
+	"github.com/berachain/beacon-kit/state-transition/core/state"
 )
 
 // StateProcessor is a basic Processor, which takes care of the
@@ -376,7 +377,7 @@ func (sp *StateProcessor[
 	if err = sp.processRegistryUpdates(st); err != nil {
 		return nil, err
 	}
-	if err = sp.processEffectiveBalanceUpdates(st); err != nil {
+	if err = sp.processEffectiveBalanceUpdates(st, slot); err != nil {
 		return nil, err
 	}
 	if err = sp.processSlashingsReset(st); err != nil {
@@ -490,6 +491,7 @@ func (sp *StateProcessor[
 	_, _, BeaconStateT, _, _, _, _, _, _, _, _, _, _, _, _, _,
 ]) processEffectiveBalanceUpdates(
 	st BeaconStateT,
+	slot math.Slot,
 ) error {
 	// Update effective balances with hysteresis
 	validators, err := st.GetValidators()
@@ -526,7 +528,9 @@ func (sp *StateProcessor[
 			updatedBalance := ctypes.ComputeEffectiveBalance(
 				balance,
 				math.U64(sp.cs.EffectiveBalanceIncrement()),
-				math.U64(sp.cs.MaxEffectiveBalance()),
+				math.U64(sp.cs.MaxEffectiveBalance(
+					state.IsPostFork3(sp.cs.DepositEth1ChainID(), slot),
+				)),
 			)
 			val.SetEffectiveBalance(updatedBalance)
 			if err = st.UpdateValidatorAtIndex(idx, val); err != nil {

state-transition/core/state_processor_genesis_test.go

@@ -38,7 +38,7 @@ func TestInitialize(t *testing.T) {
 	sp, st, _, _ := setupState(t, cs)
 
 	var (
-		maxBalance = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance = math.Gwei(cs.MaxEffectiveBalance(false))
 		increment  = math.Gwei(cs.EffectiveBalanceIncrement())
 		minBalance = math.Gwei(cs.EjectionBalance())
 	)
@@ -193,7 +193,7 @@ func TestInitializeBartio(t *testing.T) {
 	sp, st, _, _ := setupState(t, cs)
 
 	var (
-		maxBalance = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance = math.Gwei(cs.MaxEffectiveBalance(false))
 		increment  = math.Gwei(cs.EffectiveBalanceIncrement())
 		minBalance = math.Gwei(cs.EjectionBalance())
 	)
@@ -366,7 +366,7 @@ func commonChecksValidators(
 	require.Equal(t, dep.Pubkey, val.Pubkey)
 
 	var (
-		maxBalance = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance = math.Gwei(cs.MaxEffectiveBalance(false))
 		increment  = math.Gwei(cs.EffectiveBalanceIncrement())
 		minBalance = math.Gwei(cs.EjectionBalance())
 	)

state-transition/core/state_processor_staking.go

@@ -26,6 +26,7 @@ import (
 	"github.com/berachain/beacon-kit/primitives/common"
 	"github.com/berachain/beacon-kit/primitives/math"
 	"github.com/berachain/beacon-kit/primitives/version"
+	"github.com/berachain/beacon-kit/state-transition/core/state"
 )
 
 // processOperations processes the operations and ensures they match the
@@ -188,7 +189,7 @@ func (sp *StateProcessor[
 	}
 
 	// Add the validator to the registry.
-	return sp.addValidatorToRegistry(st, dep)
+	return sp.addValidatorToRegistry(st, dep, slot)
 }
 
 // addValidatorToRegistry adds a validator to the registry.
@@ -197,14 +198,17 @@ func (sp *StateProcessor[
 ]) addValidatorToRegistry(
 	st BeaconStateT,
 	dep DepositT,
+	slot math.Slot,
 ) error {
 	var val ValidatorT
 	val = val.New(
 		dep.GetPubkey(),
 		dep.GetWithdrawalCredentials(),
 		dep.GetAmount(),
 		math.Gwei(sp.cs.EffectiveBalanceIncrement()),
-		math.Gwei(sp.cs.MaxEffectiveBalance()),
+		math.Gwei(sp.cs.MaxEffectiveBalance(
+			state.IsPostFork3(sp.cs.DepositEth1ChainID(), slot),
+		)),
 	)
 
 	// TODO: This is a bug that lives on bArtio. Delete this eventually.

state-transition/core/state_processor_staking_test.go

@@ -45,7 +45,7 @@ func TestTransitionUpdateValidators(t *testing.T) {
 	sp, st, ds, ctx := setupState(t, cs)
 
 	var (
-		maxBalance       = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance       = math.Gwei(cs.MaxEffectiveBalance(false))
 		increment        = math.Gwei(cs.EffectiveBalanceIncrement())
 		minBalance       = math.Gwei(cs.EjectionBalance())
 		emptyCredentials = types.NewCredentialsFromExecutionAddress(
@@ -194,7 +194,7 @@ func TestTransitionCreateValidator(t *testing.T) {
 	sp, st, ds, ctx := setupState(t, cs)
 
 	var (
-		maxBalance       = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance       = math.Gwei(cs.MaxEffectiveBalance(false))
 		increment        = math.Gwei(cs.EffectiveBalanceIncrement())
 		minBalance       = math.Gwei(cs.EjectionBalance())
 		emptyAddress     = common.ExecutionAddress{}
@@ -389,7 +389,7 @@ func TestTransitionWithdrawals(t *testing.T) {
 	sp, st, _, ctx := setupState(t, cs)
 
 	var (
-		maxBalance   = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance   = math.Gwei(cs.MaxEffectiveBalance(false))
 		minBalance   = math.Gwei(cs.EffectiveBalanceIncrement())
 		credentials0 = types.NewCredentialsFromExecutionAddress(
 			common.ExecutionAddress{},
@@ -482,7 +482,7 @@ func TestTransitionMaxWithdrawals(t *testing.T) {
 	sp, st, _, ctx := setupState(t, cs)
 
 	var (
-		maxBalance   = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance   = math.Gwei(cs.MaxEffectiveBalance(false))
 		minBalance   = math.Gwei(cs.EffectiveBalanceIncrement())
 		address0     = common.ExecutionAddress{}
 		credentials0 = types.NewCredentialsFromExecutionAddress(address0)
@@ -620,7 +620,7 @@ func TestTransitionHittingValidatorsCap_ExtraSmall(t *testing.T) {
 	sp, st, ds, ctx := setupState(t, cs)
 
 	var (
-		maxBalance      = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance      = math.Gwei(cs.MaxEffectiveBalance(false))
 		ejectionBalance = math.Gwei(cs.EjectionBalance())
 		minBalance      = ejectionBalance + math.Gwei(
 			cs.EffectiveBalanceIncrement(),
@@ -848,7 +848,7 @@ func TestTransitionHittingValidatorsCap_ExtraBig(t *testing.T) {
 	sp, st, ds, ctx := setupState(t, cs)
 
 	var (
-		maxBalance      = math.Gwei(cs.MaxEffectiveBalance())
+		maxBalance      = math.Gwei(cs.MaxEffectiveBalance(false))
 		ejectionBalance = math.Gwei(cs.EjectionBalance())
 		minBalance      = ejectionBalance + math.Gwei(
 			cs.EffectiveBalanceIncrement(),

state-transition/core/state_processor_withdrawals.go

@@ -36,7 +36,8 @@ import (
 // NOTE: Modified from the Ethereum 2.0 specification to support EVM inflation:
 // 1. The first withdrawal MUST be a fixed EVM inflation withdrawal
 // 2. Subsequent withdrawals (if any) are processed as validator withdrawals
-// 3. This modification reduces the maximum validator withdrawals per block by one.
+// 3. This modification reduces the maximum validator withdrawals per block by
+// one.
 func (sp *StateProcessor[
 	BeaconBlockT, _, BeaconStateT, _, _, _, _, _, _, _, _, _, _, _, _, _,
 ]) processWithdrawals(
@@ -188,7 +189,7 @@ func (sp *StateProcessor[
 		}
 		nextValidatorIndex += math.ValidatorIndex(
 			sp.cs.MaxValidatorsPerWithdrawalsSweep(
-				state.IsPostUpgrade, sp.cs.DepositEth1ChainID(), slot,
+				state.IsPostFork2(sp.cs.DepositEth1ChainID(), slot),
 			))
 		nextValidatorIndex %= math.ValidatorIndex(totalValidators)
 	}
@@ -265,7 +266,7 @@ func (sp *StateProcessor[
 		}
 		nextValidatorIndex += math.ValidatorIndex(
 			sp.cs.MaxValidatorsPerWithdrawalsSweep(
-				state.IsPostUpgrade, sp.cs.DepositEth1ChainID(), slot,
+				state.IsPostFork2(sp.cs.DepositEth1ChainID(), slot),
 			))
 		nextValidatorIndex %= math.ValidatorIndex(totalValidators)
 	}