From ee8514d88b08f343a07f8aff81ed31dcfb4c502b Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Tue, 18 Feb 2020 15:12:20 +0300
Subject: [PATCH] consensus: provide message type and view inside
 RecoveryMessage

PrepareRequest inside RecoveryMessage should contain both
message type and view.
---
 pkg/consensus/payload_test.go          |  5 ++++-
 pkg/consensus/recovery_message.go      | 16 ++++++++++++----
 pkg/consensus/recovery_message_test.go | 18 ++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/pkg/consensus/payload_test.go b/pkg/consensus/payload_test.go
index 31ce8173f..631388193 100644
--- a/pkg/consensus/payload_test.go
+++ b/pkg/consensus/payload_test.go
@@ -290,7 +290,10 @@ func randomRecoveryMessage(t *testing.T) *recoveryMessage {
 				InvocationScript:   fillRandom(t, make([]byte, 4)),
 			},
 		},
-		prepareRequest: prepReq,
+		prepareRequest: &message{
+			Type:    prepareRequestType,
+			payload: prepReq,
+		},
 	}
 }
 
diff --git a/pkg/consensus/recovery_message.go b/pkg/consensus/recovery_message.go
index bd52a9bfb..55e5ca70d 100644
--- a/pkg/consensus/recovery_message.go
+++ b/pkg/consensus/recovery_message.go
@@ -15,7 +15,7 @@ type (
 		preparationPayloads []*preparationCompact
 		commitPayloads      []*commitCompact
 		changeViewPayloads  []*changeViewCompact
-		prepareRequest      *prepareRequest
+		prepareRequest      *message
 	}
 
 	changeViewCompact struct {
@@ -46,8 +46,12 @@ func (m *recoveryMessage) DecodeBinary(r *io.BinReader) {
 
 	var hasReq = r.ReadBool()
 	if hasReq {
-		m.prepareRequest = new(prepareRequest)
+		m.prepareRequest = new(message)
 		m.prepareRequest.DecodeBinary(r)
+		if r.Err == nil && m.prepareRequest.Type != prepareRequestType {
+			r.Err = errors.New("recovery message PrepareRequest has wrong type")
+			return
+		}
 	} else {
 		l := r.ReadVarUint()
 		if l != 0 {
@@ -135,7 +139,11 @@ func (p *preparationCompact) EncodeBinary(w *io.BinWriter) {
 func (m *recoveryMessage) AddPayload(p payload.ConsensusPayload) {
 	switch p.Type() {
 	case payload.PrepareRequestType:
-		m.prepareRequest = p.GetPrepareRequest().(*prepareRequest)
+		m.prepareRequest = &message{
+			Type:       prepareRequestType,
+			ViewNumber: p.ViewNumber(),
+			payload:    p.GetPrepareRequest().(*prepareRequest),
+		}
 		h := p.Hash()
 		m.preparationHash = &h
 		m.preparationPayloads = append(m.preparationPayloads, &preparationCompact{
@@ -187,7 +195,7 @@ func (m *recoveryMessage) GetPrepareRequest(p payload.ConsensusPayload, validato
 		return nil
 	}
 
-	req := fromPayload(prepareRequestType, p.(*Payload), m.prepareRequest)
+	req := fromPayload(prepareRequestType, p.(*Payload), m.prepareRequest.payload)
 	req.SetValidatorIndex(primary)
 	req.Witness.InvocationScript = compact.InvocationScript
 	req.Witness.VerificationScript = getVerificationScript(primary, validators)
diff --git a/pkg/consensus/recovery_message_test.go b/pkg/consensus/recovery_message_test.go
index ab798eca3..07182701f 100644
--- a/pkg/consensus/recovery_message_test.go
+++ b/pkg/consensus/recovery_message_test.go
@@ -1,9 +1,12 @@
 package consensus
 
 import (
+	"encoding/hex"
+	gio "io"
 	"testing"
 
 	"github.com/CityOfZion/neo-go/pkg/crypto/keys"
+	"github.com/CityOfZion/neo-go/pkg/io"
 	"github.com/CityOfZion/neo-go/pkg/util"
 	"github.com/nspcc-dev/dbft/crypto"
 	"github.com/nspcc-dev/dbft/payload"
@@ -110,6 +113,21 @@ func TestRecoveryMessage_Setters(t *testing.T) {
 	})
 }
 
+func TestRecoveryMessage_DecodeFromTestnet(t *testing.T) {
+	hexDump := "00000000924b2fa6728782b6afb94873a377c49f31573005e7f2945beb27158ec2e887300d180000010000000000" +
+		"fd29024100000120003db64b5e8e4ab7138abe65a3be48d3a3f5d10013ab9ffee489706078714f1ea20161e7ba952fdfd5f543891b1fe053af401bc34e9e3f63c90e3c0d6675d156344b00008e4ab71300000000030000414079946c76007e4297b06b074a20dc1d1d6871c74976f244df81bd03f4158a11dd485ed50fc0cc7c6ad352addd8440c5a55d7b7449650bb200e5e58b1fb8a0390c010041403631a490b17ca4fcfe52ed2e7a4ca4c0d3fcca67e73a1ef071f385db1d37cefa7a2de6e56654788647e9142425c29449b0bbfee5c46a96c4bdc79b23c1f862fc02004140147914878c23a9624a62598cebe2c75fdce80c1e19b5c73aa511630f67d4e5a660c63daad7fcfa9bd944f258f51427cb80730b8beb3015a3c2766325bf291a8e02000000989f8fa676ed07885a46ee08af10e1fa1893ef20fbd557dc3c1a9dc498189d5fceff694dcb2085e4969d90c56433b88fd7ba1caef9363829c70419a5314ac36541404f3ee34e11c521f2e31fee439206474d36951443014354ce81b32bd1787e6a92212737f7f72bee59c403ff74292ebf78c4091081174b5921c148cedcbe7bd585000100acfc8399bda6429c64b5c09885a3e4f1a0629f59125df03be956c00f5bb77616c43e43250e96700f80c42ef3e169e9ff9f906518acf0da17c53563ba41d91ebc41409957436afd1736970d4b5e52b8d845663d6b0335a34cf78ece733c71be876cf30125e9bfea197a607ea6945cef7ef28a74676ec23d14378f7ec23964544b6710014140b634941ecab3a5dd7251f9213bfbcff2021b1e3d966e6800007ea6f0d72ec46d2c04c042800e103091d2f5d184d997a10b890b13bf06b1078a4f1822d722891a232102a7bc55fe8684e0119768d104ba30795bdcc86619e864add26156723ed185cd62ac"
+	data, err := hex.DecodeString(hexDump)
+	require.NoError(t, err)
+
+	buf := io.NewBinReaderFromBuf(data)
+	var p Payload
+	p.DecodeBinary(buf)
+	require.NoError(t, buf.Err)
+
+	buf.ReadB()
+	require.Equal(t, gio.EOF, buf.Err)
+}
+
 func getKeys(t *testing.T, n int) []*privateKey {
 	privs := make([]*privateKey, 0, n)
 	for i := 0; i < n; i++ {