fix: proposal basic checks deferred to consensus (#1288)

consensus/consensus.go

@@ -227,6 +227,12 @@ func (cs *consensus) SetProposal(p *proposal.Proposal) {
 		return
 	}
 
+	if err := p.BasicCheck(); err != nil {
+		cs.logger.Warn("invalid proposal", "proposal", p, "error", err)
+
+		return
+	}
+
 	roundProposal := cs.log.RoundProposal(p.Round())
 	if roundProposal != nil {
 		cs.logger.Trace("this round has proposal", "proposal", p)

consensus/consensus_test.go

@@ -729,7 +729,17 @@ func TestProposalWithBigRound(t *testing.T) {
 
 	p := td.makeProposal(t, 1, util.MaxInt16)
 	td.consP.SetProposal(p)
-	assert.Equal(t, td.consP.log.RoundProposal(util.MaxInt16), p)
+	assert.Nil(t, td.consP.Proposal())
+}
+
+func TestInvalidProposal(t *testing.T) {
+	td := setup(t)
+
+	td.enterNewHeight(td.consP)
+
+	p := td.makeProposal(t, 1, 0)
+	p.SetSignature(nil) // Make proposal invalid
+	td.consP.SetProposal(p)
 	assert.Nil(t, td.consP.Proposal())
 }
 

network/ratelimit.go

@@ -30,7 +30,6 @@ func (r *rateLimit) reset() {
 }
 
 func (r *rateLimit) increment() bool {
-
 	// Check if the window has expired and reset if necessary
 	if r.diff() > r.window {
 		r.reset()

sync/bundle/message/proposal.go

@@ -15,7 +15,9 @@ func NewProposalMessage(p *proposal.Proposal) *ProposalMessage {
 }
 
 func (m *ProposalMessage) BasicCheck() error {
-	return m.Proposal.BasicCheck()
+	// Basic checks for the proposal are deferred to the consensus phase
+	// to avoid unnecessary validation for validators outside the committee.
+	return nil
 }
 
 func (m *ProposalMessage) Type() Type {

sync/bundle/message/proposal_test.go

@@ -3,8 +3,6 @@ package message
 import (
 	"testing"
 
-	"github.com/pactus-project/pactus/types/proposal"
-	"github.com/pactus-project/pactus/util/errors"
 	"github.com/pactus-project/pactus/util/testsuite"
 	"github.com/stretchr/testify/assert"
 )
@@ -17,13 +15,6 @@ func TestProposalType(t *testing.T) {
 func TestProposalMessage(t *testing.T) {
 	ts := testsuite.NewTestSuite(t)
 
-	t.Run("Invalid proposal", func(t *testing.T) {
-		prop := proposal.NewProposal(0, 0, nil)
-		m := NewProposalMessage(prop)
-
-		assert.Equal(t, errors.Code(m.BasicCheck()), errors.ErrInvalidBlock)
-	})
-
 	t.Run("OK", func(t *testing.T) {
 		prop, _ := ts.GenerateTestProposal(100, 0)
 		m := NewProposalMessage(prop)

sync/sync.go

@@ -580,8 +580,6 @@ func (sync *synchronizer) prepareBlocks(from, count uint32) [][]byte {
 	return blocks
 }
 
-// weAreInTheCommittee checks if one of the validators is a member of the committee
-// at the current height.
 func (sync *synchronizer) shouldPropagateGeneralMessage(_ *network.GossipMessage) bool {
 	return true
 }

util/testsuite/testsuite.go

@@ -474,10 +474,6 @@ func (ts *TestSuite) HelperSignVote(valKey *bls.ValidatorKey, v *vote.Vote) {
 func (ts *TestSuite) HelperSignProposal(valKey *bls.ValidatorKey, p *proposal.Proposal) {
 	sig := valKey.Sign(p.SignBytes())
 	p.SetSignature(sig)
-
-	if err := p.BasicCheck(); err != nil {
-		panic(err)
-	}
 }
 
 func (ts *TestSuite) HelperSignTransaction(prv crypto.PrivateKey, trx *tx.Tx) {