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.

Sign up for GitHub

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

Jump to bottom

P2P signing on direct send #4466

Merged
merged 6 commits into from
Sep 19, 2022
Merged

P2P signing on direct send #4466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d41047f
- added direct send message signing to ensure behavior consistency in…
iulianpascalau Sep 15, 2022
1c02586
Merge branch 'feat/optimise-consensus-sigcheck' into p2p-signing-on-d…
iulianpascalau Sep 15, 2022
35094a9
- fixes after review
iulianpascalau Sep 15, 2022
c3bc97e
Merge branch 'feat/optimise-consensus-sigcheck' into p2p-signing-on-d…
iulianpascalau Sep 15, 2022
388145e
- fixes after review & merge
iulianpascalau Sep 15, 2022
3a50d66
- fixed tests
iulianpascalau Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions consensus/spos/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,6 @@ var ErrNilScheduledProcessor = errors.New("nil scheduled processor")

// ErrInvalidNumSigShares signals that an invalid number of signature shares has been provided
var ErrInvalidNumSigShares = errors.New("invalid number of sig shares")

// ErrNilSignatureOnP2PMessage signals that a p2p message without signature was received
var ErrNilSignatureOnP2PMessage = errors.New("nil signature on the p2p message")
3 changes: 3 additions & 0 deletions consensus/spos/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ func (wrk *Worker) ProcessReceivedMessage(message p2p.MessageP2P, fromConnectedP
if message.Data() == nil {
return ErrNilDataToProcess
}
if len(message.Signature()) == 0 {
return ErrNilSignatureOnP2PMessage
}

topic := GetConsensusTopicID(wrk.shardCoordinator)
err := wrk.antifloodHandler.CanProcessMessagesOnTopic(message.Peer(), topic, 1, uint64(len(message.Data())), message.SeqNo())
Expand Down
141 changes: 114 additions & 27 deletions consensus/spos/worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,11 @@ func TestWorker_ProcessReceivedMessageShouldErrIfFloodIsDetectedOnTopic(t *testi
workerArgs.AntifloodHandler = antifloodHandler
wrk, _ := spos.NewWorker(workerArgs)

msg := &mock.P2PMessageMock{DataField: []byte("aaa"), TopicField: "topic1"}
msg := &mock.P2PMessageMock{
DataField: []byte("aaa"),
TopicField: "topic1",
SignatureField: []byte("signature"),
}
err := wrk.ProcessReceivedMessage(msg, "peer")
assert.Equal(t, expectedErr, err)
}
Expand Down Expand Up @@ -502,8 +506,9 @@ func TestWorker_ProcessReceivedMessageTxBlockBodyShouldRetNil(t *testing.T) {
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
time.Sleep(time.Second)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: currentPid,
DataField: buff,
PeerField: currentPid,
SignatureField: []byte("signature"),
}
err := wrk.ProcessReceivedMessage(msg, fromConnectedPeerId)

Expand All @@ -530,6 +535,21 @@ func TestWorker_ProcessReceivedMessageNilMessageDataFieldShouldErr(t *testing.T)
assert.Equal(t, spos.ErrNilDataToProcess, err)
}

