WIP: NOT TO BE MERGED!

.github/auto_request_review.yml

@@ -0,0 +1,12 @@
+# More info at https://github.com/necojackarc/auto-request-review
+reviewers:
+  defaults:
+    - evan-forbes
+    - tzdybal
+    - rach-id
+
+options:
+  ignore_draft: true
+  ignored_keywords:
+    - DO NOT REVIEW
+  enable_group_assignment: false

.github/workflows/build.yml

@@ -19,10 +19,10 @@ jobs:
         goos: ["linux"]
     timeout-minutes: 5
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
-      - uses: actions/checkout@v4
+          go-version-file: "go.mod"
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |
@@ -41,10 +41,10 @@ jobs:
     needs: build
     timeout-minutes: 5
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
-      - uses: actions/checkout@v4
+          go-version-file: "go.mod"
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |
@@ -63,10 +63,10 @@ jobs:
     needs: build
     timeout-minutes: 5
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
-      - uses: actions/checkout@v4
+          go-version-file: "go.mod"
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |

.github/workflows/check-generated.yml

@@ -16,11 +16,11 @@ jobs:
   check-mocks-metrics:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: "go.mod"
 
-      - uses: actions/checkout@v4
 
       - name: "Check generated mocks and metrics"
         run: |
@@ -42,13 +42,12 @@ jobs:
   check-proto:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.22"
-
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1 # we need a .git directory to run git diff
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
 
       - name: "Check protobuf generated code"
         run: |

.github/workflows/e2e-manual-multiversion.yml

@@ -15,11 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
-
-      - uses: actions/checkout@v4
+          go-version-file: 'go.mod'
 
       - name: Build
         working-directory: test/e2e

.github/workflows/e2e-manual.yml

@@ -15,11 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
-
-      - uses: actions/checkout@v4
+          go-version-file: 'go.mod'
 
       - name: Build
         working-directory: test/e2e

.github/workflows/e2e.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
-      - uses: actions/checkout@v4
+          go-version-file: 'go.mod'
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |

.github/workflows/fuzz-nightly.yml

@@ -14,11 +14,10 @@ jobs:
   fuzz-nightly-test:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
-
-      - uses: actions/checkout@v4
+          go-version-file: 'go.mod'
 
       - name: Install go-fuzz
         working-directory: test/fuzz

.github/workflows/govulncheck.yml

@@ -14,11 +14,11 @@ jobs:
   govulncheck:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.23"
+          go-version-file: "go.mod"
           check-latest: true
-      - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |

.github/workflows/lint.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version-file: 'go.mod'
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |

.github/workflows/pre-release.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version-file: 'go.mod'
 
       # Similar check to ./release-version.yml, but enforces this when pushing
       # tags. The ./release-version.yml check can be bypassed and is mainly

.github/workflows/release-version.yml

@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version-file: 'go.mod'
 
       - name: Check version
         run: |

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version-file: 'go.mod'
 
       # Similar check to ./release-version.yml, but enforces this when pushing
       # tags. The ./release-version.yml check can be bypassed and is mainly

.github/workflows/tests.yml

@@ -15,10 +15,10 @@ jobs:
       matrix:
         part: ["00", "01", "02", "03", "04", "05"]
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
-      - uses: actions/checkout@v4
+          go-version-file: "go.mod"
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |

.golangci.yml

@@ -86,6 +86,8 @@ linters-settings:
           - google.golang.org/protobuf/types/known/timestamppb
           - gonum.org/v1/gonum/stat
           - github.com/celestiaorg/go-square/v2
+          - github.com/stretchr/testify/assert
+          - github.com/klauspost/reedsolomon
       test:
         files:
           - "$test"
@@ -111,6 +113,7 @@ linters-settings:
           - github.com/stretchr/testify
           - github.com/decred/dcrd/dcrec/secp256k1/v4
           - github.com/celestiaorg/go-square/v2
+          - github.com/stretchr/testify/require
   revive:
     enable-all-rules: true
     rules:

blocksync/metrics.go

