From 7c292f64be671f93dbb3bd080874e4d6672662f8 Mon Sep 17 00:00:00 2001 From: Rongjian Lan Date: Sat, 9 May 2020 20:23:46 -0700 Subject: [PATCH] Fix viewID issue on prepared block during view change (#2972) * Fix viewID issue on prepared block during view change * Add more checks and remove comments * Fix lint * update rlp encode pointer * Revert go gen changes * add go gen code * [api] Fix proto to pass travis Co-authored-by: Edgar Aroutiounian --- api/proto/message/message.pb.go | 137 ++++++++++++++------------ api/proto/message/message.proto | 2 +- consensus/consensus_viewchange_msg.go | 29 +++++- consensus/fbft_log.go | 4 + consensus/view_change.go | 70 +++++++++++-- 5 files changed, 169 insertions(+), 73 deletions(-) diff --git a/api/proto/message/message.pb.go b/api/proto/message/message.pb.go index 0b453dda6..a3bcb80a0 100644 --- a/api/proto/message/message.pb.go +++ b/api/proto/message/message.pb.go @@ -702,6 +702,7 @@ type ViewChangeRequest struct { M2Bitmap []byte `protobuf:"bytes,10,opt,name=m2_bitmap,json=m2Bitmap,proto3" json:"m2_bitmap,omitempty"` M3Aggsigs []byte `protobuf:"bytes,11,opt,name=m3_aggsigs,json=m3Aggsigs,proto3" json:"m3_aggsigs,omitempty"` M3Bitmap []byte `protobuf:"bytes,12,opt,name=m3_bitmap,json=m3Bitmap,proto3" json:"m3_bitmap,omitempty"` + PreparedBlock []byte `protobuf:"bytes,13,opt,name=prepared_block,json=preparedBlock,proto3" json:"prepared_block,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -816,6 +817,13 @@ func (m *ViewChangeRequest) GetM3Bitmap() []byte { return nil } +func (m *ViewChangeRequest) GetPreparedBlock() []byte { + if m != nil { + return m.PreparedBlock + } + return nil +} + func init() { proto.RegisterEnum("message.ServiceType", ServiceType_name, ServiceType_value) proto.RegisterEnum("message.MessageType", MessageType_name, MessageType_value) @@ -835,70 +843,71 @@ func init() { } var fileDescriptor_33c57e4bae7b9afd = []byte{ - // 998 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdf, 0x6e, 0xe3, 0xc4, - 0x17, 0xae, 0xf3, 0xcf, 0xc9, 0xb1, 0x93, 0x7a, 0xe7, 0xd7, 0x1f, 0xf5, 0x76, 0xbb, 0xab, 0x92, - 0x82, 0xa8, 0xf6, 0xa2, 0x82, 0x14, 0x69, 0x05, 0xe2, 0x26, 0x4d, 0xcc, 0xd6, 0x6a, 0xeb, 0x84, - 0xb1, 0xbb, 0x15, 0x57, 0xd6, 0x34, 0x1e, 0x25, 0x56, 0x13, 0x3b, 0x78, 0x9c, 0xae, 0xf2, 0x02, - 0xbc, 0x02, 0xef, 0x03, 0xbc, 0x00, 0x57, 0xbc, 0x0e, 0x9a, 0x19, 0xdb, 0x71, 0x52, 0xb8, 0x43, - 0xdc, 0xe5, 0x7c, 0xdf, 0xf9, 0xce, 0x99, 0xf3, 0x8d, 0xcf, 0xb4, 0xd0, 0x5e, 0x50, 0xc6, 0xc8, - 0x94, 0x9e, 0x2f, 0x93, 0x38, 0x8d, 0x91, 0x9a, 0x85, 0xdd, 0x5f, 0xab, 0xa0, 0xde, 0xca, 0xdf, - 0xe8, 0x1d, 0xe8, 0x8c, 0x26, 0x4f, 0xe1, 0x84, 0xfa, 0xe9, 0x7a, 0x49, 0x4d, 0xe5, 0x44, 0x39, - 0xeb, 0xf4, 0x0e, 0xce, 0x73, 0xa9, 0x2b, 0x49, 0x6f, 0xbd, 0xa4, 0x58, 0x63, 0x9b, 0x00, 0x9d, - 0x41, 0x4d, 0x08, 0x2a, 0x3b, 0x82, 0xac, 0xb0, 0x10, 0x88, 0x0c, 0x74, 0x0c, 0x2d, 0x16, 0x4e, - 0x23, 0x92, 0xae, 0x12, 0x6a, 0x56, 0x4f, 0x94, 0x33, 0x1d, 0x6f, 0x00, 0xf4, 0x0e, 0x54, 0x96, - 0x92, 0xc7, 0x30, 0x9a, 0x9a, 0xb5, 0x13, 0xe5, 0x4c, 0xeb, 0x1d, 0x6e, 0x7a, 0x4b, 0x1c, 0xd3, - 0x9f, 0x56, 0x94, 0xa5, 0x97, 0x15, 0x53, 0xb9, 0xda, 0xc3, 0x79, 0x36, 0xfa, 0x06, 0x5a, 0x93, - 0x38, 0x62, 0x34, 0x62, 0x2b, 0x66, 0xd6, 0x85, 0xf4, 0x65, 0x21, 0x1d, 0xe4, 0x4c, 0x26, 0xbe, - 0xda, 0xc3, 0x9b, 0x6c, 0xf4, 0x15, 0xd4, 0x83, 0x84, 0x44, 0x81, 0xd9, 0x10, 0xb2, 0xff, 0x17, - 0xb2, 0x21, 0x47, 0xb7, 0xfb, 0xc9, 0x4c, 0xf4, 0x1d, 0xc0, 0x53, 0x48, 0x3f, 0x4e, 0x66, 0x24, - 0x9a, 0x52, 0x53, 0x15, 0xba, 0xa3, 0x42, 0xf7, 0x21, 0xa4, 0x1f, 0x07, 0x82, 0xda, 0xf4, 0x2b, - 0xe5, 0xa3, 0xef, 0x61, 0x7f, 0x1e, 0xa7, 0x29, 0x4d, 0xd6, 0x7e, 0x22, 0x13, 0xcc, 0xe6, 0xce, - 0xb0, 0x37, 0x92, 0xdf, 0x6e, 0xde, 0x99, 0x6f, 0xa3, 0x2d, 0x50, 0x33, 0x7d, 0xf7, 0x77, 0x05, - 0x9a, 0x98, 0xb2, 0x25, 0x1f, 0xea, 0xbf, 0xb8, 0x45, 0x1b, 0x8c, 0xcd, 0x08, 0xb2, 0xad, 0xb8, - 0x4c, 0xad, 0x67, 0x3e, 0x9f, 0x41, 0xf2, 0xd9, 0x10, 0xfb, 0xf3, 0x1d, 0x18, 0xa0, 0x99, 0x97, - 0xe8, 0x8e, 0x60, 0x7f, 0x47, 0x85, 0x8e, 0x41, 0x5d, 0xce, 0xc9, 0x9a, 0x26, 0xcc, 0xac, 0x9c, - 0x54, 0xcf, 0x5a, 0xbc, 0x0c, 0xce, 0x21, 0xf4, 0x06, 0x9a, 0x0f, 0x64, 0x4e, 0xa2, 0x09, 0x65, - 0x66, 0xb5, 0xa0, 0x0b, 0xac, 0xfb, 0x9b, 0x02, 0x9d, 0x6d, 0x2f, 0xd1, 0xd7, 0xd9, 0x90, 0xd2, - 0x95, 0xe3, 0x7f, 0xb0, 0xfc, 0x9c, 0x0f, 0x2b, 0x8a, 0xc9, 0x81, 0x4f, 0x41, 0x5b, 0x26, 0xe1, - 0x13, 0x49, 0xa9, 0xff, 0x48, 0xd7, 0xc2, 0x21, 0xd9, 0x0b, 0x32, 0xf8, 0x9a, 0xae, 0xd1, 0x11, - 0x34, 0xc8, 0x22, 0x5e, 0x45, 0xa9, 0xf0, 0xa2, 0x2a, 0xf8, 0x0c, 0xe9, 0x7e, 0x0b, 0x35, 0xe1, - 0x71, 0x1b, 0xea, 0x96, 0xe3, 0x59, 0xd8, 0xd8, 0x3b, 0xaa, 0x34, 0x15, 0xd4, 0x81, 0x06, 0xb6, - 0xdc, 0xbb, 0x1b, 0xcf, 0x50, 0x44, 0xfc, 0x3f, 0xd0, 0xc6, 0xf6, 0xe0, 0xda, 0xbf, 0xb7, 0x1d, - 0xc7, 0xc2, 0x46, 0x85, 0x83, 0x5d, 0x17, 0x3a, 0xdb, 0x5f, 0x3f, 0xfa, 0x0c, 0xb4, 0x34, 0x21, - 0x11, 0x23, 0x93, 0x34, 0x8c, 0x23, 0x31, 0x8b, 0x2e, 0xda, 0x95, 0x61, 0xf4, 0x0a, 0xd4, 0x28, - 0x0e, 0xa8, 0x1f, 0x06, 0xa5, 0x03, 0x37, 0x38, 0x64, 0x07, 0xdd, 0x3f, 0x15, 0x30, 0x76, 0x17, - 0x03, 0x1d, 0x82, 0xca, 0x3f, 0x54, 0xae, 0xe0, 0x35, 0x6b, 0xb8, 0xc1, 0x43, 0x3b, 0x40, 0xaf, - 0xa0, 0xf5, 0x30, 0x8f, 0x27, 0x8f, 0x7e, 0xb4, 0x5a, 0x88, 0x62, 0x35, 0xdc, 0x14, 0x80, 0xb3, - 0x5a, 0xa0, 0x97, 0xd0, 0x64, 0x33, 0x92, 0x04, 0x5c, 0xc6, 0x27, 0x6f, 0x63, 0x55, 0xc4, 0x76, - 0x80, 0x5e, 0x03, 0x48, 0xdd, 0x8c, 0xb0, 0x99, 0xd8, 0x69, 0x1d, 0xcb, 0x4a, 0x57, 0x84, 0xcd, - 0xd0, 0x01, 0xd4, 0x45, 0x20, 0x56, 0x56, 0xc7, 0x32, 0x40, 0xa7, 0xd0, 0x66, 0x34, 0x0a, 0x68, - 0xe2, 0x2f, 0x57, 0x0f, 0xdc, 0xee, 0x86, 0x60, 0x75, 0x09, 0x8e, 0x05, 0x86, 0x4c, 0x50, 0x97, - 0x64, 0x3d, 0x8f, 0x49, 0x20, 0x16, 0x50, 0xc7, 0x79, 0xd8, 0xfd, 0x45, 0x01, 0xbd, 0xbc, 0xbb, - 0xe8, 0x75, 0xe9, 0x7c, 0x7c, 0xac, 0xb6, 0xfc, 0x88, 0xf2, 0x33, 0x7e, 0xb1, 0xdb, 0xae, 0x52, - 0xd8, 0xb9, 0xdd, 0xf2, 0xd3, 0xad, 0x61, 0xaa, 0x45, 0x56, 0x69, 0xa0, 0xe3, 0xcd, 0xa9, 0x6a, - 0x05, 0x5f, 0x9c, 0xec, 0xe7, 0x2a, 0xbc, 0x78, 0xf6, 0x3a, 0xfc, 0xfb, 0xa6, 0x3f, 0xf3, 0xaf, - 0xf6, 0x37, 0xfe, 0x9d, 0x42, 0x7b, 0x4e, 0x49, 0x29, 0x49, 0x5e, 0x81, 0x2e, 0xc1, 0xe7, 0x26, - 0x37, 0xb6, 0x4c, 0x46, 0x9f, 0x43, 0x67, 0xf3, 0xa4, 0xf9, 0x2c, 0x9c, 0x66, 0xb7, 0xd0, 0xde, - 0xa0, 0x6e, 0x38, 0xe5, 0xf7, 0xcf, 0x81, 0x30, 0x10, 0x29, 0x4d, 0x79, 0xff, 0x12, 0xc9, 0xe8, - 0x45, 0xcf, 0x27, 0xd3, 0x29, 0x0b, 0xa7, 0xcc, 0x6c, 0x49, 0x7a, 0xd1, 0xeb, 0x4b, 0x80, 0x1b, - 0xb0, 0xe8, 0xf9, 0x0f, 0x61, 0xba, 0x20, 0x4b, 0x13, 0x04, 0xdb, 0x5c, 0xf4, 0x2e, 0x45, 0x2c, - 0xb4, 0x17, 0x85, 0x56, 0xcb, 0xb4, 0x17, 0x65, 0xed, 0x45, 0xae, 0xd5, 0x33, 0xed, 0x85, 0xd4, - 0xbe, 0x1d, 0x83, 0x56, 0x7a, 0x05, 0x51, 0x1b, 0x5a, 0x83, 0x91, 0xe3, 0x5a, 0x8e, 0x7b, 0xe7, - 0x1a, 0x7b, 0x68, 0x1f, 0x54, 0xd7, 0xeb, 0x5f, 0xdb, 0xce, 0xfb, 0x6c, 0x2b, 0xdb, 0x50, 0x1f, - 0xe2, 0xbe, 0x33, 0x94, 0xfb, 0x88, 0x10, 0x74, 0x06, 0x37, 0xb6, 0xe5, 0x78, 0xbe, 0x7b, 0x37, - 0x1e, 0x8f, 0xb0, 0x67, 0x54, 0xdf, 0xfe, 0xa1, 0x80, 0x56, 0x7a, 0x27, 0xd1, 0x1b, 0xf8, 0xc4, - 0xb1, 0xee, 0x9d, 0xd1, 0xd0, 0xf2, 0x2f, 0xad, 0xfe, 0x60, 0xe4, 0xf8, 0x79, 0x49, 0xb9, 0xf8, - 0x3a, 0x34, 0xfb, 0x8e, 0x33, 0xba, 0x73, 0x06, 0x96, 0xa1, 0x20, 0x0d, 0xd4, 0x31, 0xb6, 0xc6, - 0x7d, 0x6c, 0x19, 0x15, 0x4e, 0x65, 0xc1, 0xd0, 0xa8, 0x22, 0x80, 0xc6, 0x60, 0x74, 0x7b, 0x6b, - 0x7b, 0x46, 0x4d, 0x9e, 0x93, 0xff, 0xf6, 0xac, 0xa1, 0x51, 0x47, 0x1d, 0x80, 0x0f, 0xb6, 0x75, - 0x3f, 0xb8, 0xea, 0x3b, 0xef, 0x2d, 0xa3, 0xc1, 0xab, 0x38, 0xd6, 0x3d, 0x87, 0x0c, 0x15, 0x21, - 0x00, 0x71, 0x66, 0xdf, 0x76, 0x6c, 0xcf, 0x00, 0xd1, 0xf4, 0x00, 0x74, 0x89, 0x65, 0x15, 0x35, - 0x81, 0x1e, 0xc2, 0xfe, 0xcd, 0xc8, 0xf3, 0x2c, 0xfc, 0xa3, 0x8f, 0xad, 0x1f, 0xee, 0x2c, 0xd7, - 0x33, 0x74, 0x4e, 0xf4, 0xfa, 0xd0, 0x1e, 0xcc, 0x43, 0x1a, 0xa5, 0x99, 0x57, 0xe8, 0x4b, 0x50, - 0xc7, 0x49, 0x3c, 0xa1, 0x8c, 0x21, 0x63, 0xf7, 0xaf, 0xc3, 0xd1, 0x8b, 0x02, 0xc9, 0x1f, 0xef, - 0xee, 0xde, 0x43, 0x43, 0xfc, 0xb7, 0x71, 0xf1, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x83, 0x8d, - 0x35, 0xd0, 0x7e, 0x08, 0x00, 0x00, + // 1014 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0xae, 0xf3, 0xe7, 0xe4, 0xd8, 0x4e, 0xbd, 0xc3, 0x42, 0xbd, 0xdd, 0xee, 0xaa, 0xa4, 0xac, + 0xa8, 0xf6, 0xa2, 0x82, 0x14, 0x69, 0x05, 0xe2, 0x26, 0x4d, 0xcc, 0xd6, 0x6a, 0xeb, 0x84, 0x89, + 0xbb, 0x15, 0x57, 0xd6, 0x34, 0x1e, 0x25, 0x56, 0x13, 0xc7, 0x78, 0x9c, 0xae, 0xf2, 0x24, 0x3c, + 0x05, 0x2f, 0x01, 0xbc, 0x00, 0x57, 0xbc, 0x0e, 0x9a, 0x19, 0xdb, 0x71, 0x52, 0xb8, 0x43, 0xdc, + 0xf9, 0x7c, 0xe7, 0x7c, 0xe7, 0xe7, 0x9b, 0x39, 0x93, 0x80, 0xb1, 0xa0, 0x8c, 0x91, 0x29, 0x3d, + 0x8b, 0x93, 0x65, 0xba, 0x44, 0x6a, 0x66, 0x76, 0x7e, 0xab, 0x82, 0x7a, 0x23, 0xbf, 0xd1, 0x3b, + 0xd0, 0x19, 0x4d, 0x1e, 0xc3, 0x09, 0xf5, 0xd3, 0x75, 0x4c, 0x2d, 0xe5, 0x58, 0x39, 0x6d, 0x77, + 0x9f, 0x9f, 0xe5, 0xd4, 0xb1, 0x74, 0x7a, 0xeb, 0x98, 0x62, 0x8d, 0x6d, 0x0c, 0x74, 0x0a, 0x35, + 0x41, 0xa8, 0xec, 0x10, 0xb2, 0xc4, 0x82, 0x20, 0x22, 0xd0, 0x11, 0xb4, 0x58, 0x38, 0x8d, 0x48, + 0xba, 0x4a, 0xa8, 0x55, 0x3d, 0x56, 0x4e, 0x75, 0xbc, 0x01, 0xd0, 0x3b, 0x50, 0x59, 0x4a, 0x1e, + 0xc2, 0x68, 0x6a, 0xd5, 0x8e, 0x95, 0x53, 0xad, 0x7b, 0xb0, 0xa9, 0x2d, 0x71, 0x4c, 0x7f, 0x5e, + 0x51, 0x96, 0x5e, 0x54, 0x2c, 0xe5, 0x72, 0x0f, 0xe7, 0xd1, 0xe8, 0x5b, 0x68, 0x4d, 0x96, 0x11, + 0xa3, 0x11, 0x5b, 0x31, 0xab, 0x2e, 0xa8, 0x2f, 0x0a, 0x6a, 0x3f, 0xf7, 0x64, 0xe4, 0xcb, 0x3d, + 0xbc, 0x89, 0x46, 0x5f, 0x43, 0x3d, 0x48, 0x48, 0x14, 0x58, 0x0d, 0x41, 0xfb, 0xb4, 0xa0, 0x0d, + 0x38, 0xba, 0x5d, 0x4f, 0x46, 0xa2, 0xef, 0x01, 0x1e, 0x43, 0xfa, 0x71, 0x32, 0x23, 0xd1, 0x94, + 0x5a, 0xaa, 0xe0, 0x1d, 0x16, 0xbc, 0x0f, 0x21, 0xfd, 0xd8, 0x17, 0xae, 0x4d, 0xbd, 0x52, 0x3c, + 0xfa, 0x01, 0xf6, 0xe7, 0xcb, 0x34, 0xa5, 0xc9, 0xda, 0x4f, 0x64, 0x80, 0xd5, 0xdc, 0x19, 0xf6, + 0x5a, 0xfa, 0xb7, 0x8b, 0xb7, 0xe7, 0xdb, 0x68, 0x0b, 0xd4, 0x8c, 0xdf, 0xf9, 0x43, 0x81, 0x26, + 0xa6, 0x2c, 0xe6, 0x43, 0xfd, 0x1f, 0xa7, 0xe8, 0x80, 0xb9, 0x19, 0x41, 0x96, 0x15, 0x87, 0xa9, + 0x75, 0xad, 0xa7, 0x33, 0x48, 0x7f, 0x36, 0xc4, 0xfe, 0x7c, 0x07, 0x06, 0x68, 0xe6, 0x29, 0x3a, + 0x43, 0xd8, 0xdf, 0x61, 0xa1, 0x23, 0x50, 0xe3, 0x39, 0x59, 0xd3, 0x84, 0x59, 0x95, 0xe3, 0xea, + 0x69, 0x8b, 0xa7, 0xc1, 0x39, 0x84, 0x5e, 0x43, 0xf3, 0x9e, 0xcc, 0x49, 0x34, 0xa1, 0xcc, 0xaa, + 0x16, 0xee, 0x02, 0xeb, 0xfc, 0xae, 0x40, 0x7b, 0x5b, 0x4b, 0xf4, 0x4d, 0x36, 0xa4, 0x54, 0xe5, + 0xe8, 0x5f, 0x24, 0x3f, 0xe3, 0xc3, 0x8a, 0x64, 0x72, 0xe0, 0x13, 0xd0, 0xe2, 0x24, 0x7c, 0x24, + 0x29, 0xf5, 0x1f, 0xe8, 0x5a, 0x28, 0x24, 0x6b, 0x41, 0x06, 0x5f, 0xd1, 0x35, 0x3a, 0x84, 0x06, + 0x59, 0x2c, 0x57, 0x51, 0x2a, 0xb4, 0xa8, 0x0a, 0x7f, 0x86, 0x74, 0xbe, 0x83, 0x9a, 0xd0, 0xd8, + 0x80, 0xba, 0xed, 0x7a, 0x36, 0x36, 0xf7, 0x0e, 0x2b, 0x4d, 0x05, 0xb5, 0xa1, 0x81, 0xed, 0xf1, + 0xed, 0xb5, 0x67, 0x2a, 0xc2, 0xfe, 0x04, 0xb4, 0x91, 0xd3, 0xbf, 0xf2, 0xef, 0x1c, 0xd7, 0xb5, + 0xb1, 0x59, 0xe1, 0x60, 0x67, 0x0c, 0xed, 0xed, 0xdb, 0x8f, 0xbe, 0x00, 0x2d, 0x4d, 0x48, 0xc4, + 0xc8, 0x24, 0x0d, 0x97, 0x91, 0x98, 0x45, 0x17, 0xe5, 0xca, 0x30, 0x7a, 0x09, 0x6a, 0xb4, 0x0c, + 0xa8, 0x1f, 0x06, 0xa5, 0x86, 0x1b, 0x1c, 0x72, 0x82, 0xce, 0x5f, 0x0a, 0x98, 0xbb, 0x8b, 0x81, + 0x0e, 0x40, 0xe5, 0x17, 0x95, 0x33, 0x78, 0xce, 0x1a, 0x6e, 0x70, 0xd3, 0x09, 0xd0, 0x4b, 0x68, + 0xdd, 0xcf, 0x97, 0x93, 0x07, 0x3f, 0x5a, 0x2d, 0x44, 0xb2, 0x1a, 0x6e, 0x0a, 0xc0, 0x5d, 0x2d, + 0xd0, 0x0b, 0x68, 0xb2, 0x19, 0x49, 0x02, 0x4e, 0xe3, 0x93, 0x1b, 0x58, 0x15, 0xb6, 0x13, 0xa0, + 0x57, 0x00, 0x92, 0x37, 0x23, 0x6c, 0x26, 0x76, 0x5a, 0xc7, 0x32, 0xd3, 0x25, 0x61, 0x33, 0xf4, + 0x1c, 0xea, 0xc2, 0x10, 0x2b, 0xab, 0x63, 0x69, 0xa0, 0x13, 0x30, 0x18, 0x8d, 0x02, 0x9a, 0xf8, + 0xf1, 0xea, 0x9e, 0xcb, 0xdd, 0x10, 0x5e, 0x5d, 0x82, 0x23, 0x81, 0x21, 0x0b, 0xd4, 0x98, 0xac, + 0xe7, 0x4b, 0x12, 0x88, 0x05, 0xd4, 0x71, 0x6e, 0x76, 0x7e, 0x51, 0x40, 0x2f, 0xef, 0x2e, 0x7a, + 0x55, 0xea, 0x8f, 0x8f, 0x65, 0xc8, 0x4b, 0x94, 0xf7, 0xf8, 0xe5, 0x6e, 0xb9, 0x4a, 0x21, 0xe7, + 0x76, 0xc9, 0xcf, 0xb7, 0x86, 0xa9, 0x16, 0x51, 0xa5, 0x81, 0x8e, 0x36, 0x5d, 0xd5, 0x0a, 0x7f, + 0xd1, 0xd9, 0xaf, 0x55, 0x78, 0xf6, 0xe4, 0x75, 0xf8, 0xef, 0x45, 0x7f, 0xa2, 0x5f, 0xed, 0x1f, + 0xf4, 0x3b, 0x01, 0x63, 0x4e, 0x49, 0x29, 0x48, 0x1e, 0x81, 0x2e, 0xc1, 0xa7, 0x22, 0x37, 0xb6, + 0x44, 0x46, 0x6f, 0xa0, 0xbd, 0x79, 0xd2, 0x7c, 0x16, 0x4e, 0xb3, 0x53, 0x30, 0x36, 0xe8, 0x38, + 0x9c, 0xf2, 0xf3, 0xe7, 0x40, 0x18, 0x88, 0x90, 0xa6, 0x3c, 0x7f, 0x89, 0x64, 0xee, 0x45, 0xd7, + 0x27, 0xd3, 0x29, 0x0b, 0xa7, 0xcc, 0x6a, 0x49, 0xf7, 0xa2, 0xdb, 0x93, 0x00, 0x17, 0x60, 0xd1, + 0xf5, 0xef, 0xc3, 0x74, 0x41, 0x62, 0x0b, 0x84, 0xb7, 0xb9, 0xe8, 0x5e, 0x08, 0x5b, 0x70, 0xcf, + 0x0b, 0xae, 0x96, 0x71, 0xcf, 0xcb, 0xdc, 0xf3, 0x9c, 0xab, 0x67, 0xdc, 0xf3, 0x8c, 0xfb, 0x06, + 0xda, 0x71, 0x42, 0x63, 0x92, 0xd0, 0xc0, 0x97, 0x17, 0xd0, 0x90, 0xdd, 0xe7, 0xe8, 0x05, 0x07, + 0xdf, 0x8e, 0x40, 0x2b, 0x3d, 0x96, 0xc8, 0x80, 0x56, 0x7f, 0xe8, 0x8e, 0x6d, 0x77, 0x7c, 0x3b, + 0x36, 0xf7, 0xd0, 0x3e, 0xa8, 0x63, 0xaf, 0x77, 0xe5, 0xb8, 0xef, 0xb3, 0xe5, 0x35, 0xa0, 0x3e, + 0xc0, 0x3d, 0x77, 0x20, 0xd7, 0x16, 0x21, 0x68, 0xf7, 0xaf, 0x1d, 0xdb, 0xf5, 0xfc, 0xf1, 0xed, + 0x68, 0x34, 0xc4, 0x9e, 0x59, 0x7d, 0xfb, 0xa7, 0x02, 0x5a, 0xe9, 0x39, 0x45, 0xaf, 0xe1, 0x33, + 0xd7, 0xbe, 0x73, 0x87, 0x03, 0xdb, 0xbf, 0xb0, 0x7b, 0xfd, 0xa1, 0xeb, 0xe7, 0x29, 0xe5, 0xfb, + 0xa0, 0x43, 0xb3, 0xe7, 0xba, 0xc3, 0x5b, 0xb7, 0x6f, 0x9b, 0x0a, 0xd2, 0x40, 0x1d, 0x61, 0x7b, + 0xd4, 0xc3, 0xb6, 0x59, 0xe1, 0xae, 0xcc, 0x18, 0x98, 0x55, 0x04, 0xd0, 0xe8, 0x0f, 0x6f, 0x6e, + 0x1c, 0xcf, 0xac, 0xc9, 0x3e, 0xf9, 0xb7, 0x67, 0x0f, 0xcc, 0x3a, 0x6a, 0x03, 0x7c, 0x70, 0xec, + 0xbb, 0xfe, 0x65, 0xcf, 0x7d, 0x6f, 0x9b, 0x0d, 0x9e, 0xc5, 0xb5, 0xef, 0x38, 0x64, 0xaa, 0x08, + 0x01, 0x88, 0x9e, 0x7d, 0xc7, 0x75, 0x3c, 0x13, 0x44, 0xd1, 0xe7, 0xa0, 0x4b, 0x2c, 0xcb, 0xa8, + 0x09, 0xf4, 0x00, 0xf6, 0xaf, 0x87, 0x9e, 0x67, 0xe3, 0x9f, 0x7c, 0x6c, 0xff, 0x78, 0x6b, 0x8f, + 0x3d, 0x53, 0xe7, 0x8e, 0x6e, 0x0f, 0x8c, 0xfe, 0x3c, 0xa4, 0x51, 0x9a, 0x69, 0x85, 0xbe, 0x02, + 0x75, 0x94, 0x2c, 0x27, 0x94, 0x31, 0x64, 0xee, 0xfe, 0x88, 0x1c, 0x3e, 0x2b, 0x90, 0xfc, 0x8d, + 0xef, 0xec, 0xdd, 0x37, 0xc4, 0x9f, 0x92, 0xf3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x76, 0xe0, + 0x82, 0x48, 0xa5, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/proto/message/message.proto b/api/proto/message/message.proto index e1ecd40ad..f21156709 100644 --- a/api/proto/message/message.proto +++ b/api/proto/message/message.proto @@ -112,5 +112,5 @@ message ViewChangeRequest { bytes m2_bitmap = 10; bytes m3_aggsigs = 11; // m3: |viewID| bytes m3_bitmap= 12; - + bytes prepared_block = 13; } diff --git a/consensus/consensus_viewchange_msg.go b/consensus/consensus_viewchange_msg.go index 2409de44a..8f81abd8f 100644 --- a/consensus/consensus_viewchange_msg.go +++ b/consensus/consensus_viewchange_msg.go @@ -3,6 +3,8 @@ package consensus import ( "encoding/binary" + "github.com/ethereum/go-ethereum/rlp" + "github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/harmony/api/proto" msg_pb "github.com/harmony-one/harmony/api/proto/message" @@ -35,14 +37,27 @@ func (consensus *Consensus) constructViewChangeMessage(pubKey *bls.PublicKey, pr ) preparedMsg := consensus.FBFTLog.FindMessageByMaxViewID(preparedMsgs) + var encodedBlock []byte + if preparedMsg != nil { + block := consensus.FBFTLog.GetBlockByHash(preparedMsg.BlockHash) + if block != nil { + tmpEncoded, err := rlp.EncodeToBytes(block) + if err != nil { + consensus.getLogger().Err(err).Msg("[constructViewChangeMessage] Failed encoding block") + } + encodedBlock = tmpEncoded + } + } + var msgToSign []byte - if preparedMsg == nil { + if len(encodedBlock) == 0 { msgToSign = NIL // m2 type message vcMsg.Payload = []byte{} } else { // m1 type message msgToSign = append(preparedMsg.BlockHash[:], preparedMsg.Payload...) vcMsg.Payload = append(msgToSign[:0:0], msgToSign...) + vcMsg.PreparedBlock = encodedBlock } utils.Logger().Debug(). @@ -91,6 +106,18 @@ func (consensus *Consensus) constructNewViewMessage(viewID uint64, pubKey *bls.P // sender address vcMsg.SenderPubkey = pubKey.Serialize() vcMsg.Payload = consensus.m1Payload + if len(consensus.m1Payload) != 0 { + block := consensus.FBFTLog.GetBlockByHash(consensus.blockHash) + if block != nil { + encodedBlock, err := rlp.EncodeToBytes(block) + if err != nil { + consensus.getLogger().Err(err).Msg("[constructNewViewMessage] Failed encoding prepared block") + } + if len(encodedBlock) != 0 { + vcMsg.PreparedBlock = encodedBlock + } + } + } sig2arr := consensus.GetNilSigsArray(viewID) utils.Logger().Debug().Int("len", len(sig2arr)).Msg("[constructNewViewMessage] M2 (NIL) type signatures") diff --git a/consensus/fbft_log.go b/consensus/fbft_log.go index d06e504a8..c967e221e 100644 --- a/consensus/fbft_log.go +++ b/consensus/fbft_log.go @@ -261,6 +261,8 @@ func ParseViewChangeMessage(msg *msg_pb.Message) (*FBFTMessage, error) { vcMsg := msg.GetViewchange() pbftMsg.ViewID = vcMsg.ViewId pbftMsg.BlockNum = vcMsg.BlockNum + pbftMsg.Block = make([]byte, len(vcMsg.PreparedBlock)) + copy(pbftMsg.Block[:], vcMsg.PreparedBlock[:]) pbftMsg.Payload = make([]byte, len(vcMsg.Payload)) copy(pbftMsg.Payload[:], vcMsg.Payload[:]) @@ -309,6 +311,8 @@ func (consensus *Consensus) ParseNewViewMessage(msg *msg_pb.Message) (*FBFTMessa FBFTMsg.BlockNum = vcMsg.BlockNum FBFTMsg.Payload = make([]byte, len(vcMsg.Payload)) copy(FBFTMsg.Payload[:], vcMsg.Payload[:]) + FBFTMsg.Block = make([]byte, len(vcMsg.PreparedBlock)) + copy(FBFTMsg.Block[:], vcMsg.PreparedBlock[:]) pubKey, err := bls_cosi.BytesToBLSPublicKey(vcMsg.SenderPubkey) if err != nil { diff --git a/consensus/view_change.go b/consensus/view_change.go index 8e74dea6d..5cbd83b25 100644 --- a/consensus/view_change.go +++ b/consensus/view_change.go @@ -3,10 +3,14 @@ package consensus import ( "bytes" "encoding/binary" + "encoding/hex" "math/big" "sync" "time" + "github.com/ethereum/go-ethereum/rlp" + "github.com/harmony-one/harmony/core/types" + "github.com/ethereum/go-ethereum/common" "github.com/harmony-one/bls/ffi/go/bls" msg_pb "github.com/harmony-one/harmony/api/proto/message" @@ -192,7 +196,8 @@ func (consensus *Consensus) onViewChange(msg *msg_pb.Message) { msg_pb.MessageType_PREPARED, recvMsg.BlockNum, ) preparedMsg := consensus.FBFTLog.FindMessageByMaxViewID(preparedMsgs) - if preparedMsg == nil { + block := consensus.FBFTLog.GetBlockByHash(preparedMsg.BlockHash) + if preparedMsg == nil || block == nil { consensus.getLogger().Debug().Msg("[onViewChange] add my M2(NIL) type messaage") for i, key := range consensus.PubKey.PublicKey { priKey := consensus.priKey.PrivateKey[i] @@ -221,8 +226,19 @@ func (consensus *Consensus) onViewChange(msg *msg_pb.Message) { } } + preparedBlock := &types.Block{} + if len(recvMsg.Payload) != 0 && len(recvMsg.Block) != 0 { + if err := rlp.DecodeBytes(recvMsg.Block, preparedBlock); err != nil { + consensus.getLogger().Warn(). + Err(err). + Uint64("MsgBlockNum", recvMsg.BlockNum). + Msg("[onViewChange] Unparseable prepared block data") + return + } + } + // m2 type message - if len(recvMsg.Payload) == 0 { + if preparedBlock == nil { _, ok := consensus.nilSigs[recvMsg.ViewID][senderKey.SerializeToHexStr()] if ok { consensus.getLogger().Debug(). @@ -242,6 +258,10 @@ func (consensus *Consensus) onViewChange(msg *msg_pb.Message) { consensus.nilSigs[recvMsg.ViewID][senderKey.SerializeToHexStr()] = recvMsg.ViewchangeSig consensus.nilBitmap[recvMsg.ViewID].SetKey(recvMsg.SenderPubkey, true) // Set the bitmap indicating that this validator signed. } else { // m1 type message + if consensus.BlockVerifier(preparedBlock); err != nil { + consensus.getLogger().Error().Err(err).Msg("[onViewChange] Prepared block verification failed") + return + } _, ok := consensus.bhpSigs[recvMsg.ViewID][senderKey.SerializeToHexStr()] if ok { consensus.getLogger().Debug(). @@ -299,6 +319,8 @@ func (consensus *Consensus) onViewChange(msg *msg_pb.Message) { preparedMsg.SenderPubkey = newLeaderKey consensus.getLogger().Info().Msg("[onViewChange] New Leader Prepared Message Added") consensus.FBFTLog.AddMessage(&preparedMsg) + + consensus.FBFTLog.AddBlock(preparedBlock) } } consensus.getLogger().Debug(). @@ -342,6 +364,8 @@ func (consensus *Consensus) onViewChange(msg *msg_pb.Message) { consensus.ResetState() if len(consensus.m1Payload) == 0 { // TODO(Chao): explain why ReadySignal is sent only in this case but not the other case. + // Make sure the newly proposed block have the correct view ID + consensus.viewID = recvMsg.ViewID go func() { consensus.ReadySignal <- struct{}{} }() @@ -352,7 +376,7 @@ func (consensus *Consensus) onViewChange(msg *msg_pb.Message) { Msg("[OnViewChange] Switching phase") consensus.switchPhase(FBFTCommit, true) copy(consensus.blockHash[:], consensus.m1Payload[:32]) - aggSig, mask, err := consensus.ReadSignatureBitmapPayload(recvMsg.Payload, 32) + aggSig, mask, err := consensus.ReadSignatureBitmapPayload(consensus.m1Payload, 32) if err != nil { consensus.getLogger().Error().Err(err). @@ -363,8 +387,13 @@ func (consensus *Consensus) onViewChange(msg *msg_pb.Message) { consensus.aggregatedPrepareSig = aggSig consensus.prepareBitmap = mask // Leader sign and add commit message + block := consensus.FBFTLog.GetBlockByHash(consensus.blockHash) + if block == nil { + consensus.getLogger().Debug().Msg("[onViewChange] failed to get prepared block for self commit") + return + } commitPayload := signature.ConstructCommitPayload(consensus.ChainReader, - new(big.Int).SetUint64(consensus.epoch), consensus.blockHash, consensus.blockNum, recvMsg.ViewID) + new(big.Int).SetUint64(consensus.epoch), consensus.blockHash, consensus.blockNum, block.Header().ViewID().Uint64()) for i, key := range consensus.PubKey.PublicKey { priKey := consensus.priKey.PrivateKey[i] if _, err := consensus.Decider.SubmitVote( @@ -476,6 +505,28 @@ func (consensus *Consensus) onNewView(msg *msg_pb.Message) { } // check when M3 sigs > M2 sigs, then M1 (recvMsg.Payload) should not be empty + preparedBlock := &types.Block{} + if len(recvMsg.Payload) != 0 && len(recvMsg.Block) != 0 { + if err := rlp.DecodeBytes(recvMsg.Block, preparedBlock); err != nil { + consensus.getLogger().Warn(). + Err(err). + Uint64("MsgBlockNum", recvMsg.BlockNum). + Msg("[onNewView] Unparseable prepared block data") + return + } + + blockHash := recvMsg.Payload[:32] + preparedBlockHash := preparedBlock.Hash() + if !bytes.Equal(preparedBlockHash[:], blockHash) { + consensus.getLogger().Warn(). + Err(err). + Str("blockHash", preparedBlock.Hash().Hex()). + Str("payloadBlockHash", hex.EncodeToString(blockHash)). + Msg("[onNewView] Prepared block hash doesn't match msg block hash.") + return + } + } + if m2Mask == nil || m2Mask.Bitmap == nil || (m2Mask != nil && m2Mask.Bitmap != nil && utils.CountOneBits(m3Mask.Bitmap) > utils.CountOneBits(m2Mask.Bitmap)) { @@ -512,6 +563,8 @@ func (consensus *Consensus) onNewView(msg *msg_pb.Message) { copy(preparedMsg.Payload[:], recvMsg.Payload[32:]) preparedMsg.SenderPubkey = senderKey consensus.FBFTLog.AddMessage(&preparedMsg) + + consensus.FBFTLog.AddBlock(preparedBlock) } // newView message verified success, override my state @@ -530,11 +583,14 @@ func (consensus *Consensus) onNewView(msg *msg_pb.Message) { } // NewView message is verified, change state to normal consensus - // TODO: check magic number 32 - if len(recvMsg.Payload) > 32 { + if preparedBlock != nil { // Construct and send the commit message + if consensus.BlockVerifier(preparedBlock); err != nil { + consensus.getLogger().Error().Err(err).Msg("[onNewView] Prepared block verification failed") + return + } commitPayload := signature.ConstructCommitPayload(consensus.ChainReader, - new(big.Int).SetUint64(consensus.epoch), consensus.blockHash, consensus.blockNum, consensus.viewID) + new(big.Int).SetUint64(consensus.epoch), preparedBlock.Hash(), preparedBlock.NumberU64(), preparedBlock.Header().ViewID().Uint64()) groupID := []nodeconfig.GroupID{ nodeconfig.NewGroupIDByShardID(nodeconfig.ShardID(consensus.ShardID))} for i, key := range consensus.PubKey.PublicKey {