Merge remote-tracking branch 'origin/main' into marko/key_rotation

randygrok · randygrok · commit 5bb20d52e4d1 · 2026-06-08T18:55:09.000+02:00
# Conflicts:
#	execution/evm/go.sum
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## v1.1.2
+
 ### Changes
 
 - Add max bytes contraints in simple solo sequnecer [#3312](https://github.com/evstack/ev-node/pull/3312)
@@ -21,6 +23,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Optimize metadata writes by making it async in cache store [#3298](https://github.com/evstack/ev-node/pull/3298)
 - Reduce tx cache retention to avoid OOM under (really) heavy tx load [#3299](https://github.com/evstack/ev-node/pull/3299)
 
+### Fixed
+
+- Increase P2P pubsub max message size to match `DefaultMaxBlobSize`, preventing fullnode desync on large blocks [#3344](https://github.com/evstack/ev-node/pull/3344).
+
 ## v1.1.1
 
 ### Changes
diff --git a/apps/evm/go.mod b/apps/evm/go.mod
@@ -10,7 +10,7 @@ replace (
 
 require (
 	github.com/ethereum/go-ethereum v1.17.3
-	github.com/evstack/ev-node v1.1.1
+	github.com/evstack/ev-node v1.1.2
 	github.com/evstack/ev-node/core v1.0.0
 	github.com/evstack/ev-node/execution/evm v1.0.1
 	github.com/ipfs/go-datastore v0.9.1
diff --git a/apps/grpc/go.mod b/apps/grpc/go.mod
@@ -9,9 +9,9 @@ replace (
 )
 
 require (
-	github.com/evstack/ev-node v1.1.1
+	github.com/evstack/ev-node v1.1.2
 	github.com/evstack/ev-node/core v1.0.0
-	github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1
+	github.com/evstack/ev-node/execution/grpc v1.0.0
 	github.com/ipfs/go-datastore v0.9.1
 	github.com/rs/zerolog v1.35.1
 	github.com/spf13/cobra v1.10.2
diff --git a/apps/testapp/Dockerfile b/apps/testapp/Dockerfile
@@ -30,7 +30,7 @@ COPY . .
 WORKDIR /ev-node/apps/testapp
 
 # 125829120 = 120 MB
-RUN go build -ldflags "-X github.com/evstack/ev-node/block/internal/common.defaultMaxBlobSizeStr=125829120" -o /go/bin/testapp .
+RUN go build -ldflags "-X github.com/evstack/ev-node/pkg/blobsize.defaultMaxBlobSizeStr=125829120" -o /go/bin/testapp .
 
 ## prep the final image.
 #
diff --git a/apps/testapp/go.mod b/apps/testapp/go.mod
@@ -8,7 +8,7 @@ replace (
 )
 
 require (
-	github.com/evstack/ev-node v1.1.1
+	github.com/evstack/ev-node v1.1.2
 	github.com/evstack/ev-node/core v1.0.0
 	github.com/ipfs/go-datastore v0.9.1
 	github.com/rs/zerolog v1.35.1
diff --git a/block/internal/da/client.go b/block/internal/da/client.go
@@ -12,7 +12,7 @@ import (
 	"github.com/celestiaorg/go-square/v3/share"
 	"github.com/rs/zerolog"
 
-	"github.com/evstack/ev-node/block/internal/common"
+	"github.com/evstack/ev-node/pkg/blobsize"
 	blobrpc "github.com/evstack/ev-node/pkg/da/jsonrpc"
 	datypes "github.com/evstack/ev-node/pkg/da/types"
 )
@@ -161,7 +161,7 @@ func (c *client) Submit(ctx context.Context, data [][]byte, _ float64, namespace
 
 	blobs := make([]*blobrpc.Blob, len(data))
 	for i, raw := range data {
-		if uint64(len(raw)) > common.DefaultMaxBlobSize {
+		if uint64(len(raw)) > blobsize.DefaultMaxBlobSize {
 			return datypes.ResultSubmit{
 				BaseResult: datypes.BaseResult{
 					Code:    datypes.StatusTooBig,
@@ -559,7 +559,7 @@ func extractBlobData(resp *blobrpc.SubscriptionResponse) [][]byte {
 			continue
 		}
 		data := blob.Data()
-		if len(data) == 0 || uint64(len(data)) > common.DefaultMaxBlobSize {
+		if len(data) == 0 || uint64(len(data)) > blobsize.DefaultMaxBlobSize {
 			continue
 		}
 		blobs = append(blobs, data)
diff --git a/block/internal/executing/executor.go b/block/internal/executing/executor.go
@@ -19,6 +19,7 @@ import (
 	"github.com/evstack/ev-node/block/internal/common"
 	coreexecutor "github.com/evstack/ev-node/core/execution"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
+	"github.com/evstack/ev-node/pkg/blobsize"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/raft"
@@ -681,7 +682,7 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
 func (e *Executor) RetrieveBatch(ctx context.Context) (*BatchData, error) {
 	req := coresequencer.GetNextBatchRequest{
 		Id:            []byte(e.genesis.ChainID),
-		MaxBytes:      common.DefaultMaxBlobSize,
+		MaxBytes:      blobsize.DefaultMaxBlobSize,
 		LastBatchData: [][]byte{}, // Can be populated if needed for sequencer context
 	}
 
diff --git a/block/internal/submitting/batching_strategy_test.go b/block/internal/submitting/batching_strategy_test.go
@@ -7,13 +7,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/evstack/ev-node/block/internal/common"
+	"github.com/evstack/ev-node/pkg/blobsize"
 	"github.com/evstack/ev-node/pkg/config"
 )
 
 func TestImmediateStrategy(t *testing.T) {
 	strategy := &ImmediateStrategy{}
-	maxBlobSize := common.DefaultMaxBlobSize
+	maxBlobSize := blobsize.DefaultMaxBlobSize
 
 	tests := []struct {
 		name         string
@@ -50,7 +50,7 @@ func TestImmediateStrategy(t *testing.T) {
 }
 
 func TestSizeBasedStrategy(t *testing.T) {
-	maxBlobSize := common.DefaultMaxBlobSize
+	maxBlobSize := blobsize.DefaultMaxBlobSize
 
 	tests := []struct {
 		name           string
@@ -120,7 +120,7 @@ func TestSizeBasedStrategy(t *testing.T) {
 
 func TestTimeBasedStrategy(t *testing.T) {
 	maxDelay := 6 * time.Second
-	maxBlobSize := common.DefaultMaxBlobSize
+	maxBlobSize := blobsize.DefaultMaxBlobSize
 
 	tests := []struct {
 		name                string
@@ -174,7 +174,7 @@ func TestTimeBasedStrategy(t *testing.T) {
 }
 
 func TestAdaptiveStrategy(t *testing.T) {
-	maxBlobSize := common.DefaultMaxBlobSize
+	maxBlobSize := blobsize.DefaultMaxBlobSize
 	sizeThreshold := 0.8
 	maxDelay := 6 * time.Second
 
@@ -306,7 +306,7 @@ func TestNewBatchingStrategy(t *testing.T) {
 }
 
 func TestBatchingStrategiesComparison(t *testing.T) {
-	maxBlobSize := common.DefaultMaxBlobSize
+	maxBlobSize := blobsize.DefaultMaxBlobSize
 	pendingCount := uint64(10)
 	totalSize := maxBlobSize / 2
 	timeSinceLastSubmit := 3 * time.Second
diff --git a/block/internal/submitting/da_submitter.go b/block/internal/submitting/da_submitter.go
@@ -16,6 +16,7 @@ import (
 	"github.com/evstack/ev-node/block/internal/cache"
 	"github.com/evstack/ev-node/block/internal/common"
 	"github.com/evstack/ev-node/block/internal/da"
+	"github.com/evstack/ev-node/pkg/blobsize"
 	"github.com/evstack/ev-node/pkg/config"
 	pkgda "github.com/evstack/ev-node/pkg/da"
 	datypes "github.com/evstack/ev-node/pkg/da/types"
@@ -50,7 +51,7 @@ func defaultRetryPolicy(maxAttempts int, maxDuration time.Duration) retryPolicy
 		MaxAttempts:  maxAttempts,
 		MinBackoff:   initialBackoff,
 		MaxBackoff:   maxDuration,
-		MaxBlobBytes: common.DefaultMaxBlobSize,
+		MaxBlobBytes: blobsize.DefaultMaxBlobSize,
 	}
 }
 
diff --git a/block/internal/submitting/submitter.go b/block/internal/submitting/submitter.go
@@ -16,6 +16,7 @@ import (
 	"github.com/evstack/ev-node/block/internal/common"
 	coreexecutor "github.com/evstack/ev-node/core/execution"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
+	"github.com/evstack/ev-node/pkg/blobsize"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/signer"
@@ -219,7 +220,7 @@ func (s *Submitter) daSubmissionLoop() {
 						shouldSubmit := s.batchingStrategy.ShouldSubmit(
 							uint64(len(headers)),
 							totalSize,
-							common.DefaultMaxBlobSize,
+							blobsize.DefaultMaxBlobSize,
 							timeSinceLastSubmit,
 						)
 
@@ -279,7 +280,7 @@ func (s *Submitter) daSubmissionLoop() {
 						shouldSubmit := s.batchingStrategy.ShouldSubmit(
 							uint64(len(signedDataList)),
 							totalSize,
-							common.DefaultMaxBlobSize,
+							blobsize.DefaultMaxBlobSize,
 							timeSinceLastSubmit,
 						)
 
diff --git a/block/internal/syncing/syncer.go b/block/internal/syncing/syncer.go
@@ -20,6 +20,7 @@ import (
 	"github.com/evstack/ev-node/block/internal/common"
 	"github.com/evstack/ev-node/block/internal/da"
 	coreexecutor "github.com/evstack/ev-node/core/execution"
+	"github.com/evstack/ev-node/pkg/blobsize"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/raft"
@@ -964,7 +965,7 @@ func (s *Syncer) gracePeriodForEpoch(epochStart, epochEnd uint64) uint64 {
 	s.forcedInclusionMu.RUnlock()
 
 	avgBytes := totalBytes / heightCount
-	threshold := uint64(math.Round(fullnessThreshold * float64(common.DefaultMaxBlobSize)))
+	threshold := uint64(math.Round(fullnessThreshold * float64(blobsize.DefaultMaxBlobSize)))
 
 	var extra uint64
 	if avgBytes > threshold {
@@ -1048,7 +1049,7 @@ func (s *Syncer) VerifyForcedInclusionTxs(ctx context.Context, daHeight uint64,
 		}
 
 		// Skip intrinsically invalid txs so the sequencer isn't blamed for dropping them.
-		filterStatuses, filterErr := s.exec.FilterTxs(ctx, event.Txs, common.DefaultMaxBlobSize, executionInfo.MaxGas, true)
+		filterStatuses, filterErr := s.exec.FilterTxs(ctx, event.Txs, blobsize.DefaultMaxBlobSize, executionInfo.MaxGas, true)
 		if filterErr != nil {
 			return fmt.Errorf("failed to filter forced inclusion txs: %w", filterErr)
 		}
diff --git a/block/internal/syncing/syncer_forced_inclusion_test.go b/block/internal/syncing/syncer_forced_inclusion_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/evstack/ev-node/block/internal/common"
 	"github.com/evstack/ev-node/block/internal/da"
 	"github.com/evstack/ev-node/core/execution"
+	"github.com/evstack/ev-node/pkg/blobsize"
 	"github.com/evstack/ev-node/pkg/config"
 	datypes "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
@@ -480,7 +481,7 @@ func TestGracePeriodForEpoch_LightBlocks(t *testing.T) {
 func TestGracePeriodForEpoch_FullBlocks(t *testing.T) {
 	s := &Syncer{daBlockBytes: make(map[uint64]uint64)}
 	for h := uint64(0); h <= 4; h++ {
-		s.daBlockBytes[h] = common.DefaultMaxBlobSize
+		s.daBlockBytes[h] = blobsize.DefaultMaxBlobSize
 	}
 	grace := s.gracePeriodForEpoch(0, 4)
 	require.GreaterOrEqual(t, grace, baseGracePeriodEpochs)
@@ -490,7 +491,7 @@ func TestGracePeriodForEpoch_FullBlocks(t *testing.T) {
 // avgBytes=1.6·M, threshold=0.8·M → extra=1 → grace=base+1.
 func TestGracePeriodForEpoch_ExtendedUnderHighCongestion(t *testing.T) {
 	s := &Syncer{daBlockBytes: make(map[uint64]uint64)}
-	congested := uint64(float64(common.DefaultMaxBlobSize) * 1.6)
+	congested := uint64(float64(blobsize.DefaultMaxBlobSize) * 1.6)
 	for h := uint64(0); h <= 2; h++ {
 		s.daBlockBytes[h] = congested
 	}
@@ -501,7 +502,7 @@ func TestGracePeriodForEpoch_ExtendedUnderHighCongestion(t *testing.T) {
 // TestGracePeriodForEpoch_CappedAtMax verifies the grace period never exceeds maxGracePeriodEpochs.
 func TestGracePeriodForEpoch_CappedAtMax(t *testing.T) {
 	s := &Syncer{daBlockBytes: make(map[uint64]uint64)}
-	huge := common.DefaultMaxBlobSize * 100
+	huge := blobsize.DefaultMaxBlobSize * 100
 	for h := uint64(0); h <= 4; h++ {
 		s.daBlockBytes[h] = huge
 	}
@@ -526,7 +527,7 @@ func TestVerifyForcedInclusionTxs_DynamicGrace_CongestedEpochGetsExtraTime(t *te
 	mockFIEmpty(client, 2, 9)
 
 	// avgBytes = 1.6·M → extra=1 → gracePeriodForEpoch(0,1)=2 → graceBoundary=5.
-	blockBytes := uint64(float64(common.DefaultMaxBlobSize) * 1.6)
+	blockBytes := uint64(float64(blobsize.DefaultMaxBlobSize) * 1.6)
 
 	d0 := makeData("tchain", 1, 1)
 	d0.Txs[0] = types.Tx(make([]byte, blockBytes))
diff --git a/execution/evm/go.mod b/execution/evm/go.mod
@@ -9,7 +9,7 @@ replace (
 
 require (
 	github.com/ethereum/go-ethereum v1.17.3
-	github.com/evstack/ev-node v1.1.1
+	github.com/evstack/ev-node v1.1.2
 	github.com/evstack/ev-node/core v1.0.0
 	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/ipfs/go-datastore v0.9.1
diff --git a/execution/evm/test/go.mod b/execution/evm/test/go.mod
@@ -78,7 +78,7 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
 	github.com/emicklei/dot v1.6.2 // indirect
 	github.com/ethereum/c-kzg-4844/v2 v2.1.6 // indirect
-	github.com/evstack/ev-node v1.1.1 // indirect
+	github.com/evstack/ev-node v1.1.2 // indirect
 	github.com/evstack/ev-node/core v1.0.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/ferranbt/fastssz v0.1.4 // indirect
diff --git a/pkg/blobsize/blobsize.go b/pkg/blobsize/blobsize.go
@@ -1,11 +1,11 @@
-package common
+package blobsize
 
 import "strconv"
 
 // defaultMaxBlobSizeStr holds the string representation of the default blob
 // size limit. Override at link time via:
 //
-//	go build -ldflags "-X github.com/evstack/ev-node/block/internal/common.defaultMaxBlobSizeStr=125829120"
+//	go build -ldflags "-X github.com/evstack/ev-node/pkg/blobsize.defaultMaxBlobSizeStr=125829120"
 var defaultMaxBlobSizeStr = "5242880" // 5 MB
 
 // DefaultMaxBlobSize is the max blob size limit used for blob submission.
diff --git a/pkg/p2p/client.go b/pkg/p2p/client.go
@@ -24,6 +24,7 @@ import (
 	"github.com/multiformats/go-multiaddr"
 	"github.com/rs/zerolog"
 
+	"github.com/evstack/ev-node/pkg/blobsize"
 	"github.com/evstack/ev-node/pkg/config"
 	rollhash "github.com/evstack/ev-node/pkg/hash"
 )
@@ -465,7 +466,7 @@ func (c *Client) tryConnect(ctx context.Context, peer peer.AddrInfo) {
 
 func (c *Client) setupGossiping(ctx context.Context) error {
 	var err error
-	c.ps, err = pubsub.NewFloodSub(ctx, c.host)
+	c.ps, err = pubsub.NewFloodSub(ctx, c.host, pubsub.WithMaxMessageSize(int(blobsize.DefaultMaxBlobSize)))
 	if err != nil {
 		return err
 	}
diff --git a/pkg/p2p/client_test.go b/pkg/p2p/client_test.go
@@ -82,6 +82,48 @@ func TestNewClientWithHost(t *testing.T) {
 
 }
 
+func TestPubSubMaxMessageSize(t *testing.T) {
+	require := require.New(t)
+	logger := zerolog.Nop()
+
+	ctx := t.Context()
+	clients := startTestNetwork(ctx, t, 2, map[int]hostDescr{
+		1: {conns: []int{0}},
+	}, logger)
+	defer clients.Close()
+	clients.WaitForDHT()
+
+	const topic = "test-large-msg"
+
+	subTopic, err := clients[1].PubSub().Join(topic)
+	require.NoError(err)
+	sub, err := subTopic.Subscribe()
+	require.NoError(err)
+
+	// allow subscription to propagate
+	time.Sleep(200 * time.Millisecond)
+
+	tp, err := clients[0].PubSub().Join(topic)
+	require.NoError(err)
+
+	// 1.5 MB — exceeds the default 1 MB limit but fits within our configured limit
+	msgSize := 1.5 * 1024 * 1024
+	payload := make([]byte, int(msgSize))
+	for i := range payload {
+		payload[i] = byte(i % 256)
+	}
+
+	err = tp.Publish(ctx, payload)
+	require.NoError(err)
+
+	recvCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cancel()
+
+	msg, err := sub.Next(recvCtx)
+	require.NoError(err)
+	require.Equal(payload, msg.Data)
+}
+
 func TestClientStartup(t *testing.T) {
 	assert := assert.New(t)
 	// create temp config dir
diff --git a/pkg/sequencers/solo/sequencer_test.go b/pkg/sequencers/solo/sequencer_test.go
@@ -296,7 +296,7 @@ func TestSoloSequencer_SubmitBatchTxs_UnboundedByDefault(t *testing.T) {
 	seq := newTestSequencer(t)
 
 	bigTx := make([]byte, 1024*1024)
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		_, err := seq.SubmitBatchTxs(context.Background(), coresequencer.SubmitBatchTxsRequest{
 			Id:    []byte("test"),
 			Batch: &coresequencer.Batch{Transactions: [][]byte{bigTx}},
diff --git a/test/e2e/go.mod b/test/e2e/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.53.6
 	github.com/cosmos/ibc-go/v8 v8.8.0
 	github.com/ethereum/go-ethereum v1.17.3
-	github.com/evstack/ev-node v1.1.1
+	github.com/evstack/ev-node v1.1.2
 	github.com/evstack/ev-node/execution/evm v0.0.0-20250602130019-2a732cf903a5
 	github.com/evstack/ev-node/execution/evm/test v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.48.0

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ COPY . .`
`30`	`30`	`WORKDIR /ev-node/apps/testapp`
`31`	`31`
`32`	`32`	`# 125829120 = 120 MB`
`33`		`-RUN go build -ldflags "-X github.com/evstack/ev-node/block/internal/common.defaultMaxBlobSizeStr=125829120" -o /go/bin/testapp .`
	`33`	`+RUN go build -ldflags "-X github.com/evstack/ev-node/pkg/blobsize.defaultMaxBlobSizeStr=125829120" -o /go/bin/testapp .`
`34`	`34`
`35`	`35`	`## prep the final image.`
`36`	`36`	`#`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ replace (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`require (`
`11`		`- github.com/evstack/ev-node v1.1.1`
	`11`	`+ github.com/evstack/ev-node v1.1.2`
`12`	`12`	`github.com/evstack/ev-node/core v1.0.0`
`13`	`13`	`github.com/ipfs/go-datastore v0.9.1`
`14`	`14`	`github.com/rs/zerolog v1.35.1`