@@ -1,8 +1,9 @@
 package blocksync
 
 import (
-	"github.com/cometbft/cometbft/types"
 	"github.com/go-kit/kit/metrics"
+
+	"github.com/cometbft/cometbft/types"
 )
 
 const (

blocksync/pool.go

@@ -32,7 +32,7 @@ eg, L = latency = 0.1s
 const (
 	requestIntervalMS         = 2
 	maxPendingRequestsPerPeer = 20
-	requestRetrySeconds       = 30
+	requestRetrySeconds       = 45
 
 	// Minimum recv rate to ensure we're receiving blocks from a peer fast
 	// enough. If a peer is not sending us data at at least that rate, we
@@ -54,7 +54,7 @@ const (
 	minBlocksForSingleRequest = 50
 )
 
-var peerTimeout = 15 * time.Second // not const so we can override with tests
+var peerTimeout = 120 * time.Second // not const so we can override with tests
 
 /*
 	Peers self report their heights when we join the block pool.

blocksync/reactor.go

@@ -181,7 +181,7 @@ func (bcR *Reactor) GetChannels() []*p2p.ChannelDescriptor {
 	return []*p2p.ChannelDescriptor{
 		{
 			ID:                  BlocksyncChannel,
-			Priority:            5,
+			Priority:            30,
 			SendQueueCapacity:   1000,
 			RecvBufferCapacity:  50 * 4096,
 			RecvMessageCapacity: MaxMsgSize,

blocksync/reactor_test.go

@@ -138,10 +138,9 @@ func newReactor(
 
 		lastExtCommit := seenExtCommit.Clone()
 
-		thisBlock := state.MakeBlock(blockHeight, types.MakeData([]types.Tx{}), lastExtCommit.ToCommit(), nil, state.Validators.Proposer.Address)
-
-		thisParts, err := thisBlock.MakePartSet(types.BlockPartSizeBytes)
+		thisBlock, thisParts, err := state.MakeBlock(blockHeight, types.MakeData([]types.Tx{}), lastExtCommit.ToCommit(), nil, state.Validators.Proposer.Address)
 		require.NoError(t, err)
+
 		blockID := types.BlockID{Hash: thisBlock.Hash(), PartSetHeader: thisParts.Header()}
 
 		// Simulate a commit for the current height

consensus/byzantine_test.go

@@ -9,6 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cometbft/cometbft/consensus/propagation"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -57,11 +59,13 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		})
 		state, _ := stateStore.LoadFromDBOrGenesisDoc(genDoc)
 		thisConfig := ResetConfig(fmt.Sprintf("%s_%d", testName, i))
+		nodeKey, err := p2p.LoadOrGenNodeKey(thisConfig.NodeKeyFile())
+		require.NoError(t, err)
 		defer os.RemoveAll(thisConfig.RootDir)
 		ensureDir(path.Dir(thisConfig.Consensus.WalFile()), 0o700) // dir for wal
 		app := appFunc()
 		vals := types.TM2PB.ValidatorUpdates(state.Validators)
-		_, err := app.InitChain(context.Background(), &abci.RequestInitChain{Validators: vals})
+		_, err = app.InitChain(context.Background(), &abci.RequestInitChain{Validators: vals})
 		require.NoError(t, err)
 
 		blockDB := dbm.NewMemDB()
@@ -91,11 +95,14 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 
 		// Make State
 		blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyAppConnCon, mempool, evpool, blockStore)
-		cs := NewState(thisConfig.Consensus, state, blockExec, blockStore, mempool, evpool)
-		cs.SetLogger(cs.Logger)
+
 		// set private validator
 		pv := privVals[i]
+		propagationReactor := propagation.NewReactor(nodeKey.ID(), blockStore, mempool, pv, state.ChainID)
+		cs := NewState(thisConfig.Consensus, state, blockExec, blockStore, propagationReactor, mempool, evpool)
+		cs.SetLogger(cs.Logger)
 		cs.SetPrivValidator(pv)
+		propagationReactor.SetProposalVerifier(cs)
 
 		eventBus := types.NewEventBus()
 		eventBus.SetLogger(log.TestingLogger().With("module", "events"))
@@ -114,7 +121,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 	blocksSubs := make([]types.Subscription, 0)
 	eventBuses := make([]*types.EventBus, nValidators)
 	for i := 0; i < nValidators; i++ {
-		reactors[i] = NewReactor(css[i], true) // so we dont start the consensus states
+		reactors[i] = NewReactor(css[i], css[i].propagator, true) // so we dont start the consensus states
 		reactors[i].SetLogger(css[i].Logger)
 
 		// eventBus is already started with the cs
@@ -210,7 +217,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		}
 		proposerAddr := lazyProposer.privValidatorPubKey.Address()
 
-		block, err := lazyProposer.blockExec.CreateProposalBlock(
+		block, _, err := lazyProposer.blockExec.CreateProposalBlock(
 			ctx, lazyProposer.Height, lazyProposer.state, extCommit, proposerAddr)
 		require.NoError(t, err)
 		blockParts, err := block.MakePartSet(types.BlockPartSizeBytes)
@@ -352,7 +359,7 @@ func TestByzantineConflictingProposalsWithPartition(t *testing.T) {
 		blocksSubs[i], err = eventBus.Subscribe(context.Background(), testSubscriber, types.EventQueryNewBlock)
 		require.NoError(t, err)
 
-		conR := NewReactor(css[i], true) // so we don't start the consensus states
+		conR := NewReactor(css[i], css[i].propagator, true) // so we don't start the consensus states
 		conR.SetLogger(logger.With("validator", i))
 		conR.SetEventBus(eventBus)
 
@@ -461,7 +468,7 @@ func byzantineDecideProposalFunc(ctx context.Context, t *testing.T, height int64
 	// Avoid sending on internalMsgQueue and running consensus state.
 
 	// Create a new proposal block from state/txs from the mempool.
-	block1, err := cs.createProposalBlock(ctx)
+	block1, _, err := cs.createProposalBlock(ctx)
 	require.NoError(t, err)
 	blockParts1, err := block1.MakePartSet(types.BlockPartSizeBytes)
 	require.NoError(t, err)
@@ -478,7 +485,7 @@ func byzantineDecideProposalFunc(ctx context.Context, t *testing.T, height int64
 	deliverTxsRange(t, cs, 0, 1)
 
 	// Create a new proposal block from state/txs from the mempool.
-	block2, err := cs.createProposalBlock(ctx)
+	block2, _, err := cs.createProposalBlock(ctx)
 	require.NoError(t, err)
 	blockParts2, err := block2.MakePartSet(types.BlockPartSizeBytes)
 	require.NoError(t, err)