signing optimization

Author: julienrbrt

block/internal/submitting/da_submitter.go

@@ -5,8 +5,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"runtime"
+	"sync"
 	"time"
 
+	lru "github.com/hashicorp/golang-lru/v2"
 	"github.com/rs/zerolog"
 
 	"github.com/evstack/ev-node/block/internal/cache"
@@ -21,6 +24,16 @@ import (
 	"github.com/evstack/ev-node/types"
 )
 
+const (
+	// DefaultEnvelopeCacheSize is the default size for caching signed DA envelopes.
+	// This avoids re-signing headers on retry scenarios.
+	DefaultEnvelopeCacheSize = 10_000
+
+	// signingWorkerPoolSize determines how many parallel signing goroutines to use.
+	// Ed25519 signing is CPU-bound, so we use GOMAXPROCS workers.
+	signingWorkerPoolSize = 0 // 0 means use runtime.GOMAXPROCS(0)
+)
+
 const initialBackoff = 100 * time.Millisecond
 
 // retryPolicy defines clamped bounds for retries and backoff.
@@ -100,6 +113,13 @@ type DASubmitter struct {
 
 	// address selector for multi-account support
 	addressSelector pkgda.AddressSelector
+
+	// envelopeCache caches fully signed DA envelopes by height to avoid re-signing on retries
+	envelopeCache   *lru.Cache[uint64, []byte]
+	envelopeCacheMu sync.RWMutex
+
+	// signingWorkers is the number of parallel workers for signing
+	signingWorkers int
 }
 
 // NewDASubmitter creates a new DA submitter
@@ -134,6 +154,18 @@ func NewDASubmitter(
 		addressSelector = pkgda.NewNoOpSelector()
 	}
 
+	// Create envelope cache for avoiding re-signing on retries
+	envelopeCache, err := lru.New[uint64, []byte](DefaultEnvelopeCacheSize)
+	if err != nil {
+		daSubmitterLogger.Warn().Err(err).Msg("failed to create envelope cache, continuing without caching")
+	}
+
+	// Determine number of signing workers
+	workers := signingWorkerPoolSize
+	if workers <= 0 || workers > runtime.GOMAXPROCS(0) {
+		workers = runtime.GOMAXPROCS(0)
+	}
+
 	return &DASubmitter{
 		client:          client,
 		config:          config,
@@ -142,6 +174,8 @@ func NewDASubmitter(
 		metrics:         metrics,
 		logger:          daSubmitterLogger,
 		addressSelector: addressSelector,
+		envelopeCache:   envelopeCache,
+		signingWorkers:  workers,
 	}
 }
 
