Merge branch 'main' into da-interface-part3

Author: randygrok

block/components.go

@@ -35,17 +35,6 @@ type Components struct {
 	errorCh chan error
 }
 
-// GetLastState returns the current blockchain state
-func (bc *Components) GetLastState() types.State {
-	if bc.Executor != nil {
-		return bc.Executor.GetLastState()
-	}
-	if bc.Syncer != nil {
-		return bc.Syncer.GetLastState()
-	}
-	return types.State{}
-}
-
 // Start starts all components and monitors for critical errors.
 // It is blocking and returns when the context is cancelled or an error occurs
 func (bc *Components) Start(ctx context.Context) error {

block/components_test.go

@@ -52,18 +52,6 @@ func TestBlockComponents_ExecutionClientFailure_StopsNode(t *testing.T) {
 	assert.Contains(t, err.Error(), "execution client connection lost")
 }
 
-func TestBlockComponents_GetLastState(t *testing.T) {
-	// Test that GetLastState works correctly for different component types
-
-	t.Run("Empty state", func(t *testing.T) {
-		// When neither is present, return empty state
-		bc := &Components{}
-
-		result := bc.GetLastState()
-		assert.Equal(t, uint64(0), result.LastBlockHeight)
-	})
-}
-
 func TestBlockComponents_StartStop_Lifecycle(t *testing.T) {
 	// Simple lifecycle test without creating full components
 	bc := &Components{

block/internal/executing/executor.go

@@ -151,14 +151,6 @@ func (e *Executor) Stop() error {
 	return nil
 }
 
-// GetLastState returns the current state.
-func (e *Executor) GetLastState() types.State {
-	state := e.getLastState()
-	state.AppHash = bytes.Clone(state.AppHash)
-
-	return state
-}
-
 // getLastState returns the current state.
 // getLastState should never directly mutate.
 func (e *Executor) getLastState() types.State {

block/internal/syncing/syncer.go

@@ -226,18 +226,14 @@ func (s *Syncer) Stop() error {
 	return nil
 }
 
-// GetLastState returns the current state
-func (s *Syncer) GetLastState() types.State {
+// getLastState returns the current state
+func (s *Syncer) getLastState() types.State {
 	state := s.lastState.Load()
 	if state == nil {
 		return types.State{}
 	}
 
-	stateCopy := *state
-	stateCopy.AppHash = bytes.Clone(state.AppHash)
-	stateCopy.LastHeaderHash = bytes.Clone(state.LastHeaderHash)
-
-	return stateCopy
+	return *state
 }
 
 // SetLastState updates the current state
@@ -532,7 +528,7 @@ func (s *Syncer) processHeightEvent(event *common.DAHeightEvent) {
 		case errors.Is(err, errInvalidState):
 			s.sendCriticalError(fmt.Errorf("invalid state detected (block-height %d, state-height %d) "+
 				"- block references do not match local state. Manual intervention required: %w", event.Header.Height(),
-				s.GetLastState().LastBlockHeight, err))
+				s.getLastState().LastBlockHeight, err))
 		default:
 			s.cache.SetPendingEvent(height, event)
 		}
@@ -577,7 +573,7 @@ func (s *Syncer) trySyncNextBlock(event *common.DAHeightEvent) error {
 	header := event.Header
 	data := event.Data
 	nextHeight := event.Header.Height()
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	headerHash := header.Hash().String()
 
 	s.logger.Info().Uint64("height", nextHeight).Msg("syncing block")

block/internal/syncing/syncer_forced_inclusion_test.go

@@ -405,7 +405,7 @@ func TestVerifyForcedInclusionTxs_AllTransactionsIncluded(t *testing.T) {
 	data := makeData(gen.ChainID, 1, 1)
 	data.Txs[0] = types.Tx(dataBin)
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 0
 
 	// Verify - should pass since all forced txs are included
@@ -480,7 +480,7 @@ func TestVerifyForcedInclusionTxs_MissingTransactions(t *testing.T) {
 	data.Txs[0] = types.Tx([]byte("regular_tx_1"))
 	data.Txs[1] = types.Tx([]byte("regular_tx_2"))
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 0
 
 	// Verify - should pass since forced tx blob may be legitimately deferred within the epoch
@@ -584,7 +584,7 @@ func TestVerifyForcedInclusionTxs_PartiallyIncluded(t *testing.T) {
 	data.Txs[1] = types.Tx([]byte("regular_tx"))
 	// dataBin2 is missing
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 0
 
 	// Verify - should pass since dataBin2 may be legitimately deferred within the epoch
@@ -683,7 +683,7 @@ func TestVerifyForcedInclusionTxs_NoForcedTransactions(t *testing.T) {
 	// Create block data
 	data := makeData(gen.ChainID, 1, 2)
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 0
 
 	// Verify - should pass since no forced txs to verify
@@ -744,7 +744,7 @@ func TestVerifyForcedInclusionTxs_NamespaceNotConfigured(t *testing.T) {
 	// Create block data
 	data := makeData(gen.ChainID, 1, 2)
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 0
 
 	// Verify - should pass since namespace not configured
@@ -830,7 +830,7 @@ func TestVerifyForcedInclusionTxs_DeferralWithinEpoch(t *testing.T) {
 	data1.Txs[0] = types.Tx(dataBin1)
 	data1.Txs[1] = types.Tx([]byte("regular_tx_1"))
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 104
 
 	// Verify - should pass since dataBin2 can be deferred within epoch
@@ -953,7 +953,7 @@ func TestVerifyForcedInclusionTxs_MaliciousAfterEpochEnd(t *testing.T) {
 	data1 := makeData(gen.ChainID, 1, 1)
 	data1.Txs[0] = types.Tx([]byte("regular_tx_1"))
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 102
 
 	// Verify - should pass, tx can be deferred within epoch
@@ -1047,7 +1047,7 @@ func TestVerifyForcedInclusionTxs_SmoothingExceedsEpoch(t *testing.T) {
 	data1.Txs[0] = types.Tx(dataBin1)
 	data1.Txs[1] = types.Tx(dataBin2)
 
-	currentState := s.GetLastState()
+	currentState := s.getLastState()
 	currentState.DAHeight = 102 // At epoch end
 
 	err = s.verifyForcedInclusionTxs(currentState, data1)

block/internal/syncing/syncer_test.go

@@ -134,19 +134,19 @@ func TestSyncer_validateBlock_DataHashMismatch(t *testing.T) {
 	data := makeData(gen.ChainID, 1, 2) // non-empty
 	_, header := makeSignedHeaderBytes(t, gen.ChainID, 1, addr, pub, signer, nil, data, nil)
 
-	err = s.validateBlock(s.GetLastState(), data, header)
+	err = s.validateBlock(s.getLastState(), data, header)
 	require.NoError(t, err)
 
 	// Create header and data with mismatched hash
 	data = makeData(gen.ChainID, 1, 2) // non-empty
 	_, header = makeSignedHeaderBytes(t, gen.ChainID, 1, addr, pub, signer, nil, nil, nil)
-	err = s.validateBlock(s.GetLastState(), data, header)
+	err = s.validateBlock(s.getLastState(), data, header)
 	require.Error(t, err)
 
 	// Create header and empty data
 	data = makeData(gen.ChainID, 1, 0) // empty
 	_, header = makeSignedHeaderBytes(t, gen.ChainID, 2, addr, pub, signer, nil, nil, nil)
-	err = s.validateBlock(s.GetLastState(), data, header)
+	err = s.validateBlock(s.getLastState(), data, header)
 	require.Error(t, err)
 }
 
@@ -185,7 +185,7 @@ func TestProcessHeightEvent_SyncsAndUpdatesState(t *testing.T) {
 	// set a context for internal loops that expect it
 	s.ctx = context.Background()
 	// Create signed header & data for height 1
-	lastState := s.GetLastState()
+	lastState := s.getLastState()
 	data := makeData(gen.ChainID, 1, 0)
 	_, hdr := makeSignedHeaderBytes(t, gen.ChainID, 1, addr, pub, signer, lastState.AppHash, data, nil)
 
@@ -238,7 +238,7 @@ func TestSequentialBlockSync(t *testing.T) {
 	s.ctx = context.Background()
 
 	// Sync two consecutive blocks via processHeightEvent so ExecuteTxs is called and state stored
-	st0 := s.GetLastState()
+	st0 := s.getLastState()
 	data1 := makeData(gen.ChainID, 1, 1) // non-empty
 	_, hdr1 := makeSignedHeaderBytes(t, gen.ChainID, 1, addr, pub, signer, st0.AppHash, data1, st0.LastHeaderHash)
 	// Expect ExecuteTxs call for height 1
@@ -629,7 +629,7 @@ func TestSyncer_InitializeState_CallsReplayer(t *testing.T) {
 	require.NoError(t, err)
 
 	// Verify state was initialized correctly
-	state := syncer.GetLastState()
+	state := syncer.getLastState()
 	assert.Equal(t, storeHeight, state.LastBlockHeight)
 	assert.Equal(t, gen.ChainID, state.ChainID)
 

execution/evm/test/test_helpers.go

@@ -6,19 +6,18 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	"github.com/celestiaorg/tastora/framework/types"
-	"github.com/golang-jwt/jwt/v5"
 	mathrand "math/rand"
 	"net/http"
 	"strings"
 	"sync"
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/celestiaorg/tastora/framework/docker"
 	"github.com/celestiaorg/tastora/framework/docker/evstack/reth"
+	"github.com/celestiaorg/tastora/framework/types"
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/stretchr/testify/require"
 )
 
 // Test-scoped Docker client/network mapping to avoid conflicts between tests

execution/evm/test_helpers.go

@@ -2,14 +2,15 @@ package evm
 
 import (
 	"context"
+	"math/big"
+	"math/rand"
+	"testing"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
-	"math/big"
-	"math/rand"
-	"testing"
 )
 
 // Transaction Helpers

node/single_sequencer_integration_test.go

@@ -218,7 +218,8 @@ func (s *FullNodeTestSuite) TestGenesisInitialization() {
 	require := require.New(s.T())
 
 	// Verify genesis state
-	state := s.node.blockComponents.GetLastState()
+	state, err := s.node.Store.GetState(s.ctx)
+	require.NoError(err)
 	require.Equal(s.node.genesis.InitialHeight, state.InitialHeight)
 	require.Equal(s.node.genesis.ChainID, state.ChainID)
 }