func TestWorker_ProcessReceivedMessageEmptySignatureFieldShouldErr(t *testing.T) {
t.Parallel()
wrk := *initWorker(&statusHandlerMock.AppStatusHandlerStub{})
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: []byte("data field"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.Equal(t, 0, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
assert.Equal(t, spos.ErrNilSignatureOnP2PMessage, err)
}

func TestWorker_ProcessReceivedMessageRedundancyNodeShouldResetInactivityIfNeeded(t *testing.T) {
t.Parallel()
wrk := *initWorker(&statusHandlerMock.AppStatusHandlerStub{})
Expand All @@ -544,7 +564,13 @@ func TestWorker_ProcessReceivedMessageRedundancyNodeShouldResetInactivityIfNeede
}
wrk.SetNodeRedundancyHandler(nodeRedundancyMock)
buff, _ := wrk.Marshalizer().Marshal(&consensus.Message{})
_ = wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
_ = wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)

assert.True(t, wasCalled)
}
Expand All @@ -570,7 +596,13 @@ func TestWorker_ProcessReceivedMessageNodeNotInEligibleListShouldErr(t *testing.
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.Equal(t, 0, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
Expand Down Expand Up @@ -634,8 +666,9 @@ func TestWorker_ProcessReceivedMessageComputeReceivedProposedBlockMetric(t *test

buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: currentPid,
DataField: buff,
PeerField: currentPid,
SignatureField: []byte("signature"),
}
_ = wrk.ProcessReceivedMessage(msg, "")

Expand Down Expand Up @@ -668,7 +701,13 @@ func TestWorker_ProcessReceivedMessageInconsistentChainIDInConsensusMessageShoul
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)

assert.True(t, errors.Is(err, spos.ErrInvalidChainID))
}
Expand All @@ -694,7 +733,13 @@ func TestWorker_ProcessReceivedMessageTypeInvalidShouldErr(t *testing.T) {
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.Equal(t, 0, len(wrk.ReceivedMessages()[666]))
Expand Down Expand Up @@ -722,7 +767,13 @@ func TestWorker_ProcessReceivedHeaderHashSizeInvalidShouldErr(t *testing.T) {
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.Equal(t, 0, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
Expand Down Expand Up @@ -750,7 +801,13 @@ func TestWorker_ProcessReceivedMessageForFutureRoundShouldErr(t *testing.T) {
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.Equal(t, 0, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
Expand Down Expand Up @@ -778,7 +835,13 @@ func TestWorker_ProcessReceivedMessageForPastRoundShouldErr(t *testing.T) {
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.Equal(t, 0, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
Expand Down Expand Up @@ -807,16 +870,23 @@ func TestWorker_ProcessReceivedMessageTypeLimitReachedShouldErr(t *testing.T) {
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: currentPid,
DataField: buff,
PeerField: currentPid,
SignatureField: []byte("signature"),
}

err := wrk.ProcessReceivedMessage(msg, fromConnectedPeerId)
time.Sleep(time.Second)
assert.Equal(t, 1, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
assert.Nil(t, err)

err = wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err = wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)
assert.Equal(t, 1, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
assert.True(t, errors.Is(err, spos.ErrMessageTypeLimitReached))
Expand All @@ -843,7 +913,13 @@ func TestWorker_ProcessReceivedMessageInvalidSignatureShouldErr(t *testing.T) {
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.Equal(t, 0, len(wrk.ReceivedMessages()[bls.MtBlockBody]))
Expand Down Expand Up @@ -872,8 +948,9 @@ func TestWorker_ProcessReceivedMessageReceivedMessageIsFromSelfShouldRetNilAndNo
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: currentPid,
DataField: buff,
PeerField: currentPid,
SignatureField: []byte("signature"),
}
err := wrk.ProcessReceivedMessage(msg, fromConnectedPeerId)
time.Sleep(time.Second)
Expand Down Expand Up @@ -905,8 +982,9 @@ func TestWorker_ProcessReceivedMessageWhenRoundIsCanceledShouldRetNilAndNotProce
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: currentPid,
DataField: buff,
PeerField: currentPid,
SignatureField: []byte("signature"),
}
err := wrk.ProcessReceivedMessage(msg, fromConnectedPeerId)
time.Sleep(time.Second)
Expand Down Expand Up @@ -953,7 +1031,13 @@ func TestWorker_ProcessReceivedMessageWrongChainIDInProposedBlockShouldError(t *
currentPid,
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
err := wrk.ProcessReceivedMessage(&mock.P2PMessageMock{DataField: buff}, fromConnectedPeerId)
err := wrk.ProcessReceivedMessage(
&mock.P2PMessageMock{
DataField: buff,
SignatureField: []byte("signature"),
},
fromConnectedPeerId,
)
time.Sleep(time.Second)

assert.True(t, errors.Is(err, spos.ErrInvalidChainID))
Expand Down Expand Up @@ -1002,8 +1086,9 @@ func TestWorker_ProcessReceivedMessageWithABadOriginatorShouldErr(t *testing.T)
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: "other originator",
DataField: buff,
PeerField: "other originator",
SignatureField: []byte("signature"),
}
err := wrk.ProcessReceivedMessage(msg, fromConnectedPeerId)
time.Sleep(time.Second)
Expand Down Expand Up @@ -1069,8 +1154,9 @@ func TestWorker_ProcessReceivedMessageOkValsShouldWork(t *testing.T) {
)
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: currentPid,
DataField: buff,
PeerField: currentPid,
SignatureField: []byte("signature"),
}
err := wrk.ProcessReceivedMessage(msg, fromConnectedPeerId)
time.Sleep(time.Second)
Expand Down Expand Up @@ -1581,8 +1667,9 @@ func TestWorker_ProcessReceivedMessageWrongHeaderShouldErr(t *testing.T) {
buff, _ := wrk.Marshalizer().Marshal(cnsMsg)
time.Sleep(time.Second)
msg := &mock.P2PMessageMock{
DataField: buff,
PeerField: currentPid,
DataField: buff,
PeerField: currentPid,
SignatureField: []byte("signature"),
}
err := wrk.ProcessReceivedMessage(msg, "")
assert.True(t, errors.Is(err, spos.ErrInvalidHeader))
Expand Down