@@ -175,21 +209,10 @@ func (s *DASubmitter) SubmitHeaders(ctx context.Context, headers []*types.Signed
 
 	s.logger.Info().Int("count", len(headers)).Msg("submitting headers to DA")
 
-	// Create DA envelopes from pre-marshalled headers
-	envelopes := make([][]byte, len(headers))
-	for i, header := range headers {
-		// Sign the pre-marshalled header content
-		envelopeSignature, err := signer.Sign(marshalledHeaders[i])
-		if err != nil {
-			return fmt.Errorf("failed to sign envelope for header %d: %w", i, err)
-		}
-
-		// Create the envelope and marshal it
-		envelope, err := header.MarshalDAEnvelope(envelopeSignature)
-		if err != nil {
-			return fmt.Errorf("failed to marshal DA envelope for header %d: %w", i, err)
-		}
-		envelopes[i] = envelope
+	// Create DA envelopes with parallel signing and caching
+	envelopes, err := s.createDAEnvelopes(headers, marshalledHeaders, signer)
+	if err != nil {
+		return err
 	}
 
 	return submitToDA(s, ctx, headers, envelopes,
@@ -200,6 +223,8 @@ func (s *DASubmitter) SubmitHeaders(ctx context.Context, headers []*types.Signed
 			if l := len(submitted); l > 0 {
 				lastHeight := submitted[l-1].Height()
 				cache.SetLastSubmittedHeaderHeight(ctx, lastHeight)
+				// Clear envelope cache for successfully submitted heights
+				s.clearEnvelopeCacheUpTo(lastHeight)
 			}
 		},
 		"header",
@@ -209,6 +234,173 @@ func (s *DASubmitter) SubmitHeaders(ctx context.Context, headers []*types.Signed
 	)
 }
 
+// createDAEnvelopes creates signed DA envelopes for the given headers.
+// It uses caching to avoid re-signing on retries and parallel signing for new envelopes.
+func (s *DASubmitter) createDAEnvelopes(headers []*types.SignedHeader, marshalledHeaders [][]byte, signer signer.Signer) ([][]byte, error) {
+	envelopes := make([][]byte, len(headers))
+
+	// First pass: check cache for already-signed envelopes
+	var needSigning []int // indices that need signing
+	for i, header := range headers {
+		height := header.Height()
+		if cached := s.getCachedEnvelope(height); cached != nil {
+			envelopes[i] = cached
+		} else {
+			needSigning = append(needSigning, i)
+		}
+	}
+
+	// If all envelopes were cached, we're done
+	if len(needSigning) == 0 {
+		s.logger.Debug().Int("cached", len(headers)).Msg("all envelopes retrieved from cache")
+		return envelopes, nil
+	}
+
+	s.logger.Debug().
+		Int("cached", len(headers)-len(needSigning)).
+		Int("to_sign", len(needSigning)).
+		Msg("signing DA envelopes")
+
+	// For small batches, sign sequentially to avoid goroutine overhead
+	if len(needSigning) <= 2 || s.signingWorkers <= 1 {
+		for _, i := range needSigning {
+			envelope, err := s.signAndCacheEnvelope(headers[i], marshalledHeaders[i], signer)
+			if err != nil {
+				return nil, fmt.Errorf("failed to create envelope for header %d: %w", i, err)
+			}
+			envelopes[i] = envelope
+		}
+		return envelopes, nil
+	}
+
+	// Parallel signing for larger batches
+	return s.signEnvelopesParallel(headers, marshalledHeaders, envelopes, needSigning, signer)
+}
+
+// signEnvelopesParallel signs envelopes in parallel using a worker pool.
+func (s *DASubmitter) signEnvelopesParallel(
+	headers []*types.SignedHeader,
+	marshalledHeaders [][]byte,
+	envelopes [][]byte,
+	needSigning []int,
+	signer signer.Signer,
+) ([][]byte, error) {
+	type signJob struct {
+		index int
+	}
+	type signResult struct {
+		index    int
+		envelope []byte
+		err      error
+	}
+
+	jobs := make(chan signJob, len(needSigning))
+	results := make(chan signResult, len(needSigning))
+
+	// Start workers
+	numWorkers := min(s.signingWorkers, len(needSigning))
+	var wg sync.WaitGroup
+	for range numWorkers {
+		wg.Go(func() {
+			for job := range jobs {
+				envelope, err := s.signAndCacheEnvelope(headers[job.index], marshalledHeaders[job.index], signer)
+				results <- signResult{index: job.index, envelope: envelope, err: err}
+			}
+		})
+	}
+
+	// Send jobs
+	for _, i := range needSigning {
+		jobs <- signJob{index: i}
+	}
+	close(jobs)
+
+	// Wait for workers to finish and close results
+	go func() {
+		wg.Wait()
+		close(results)
+	}()
+
+	// Collect results
+	var firstErr error
+	for result := range results {
+		if result.err != nil && firstErr == nil {
+			firstErr = fmt.Errorf("failed to create envelope for header %d: %w", result.index, result.err)
+			continue
+		}
+		if result.err == nil {
+			envelopes[result.index] = result.envelope
+		}
+	}
+
+	if firstErr != nil {
+		return nil, firstErr
+	}
+
+	return envelopes, nil
+}
+
+// signAndCacheEnvelope signs a single header and caches the result.
+func (s *DASubmitter) signAndCacheEnvelope(header *types.SignedHeader, marshalledHeader []byte, signer signer.Signer) ([]byte, error) {
+	// Sign the pre-marshalled header content
+	envelopeSignature, err := signer.Sign(marshalledHeader)
+	if err != nil {
+		return nil, fmt.Errorf("failed to sign envelope: %w", err)
+	}
+
+	// Create the envelope and marshal it
+	envelope, err := header.MarshalDAEnvelope(envelopeSignature)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal DA envelope: %w", err)
+	}
+
+	// Cache for potential retries
+	s.setCachedEnvelope(header.Height(), envelope)
+
+	return envelope, nil
+}
+
+// getCachedEnvelope retrieves a cached envelope for the given height.
+func (s *DASubmitter) getCachedEnvelope(height uint64) []byte {
+	if s.envelopeCache == nil {
+		return nil
+	}
+	s.envelopeCacheMu.RLock()
+	defer s.envelopeCacheMu.RUnlock()
+
+	if envelope, ok := s.envelopeCache.Get(height); ok {
+		return envelope
+	}
+	return nil
+}
+
+// setCachedEnvelope stores an envelope in the cache.
+func (s *DASubmitter) setCachedEnvelope(height uint64, envelope []byte) {
+	if s.envelopeCache == nil {
+		return
+	}
+	s.envelopeCacheMu.Lock()
+	defer s.envelopeCacheMu.Unlock()
+
+	s.envelopeCache.Add(height, envelope)
+}
+
+// clearEnvelopeCacheUpTo removes cached envelopes up to and including the given height.
+func (s *DASubmitter) clearEnvelopeCacheUpTo(height uint64) {
+	if s.envelopeCache == nil {
+		return
+	}
+	s.envelopeCacheMu.Lock()
+	defer s.envelopeCacheMu.Unlock()
+
+	keys := s.envelopeCache.Keys()
+	for _, h := range keys {
+		if h <= height {
+			s.envelopeCache.Remove(h)
+		}
+	}
+}
+
 // SubmitData submits pending data to DA layer
 func (s *DASubmitter) SubmitData(ctx context.Context, unsignedDataList []*types.SignedData, marshalledData [][]byte, cache cache.Manager, signer signer.Signer, genesis genesis.Genesis) error {
 	if len(unsignedDataList) == 0 {

pkg/store/cached_store.go

@@ -171,7 +171,7 @@ func (cs *CachedStore) ClearCache() {
 
 // Rollback wraps the underlying store's Rollback and invalidates affected cache entries.
 func (cs *CachedStore) Rollback(ctx context.Context, height uint64, aggregator bool) error {
-	currentHeight, err := cs.Store.Height(ctx)
+	currentHeight, err := cs.Height(ctx)
 	if err != nil {
 		return err
 	}

pkg/store/cached_store_test.go

@@ -74,19 +74,21 @@ func TestCachedStore_GetHeader_MultipleHeights(t *testing.T) {
 
 	// Load multiple heights
 	headers := make([]*types.SignedHeader, 5)
-	for h := uint64(1); h <= 5; h++ {
+	for i := 0; i < 5; i++ {
+		h := uint64(i + 1)
 		header, err := cachedStore.GetHeader(ctx, h)
 		require.NoError(t, err)
 		require.NotNil(t, header)
 		assert.Equal(t, h, header.Height())
-		headers[h-1] = header
+		headers[i] = header
 	}
 
 	// Re-access all heights - should return same cached references
-	for h := uint64(1); h <= 5; h++ {
+	for i := 0; i < 5; i++ {
+		h := uint64(i + 1)
 		header, err := cachedStore.GetHeader(ctx, h)
 		require.NoError(t, err)
-		assert.Same(t, headers[h-1], header, "should return cached header for height %d", h)
+		assert.Same(t, headers[i], header, "should return cached header for height %d", h)
 	}
 }