From 1acb65f2465b7fb504cfd2c8f297dee372c707c5 Mon Sep 17 00:00:00 2001 From: YACOVM Date: Sun, 30 Apr 2017 17:58:07 +0300 Subject: [PATCH] [FAB-3497] Removing the hash from gossip dataMsg The hash field isn't used anywhere but in the protos comparator function to compare 2 ledger blocks disseminated. This imposes a security vulnerability: A malicious peer can send blocks with an arbitrary hash in the hash field of the DataMsg, and then these messages would enter the in-memory stores and fill up the memory. Since we have no use of the block hash of our own message, I am removing it entirely. Change-Id: Ic22ed3d06f102795c8f2a74b27063848affc926a Signed-off-by: Yacov Manevich --- gossip/comm/mock/mock_comm_test.go | 10 +- gossip/gossip/channel/channel_test.go | 2 - gossip/gossip/gossip_test.go | 13 +- gossip/gossip/pull/pullstore_test.go | 1 - gossip/state/payloads_buffer_test.go | 23 +--- gossip/state/state.go | 1 - gossip/state/state_test.go | 15 ++- protos/gossip/extensions.go | 5 +- protos/gossip/extensions_test.go | 42 +++---- protos/gossip/message.pb.go | 174 +++++++++++++------------- protos/gossip/message.proto | 3 +- 11 files changed, 137 insertions(+), 152 deletions(-) diff --git a/gossip/comm/mock/mock_comm_test.go b/gossip/comm/mock/mock_comm_test.go index 450ad07153d..6d8f7ef8402 100644 --- a/gossip/comm/mock/mock_comm_test.go +++ b/gossip/comm/mock/mock_comm_test.go @@ -76,7 +76,10 @@ func TestMockComm_PingPong(t *testing.T) { peerA.Send((&proto.GossipMessage{ Content: &proto.GossipMessage_DataMsg{ &proto.DataMessage{ - &proto.Payload{1, "", []byte("Ping")}, + &proto.Payload{ + SeqNum: 1, + Data: []byte("Ping"), + }, }}, }).NoopSign(), &comm.RemotePeer{"peerB", common.PKIidType("peerB")}) @@ -88,7 +91,10 @@ func TestMockComm_PingPong(t *testing.T) { msg.Respond(&proto.GossipMessage{ Content: &proto.GossipMessage_DataMsg{ &proto.DataMessage{ - &proto.Payload{1, "", []byte("Pong")}, + &proto.Payload{ + SeqNum: 1, + Data: []byte("Pong"), + }, }}, }) diff --git a/gossip/gossip/channel/channel_test.go b/gossip/gossip/channel/channel_test.go index cd2116c75b5..5c71e29fabb 100644 --- a/gossip/gossip/channel/channel_test.go +++ b/gossip/gossip/channel/channel_test.go @@ -1393,7 +1393,6 @@ func dataMsgOfChannel(seqnum uint64, channel common.ChainID) *proto.SignedGossip DataMsg: &proto.DataMessage{ Payload: &proto.Payload{ Data: []byte{}, - Hash: "", SeqNum: seqnum, }, }, @@ -1441,7 +1440,6 @@ func createDataMsg(seqnum uint64, channel common.ChainID) *proto.SignedGossipMes DataMsg: &proto.DataMessage{ Payload: &proto.Payload{ Data: []byte{}, - Hash: "", SeqNum: seqnum, }, }, diff --git a/gossip/gossip/gossip_test.go b/gossip/gossip/gossip_test.go index 3b9f176cd7d..4a037e17d7e 100644 --- a/gossip/gossip/gossip_test.go +++ b/gossip/gossip/gossip_test.go @@ -330,7 +330,7 @@ func TestPull(t *testing.T) { } for i := 1; i <= msgsCount2Send; i++ { - boot.Gossip(createDataMsg(uint64(i), []byte{}, "", common.ChainID("A"))) + boot.Gossip(createDataMsg(uint64(i), []byte{}, common.ChainID("A"))) } waitUntilOrFail(t, knowAll) @@ -564,7 +564,7 @@ func TestDissemination(t *testing.T) { t.Log("Membership establishment took", time.Since(membershipTime)) for i := 1; i <= msgsCount2Send; i++ { - boot.Gossip(createDataMsg(uint64(i), []byte{}, "", common.ChainID("A"))) + boot.Gossip(createDataMsg(uint64(i), []byte{}, common.ChainID("A"))) } t2 := time.Now() @@ -902,8 +902,8 @@ func TestDataLeakage(t *testing.T) { } t1 = time.Now() - peers[0].Gossip(createDataMsg(1, []byte{}, "", channels[0])) - peers[n/2].Gossip(createDataMsg(2, []byte{}, "", channels[1])) + peers[0].Gossip(createDataMsg(1, []byte{}, channels[0])) + peers[n/2].Gossip(createDataMsg(2, []byte{}, channels[1])) waitUntilOrFailBlocking(t, gotMessages) t.Log("Dissemination took", time.Since(t1)) stop := func() { @@ -972,7 +972,7 @@ func TestDisseminateAll2All(t *testing.T) { blockStartIndex := i * 10 for j := 0; j < 10; j++ { blockSeq := uint64(j + blockStartIndex) - peers[i].Gossip(createDataMsg(blockSeq, []byte{}, "", common.ChainID("A"))) + peers[i].Gossip(createDataMsg(blockSeq, []byte{}, common.ChainID("A"))) } }(i) } @@ -1044,7 +1044,7 @@ func TestEndedGoroutines(t *testing.T) { ensureGoroutineExit(t) } -func createDataMsg(seqnum uint64, data []byte, hash string, channel common.ChainID) *proto.GossipMessage { +func createDataMsg(seqnum uint64, data []byte, channel common.ChainID) *proto.GossipMessage { return &proto.GossipMessage{ Channel: []byte(channel), Nonce: 0, @@ -1053,7 +1053,6 @@ func createDataMsg(seqnum uint64, data []byte, hash string, channel common.Chain DataMsg: &proto.DataMessage{ Payload: &proto.Payload{ Data: data, - Hash: hash, SeqNum: seqnum, }, }, diff --git a/gossip/gossip/pull/pullstore_test.go b/gossip/gossip/pull/pullstore_test.go index e55022c688e..ea96a879be6 100644 --- a/gossip/gossip/pull/pullstore_test.go +++ b/gossip/gossip/pull/pullstore_test.go @@ -332,7 +332,6 @@ func dataMsg(seqNum int) *proto.SignedGossipMessage { DataMsg: &proto.DataMessage{ Payload: &proto.Payload{ Data: []byte{}, - Hash: "", SeqNum: uint64(seqNum), }, }, diff --git a/gossip/state/payloads_buffer_test.go b/gossip/state/payloads_buffer_test.go index cb648694bf2..74b4aef46ce 100644 --- a/gossip/state/payloads_buffer_test.go +++ b/gossip/state/payloads_buffer_test.go @@ -18,7 +18,6 @@ package state import ( "crypto/rand" - "fmt" "sync" "sync/atomic" "testing" @@ -33,30 +32,16 @@ func init() { util.SetupTestLogging() } -func uuid() (string, error) { - uuid := make([]byte, 16) - _, err := rand.Read(uuid) - if err != nil { - return "", err - } - uuid[8] = uuid[8]&^0xc0 | 0x80 - - uuid[6] = uuid[6]&^0xf0 | 0x40 - return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:]), nil -} - func randomPayloadWithSeqNum(seqNum uint64) (*proto.Payload, error) { data := make([]byte, 64) _, err := rand.Read(data) if err != nil { return nil, err } - uuid, err := uuid() - if err != nil { - return nil, err - } - - return &proto.Payload{seqNum, uuid, data}, nil + return &proto.Payload{ + SeqNum: seqNum, + Data: data, + }, nil } func TestNewPayloadsBuffer(t *testing.T) { diff --git a/gossip/state/state.go b/gossip/state/state.go index 25cd6a068ea..115f42efff7 100644 --- a/gossip/state/state.go +++ b/gossip/state/state.go @@ -343,7 +343,6 @@ func (s *GossipStateProviderImpl) handleStateRequest(msg proto.ReceivedMessage) response.Payloads = append(response.Payloads, &proto.Payload{ SeqNum: seqNum, Data: blockBytes, - Hash: string(blocks[0].Header.Hash()), }) } // Sending back response with missing blocks diff --git a/gossip/state/state_test.go b/gossip/state/state_test.go index 58fa22c1a88..b649250358e 100644 --- a/gossip/state/state_test.go +++ b/gossip/state/state_test.go @@ -394,7 +394,10 @@ func TestAccessControl(t *testing.T) { for i := 1; i <= msgCount; i++ { rawblock := pcomm.NewBlock(uint64(i), []byte{}) if b, err := pb.Marshal(rawblock); err == nil { - payload := &proto.Payload{uint64(i), "", b} + payload := &proto.Payload{ + SeqNum: uint64(i), + Data: b, + } bootstrapSet[0].s.AddPayload(payload) } else { t.Fail() @@ -550,7 +553,10 @@ func TestNewGossipStateProvider_SendingManyMessages(t *testing.T) { for i := 1; i <= msgCount; i++ { rawblock := pcomm.NewBlock(uint64(i), []byte{}) if b, err := pb.Marshal(rawblock); err == nil { - payload := &proto.Payload{uint64(i), "", b} + payload := &proto.Payload{ + SeqNum: uint64(i), + Data: b, + } bootstrapSet[0].s.AddPayload(payload) } else { t.Fail() @@ -682,7 +688,10 @@ func TestNewGossipStateProvider_BatchingOfStateRequest(t *testing.T) { for i := 1; i <= msgCount; i++ { rawblock := pcomm.NewBlock(uint64(i), []byte{}) if b, err := pb.Marshal(rawblock); err == nil { - payload := &proto.Payload{uint64(i), "", b} + payload := &proto.Payload{ + SeqNum: uint64(i), + Data: b, + } bootPeer.s.AddPayload(payload) } else { t.Fail() diff --git a/protos/gossip/extensions.go b/protos/gossip/extensions.go index 087f7d7adb6..acdc3ac4cef 100644 --- a/protos/gossip/extensions.go +++ b/protos/gossip/extensions.go @@ -85,10 +85,7 @@ func (mc *msgComparator) identityInvalidationPolicy(thisIdentityMsg *PeerIdentit func (mc *msgComparator) dataInvalidationPolicy(thisDataMsg *DataMessage, thatDataMsg *DataMessage) common.InvalidationResult { if thisDataMsg.Payload.SeqNum == thatDataMsg.Payload.SeqNum { - if thisDataMsg.Payload.Hash == thatDataMsg.Payload.Hash { - return common.MessageInvalidated - } - return common.MessageNoAction + return common.MessageInvalidated } diff := abs(thisDataMsg.Payload.SeqNum, thatDataMsg.Payload.SeqNum) diff --git a/protos/gossip/extensions_test.go b/protos/gossip/extensions_test.go index 58b43a76955..2d1785f4496 100644 --- a/protos/gossip/extensions_test.go +++ b/protos/gossip/extensions_test.go @@ -273,17 +273,15 @@ func TestDataMessageInvalidation(t *testing.T) { comparator := NewGossipMessageComparator(5) data := []byte{1, 1, 1} - sMsg1 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(1, "hash", data)) - sMsg2 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(1, "hash", data)) - sMsg3 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(1, "newHash", data)) - sMsg4 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(2, "newHash", data)) - sMsg5 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(7, "newHash", data)) + sMsg1 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(1, data)) + sMsg1Clone := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(1, data)) + sMsg3 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(2, data)) + sMsg4 := signedGossipMessage("testChannel", GossipMessage_EMPTY, dataMessage(7, data)) - assert.Equal(t, comparator(sMsg1, sMsg2), common.MessageInvalidated) + assert.Equal(t, comparator(sMsg1, sMsg1Clone), common.MessageInvalidated) assert.Equal(t, comparator(sMsg1, sMsg3), common.MessageNoAction) - assert.Equal(t, comparator(sMsg1, sMsg4), common.MessageNoAction) - assert.Equal(t, comparator(sMsg1, sMsg5), common.MessageInvalidated) - assert.Equal(t, comparator(sMsg5, sMsg1), common.MessageInvalidates) + assert.Equal(t, comparator(sMsg1, sMsg4), common.MessageInvalidated) + assert.Equal(t, comparator(sMsg4, sMsg1), common.MessageInvalidates) } func TestIdentityMessagesInvalidation(t *testing.T) { @@ -376,7 +374,7 @@ func TestCheckGossipMessageTypes(t *testing.T) { assert.True(t, msg.IsAliveMsg()) // Create gossip data message - msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, "hash", []byte{1, 2, 3, 4, 5})) + msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, []byte{1, 2, 3, 4, 5})) assert.True(t, msg.IsDataMsg()) // Create data request message @@ -436,7 +434,6 @@ func TestCheckGossipMessageTypes(t *testing.T) { StateResponse: &RemoteStateResponse{ Payloads: []*Payload{&Payload{ SeqNum: 1, - Hash: "hash", Data: []byte{1, 2, 3, 4, 5}, }}, }, @@ -497,7 +494,7 @@ func TestGossipPullMessageType(t *testing.T) { assert.Equal(t, msg.GetPullMsgType(), PullMsgType_IDENTITY_MSG) // Create gossip data message - msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, "hash", []byte{1, 2, 3, 4, 5})) + msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, []byte{1, 2, 3, 4, 5})) assert.True(t, msg.IsDataMsg()) assert.Equal(t, msg.GetPullMsgType(), PullMsgType_UNDEFINED) } @@ -506,30 +503,30 @@ func TestGossipMessageDataMessageTagType(t *testing.T) { var msg *SignedGossipMessage channelID := "testID1" - msg = signedGossipMessage(channelID, GossipMessage_CHAN_AND_ORG, dataMessage(1, "hash", []byte{1})) + msg = signedGossipMessage(channelID, GossipMessage_CHAN_AND_ORG, dataMessage(1, []byte{1})) assert.True(t, msg.IsChannelRestricted()) assert.True(t, msg.IsOrgRestricted()) assert.NoError(t, msg.IsTagLegal()) - msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, "hash", []byte{1})) + msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, []byte{1})) assert.Error(t, msg.IsTagLegal()) - msg = signedGossipMessage(channelID, GossipMessage_UNDEFINED, dataMessage(1, "hash", []byte{1})) + msg = signedGossipMessage(channelID, GossipMessage_UNDEFINED, dataMessage(1, []byte{1})) assert.Error(t, msg.IsTagLegal()) - msg = signedGossipMessage(channelID, GossipMessage_ORG_ONLY, dataMessage(1, "hash", []byte{1})) + msg = signedGossipMessage(channelID, GossipMessage_ORG_ONLY, dataMessage(1, []byte{1})) assert.False(t, msg.IsChannelRestricted()) assert.True(t, msg.IsOrgRestricted()) - msg = signedGossipMessage(channelID, GossipMessage_CHAN_OR_ORG, dataMessage(1, "hash", []byte{1})) + msg = signedGossipMessage(channelID, GossipMessage_CHAN_OR_ORG, dataMessage(1, []byte{1})) assert.True(t, msg.IsChannelRestricted()) assert.False(t, msg.IsOrgRestricted()) - msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, "hash", []byte{1})) + msg = signedGossipMessage(channelID, GossipMessage_EMPTY, dataMessage(1, []byte{1})) assert.False(t, msg.IsChannelRestricted()) assert.False(t, msg.IsOrgRestricted()) - msg = signedGossipMessage(channelID, GossipMessage_UNDEFINED, dataMessage(1, "hash", []byte{1})) + msg = signedGossipMessage(channelID, GossipMessage_UNDEFINED, dataMessage(1, []byte{1})) assert.False(t, msg.IsChannelRestricted()) assert.False(t, msg.IsOrgRestricted()) } @@ -774,7 +771,7 @@ func TestSignedGossipMessage_Verify(t *testing.T) { func TestEnvelope(t *testing.T) { dataMsg := &GossipMessage{ - Content: dataMessage(1, "hash", []byte("data")), + Content: dataMessage(1, []byte("data")), } bytes, err := proto.Marshal(dataMsg) assert.NoError(t, err) @@ -791,7 +788,7 @@ func TestEnvelope(t *testing.T) { func TestEnvelope_SignSecret(t *testing.T) { dataMsg := &GossipMessage{ - Content: dataMessage(1, "hash", []byte("data")), + Content: dataMessage(1, []byte("data")), } bytes, err := proto.Marshal(dataMsg) assert.NoError(t, err) @@ -851,12 +848,11 @@ func stateInfoMessage(incNumber uint64, seqNum uint64, pkid []byte, mac []byte) } } -func dataMessage(seqNum uint64, hash string, data []byte) *GossipMessage_DataMsg { +func dataMessage(seqNum uint64, data []byte) *GossipMessage_DataMsg { return &GossipMessage_DataMsg{ DataMsg: &DataMessage{ Payload: &Payload{ SeqNum: seqNum, - Hash: hash, Data: data, }, }, diff --git a/protos/gossip/message.pb.go b/protos/gossip/message.pb.go index 630f7443b11..fba7025acac 100644 --- a/protos/gossip/message.pb.go +++ b/protos/gossip/message.pb.go @@ -1004,8 +1004,7 @@ func (m *DataMessage) GetPayload() *Payload { // Payload contains a block type Payload struct { SeqNum uint64 `protobuf:"varint,1,opt,name=seq_num,json=seqNum" json:"seq_num,omitempty"` - Hash string `protobuf:"bytes,2,opt,name=hash" json:"hash,omitempty"` - Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` } func (m *Payload) Reset() { *m = Payload{} } @@ -1341,90 +1340,89 @@ var _Gossip_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gossip/message.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1352 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6f, 0xe3, 0x44, - 0x10, 0x8f, 0x9b, 0x4f, 0x4f, 0x3e, 0x9a, 0x6e, 0x7b, 0x60, 0xca, 0x71, 0xaa, 0x2c, 0xee, 0x54, - 0xe8, 0x91, 0x9e, 0x7a, 0x80, 0x4e, 0x3a, 0x81, 0x94, 0x36, 0xa1, 0x09, 0x5c, 0xd2, 0xca, 0xcd, - 0x09, 0x8e, 0x17, 0x6b, 0x13, 0x6f, 0x1d, 0x73, 0xf6, 0xda, 0xf5, 0x6e, 0x0e, 0xfa, 0x08, 0x8f, - 0x3c, 0xf0, 0xcc, 0x9f, 0x8b, 0xbc, 0x6b, 0x3b, 0x76, 0xdd, 0x9e, 0xd4, 0x93, 0x78, 0xf3, 0x7c, - 0xfc, 0x66, 0x66, 0x67, 0x67, 0x67, 0xc6, 0xb0, 0x63, 0xfb, 0x8c, 0x39, 0xc1, 0xa1, 0x47, 0x18, - 0xc3, 0x36, 0xe9, 0x05, 0xa1, 0xcf, 0x7d, 0x54, 0x93, 0x5c, 0xfd, 0x2f, 0x05, 0x1a, 0x43, 0xfa, - 0x8e, 0xb8, 0x7e, 0x40, 0x90, 0x06, 0xf5, 0x00, 0x5f, 0xbb, 0x3e, 0xb6, 0x34, 0x65, 0x4f, 0xd9, - 0x6f, 0x19, 0x09, 0x89, 0x1e, 0x82, 0xca, 0x1c, 0x9b, 0x62, 0xbe, 0x0a, 0x89, 0xb6, 0x21, 0x64, - 0x6b, 0x06, 0xfa, 0x1e, 0x3a, 0x8c, 0x2c, 0x42, 0xc2, 0x13, 0x4b, 0x5a, 0x79, 0x4f, 0xd9, 0x6f, - 0x1e, 0x7d, 0xd4, 0x93, 0x5e, 0x7a, 0x17, 0x39, 0xa9, 0x71, 0x43, 0x5b, 0x1f, 0x41, 0x27, 0xaf, - 0xf1, 0xa1, 0x91, 0xe8, 0x7d, 0xa8, 0x49, 0x4b, 0xe8, 0x29, 0x74, 0x1d, 0xca, 0x49, 0x48, 0xb1, - 0x3b, 0xa4, 0x56, 0xe0, 0x3b, 0x94, 0x0b, 0x53, 0xea, 0xa8, 0x64, 0x14, 0x24, 0xc7, 0x2a, 0xd4, - 0x17, 0x3e, 0xe5, 0x84, 0x72, 0xfd, 0x5f, 0x15, 0xda, 0xa7, 0x22, 0xec, 0x89, 0xcc, 0x18, 0xda, - 0x81, 0x2a, 0xf5, 0xe9, 0x82, 0x08, 0x7c, 0xc5, 0x90, 0x44, 0x14, 0xe2, 0x62, 0x89, 0x29, 0x25, - 0x6e, 0x1c, 0x46, 0x42, 0xa2, 0x03, 0x28, 0x73, 0x6c, 0x8b, 0x1c, 0x74, 0x8e, 0x3e, 0x49, 0x72, - 0x90, 0xb3, 0xd9, 0x9b, 0x61, 0xdb, 0x88, 0xb4, 0xd0, 0x73, 0x50, 0xb1, 0xeb, 0xbc, 0x23, 0xa6, - 0xc7, 0x6c, 0xad, 0x2a, 0xd2, 0xb6, 0x93, 0x40, 0xfa, 0x91, 0x20, 0x46, 0x8c, 0x4a, 0x46, 0x43, - 0x28, 0x4e, 0x98, 0x8d, 0xbe, 0x86, 0xba, 0x47, 0x3c, 0x33, 0x24, 0x57, 0x5a, 0x4d, 0x40, 0x52, - 0x2f, 0x13, 0xe2, 0xcd, 0x49, 0xc8, 0x96, 0x4e, 0x60, 0x90, 0xab, 0x15, 0x61, 0x7c, 0x54, 0x32, - 0x6a, 0x1e, 0xf1, 0x0c, 0x72, 0x85, 0xbe, 0x49, 0x50, 0x4c, 0xab, 0x0b, 0xd4, 0xee, 0x6d, 0x28, - 0x16, 0xf8, 0x94, 0x91, 0x14, 0xc6, 0xd0, 0x33, 0x68, 0x58, 0x98, 0x63, 0x11, 0x60, 0x43, 0xe0, - 0xb6, 0x13, 0xdc, 0x00, 0x73, 0xbc, 0x8e, 0xaf, 0x1e, 0xa9, 0x45, 0xe1, 0x1d, 0x40, 0x75, 0x49, - 0x5c, 0xd7, 0xd7, 0xd4, 0xbc, 0xba, 0x4c, 0xc1, 0x28, 0x12, 0x8d, 0x4a, 0x86, 0xd4, 0x41, 0x87, - 0xb1, 0x79, 0xcb, 0xb1, 0x35, 0x10, 0xfa, 0x28, 0x6b, 0x7e, 0xe0, 0xd8, 0xf2, 0x14, 0xc2, 0xfa, - 0xc0, 0xb1, 0xd3, 0x78, 0xa2, 0xd3, 0x37, 0x8b, 0xf1, 0xac, 0xcf, 0x2d, 0x10, 0xf2, 0xe0, 0x4d, - 0x81, 0x58, 0x05, 0x16, 0xe6, 0x44, 0x6b, 0x15, 0xbd, 0xbc, 0x16, 0x92, 0x51, 0xc9, 0x00, 0x2b, - 0xa5, 0xd0, 0x63, 0xa8, 0x12, 0x2f, 0xe0, 0xd7, 0x5a, 0x5b, 0x00, 0xda, 0x09, 0x60, 0x18, 0x31, - 0xa3, 0x03, 0x08, 0x29, 0x3a, 0x80, 0xca, 0xc2, 0xa7, 0x54, 0xeb, 0x08, 0xad, 0x07, 0x89, 0xd6, - 0x89, 0x4f, 0xe9, 0x90, 0x71, 0x3c, 0x77, 0x1d, 0xb6, 0x1c, 0x95, 0x0c, 0xa1, 0x84, 0x8e, 0x00, - 0x18, 0xc7, 0x9c, 0x98, 0x0e, 0xbd, 0xf4, 0xb5, 0x4d, 0x01, 0xd9, 0x4a, 0x9f, 0x49, 0x24, 0x19, - 0xd3, 0xcb, 0x28, 0x3b, 0x2a, 0x4b, 0x08, 0x74, 0x0c, 0x1d, 0x89, 0x61, 0x14, 0x07, 0x6c, 0xe9, - 0x73, 0xad, 0x9b, 0xbf, 0xf4, 0x14, 0x77, 0x11, 0x2b, 0x8c, 0x4a, 0x46, 0x5b, 0x40, 0x12, 0x06, - 0x9a, 0xc0, 0xf6, 0xda, 0xaf, 0x19, 0xac, 0x5c, 0x57, 0xe4, 0x6f, 0x4b, 0x18, 0x7a, 0x58, 0x30, - 0x74, 0xbe, 0x72, 0xdd, 0x75, 0x22, 0xbb, 0xec, 0x06, 0x1f, 0xf5, 0x41, 0xda, 0x8f, 0x8c, 0x44, - 0x4a, 0x1a, 0xca, 0x17, 0x94, 0x41, 0x3c, 0x9f, 0x13, 0x61, 0x6e, 0x6d, 0xa6, 0xc5, 0x32, 0x34, - 0x1a, 0x24, 0xa7, 0x0a, 0xe3, 0x92, 0xd3, 0xb6, 0x85, 0x8d, 0x4f, 0x6f, 0xb5, 0x91, 0x56, 0x65, - 0x9b, 0x65, 0x19, 0x51, 0x6e, 0x5c, 0x82, 0x2d, 0x59, 0xbc, 0xa2, 0x44, 0x77, 0xf2, 0xb9, 0x79, - 0x95, 0x4a, 0xd7, 0x85, 0xda, 0x5e, 0x43, 0xa2, 0x72, 0x7d, 0x09, 0xed, 0x80, 0x90, 0xd0, 0x74, - 0x2c, 0x42, 0xb9, 0xc3, 0xaf, 0xb5, 0x07, 0xf9, 0x67, 0x78, 0x4e, 0x48, 0x38, 0x8e, 0x65, 0xd1, - 0x31, 0x82, 0x0c, 0xad, 0x9b, 0x50, 0x9e, 0x61, 0x1b, 0xb5, 0x41, 0x7d, 0x3d, 0x1d, 0x0c, 0x7f, - 0x18, 0x4f, 0x87, 0x83, 0x6e, 0x09, 0xa9, 0x50, 0x1d, 0x4e, 0xce, 0x67, 0x6f, 0xba, 0x0a, 0x6a, - 0x41, 0xe3, 0xcc, 0x38, 0x35, 0xcf, 0xa6, 0xaf, 0xde, 0x74, 0x37, 0x22, 0xbd, 0x93, 0x51, 0x7f, - 0x2a, 0xc9, 0x32, 0xea, 0x42, 0x4b, 0x90, 0xfd, 0xe9, 0xc0, 0x3c, 0x33, 0x4e, 0xbb, 0x15, 0xb4, - 0x09, 0x4d, 0xa9, 0x60, 0x08, 0x46, 0x35, 0xdb, 0x9a, 0xfe, 0x51, 0x40, 0x4d, 0xaf, 0x08, 0xed, - 0x42, 0xc3, 0x23, 0x1c, 0x47, 0x05, 0x1b, 0x37, 0xc9, 0x94, 0x46, 0x3d, 0x50, 0xb9, 0xe3, 0x11, - 0xc6, 0xb1, 0x17, 0x88, 0xf6, 0xd4, 0x3c, 0xea, 0x66, 0x8f, 0x33, 0x73, 0x3c, 0x62, 0xac, 0x55, - 0xd0, 0x03, 0xa8, 0x05, 0x6f, 0x1d, 0xd3, 0xb1, 0x44, 0xd7, 0x6a, 0x19, 0xd5, 0xe0, 0xad, 0x33, - 0xb6, 0xd0, 0x23, 0x80, 0xb8, 0xa9, 0x4d, 0xfa, 0x27, 0x5a, 0x45, 0x88, 0x32, 0x1c, 0xbd, 0x0f, - 0x5b, 0x85, 0xda, 0x43, 0x4f, 0xa1, 0x41, 0x5c, 0xe2, 0x11, 0xca, 0x99, 0xa6, 0xec, 0x95, 0xb3, - 0xae, 0xd3, 0x09, 0x90, 0x6a, 0xe8, 0xdf, 0xc2, 0xce, 0x6d, 0x55, 0x77, 0xc3, 0xb5, 0x52, 0x70, - 0x3d, 0x85, 0x76, 0xee, 0x85, 0x65, 0x8e, 0xa0, 0x64, 0x8f, 0x80, 0xa0, 0xb2, 0x20, 0x21, 0x8f, - 0x7b, 0xb4, 0xf8, 0x8e, 0x78, 0x4b, 0xcc, 0x96, 0xf1, 0x59, 0xc5, 0xb7, 0xfe, 0x1a, 0x5a, 0xd9, - 0x7b, 0xbe, 0x8f, 0xb9, 0xec, 0x45, 0x94, 0xf3, 0x17, 0xa1, 0x7b, 0xd0, 0xcc, 0x34, 0xa5, 0xbb, - 0x47, 0x89, 0x25, 0xda, 0x1c, 0xd3, 0x36, 0xf6, 0xca, 0xfb, 0xaa, 0x91, 0x90, 0xa8, 0x07, 0x0d, - 0x8f, 0xd9, 0x26, 0xbf, 0x8e, 0x67, 0x6a, 0x67, 0xdd, 0xeb, 0xa2, 0x64, 0x4d, 0x98, 0x3d, 0xbb, - 0x0e, 0x88, 0x51, 0xf7, 0xe4, 0x87, 0xee, 0x43, 0x33, 0xd3, 0x64, 0xef, 0x70, 0x97, 0x8d, 0x77, - 0xa3, 0x50, 0x38, 0xf7, 0x73, 0xf8, 0x07, 0xc0, 0xba, 0x7f, 0xde, 0xe1, 0xef, 0x73, 0xa8, 0xc4, - 0xbe, 0x6e, 0x2f, 0x86, 0xca, 0x07, 0x79, 0x76, 0xa5, 0x67, 0x39, 0x1f, 0xfe, 0xf7, 0xc4, 0xbe, - 0x90, 0xf7, 0x98, 0xac, 0x04, 0x5f, 0xe4, 0xf7, 0x93, 0xe6, 0xd1, 0x66, 0x8a, 0x96, 0xec, 0x74, - 0x61, 0xd1, 0x7f, 0x84, 0x7a, 0xcc, 0x43, 0x1f, 0x43, 0x9d, 0x91, 0x2b, 0x93, 0xae, 0xbc, 0x38, - 0xcc, 0x1a, 0x23, 0x57, 0xd3, 0x95, 0x97, 0x16, 0x64, 0x74, 0x1b, 0xaa, 0x2c, 0xc8, 0x88, 0x97, - 0xa9, 0x28, 0xf1, 0xad, 0xff, 0xad, 0x40, 0x2b, 0xbb, 0x14, 0xa0, 0x1e, 0x80, 0x97, 0xce, 0xee, - 0x38, 0x94, 0x4e, 0x7e, 0xaa, 0x1b, 0x19, 0x8d, 0x7b, 0xf7, 0x85, 0x5d, 0x68, 0xa4, 0x5d, 0x51, - 0x3e, 0xff, 0x94, 0xd6, 0xff, 0x54, 0x60, 0xab, 0xd0, 0x5d, 0xef, 0x7a, 0x37, 0xf7, 0x75, 0xfc, - 0x18, 0x3a, 0x0e, 0x33, 0x2d, 0xb2, 0x70, 0x71, 0x88, 0xb9, 0xe3, 0x53, 0x91, 0x87, 0x86, 0xd1, - 0x76, 0xd8, 0x60, 0xcd, 0xd4, 0x8f, 0xa1, 0x91, 0xa0, 0xd1, 0x67, 0x00, 0x0e, 0x5d, 0x44, 0xd9, - 0x9d, 0x93, 0x30, 0x4e, 0xb0, 0xea, 0xd0, 0xc5, 0x54, 0x30, 0xb2, 0xc9, 0xdf, 0xc8, 0x26, 0x5f, - 0xbf, 0x84, 0xad, 0xc2, 0xd6, 0x84, 0x5e, 0x42, 0x97, 0x11, 0xf7, 0x52, 0x8c, 0xcb, 0xd0, 0x93, - 0x11, 0x28, 0xf9, 0xb0, 0xd3, 0xfa, 0xdd, 0x8c, 0x34, 0xc7, 0x6b, 0xc5, 0xa8, 0x18, 0xdf, 0x52, - 0xff, 0x77, 0x2a, 0x8a, 0xae, 0x65, 0x48, 0x42, 0x9f, 0x03, 0x2a, 0xee, 0x59, 0xe8, 0x09, 0x54, - 0xc5, 0x5a, 0x77, 0x67, 0xab, 0x94, 0x62, 0xf1, 0x88, 0x08, 0xb6, 0xde, 0xf3, 0x88, 0x08, 0xb6, - 0xf4, 0x9f, 0xa1, 0x26, 0x7d, 0x44, 0x37, 0x47, 0x72, 0x7b, 0xaf, 0x91, 0xd2, 0xef, 0x6d, 0x00, - 0xb7, 0x4f, 0x02, 0xbd, 0x0e, 0x55, 0xb1, 0xf6, 0xe8, 0xbf, 0x00, 0x2a, 0x0e, 0x77, 0xa4, 0x8b, - 0x7d, 0x20, 0xe4, 0x66, 0xbe, 0xbe, 0x9b, 0x82, 0x79, 0x21, 0x8b, 0xfc, 0x11, 0x34, 0x09, 0xb5, - 0xcc, 0xfc, 0x25, 0xa8, 0x84, 0x5a, 0x52, 0xae, 0x1f, 0xc3, 0xf6, 0x2d, 0x23, 0x1f, 0x1d, 0x40, - 0x23, 0x7e, 0x4a, 0xc9, 0x38, 0x29, 0xbc, 0xb5, 0x54, 0xe1, 0xcb, 0xef, 0xa0, 0x99, 0x79, 0xbe, - 0x37, 0xa7, 0x72, 0x1b, 0xd4, 0xe3, 0x57, 0x67, 0x27, 0x3f, 0x99, 0x93, 0x8b, 0xd3, 0xae, 0x12, - 0x0d, 0xdf, 0xf1, 0x60, 0x38, 0x9d, 0x8d, 0x67, 0x6f, 0x04, 0x67, 0xe3, 0xe8, 0x37, 0xa8, 0xc9, - 0xf6, 0x89, 0x5e, 0x40, 0x4b, 0x7e, 0x5d, 0xf0, 0x90, 0x60, 0x0f, 0x15, 0x12, 0xbe, 0x5b, 0xe0, - 0xe8, 0xa5, 0x7d, 0xe5, 0x99, 0x82, 0x9e, 0x40, 0xe5, 0xdc, 0xa1, 0x36, 0xca, 0xaf, 0x8b, 0xbb, - 0x79, 0x52, 0x2f, 0x1d, 0x7f, 0xf5, 0xeb, 0x81, 0xed, 0xf0, 0xe5, 0x6a, 0xde, 0x5b, 0xf8, 0xde, - 0xe1, 0xf2, 0x3a, 0x20, 0xa1, 0x4b, 0x2c, 0x9b, 0x84, 0x87, 0x97, 0x78, 0x1e, 0x3a, 0x8b, 0x43, - 0xf1, 0xa3, 0xc6, 0x0e, 0x25, 0x6c, 0x5e, 0x13, 0xe4, 0xf3, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, - 0xd6, 0x2d, 0x62, 0x5a, 0xcf, 0x0d, 0x00, 0x00, + // 1344 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0xdb, 0x46, + 0x10, 0x16, 0xad, 0x27, 0x47, 0x0f, 0xcb, 0x6b, 0xa7, 0x65, 0xdd, 0x34, 0x30, 0x88, 0x26, 0x70, + 0xeb, 0x54, 0x0e, 0x9c, 0x36, 0x08, 0x10, 0xb4, 0x80, 0x6c, 0xa9, 0x96, 0xd0, 0x48, 0x36, 0x68, + 0x05, 0x6d, 0x7a, 0x21, 0x56, 0xe2, 0x9a, 0x62, 0x43, 0x2e, 0x69, 0xee, 0x2a, 0xad, 0x8f, 0xed, + 0xb1, 0x87, 0x9e, 0xfb, 0x73, 0x0b, 0xee, 0x92, 0x14, 0x69, 0xda, 0x01, 0x1c, 0xa0, 0x37, 0xce, + 0xe3, 0x9b, 0x99, 0x9d, 0x9d, 0xc7, 0x12, 0x76, 0x6c, 0x9f, 0x31, 0x27, 0x38, 0xf4, 0x08, 0x63, + 0xd8, 0x26, 0xbd, 0x20, 0xf4, 0xb9, 0x8f, 0x6a, 0x92, 0xab, 0xff, 0xa5, 0x40, 0x63, 0x48, 0xdf, + 0x13, 0xd7, 0x0f, 0x08, 0xd2, 0xa0, 0x1e, 0xe0, 0x6b, 0xd7, 0xc7, 0x96, 0xa6, 0xec, 0x29, 0xfb, + 0x2d, 0x23, 0x21, 0xd1, 0x43, 0x50, 0x99, 0x63, 0x53, 0xcc, 0x57, 0x21, 0xd1, 0x36, 0x84, 0x6c, + 0xcd, 0x40, 0x3f, 0x40, 0x87, 0x91, 0x45, 0x48, 0x78, 0x62, 0x49, 0x2b, 0xef, 0x29, 0xfb, 0xcd, + 0xa3, 0x4f, 0x7a, 0xd2, 0x4b, 0xef, 0x22, 0x27, 0x35, 0x6e, 0x68, 0xeb, 0x23, 0xe8, 0xe4, 0x35, + 0x3e, 0x36, 0x12, 0xbd, 0x0f, 0x35, 0x69, 0x09, 0x3d, 0x85, 0xae, 0x43, 0x39, 0x09, 0x29, 0x76, + 0x87, 0xd4, 0x0a, 0x7c, 0x87, 0x72, 0x61, 0x4a, 0x1d, 0x95, 0x8c, 0x82, 0xe4, 0x58, 0x85, 0xfa, + 0xc2, 0xa7, 0x9c, 0x50, 0xae, 0xff, 0xab, 0x42, 0xfb, 0x54, 0x84, 0x3d, 0x91, 0x19, 0x43, 0x3b, + 0x50, 0xa5, 0x3e, 0x5d, 0x10, 0x81, 0xaf, 0x18, 0x92, 0x88, 0x42, 0x5c, 0x2c, 0x31, 0xa5, 0xc4, + 0x8d, 0xc3, 0x48, 0x48, 0x74, 0x00, 0x65, 0x8e, 0x6d, 0x91, 0x83, 0xce, 0xd1, 0x67, 0x49, 0x0e, + 0x72, 0x36, 0x7b, 0x33, 0x6c, 0x1b, 0x91, 0x16, 0x7a, 0x0e, 0x2a, 0x76, 0x9d, 0xf7, 0xc4, 0xf4, + 0x98, 0xad, 0x55, 0x45, 0xda, 0x76, 0x12, 0x48, 0x3f, 0x12, 0xc4, 0x88, 0x51, 0xc9, 0x68, 0x08, + 0xc5, 0x09, 0xb3, 0xd1, 0xb7, 0x50, 0xf7, 0x88, 0x67, 0x86, 0xe4, 0x4a, 0xab, 0x09, 0x48, 0xea, + 0x65, 0x42, 0xbc, 0x39, 0x09, 0xd9, 0xd2, 0x09, 0x0c, 0x72, 0xb5, 0x22, 0x8c, 0x8f, 0x4a, 0x46, + 0xcd, 0x23, 0x9e, 0x41, 0xae, 0xd0, 0x77, 0x09, 0x8a, 0x69, 0x75, 0x81, 0xda, 0xbd, 0x0d, 0xc5, + 0x02, 0x9f, 0x32, 0x92, 0xc2, 0x18, 0x7a, 0x06, 0x0d, 0x0b, 0x73, 0x2c, 0x02, 0x6c, 0x08, 0xdc, + 0x76, 0x82, 0x1b, 0x60, 0x8e, 0xd7, 0xf1, 0xd5, 0x23, 0xb5, 0x28, 0xbc, 0x03, 0xa8, 0x2e, 0x89, + 0xeb, 0xfa, 0x9a, 0x9a, 0x57, 0x97, 0x29, 0x18, 0x45, 0xa2, 0x51, 0xc9, 0x90, 0x3a, 0xe8, 0x30, + 0x36, 0x6f, 0x39, 0xb6, 0x06, 0x42, 0x1f, 0x65, 0xcd, 0x0f, 0x1c, 0x5b, 0x9e, 0x42, 0x58, 0x1f, + 0x38, 0x76, 0x1a, 0x4f, 0x74, 0xfa, 0x66, 0x31, 0x9e, 0xf5, 0xb9, 0x05, 0x42, 0x1e, 0xbc, 0x29, + 0x10, 0xab, 0xc0, 0xc2, 0x9c, 0x68, 0xad, 0xa2, 0x97, 0x37, 0x42, 0x32, 0x2a, 0x19, 0x60, 0xa5, + 0x14, 0x7a, 0x0c, 0x55, 0xe2, 0x05, 0xfc, 0x5a, 0x6b, 0x0b, 0x40, 0x3b, 0x01, 0x0c, 0x23, 0x66, + 0x74, 0x00, 0x21, 0x45, 0x07, 0x50, 0x59, 0xf8, 0x94, 0x6a, 0x1d, 0xa1, 0xf5, 0x20, 0xd1, 0x3a, + 0xf1, 0x29, 0x1d, 0x32, 0x8e, 0xe7, 0xae, 0xc3, 0x96, 0xa3, 0x92, 0x21, 0x94, 0xd0, 0x11, 0x00, + 0xe3, 0x98, 0x13, 0xd3, 0xa1, 0x97, 0xbe, 0xb6, 0x29, 0x20, 0x5b, 0x69, 0x9b, 0x44, 0x92, 0x31, + 0xbd, 0x8c, 0xb2, 0xa3, 0xb2, 0x84, 0x40, 0xc7, 0xd0, 0x91, 0x18, 0x46, 0x71, 0xc0, 0x96, 0x3e, + 0xd7, 0xba, 0xf9, 0x4b, 0x4f, 0x71, 0x17, 0xb1, 0xc2, 0xa8, 0x64, 0xb4, 0x05, 0x24, 0x61, 0xa0, + 0x09, 0x6c, 0xaf, 0xfd, 0x9a, 0xc1, 0xca, 0x75, 0x45, 0xfe, 0xb6, 0x84, 0xa1, 0x87, 0x05, 0x43, + 0xe7, 0x2b, 0xd7, 0x5d, 0x27, 0xb2, 0xcb, 0x6e, 0xf0, 0x51, 0x1f, 0xa4, 0xfd, 0xc8, 0x48, 0xa4, + 0xa4, 0xa1, 0x7c, 0x41, 0x19, 0xc4, 0xf3, 0x39, 0x11, 0xe6, 0xd6, 0x66, 0x5a, 0x2c, 0x43, 0xa3, + 0x41, 0x72, 0xaa, 0x30, 0x2e, 0x39, 0x6d, 0x5b, 0xd8, 0xf8, 0xfc, 0x56, 0x1b, 0x69, 0x55, 0xb6, + 0x59, 0x96, 0x11, 0xe5, 0xc6, 0x25, 0xd8, 0x92, 0xc5, 0x2b, 0x4a, 0x74, 0x27, 0x9f, 0x9b, 0xd7, + 0xa9, 0x74, 0x5d, 0xa8, 0xed, 0x35, 0x24, 0x2a, 0xd7, 0x57, 0xd0, 0x0e, 0x08, 0x09, 0x4d, 0xc7, + 0x22, 0x94, 0x3b, 0xfc, 0x5a, 0x7b, 0x90, 0x6f, 0xc3, 0x73, 0x42, 0xc2, 0x71, 0x2c, 0x8b, 0x8e, + 0x11, 0x64, 0x68, 0xdd, 0x84, 0xf2, 0x0c, 0xdb, 0xa8, 0x0d, 0xea, 0x9b, 0xe9, 0x60, 0xf8, 0xe3, + 0x78, 0x3a, 0x1c, 0x74, 0x4b, 0x48, 0x85, 0xea, 0x70, 0x72, 0x3e, 0x7b, 0xdb, 0x55, 0x50, 0x0b, + 0x1a, 0x67, 0xc6, 0xa9, 0x79, 0x36, 0x7d, 0xfd, 0xb6, 0xbb, 0x11, 0xe9, 0x9d, 0x8c, 0xfa, 0x53, + 0x49, 0x96, 0x51, 0x17, 0x5a, 0x82, 0xec, 0x4f, 0x07, 0xe6, 0x99, 0x71, 0xda, 0xad, 0xa0, 0x4d, + 0x68, 0x4a, 0x05, 0x43, 0x30, 0xaa, 0xd9, 0xd1, 0xf4, 0x8f, 0x02, 0x6a, 0x7a, 0x45, 0x68, 0x17, + 0x1a, 0x1e, 0xe1, 0x38, 0x2a, 0xd8, 0x78, 0x48, 0xa6, 0x34, 0xea, 0x81, 0xca, 0x1d, 0x8f, 0x30, + 0x8e, 0xbd, 0x40, 0x8c, 0xa7, 0xe6, 0x51, 0x37, 0x7b, 0x9c, 0x99, 0xe3, 0x11, 0x63, 0xad, 0x82, + 0x1e, 0x40, 0x2d, 0x78, 0xe7, 0x98, 0x8e, 0x25, 0xa6, 0x56, 0xcb, 0xa8, 0x06, 0xef, 0x9c, 0xb1, + 0x85, 0x1e, 0x01, 0xc4, 0x43, 0x6d, 0xd2, 0x3f, 0xd1, 0x2a, 0x42, 0x94, 0xe1, 0xe8, 0x7d, 0xd8, + 0x2a, 0xd4, 0x1e, 0x7a, 0x0a, 0x0d, 0xe2, 0x12, 0x8f, 0x50, 0xce, 0x34, 0x65, 0xaf, 0x9c, 0x75, + 0x9d, 0x6e, 0x80, 0x54, 0x43, 0x7f, 0x01, 0x3b, 0xb7, 0x55, 0xdd, 0x0d, 0xd7, 0x4a, 0xc1, 0xf5, + 0x14, 0xda, 0xb9, 0x0e, 0xcb, 0x1c, 0x41, 0xc9, 0x1e, 0x01, 0x41, 0x65, 0x41, 0x42, 0x1e, 0xcf, + 0x68, 0xf1, 0x1d, 0xf1, 0x96, 0x98, 0x2d, 0xe3, 0xb3, 0x8a, 0x6f, 0xfd, 0x0d, 0xb4, 0xb2, 0xf7, + 0x7c, 0x1f, 0x73, 0xd9, 0x8b, 0x28, 0xe7, 0x2f, 0x42, 0xf7, 0xa0, 0x99, 0x19, 0x4a, 0x77, 0xaf, + 0x12, 0x4b, 0x8c, 0x39, 0xa6, 0x6d, 0xec, 0x95, 0xf7, 0x55, 0x23, 0x21, 0x51, 0x0f, 0x1a, 0x1e, + 0xb3, 0x4d, 0x7e, 0x1d, 0xef, 0xd4, 0xce, 0x7a, 0xd6, 0x45, 0xc9, 0x9a, 0x30, 0x7b, 0x76, 0x1d, + 0x10, 0xa3, 0xee, 0xc9, 0x0f, 0xdd, 0x87, 0x66, 0x66, 0xc8, 0xde, 0xe1, 0x2e, 0x1b, 0xef, 0x46, + 0xa1, 0x70, 0xee, 0xe7, 0xf0, 0x0f, 0x80, 0xf5, 0xfc, 0xbc, 0xc3, 0xdf, 0x97, 0x50, 0x89, 0x7d, + 0xdd, 0x5e, 0x0c, 0x95, 0x8f, 0xf2, 0xec, 0x4a, 0xcf, 0x72, 0x3f, 0xfc, 0xef, 0x89, 0x7d, 0x29, + 0xef, 0x31, 0x79, 0x12, 0x7c, 0x95, 0x7f, 0x9f, 0x34, 0x8f, 0x36, 0x53, 0xb4, 0x64, 0xa7, 0x0f, + 0x16, 0xfd, 0x05, 0xd4, 0x63, 0x1e, 0xfa, 0x14, 0xea, 0x8c, 0x5c, 0x99, 0x74, 0xe5, 0xc5, 0x61, + 0xd6, 0x18, 0xb9, 0x9a, 0xae, 0xbc, 0xa8, 0xaa, 0x32, 0xb7, 0x21, 0xbe, 0xf5, 0xbf, 0x15, 0x68, + 0x65, 0x1f, 0x00, 0xa8, 0x07, 0xe0, 0xa5, 0x7b, 0x3a, 0x76, 0xdb, 0xc9, 0x6f, 0x70, 0x23, 0xa3, + 0x71, 0xef, 0x19, 0xb0, 0x0b, 0x8d, 0x74, 0x02, 0xca, 0x56, 0x4f, 0x69, 0xfd, 0x4f, 0x05, 0xb6, + 0x0a, 0x93, 0xf4, 0xae, 0x1e, 0xb9, 0xaf, 0xe3, 0xc7, 0xd0, 0x71, 0x98, 0x69, 0x91, 0x85, 0x8b, + 0x43, 0xcc, 0x1d, 0x9f, 0x8a, 0x1b, 0x69, 0x18, 0x6d, 0x87, 0x0d, 0xd6, 0x4c, 0xfd, 0x18, 0x1a, + 0x09, 0x1a, 0x7d, 0x01, 0xe0, 0xd0, 0x45, 0x94, 0xc9, 0x39, 0x09, 0xe3, 0x64, 0xaa, 0x0e, 0x5d, + 0x4c, 0x05, 0x23, 0x9b, 0xe8, 0x8d, 0x6c, 0xa2, 0xf5, 0x4b, 0xd8, 0x2a, 0xbc, 0x90, 0xd0, 0x2b, + 0xe8, 0x32, 0xe2, 0x5e, 0x8a, 0xd5, 0x18, 0x7a, 0x32, 0x02, 0x25, 0x1f, 0x76, 0x5a, 0xab, 0x9b, + 0x91, 0xe6, 0x78, 0xad, 0x18, 0x15, 0xde, 0x3b, 0xea, 0xff, 0x4e, 0x45, 0x81, 0xb5, 0x0c, 0x49, + 0xe8, 0x73, 0x40, 0xc5, 0x37, 0x15, 0x7a, 0x02, 0x55, 0xf1, 0x84, 0xbb, 0x73, 0x2c, 0x4a, 0xb1, + 0x68, 0x18, 0x82, 0xad, 0x0f, 0x34, 0x0c, 0xc1, 0x96, 0xfe, 0x33, 0xd4, 0xa4, 0x8f, 0xe8, 0xe6, + 0x48, 0xee, 0x8d, 0x6b, 0xa4, 0xf4, 0x07, 0x9b, 0xfd, 0xf6, 0xa9, 0xaf, 0xd7, 0xa1, 0x2a, 0x9e, + 0x38, 0xfa, 0x2f, 0x80, 0x8a, 0x8b, 0x1c, 0xe9, 0x62, 0xf7, 0x87, 0xdc, 0xcc, 0xd7, 0x72, 0x53, + 0x30, 0x2f, 0x64, 0x41, 0x3f, 0x82, 0x26, 0xa1, 0x96, 0x99, 0xbf, 0x04, 0x95, 0x50, 0x4b, 0xca, + 0xf5, 0x63, 0xd8, 0xbe, 0x65, 0xbd, 0xa3, 0x03, 0x68, 0xc4, 0x6d, 0x93, 0xac, 0x8e, 0x42, 0x5f, + 0xa5, 0x0a, 0x5f, 0x7f, 0x0f, 0xcd, 0x4c, 0xab, 0xde, 0xdc, 0xc0, 0x6d, 0x50, 0x8f, 0x5f, 0x9f, + 0x9d, 0xfc, 0x64, 0x4e, 0x2e, 0x4e, 0xbb, 0x4a, 0xb4, 0x68, 0xc7, 0x83, 0xe1, 0x74, 0x36, 0x9e, + 0xbd, 0x15, 0x9c, 0x8d, 0xa3, 0xdf, 0xa0, 0x26, 0x47, 0x25, 0x7a, 0x09, 0x2d, 0xf9, 0x75, 0xc1, + 0x43, 0x82, 0x3d, 0x54, 0x48, 0xf8, 0x6e, 0x81, 0xa3, 0x97, 0xf6, 0x95, 0x67, 0x0a, 0x7a, 0x02, + 0x95, 0x73, 0x87, 0xda, 0x28, 0xff, 0x34, 0xdc, 0xcd, 0x93, 0x7a, 0xe9, 0xf8, 0x9b, 0x5f, 0x0f, + 0x6c, 0x87, 0x2f, 0x57, 0xf3, 0xde, 0xc2, 0xf7, 0x0e, 0x97, 0xd7, 0x01, 0x09, 0x5d, 0x62, 0xd9, + 0x24, 0x3c, 0xbc, 0xc4, 0xf3, 0xd0, 0x59, 0x1c, 0x8a, 0x9f, 0x32, 0x76, 0x28, 0x61, 0xf3, 0x9a, + 0x20, 0x9f, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x4d, 0xd0, 0x41, 0xbb, 0x0d, 0x00, 0x00, } diff --git a/protos/gossip/message.proto b/protos/gossip/message.proto index 48d946f03ed..329b826a11b 100644 --- a/protos/gossip/message.proto +++ b/protos/gossip/message.proto @@ -218,8 +218,7 @@ message DataMessage { // Payload contains a block message Payload { uint64 seq_num = 1; - string hash = 2; - bytes data = 3; + bytes data = 2; }