Merge branch 'main' into marko/2392

Author: tac0turtle

.github/workflows/semantic-pull-request.yml

@@ -15,6 +15,6 @@ jobs:
     name: conventional-commit-pr-title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
+      - uses: amannn/action-semantic-pull-request@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -27,3 +27,4 @@ docs/.vitepress/cache
 .temp
 .vite_opt_cache
 .vscode
+.claude

apps/evm/single/go.mod

@@ -84,7 +84,7 @@ require (
 	github.com/docker/cli-docs-tool v0.9.0 // indirect
 	github.com/docker/compose/v2 v2.35.0 // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v28.2.2+incompatible // indirect
+	github.com/docker/docker v28.3.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.2 // indirect
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-connections v0.5.0 // indirect

apps/evm/single/go.sum

@@ -216,8 +216,8 @@ github.com/docker/compose/v2 v2.35.0/go.mod h1:S5ejUILn9KTYC6noX3IxznWu3/sb3FxdZ
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
-github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
+github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=

block/sync.go

@@ -149,16 +149,17 @@ func (m *Manager) trySyncNextBlock(ctx context.Context, daHeight uint64) error {
 		// set the custom verifier to ensure proper signature validation
 		h.SetCustomVerifier(m.signaturePayloadProvider)
 
-		// validate the received block before applying
-		if err := m.Validate(ctx, h, d); err != nil {
-			return fmt.Errorf("failed to validate block: %w", err)
-		}
-
 		newState, err := m.applyBlock(ctx, h.Header, d)
 		if err != nil {
 			return fmt.Errorf("failed to apply block: %w", err)
 		}
 
+		// validate the received block after applying
+		// a custom verification function can depend on the state of the blockchain
+		if err := m.Validate(ctx, h, d); err != nil {
+			return fmt.Errorf("failed to validate block: %w", err)
+		}
+
 		if err = m.updateState(ctx, newState); err != nil {
 			return fmt.Errorf("failed to save updated state: %w", err)
 		}

node/full_node_integration_test.go

@@ -39,9 +39,16 @@ func TestTxGossipingMultipleNodesNoDA(t *testing.T) {
 	// Verify block manager is properly initialized
 	require.NotNil(nodes[0].blockManager, "Block manager should be initialized")
 
+	// Add a small delay to ensure P2P services are fully ready
+	time.Sleep(500 * time.Millisecond)
+
 	// Start the other nodes
 	for i := 1; i < numNodes; i++ {
 		startNodeInBackground(t, nodes, ctxs, &runningWg, i)
+		// Add a small delay between starting nodes to avoid connection race
+		if i < numNodes-1 {
+			time.Sleep(100 * time.Millisecond)
+		}
 	}
 
 	// Inject a transaction into the sequencer's executor
@@ -88,9 +95,16 @@ func TestTxGossipingMultipleNodesDAIncluded(t *testing.T) {
 	// Verify block manager is properly initialized
 	require.NotNil(nodes[0].blockManager, "Block manager should be initialized")
 
+	// Add a small delay to ensure P2P services are fully ready
+	time.Sleep(500 * time.Millisecond)
+
 	// Start the other nodes
 	for i := 1; i < numNodes; i++ {
 		startNodeInBackground(t, nodes, ctxs, &runningWg, i)
+		// Add a small delay between starting nodes to avoid connection race
+		if i < numNodes-1 {
+			time.Sleep(100 * time.Millisecond)
+		}
 	}
 
 	// Inject a transaction into the sequencer's executor
@@ -142,6 +156,9 @@ func TestFastDASync(t *testing.T) {
 	blocksToWaitFor := uint64(2)
 	require.NoError(waitForAtLeastNDAIncludedHeight(nodes[0], blocksToWaitFor))
 
+	// Add a small delay to ensure P2P services are fully ready
+	time.Sleep(500 * time.Millisecond)
+
 	// Now start the second node and time its sync
 	startNodeInBackground(t, nodes, ctxs, &runningWg, 1)
 	start := time.Now()
@@ -186,9 +203,16 @@ func TestSingleSequencerTwoFullNodesBlockSyncSpeed(t *testing.T) {
 	// Wait for the sequencer to produce at first block
 	require.NoError(waitForFirstBlock(nodes[0], Store))
 
+	// Add a small delay to ensure P2P services are fully ready
+	time.Sleep(500 * time.Millisecond)
+
 	// Now start the other nodes
 	for i := 1; i < numNodes; i++ {
 		startNodeInBackground(t, nodes, ctxs, &runningWg, i)
+		// Add a small delay between starting nodes to avoid connection race
+		if i < numNodes-1 {
+			time.Sleep(100 * time.Millisecond)
+		}
 	}
 
 	blocksToWaitFor := uint64(10)
@@ -274,6 +298,9 @@ func testSingleSequencerSingleFullNode(t *testing.T, source Source) {
 	// Wait for the sequencer to produce at first block
 	require.NoError(waitForFirstBlock(nodes[0], source))
 
+	// Add a small delay to ensure P2P services are fully ready
+	time.Sleep(500 * time.Millisecond)
+
 	// Start the full node
 	startNodeInBackground(t, nodes, ctxs, &runningWg, 1)
 
@@ -312,9 +339,16 @@ func testSingleSequencerTwoFullNodes(t *testing.T, source Source) {
 	// Wait for the sequencer to produce at first block
 	require.NoError(waitForFirstBlock(nodes[0], source))
 
+	// Add a small delay to ensure P2P services are fully ready
+	time.Sleep(500 * time.Millisecond)
+
 	// Start the full nodes
 	for i := 1; i < numNodes; i++ {
 		startNodeInBackground(t, nodes, ctxs, &runningWg, i)
+		// Add a small delay between starting nodes to avoid connection race
+		if i < numNodes-1 {
+			time.Sleep(100 * time.Millisecond)
+		}
 	}
 
 	blocksToWaitFor := uint64(3)
@@ -372,6 +406,9 @@ func testSingleSequencerSingleFullNodeTrustedHash(t *testing.T, source Source) {
 	// Set the trusted hash in the full node
 	nodes[1].nodeConfig.Node.TrustedHash = trustedHash
 
+	// Add a small delay to ensure P2P services are fully ready
+	time.Sleep(500 * time.Millisecond)
+
 	// Start the full node
 	startNodeInBackground(t, nodes, ctxs, &runningWg, 1)
 

node/single_sequencer_integration_test.go

@@ -109,7 +109,7 @@ func (s *FullNodeTestSuite) TearDownTest() {
 		select {
 		case <-waitCh:
 			// Node stopped successfully
-		case <-time.After(5 * time.Second):
+		case <-time.After(10 * time.Second):
 			s.T().Log("Warning: Node did not stop gracefully within timeout")
 		}
 
@@ -243,7 +243,7 @@ func TestStateRecovery(t *testing.T) {
 	select {
 	case <-waitCh:
 		// Node stopped successfully
-	case <-time.After(2 * time.Second):
+	case <-time.After(30 * time.Second):
 		t.Fatalf("Node did not stop gracefully within timeout")
 	}
 
@@ -288,7 +288,7 @@ func TestMaxPendingHeadersAndData(t *testing.T) {
 	require.LessOrEqual(height, config.Node.MaxPendingHeadersAndData)
 
 	// Stop the node and wait for shutdown
-	shutdownAndWait(t, []context.CancelFunc{cancel}, &runningWg, 5*time.Second)
+	shutdownAndWait(t, []context.CancelFunc{cancel}, &runningWg, 10*time.Second)
 }
 
 // TestBatchQueueThrottlingWithDAFailure tests that when DA layer fails and MaxPendingHeadersAndData
@@ -400,5 +400,5 @@ func TestBatchQueueThrottlingWithDAFailure(t *testing.T) {
 	t.Log("the batch queue would fill up and return ErrQueueFull, providing backpressure.")
 
 	// Shutdown
-	shutdownAndWait(t, []context.CancelFunc{cancel}, &runningWg, 5*time.Second)
+	shutdownAndWait(t, []context.CancelFunc{cancel}, &runningWg, 10*time.Second)
 }

node/single_sequencer_test.go

@@ -26,7 +26,7 @@ func TestStartup(t *testing.T) {
 	}()
 
 	// Allow some time for the node to start
-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(500 * time.Millisecond)
 
 	// Node should be running (no error received yet)
 	select {
@@ -44,7 +44,7 @@ func TestStartup(t *testing.T) {
 	case err := <-errChan:
 		// Context cancellation should result in context.Canceled error
 		require.ErrorIs(t, err, context.Canceled)
-	case <-time.After(500 * time.Millisecond):
+	case <-time.After(2 * time.Second):
 		t.Fatal("Node did not stop after context cancellation")
 	}
 

test/docker-e2e/docker_test.go

@@ -66,7 +66,7 @@ func (s *DockerTestSuite) CreateDockerProvider(opts ...ConfigOption) tastoratype
 	numValidators := 1
 	numFullNodes := 0
 	client, network := tastoradocker.DockerSetup(t)
-	
+
 	// Store client and network ID in the suite for later use
 	s.dockerClient = client
 	s.dockerNetworkID = network
@@ -76,11 +76,11 @@ func (s *DockerTestSuite) CreateDockerProvider(opts ...ConfigOption) tastoratype
 		DockerClient:    client,
 		DockerNetworkID: network,
 		ChainConfig: &tastoradocker.ChainConfig{
-			Name:          "celestia",
-			NumValidators: &numValidators,
-			NumFullNodes:  &numFullNodes,
-			ChainID:       testChainID,
-			Image: container.NewImage("ghcr.io/celestiaorg/celestia-app", "v4.0.0-rc6", "10001:10001"),
+			Name:           "celestia",
+			NumValidators:  &numValidators,
+			NumFullNodes:   &numFullNodes,
+			ChainID:        testChainID,
+			Image:          container.NewImage("ghcr.io/celestiaorg/celestia-app", "v4.0.0-rc6", "10001:10001"),
 			Bin:            "celestia-appd",
 			Bech32Prefix:   "celestia",
 			Denom:          "utia",
@@ -99,7 +99,7 @@ func (s *DockerTestSuite) CreateDockerProvider(opts ...ConfigOption) tastoratype
 		},
 		DataAvailabilityNetworkConfig: &tastoradocker.DataAvailabilityNetworkConfig{
 			BridgeNodeCount: 1,
-			Image: container.NewImage("ghcr.io/celestiaorg/celestia-node", "pr-4283", "10001:10001"),
+			Image:           container.NewImage("ghcr.io/celestiaorg/celestia-node", "pr-4283", "10001:10001"),
 		},
 		RollkitChainConfig: &tastoradocker.RollkitChainConfig{
 			ChainID:              "rollkit-test",
@@ -170,7 +170,7 @@ func (s *DockerTestSuite) CreateChain() tastoratypes.Chain {
 		WithDockerClient(s.dockerClient).
 		WithDockerNetworkID(s.dockerNetworkID).
 		WithNode(tastoradocker.NewChainNodeConfigBuilder().
-			WithNodeType(tastoradocker.ValidatorNodeType).
+			WithNodeType(tastoratypes.NodeTypeValidator).
 			Build()).
 		Build(ctx)
 

test/docker-e2e/go.mod

@@ -2,7 +2,7 @@ module github.com/evstack/ev-node/test/docker-e2e
 
 go 1.24.2
 
-require github.com/celestiaorg/tastora v0.2.2
+require github.com/celestiaorg/tastora v0.2.3
 
 require (
 	cosmossdk.io/x/upgrade v0.1.4 // indirect