aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #679 from nspcc-dev/fix/recovery_message

Browse source 
consensus: provide message type and view inside RecoveryMessage

Fixes interoperability with C# node.
This commit is contained in:
Roman Khimov 2020-02-18 15:42:47 +03:00 committed by GitHub
commit b5ec94bdb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/consensus/payload_test.go
View file

@ -290,7 +290,10 @@ func randomRecoveryMessage(t *testing.T) *recoveryMessage {
InvocationScript: fillRandom(t, make([]byte, 4)), InvocationScript: fillRandom(t, make([]byte, 4)),
}, },
}, },
prepareRequest: prepReq, prepareRequest: &message{
Type: prepareRequestType,
payload: prepReq,
},
} }
} }

16
pkg/consensus/recovery_message.go
View file

@ -15,7 +15,7 @@ type (
preparationPayloads []*preparationCompact preparationPayloads []*preparationCompact
commitPayloads []*commitCompact commitPayloads []*commitCompact
changeViewPayloads []*changeViewCompact changeViewPayloads []*changeViewCompact
prepareRequest *prepareRequest prepareRequest *message
} }
changeViewCompact struct { changeViewCompact struct {
@ -46,8 +46,12 @@ func (m *recoveryMessage) DecodeBinary(r *io.BinReader) {
var hasReq = r.ReadBool() var hasReq = r.ReadBool()
if hasReq { if hasReq {
m.prepareRequest = new(prepareRequest) m.prepareRequest = new(message)
m.prepareRequest.DecodeBinary(r) m.prepareRequest.DecodeBinary(r)
if r.Err == nil && m.prepareRequest.Type != prepareRequestType {
r.Err = errors.New("recovery message PrepareRequest has wrong type")
return
}
} else { } else {
l := r.ReadVarUint() l := r.ReadVarUint()
if l != 0 { if l != 0 {
@ -135,7 +139,11 @@ func (p *preparationCompact) EncodeBinary(w *io.BinWriter) {
func (m *recoveryMessage) AddPayload(p payload.ConsensusPayload) { func (m *recoveryMessage) AddPayload(p payload.ConsensusPayload) {
switch p.Type() { switch p.Type() {
case payload.PrepareRequestType: case payload.PrepareRequestType:
m.prepareRequest = p.GetPrepareRequest().(*prepareRequest) m.prepareRequest = &message{
Type: prepareRequestType,
ViewNumber: p.ViewNumber(),
payload: p.GetPrepareRequest().(*prepareRequest),
}
h := p.Hash() h := p.Hash()
m.preparationHash = &h m.preparationHash = &h
m.preparationPayloads = append(m.preparationPayloads, &preparationCompact{ m.preparationPayloads = append(m.preparationPayloads, &preparationCompact{
@ -187,7 +195,7 @@ func (m *recoveryMessage) GetPrepareRequest(p payload.ConsensusPayload, validato
return nil return nil
} }
req := fromPayload(prepareRequestType, p.(*Payload), m.prepareRequest) req := fromPayload(prepareRequestType, p.(*Payload), m.prepareRequest.payload)
req.SetValidatorIndex(primary) req.SetValidatorIndex(primary)
req.Witness.InvocationScript = compact.InvocationScript req.Witness.InvocationScript = compact.InvocationScript
req.Witness.VerificationScript = getVerificationScript(primary, validators) req.Witness.VerificationScript = getVerificationScript(primary, validators)

18
pkg/consensus/recovery_message_test.go
View file

@ -1,9 +1,12 @@
package consensus package consensus
import ( import (
"encoding/hex"
gio "io"
"testing" "testing"
"github.com/CityOfZion/neo-go/pkg/crypto/keys" "github.com/CityOfZion/neo-go/pkg/crypto/keys"
"github.com/CityOfZion/neo-go/pkg/io"
"github.com/CityOfZion/neo-go/pkg/util" "github.com/CityOfZion/neo-go/pkg/util"
"github.com/nspcc-dev/dbft/crypto" "github.com/nspcc-dev/dbft/crypto"
"github.com/nspcc-dev/dbft/payload" "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 { func getKeys(t *testing.T, n int) []*privateKey {
privs := make([]*privateKey, 0, n) privs := make([]*privateKey, 0, n)
for i := 0; i < n; i++ { for i := 0; i < n; i++ {