Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - proposals: dont accept proposals from future #5065

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions proposals/handler.go
Original file line number Diff line number Diff line change
@@ -259,12 +259,13 @@ func (h *Handler) handleProposal(ctx context.Context, expHash types.Hash32, peer
}
if p.Layer <= types.GetEffectiveGenesis() {
preGenesis.Inc()
return fmt.Errorf("proposal before effective genesis: layer %v", p.Layer)
}
if p.Layer <= h.mesh.ProcessedLayer() {
// old proposals have no use for the node
return fmt.Errorf("proposal before effective genesis: %d/%s", p.Layer, p.ID().String())
} else if p.Layer <= h.mesh.ProcessedLayer() {
tooLate.Inc()
return fmt.Errorf("proposal too late: layer %v", p.Layer)
return fmt.Errorf("proposal too late: %d/%s", p.Layer, p.ID().String())
} else if p.Layer >= h.clock.CurrentLayer()+1 {
tooFuture.Inc()
return fmt.Errorf("proposal from future: %d/%s", p.Layer, p.ID().String())
}

latency := receivedTime.Sub(h.clock.LayerToTime(p.Layer))
28 changes: 22 additions & 6 deletions proposals/handler_test.go
Original file line number Diff line number Diff line change
@@ -184,6 +184,13 @@ func withTransactions(ids ...types.TransactionID) createProposalOpt {
}
}

func withProposalLayer(layer types.LayerID) createProposalOpt {
return func(p *types.Proposal) {
p.Layer = layer
p.Ballot.Layer = layer
}
}

func createProposal(t *testing.T, opts ...any) *types.Proposal {
t.Helper()
b := types.RandomBallot()
@@ -844,7 +851,7 @@ func TestBallot_DecodedStoreFailure(t *testing.T) {

func TestProposal_MalformedData(t *testing.T) {
th := createTestHandlerNoopDecoder(t)
p := createProposal(t)
p := createProposal(t, withProposalLayer(th.clock.CurrentLayer()))
data, err := codec.Encode(&p.InnerProposal)
require.NoError(t, err)
require.ErrorIs(t, th.HandleSyncedProposal(context.Background(), p.ID().AsHash32(), p2p.NoPeer, data), errMalformedData)
@@ -854,7 +861,7 @@ func TestProposal_MalformedData(t *testing.T) {

func TestProposal_BeforeEffectiveGenesis(t *testing.T) {
th := createTestHandlerNoopDecoder(t)
p := createProposal(t)
p := createProposal(t, withProposalLayer(th.clock.CurrentLayer()))
p.Layer = types.GetEffectiveGenesis()
data := encodeProposal(t, p)
got := th.HandleSyncedProposal(context.Background(), p.ID().AsHash32(), p2p.NoPeer, data)
@@ -868,7 +875,7 @@ func TestProposal_TooOld(t *testing.T) {
th := createTestHandlerNoopDecoder(t)
lid := types.LayerID(11)
th.mockSet.setCurrentLayer(lid)
p := createProposal(t)
p := createProposal(t, withProposalLayer(th.clock.CurrentLayer()))
p.Layer = lid - 1
data := encodeProposal(t, p)
got := th.HandleSyncedProposal(context.Background(), p.ID().AsHash32(), p2p.NoPeer, data)
@@ -878,9 +885,17 @@ func TestProposal_TooOld(t *testing.T) {
checkProposal(t, th.cdb, p, false)
}

func TestProposal_TooFuture(t *testing.T) {
th := createTestHandlerNoopDecoder(t)
p := createProposal(t, withProposalLayer(th.clock.CurrentLayer()+10))
data := encodeProposal(t, p)
got := th.HandleSyncedProposal(context.Background(), p.ID().AsHash32(), p2p.NoPeer, data)
require.ErrorContains(t, got, "proposal from future")
}

func TestProposal_BadSignature(t *testing.T) {
th := createTestHandlerNoopDecoder(t)
p := createProposal(t)
p := createProposal(t, withProposalLayer(th.clock.CurrentLayer()))
p.Signature = types.EmptyEdSignature
data := encodeProposal(t, p)
got := th.HandleSyncedProposal(context.Background(), p.ID().AsHash32(), p2p.NoPeer, data)
@@ -918,7 +933,7 @@ func TestProposal_InconsistentSmeshers(t *testing.T) {

func TestProposal_WrongHash(t *testing.T) {
th := createTestHandlerNoopDecoder(t)
p := createProposal(t)
p := createProposal(t, withProposalLayer(th.clock.CurrentLayer()))
data := encodeProposal(t, p)
err := th.HandleSyncedProposal(context.Background(), types.RandomHash(), p2p.NoPeer, data)
require.ErrorIs(t, err, errWrongHash)
@@ -927,7 +942,7 @@ func TestProposal_WrongHash(t *testing.T) {

func TestProposal_KnownProposal(t *testing.T) {
th := createTestHandlerNoopDecoder(t)
p := createProposal(t)
p := createProposal(t, withProposalLayer(th.clock.CurrentLayer()))
createAtx(t, th.cdb.Database, p.Layer.GetEpoch()-1, p.AtxID, p.SmesherID)
require.NoError(t, ballots.Add(th.cdb, &p.Ballot))
require.NoError(t, proposals.Add(th.cdb, p))
@@ -1430,6 +1445,7 @@ func TestHandleSyncedProposalActiveSet(t *testing.T) {
th := createTestHandler(t)
pid := p2p.Peer("any")

th.mclock.EXPECT().CurrentLayer().Return(lid).AnyTimes()
th.mm.EXPECT().ProcessedLayer().Return(lid - 2).AnyTimes()
th.mclock.EXPECT().LayerToTime(gomock.Any())
th.mf.EXPECT().RegisterPeerHashes(pid, gomock.Any()).AnyTimes()
1 change: 1 addition & 0 deletions proposals/metrics.go
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ var (
failedInit = processErrors.WithLabelValues("init")
known = processErrors.WithLabelValues("known")
tooLate = processErrors.WithLabelValues("late")
tooFuture = processErrors.WithLabelValues("future")
preGenesis = processErrors.WithLabelValues("genesis")
badSigProposal = processErrors.WithLabelValues("sigp")
badSigBallot = processErrors.WithLabelValues("sigb")
Loading