Merge branch 'main' into julien/fi-p2p

Author: julienrbrt

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## v1.0.0-rc.2
+
 ### Changes
 
 - Improve cache handling when there is a significant backlog of pending headers and data. ([#3030](https://github.com/evstack/ev-node/pull/3030))

apps/evm/go.mod

@@ -9,9 +9,9 @@ replace (
 
 require (
 	github.com/ethereum/go-ethereum v1.16.8
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/core v1.0.0-rc.1
-	github.com/evstack/ev-node/execution/evm v1.0.0-rc.1
+	github.com/evstack/ev-node/execution/evm v1.0.0-rc.2
 	github.com/ipfs/go-datastore v0.9.0
 	github.com/rs/zerolog v1.34.0
 	github.com/spf13/cobra v1.10.2

apps/grpc/go.mod

@@ -8,7 +8,7 @@ replace (
 )
 
 require (
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/core v1.0.0-rc.1
 	github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1
 	github.com/ipfs/go-datastore v0.9.0

apps/testapp/go.mod

@@ -3,7 +3,7 @@ module github.com/evstack/ev-node/apps/testapp
 go 1.25.0
 
 require (
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/core v1.0.0-rc.1
 	github.com/ipfs/go-datastore v0.9.0
 	github.com/rs/zerolog v1.34.0

apps/testapp/go.sum

@@ -365,8 +365,8 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni
 github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs=
 github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
-github.com/evstack/ev-node v1.0.0-rc.1 h1:MO7DT3y1X4WK7pTgl/867NroqhXJ/oe2NbmvMr3jqq8=
-github.com/evstack/ev-node v1.0.0-rc.1/go.mod h1:JtbvY2r6k6ZhGYMeDNZk7cx6ALj3d0f6dVyyJmJHBd4=
+github.com/evstack/ev-node v1.0.0-rc.2 h1:gUQzLTkCj6D751exm/FIR/yw2aXWiW2aEREEwtxMvw0=
+github.com/evstack/ev-node v1.0.0-rc.2/go.mod h1:Qa2nN1D6PJQRU2tiarv6X5Der5OZg/+2QGY/K2mA760=
 github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
 github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=

block/internal/submitting/submitter.go

@@ -129,19 +129,11 @@ func (s *Submitter) Start(ctx context.Context) error {
 	// Start DA submission loop if signer is available (aggregator nodes only)
 	if s.signer != nil {
 		s.logger.Info().Msg("starting DA submission loop")
-		s.wg.Add(1)
-		go func() {
-			defer s.wg.Done()
-			s.daSubmissionLoop()
-		}()
+		s.wg.Go(s.daSubmissionLoop)
 	}
 
 	// Start DA inclusion processing loop (both sync and aggregator nodes)
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
-		s.processDAInclusionLoop()
-	}()
+	s.wg.Go(s.processDAInclusionLoop)
 
 	return nil
 }
@@ -345,9 +337,9 @@ func (s *Submitter) processDAInclusionLoop() {
 
 				s.logger.Debug().Uint64("height", nextHeight).Msg("advancing DA included height")
 
-				// Set sequencer height to DA height mapping using already retrieved data
-				if err := s.setSequencerHeightToDAHeight(s.ctx, nextHeight, header, data, currentDAIncluded == 0); err != nil {
-					s.logger.Error().Err(err).Uint64("height", nextHeight).Msg("failed to set sequencer height to DA height mapping")
+				// Set node height to DA height mapping using already retrieved data
+				if err := s.setNodeHeightToDAHeight(s.ctx, nextHeight, header, data, currentDAIncluded == 0); err != nil {
+					s.logger.Error().Err(err).Uint64("height", nextHeight).Msg("failed to set node height to DA height mapping")
 					break
 				}
 
@@ -435,14 +427,14 @@ func (s *Submitter) sendCriticalError(err error) {
 	}
 }
 
-// setSequencerHeightToDAHeight stores the mapping from a ev-node block height to the corresponding
+// setNodeHeightToDAHeight stores the mapping from a ev-node block height to the corresponding
 // DA (Data Availability) layer heights where the block's header and data were included.
 // This mapping is persisted in the store metadata and is used to track which DA heights
 // contain the block components for a given ev-node height.
 //
 // For blocks with empty transactions, both header and data use the same DA height since
 // empty transaction data is not actually published to the DA layer.
-func (s *Submitter) setSequencerHeightToDAHeight(ctx context.Context, height uint64, header *types.SignedHeader, data *types.Data, genesisInclusion bool) error {
+func (s *Submitter) setNodeHeightToDAHeight(ctx context.Context, height uint64, header *types.SignedHeader, data *types.Data, genesisInclusion bool) error {
 	headerHash, dataHash := header.Hash(), data.DACommitment()
 
 	headerDaHeightBytes := make([]byte, 8)

block/internal/submitting/submitter_test.go

@@ -191,10 +191,10 @@ func TestSubmitter_setSequencerHeightToDAHeight(t *testing.T) {
 	mockStore.On("SetMetadata", mock.Anything, dataKey, dBz).Return(nil).Once()
 	mockStore.On("SetMetadata", mock.Anything, store.GenesisDAHeightKey, gBz).Return(nil).Once()
 
-	require.NoError(t, s.setSequencerHeightToDAHeight(ctx, 1, h, d, true))
+	require.NoError(t, s.setNodeHeightToDAHeight(ctx, 1, h, d, true))
 }
 
-func TestSubmitter_setSequencerHeightToDAHeight_Errors(t *testing.T) {
+func TestSubmitter_setNodeHeightToDAHeight_Errors(t *testing.T) {
 	ctx := t.Context()
 	cm, st := newTestCacheAndStore(t)
 
@@ -205,11 +205,11 @@ func TestSubmitter_setSequencerHeightToDAHeight_Errors(t *testing.T) {
 	// No cache entries -> expect error on missing header
 	_, ok := cm.GetHeaderDAIncluded(h.Hash().String())
 	assert.False(t, ok)
-	assert.Error(t, s.setSequencerHeightToDAHeight(ctx, 1, h, d, false))
+	assert.Error(t, s.setNodeHeightToDAHeight(ctx, 1, h, d, false))
 
 	// Add header, missing data
 	cm.SetHeaderDAIncluded(h.Hash().String(), 10, 1)
-	assert.Error(t, s.setSequencerHeightToDAHeight(ctx, 1, h, d, false))
+	assert.Error(t, s.setNodeHeightToDAHeight(ctx, 1, h, d, false))
 }
 
 func TestSubmitter_initializeDAIncludedHeight(t *testing.T) {

block/internal/syncing/da_retriever.go

@@ -79,14 +79,11 @@ func (r *daRetriever) QueuePriorityHeight(daHeight uint64) {
 	r.priorityMu.Lock()
 	defer r.priorityMu.Unlock()
 
-	// Skip if already queued
-	if slices.Contains(r.priorityHeights, daHeight) {
-		return
+	idx, found := slices.BinarySearch(r.priorityHeights, daHeight)
+	if found {
+		return // Already queued
 	}
-
-	r.priorityHeights = append(r.priorityHeights, daHeight)
-	// Keep sorted in ascending order so we process lower heights first
-	slices.Sort(r.priorityHeights)
+	r.priorityHeights = slices.Insert(r.priorityHeights, idx, daHeight)
 }
 
 // PopPriorityHeight returns the next priority height to fetch, or 0 if none.

block/internal/syncing/syncer_backoff_test.go

@@ -76,6 +76,9 @@ func TestSyncer_BackoffOnDAError(t *testing.T) {
 			syncer.p2pHandler = p2pHandler
 			p2pHandler.On("SetProcessedHeight", mock.Anything).Return().Maybe()
 
+			// Mock PopPriorityHeight to always return 0 (no priority heights)
+			daRetriever.On("PopPriorityHeight").Return(uint64(0)).Maybe()
+
 			// Create mock stores for P2P
 			mockHeaderStore := extmocks.NewMockStore[*types.SignedHeader](t)
 			mockHeaderStore.EXPECT().Height().Return(uint64(0)).Maybe()
@@ -164,6 +167,9 @@ func TestSyncer_BackoffResetOnSuccess(t *testing.T) {
 	syncer.p2pHandler = p2pHandler
 	p2pHandler.On("SetProcessedHeight", mock.Anything).Return().Maybe()
 
+	// Mock PopPriorityHeight to always return 0 (no priority heights)
+	daRetriever.On("PopPriorityHeight").Return(uint64(0)).Maybe()
+
 	// Create mock stores for P2P
 	mockHeaderStore := extmocks.NewMockStore[*types.SignedHeader](t)
 	mockHeaderStore.EXPECT().Height().Return(uint64(0)).Maybe()
@@ -246,6 +252,9 @@ func TestSyncer_BackoffBehaviorIntegration(t *testing.T) {
 	syncer.daRetriever = daRetriever
 	syncer.p2pHandler = p2pHandler
 
+	// Mock PopPriorityHeight to always return 0 (no priority heights)
+	daRetriever.On("PopPriorityHeight").Return(uint64(0)).Maybe()
+
 	// Create mock stores for P2P
 	mockHeaderStore := extmocks.NewMockStore[*types.SignedHeader](t)
 	mockHeaderStore.EXPECT().Height().Return(uint64(0)).Maybe()

block/internal/syncing/syncer_benchmark_test.go

@@ -136,6 +136,7 @@ func newBenchFixture(b *testing.B, totalHeights uint64, shuffledTx bool, daDelay
 
 	// Mock DA retriever to emit exactly totalHeights events, then HFF and cancel
 	daR := NewMockDARetriever(b)
+	daR.On("PopPriorityHeight").Return(uint64(0)).Maybe()
 	for i := uint64(0); i < totalHeights; i++ {
 		daHeight := i + daHeightOffset
 		daR.On("RetrieveFromDA", mock.Anything, daHeight).