chore(state-transition): flipped transaction context attributes logic

beacon/blockchain/finalize_block.go

@@ -153,7 +153,7 @@ func (s *Service) executeStateTransition(
 	defer s.metrics.measureStateTransitionDuration(startTime)
 	valUpdates, err := s.stateProcessor.Transition(
 		&transition.Context{
-			Context: ctx,
+			ConsensusCtx: ctx,
 
 			MeterGas: true,
 
@@ -177,13 +177,13 @@ func (s *Service) executeStateTransition(
 			// of validators in their process proposal call and thus
 			// the "verification aspect" of this NewPayload call is
 			// actually irrelevant at this point.
-			SkipPayloadVerification: false,
+			VerifyPayload: true,
 
 			// We skip randao validation in FinalizeBlock since either
 			// 1. we validated it during ProcessProposal at the head of the chain OR
 			// 2. we are bootstrapping and implicitly trust that the randao was validated by
 			//    the super majority during ProcessProposal of the given block height.
-			SkipValidateRandao: true,
+			ValidateRandao: false,
 
 			ProposerAddress: blk.GetProposerAddress(),
 			ConsensusTime:   blk.GetConsensusTime(),

beacon/blockchain/process_proposal.go

@@ -326,14 +326,14 @@ func (s *Service) verifyStateRoot(
 		// We run with a non-optimistic engine here to ensure
 		// that the proposer does not try to push through a bad block.
 		&transition.Context{
-			Context:                 ctx,
-			MeterGas:                false,
-			OptimisticEngine:        false,
-			SkipPayloadVerification: false,
-			SkipValidateResult:      false,
-			SkipValidateRandao:      false,
-			ProposerAddress:         proposerAddress,
-			ConsensusTime:           consensusTime,
+			ConsensusCtx:     ctx,
+			MeterGas:         false,
+			OptimisticEngine: false,
+			VerifyPayload:    true,
+			ValidateResult:   true,
+			ValidateRandao:   true,
+			ProposerAddress:  proposerAddress,
+			ConsensusTime:    consensusTime,
 		},
 		st, blk,
 	)

beacon/validator/block_builder.go

@@ -374,14 +374,14 @@ func (s *Service) computeStateRoot(
 		// engine enabled here would affect the proposer when
 		// the payload in their block has come from a remote builder.
 		&transition.Context{
-			Context:                 ctx,
-			MeterGas:                false,
-			OptimisticEngine:        true,
-			SkipPayloadVerification: true,
-			SkipValidateResult:      true,
-			SkipValidateRandao:      true,
-			ProposerAddress:         proposerAddress,
-			ConsensusTime:           consensusTime,
+			ConsensusCtx:     ctx,
+			MeterGas:         false,
+			OptimisticEngine: true,
+			VerifyPayload:    false,
+			ValidateResult:   false,
+			ValidateRandao:   false,
+			ProposerAddress:  proposerAddress,
+			ConsensusTime:    consensusTime,
 		},
 		st, blk,
 	); err != nil {

cmd/beacond/types.go

@@ -83,7 +83,7 @@ type (
 	SidecarFactory = dablob.SidecarFactory
 
 	// StateProcessor is the type alias for the state processor interface.
-	StateProcessor = core.StateProcessor[*Context]
+	StateProcessor = core.StateProcessor
 
 	// StorageBackend is the type alias for the storage backend interface.
 	StorageBackend = storage.Backend

node-core/components/interfaces.go

@@ -204,39 +204,6 @@ type (
 		) (*v1.ProcessProposalResponse, error)
 	}
 
-	// 	// Context defines an interface for managing state transition context.
-	// 	Context[T any] interface {
-	// 		context.Context
-	// 		// Wrap returns a new context with the given context.
-	// 		Wrap(context.Context) T
-	// 		// OptimisticEngine sets the optimistic engine flag to true.
-	// 		OptimisticEngine() T
-	// 		// SkipPayloadVerification sets the skip payload verification flag to
-	// 		// true.
-	// 		SkipPayloadVerification() T
-	// 		// SkipValidateRandao sets the skip validate randao flag to true.
-	// 		SkipValidateRandao() T
-	// 		// SkipValidateResult sets the skip validate result flag to true.
-	// 		SkipValidateResult() T
-	// 		// GetOptimisticEngine returns whether to optimistically assume the
-	// 		// execution client has the correct state when certain errors are
-	// 		// returned
-	// 		// by the execution engine.
-	// 		GetOptimisticEngine() bool
-	// 		// GetSkipPayloadVerification returns whether to skip verifying the
-	// 		// payload
-	// 		// if
-	// 		// it already exists on the execution client.
-	// 		GetSkipPayloadVerification() bool
-	// 		// GetSkipValidateRandao returns whether to skip validating the RANDAO
-	// 		// reveal.
-	// 		GetSkipValidateRandao() bool
-	// 		// GetSkipValidateResult returns whether to validate the result of the
-	// 		// state
-	// 		// transition.
-	// 		GetSkipValidateResult() bool
-	// 	}
-
 	// Deposit is the interface for a deposit.
 	Deposit[
 		T any,

node-core/components/state_processor.go

@@ -51,7 +51,7 @@ func ProvideStateProcessor[
 	LoggerT log.AdvancedLogger[LoggerT],
 ](
 	in StateProcessorInput[LoggerT],
-) *core.StateProcessor[*Context] {
+) *core.StateProcessor {
 	return core.NewStateProcessor[*Context](
 		in.Logger.With("service", "state-processor"),
 		in.ChainSpec,

primitives/transition/context.go

@@ -28,71 +28,30 @@ import (
 
 // Context is the context for the state transition.
 type Context struct {
-	context.Context
-
+	// ConsensusCtx is the context passed by CometBFT callbacks
+	// We pass it down to be able to cancel processing (although
+	// currently CometBFT context is set to TODO)
+	ConsensusCtx context.Context
+	// MeterGas controls whether gas data related to the execution
+	// layer payload should be meter or not. We currently meter only
+	// finalized blocks.
 	MeterGas bool
 	// OptimisticEngine indicates whether to optimistically assume
 	// the execution client has the correct state certain errors
 	// are returned by the execution engine.
 	OptimisticEngine bool
-	// SkipPayloadVerification indicates whether to skip calling NewPayload
-	// on the execution client. This can be done when the node is not
+	// VerifyPayload indicates whether to call NewPayload on the
+	// execution client. This can be done when the node is not
 	// syncing, and the payload is already known to the execution client.
-	SkipPayloadVerification bool
-	// SkipValidateRandao indicates whether to skip validating the Randao mix.
-	SkipValidateRandao bool
-	// SkipValidateResult indicates whether to validate the result of
+	VerifyPayload bool
+	// ValidateRandao indicates whether to validate the Randao mix.
+	ValidateRandao bool
+	// ValidateResult indicates whether to validate the result of
 	// the state transition.
-	SkipValidateResult bool
+	ValidateResult bool
 	// Address of current block proposer
 	ProposerAddress []byte
 	// ConsensusTime returns the timestamp of current consensus request.
 	// It is used to build next payload and to validate currentpayload.
 	ConsensusTime math.U64
 }
-
-func (c *Context) GetMeterGas() bool {
-	return c.MeterGas
-}
-
-// GetOptimisticEngine returns whether to optimistically assume the execution
-// client has the correct state when certain errors are returned by the
-// execution engine.
-func (c *Context) GetOptimisticEngine() bool {
-	return c.OptimisticEngine
-}
-
-// GetSkipPayloadVerification returns whether to skip calling NewPayload on the
-// execution client. This can be done when the node is not syncing, and the
-// payload is already known to the execution client.
-func (c *Context) GetSkipPayloadVerification() bool {
-	return c.SkipPayloadVerification
-}
-
-// GetSkipValidateRandao returns whether to skip validating the Randao mix.
-func (c *Context) GetSkipValidateRandao() bool {
-	return c.SkipValidateRandao
-}
-
-// GetSkipValidateResult returns whether to validate the result of the state
-// transition.
-func (c *Context) GetSkipValidateResult() bool {
-	return c.SkipValidateResult
-}
-
-// GetProposerAddress returns the address of the validator
-// selected by consensus to propose the block.
-func (c *Context) GetProposerAddress() []byte {
-	return c.ProposerAddress
-}
-
-// GetConsensusTime returns the timestamp of current consensus request.
-// It is used to build next payload and to validate currentpayload.
-func (c *Context) GetConsensusTime() math.U64 {
-	return c.ConsensusTime
-}
-
-// Unwrap returns the underlying standard context.
-func (c *Context) Unwrap() context.Context {
-	return c.Context
-}

state-transition/core/state_processor.go

@@ -37,7 +37,7 @@ import (
 
 // StateProcessor is a basic Processor, which takes care of the
 // main state transition for the beacon chain.
-type StateProcessor[ContextT Context] struct {
+type StateProcessor struct {
 	// logger is used for logging information and errors.
 	logger log.Logger
 	// cs is the chain specification for the beacon chain.
@@ -58,7 +58,7 @@ type StateProcessor[ContextT Context] struct {
 
 // NewStateProcessor creates a new state processor.
 func NewStateProcessor[
-	ContextT Context,
+	ContextT *transition.Context,
 ](
 	logger log.Logger,
 	cs chain.Spec,
@@ -67,8 +67,8 @@ func NewStateProcessor[
 	signer crypto.BLSSigner,
 	fGetAddressFromPubKey func(crypto.BLSPubkey) ([]byte, error),
 	telemetrySink TelemetrySink,
-) *StateProcessor[ContextT] {
-	return &StateProcessor[ContextT]{
+) *StateProcessor {
+	return &StateProcessor{
 		logger:                logger,
 		cs:                    cs,
 		executionEngine:       executionEngine,
@@ -80,8 +80,8 @@ func NewStateProcessor[
 }
 
 // Transition is the main function for processing a state transition.
-func (sp *StateProcessor[ContextT]) Transition(
-	ctx ContextT,
+func (sp *StateProcessor) Transition(
+	ctx *transition.Context,
 	st *state.StateDB,
 	blk *ctypes.BeaconBlock,
 ) (transition.ValidatorUpdates, error) {
@@ -106,7 +106,7 @@ func (sp *StateProcessor[ContextT]) Transition(
 // NOTE: if process slots is called across multiple epochs (the given slot is more than 1 multiple
 // ahead of the current state slot), then validator updates will be returned in the order they are
 // processed, which may effectually override each other.
-func (sp *StateProcessor[_]) ProcessSlots(
+func (sp *StateProcessor) ProcessSlots(
 	st *state.StateDB, slot math.Slot,
 ) (transition.ValidatorUpdates, error) {
 	var res transition.ValidatorUpdates
@@ -143,7 +143,7 @@ func (sp *StateProcessor[_]) ProcessSlots(
 }
 
 // processSlot is run when a slot is missed.
-func (sp *StateProcessor[_]) processSlot(st *state.StateDB) error {
+func (sp *StateProcessor) processSlot(st *state.StateDB) error {
 	stateSlot, err := st.GetSlot()
 	if err != nil {
 		return err
@@ -181,8 +181,8 @@ func (sp *StateProcessor[_]) processSlot(st *state.StateDB) error {
 
 // ProcessBlock processes the block, it optionally verifies the
 // state root.
-func (sp *StateProcessor[ContextT]) ProcessBlock(
-	ctx ContextT, st *state.StateDB, blk *ctypes.BeaconBlock,
+func (sp *StateProcessor) ProcessBlock(
+	ctx *transition.Context, st *state.StateDB, blk *ctypes.BeaconBlock,
 ) error {
 	if err := sp.processBlockHeader(ctx, st, blk); err != nil {
 		return err
@@ -206,7 +206,7 @@ func (sp *StateProcessor[ContextT]) ProcessBlock(
 
 	// If we are skipping validate, we can skip calculating the state
 	// root to save compute.
-	if ctx.GetSkipValidateResult() {
+	if !ctx.ValidateResult {
 		return nil
 	}
 
@@ -225,7 +225,7 @@ func (sp *StateProcessor[ContextT]) ProcessBlock(
 
 // processEpoch processes the epoch and ensures it matches the local state. Currently
 // beacon-kit does not enforce rewards, penalties, and slashing for validators.
-func (sp *StateProcessor[_]) processEpoch(st *state.StateDB) (transition.ValidatorUpdates, error) {
+func (sp *StateProcessor) processEpoch(st *state.StateDB) (transition.ValidatorUpdates, error) {
 	slot, err := st.GetSlot()
 	if err != nil {
 		return nil, err
@@ -271,8 +271,8 @@ func (sp *StateProcessor[_]) processEpoch(st *state.StateDB) (transition.Validat
 }
 
 // processBlockHeader processes the header and ensures it matches the local state.
-func (sp *StateProcessor[ContextT]) processBlockHeader(
-	ctx ContextT, st *state.StateDB, blk *ctypes.BeaconBlock,
+func (sp *StateProcessor) processBlockHeader(
+	ctx *transition.Context, st *state.StateDB, blk *ctypes.BeaconBlock,
 ) error {
 	// Ensure the block slot matches the state slot.
 	slot, err := st.GetSlot()
@@ -304,10 +304,10 @@ func (sp *StateProcessor[ContextT]) processBlockHeader(
 	if err != nil {
 		return err
 	}
-	if !bytes.Equal(stateProposerAddress, ctx.GetProposerAddress()) {
+	if !bytes.Equal(stateProposerAddress, ctx.ProposerAddress) {
 		return errors.Wrapf(
 			ErrProposerMismatch, "store key: %s, consensus key: %s",
-			stateProposerAddress, ctx.GetProposerAddress(),
+			stateProposerAddress, ctx.ProposerAddress,
 		)
 	}
 
@@ -344,7 +344,7 @@ func (sp *StateProcessor[ContextT]) processBlockHeader(
 
 // processEffectiveBalanceUpdates as defined in the Ethereum 2.0 specification.
 // https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#effective-balances-updates
-func (sp *StateProcessor[_]) processEffectiveBalanceUpdates(st *state.StateDB) error {
+func (sp *StateProcessor) processEffectiveBalanceUpdates(st *state.StateDB) error {
 	// Update effective balances with hysteresis
 	validators, err := st.GetValidators()
 	if err != nil {

state-transition/core/state_processor_genesis.go

@@ -35,7 +35,7 @@ import (
 // InitializePreminedBeaconStateFromEth1 initializes the beacon state.
 //
 //nolint:gocognit,funlen // todo fix.
-func (sp *StateProcessor[_]) InitializePreminedBeaconStateFromEth1(
+func (sp *StateProcessor) InitializePreminedBeaconStateFromEth1(
 	st *statedb.StateDB,
 	deposits ctypes.Deposits,
 	execPayloadHeader *ctypes.ExecutionPayloadHeader,
@@ -149,7 +149,7 @@ func (sp *StateProcessor[_]) InitializePreminedBeaconStateFromEth1(
 	return validatorSetsDiffs(nil, activeVals), nil
 }
 
-func (sp *StateProcessor[_]) processGenesisActivation(st *statedb.StateDB) error {
+func (sp *StateProcessor) processGenesisActivation(st *statedb.StateDB) error {
 	vals, err := st.GetValidators()
 	if err != nil {
 		return fmt.Errorf("genesis activation, failed listing validators: %w", err)