From b7a7c1ab37fde91f9687b5c1c4766119e7b71db5 Mon Sep 17 00:00:00 2001 From: Evan Forbes <42654277+evan-forbes@users.noreply.github.com> Date: Fri, 11 Nov 2022 06:56:43 -0600 Subject: [PATCH] chore!: rename blockdata.Messages -> blockdata.Blobs (#879) * chore!: rename Messages -> blobs * fix: adjust tests now that there is less overhead * review: feedback Co-authored-by: Rootul P * chore; docs Co-authored-by: Rootul P --- blockchain/msgs_test.go | 2 +- mempool/v0/clist_mempool_test.go | 4 +- mempool/v1/mempool_test.go | 2 +- proto/tendermint/types/types.pb.go | 578 ++++++++++------------------- proto/tendermint/types/types.proto | 16 +- state/test/factory/block.go | 6 +- state/tx_filter_test.go | 4 +- test/factory/tx.go | 6 +- types/block.go | 90 ++--- types/block_test.go | 35 +- types/test_util.go | 9 +- types/tx_test.go | 10 +- 12 files changed, 287 insertions(+), 475 deletions(-) diff --git a/blockchain/msgs_test.go b/blockchain/msgs_test.go index 779bac7644..147b015222 100644 --- a/blockchain/msgs_test.go +++ b/blockchain/msgs_test.go @@ -98,7 +98,7 @@ func TestBlockchainMessageVectors(t *testing.T) { BlockRequest: &bcproto.BlockRequest{Height: math.MaxInt64}}}, "0a0a08ffffffffffffffff7f"}, {"BlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_BlockResponse{ - BlockResponse: &bcproto.BlockResponse{Block: bpb}}}, "1a95010a92010a5b0a02080b1803220b088092b8c398feffffff012a0212003a20c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf96a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85512330a0b48656c6c6f20576f726c641a0022003220c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf9"}, + BlockResponse: &bcproto.BlockResponse{Block: bpb}}}, "1a93010a90010a5b0a02080b1803220b088092b8c398feffffff012a0212003a20c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf96a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85512310a0b48656c6c6f20576f726c641a003220c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf9"}, {"NoBlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_NoBlockResponse{ NoBlockResponse: &bcproto.NoBlockResponse{Height: 1}}}, "12020801"}, {"NoBlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_NoBlockResponse{ diff --git a/mempool/v0/clist_mempool_test.go b/mempool/v0/clist_mempool_test.go index 3766da056b..03fcc051a6 100644 --- a/mempool/v0/clist_mempool_test.go +++ b/mempool/v0/clist_mempool_test.go @@ -151,9 +151,9 @@ func TestReapMaxBytesMaxGas(t *testing.T) { {20, 10, 10, 0}, {20, 28, 10, 1}, // account for overhead in Data{} {20, 240, 5, 5}, - {20, 240, -1, 10}, + {20, 240, -1, 12}, {20, 240, 10, 10}, - {20, 240, 15, 10}, + {20, 240, 15, 12}, {20, 20000, -1, 20}, {20, 20000, 5, 5}, {20, 20000, 30, 20}, diff --git a/mempool/v1/mempool_test.go b/mempool/v1/mempool_test.go index 3d23d540c2..0ee231d26b 100644 --- a/mempool/v1/mempool_test.go +++ b/mempool/v1/mempool_test.go @@ -350,7 +350,7 @@ func TestTxMempool_ReapMaxBytesMaxGas(t *testing.T) { ensurePrioritized(reapedTxs) require.Equal(t, len(tTxs), txmp.Size()) require.Equal(t, int64(5690), txmp.SizeBytes()) - require.Len(t, reapedTxs, 23) + require.Len(t, reapedTxs, 24) } func TestTxMempool_ReapMaxTxs(t *testing.T) { diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 6cf371122d..6c6b8a3b88 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -423,7 +423,7 @@ type Data struct { Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` // field number 2 is reserved for intermediate state roots Evidence EvidenceList `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence"` - Messages Messages `protobuf:"bytes,4,opt,name=messages,proto3" json:"messages"` + Blobs []Blob `protobuf:"bytes,4,rep,name=blobs,proto3" json:"blobs"` SquareSize uint64 `protobuf:"varint,5,opt,name=square_size,json=squareSize,proto3" json:"square_size,omitempty"` Hash []byte `protobuf:"bytes,6,opt,name=hash,proto3" json:"hash,omitempty"` } @@ -475,11 +475,11 @@ func (m *Data) GetEvidence() EvidenceList { return EvidenceList{} } -func (m *Data) GetMessages() Messages { +func (m *Data) GetBlobs() []Blob { if m != nil { - return m.Messages + return m.Blobs } - return Messages{} + return nil } func (m *Data) GetSquareSize() uint64 { @@ -780,67 +780,24 @@ func (m *EvidenceList) GetEvidence() []Evidence { return nil } -type Messages struct { - MessagesList []*Message `protobuf:"bytes,1,rep,name=messages_list,json=messagesList,proto3" json:"messages_list,omitempty"` -} - -func (m *Messages) Reset() { *m = Messages{} } -func (m *Messages) String() string { return proto.CompactTextString(m) } -func (*Messages) ProtoMessage() {} -func (*Messages) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{9} -} -func (m *Messages) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Messages) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Messages.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Messages) XXX_Merge(src proto.Message) { - xxx_messageInfo_Messages.Merge(m, src) -} -func (m *Messages) XXX_Size() int { - return m.Size() -} -func (m *Messages) XXX_DiscardUnknown() { - xxx_messageInfo_Messages.DiscardUnknown(m) -} - -var xxx_messageInfo_Messages proto.InternalMessageInfo - -func (m *Messages) GetMessagesList() []*Message { - if m != nil { - return m.MessagesList - } - return nil -} - -type Message struct { +// Blob defines an indivisible chunk of data that is posted on chain. +type Blob struct { NamespaceId []byte `protobuf:"bytes,1,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` } -func (m *Message) Reset() { *m = Message{} } -func (m *Message) String() string { return proto.CompactTextString(m) } -func (*Message) ProtoMessage() {} -func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{10} +func (m *Blob) Reset() { *m = Blob{} } +func (m *Blob) String() string { return proto.CompactTextString(m) } +func (*Blob) ProtoMessage() {} +func (*Blob) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{9} } -func (m *Message) XXX_Unmarshal(b []byte) error { +func (m *Blob) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *Blob) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_Message.Marshal(b, m, deterministic) + return xxx_messageInfo_Blob.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -850,26 +807,26 @@ func (m *Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *Message) XXX_Merge(src proto.Message) { - xxx_messageInfo_Message.Merge(m, src) +func (m *Blob) XXX_Merge(src proto.Message) { + xxx_messageInfo_Blob.Merge(m, src) } -func (m *Message) XXX_Size() int { +func (m *Blob) XXX_Size() int { return m.Size() } -func (m *Message) XXX_DiscardUnknown() { - xxx_messageInfo_Message.DiscardUnknown(m) +func (m *Blob) XXX_DiscardUnknown() { + xxx_messageInfo_Blob.DiscardUnknown(m) } -var xxx_messageInfo_Message proto.InternalMessageInfo +var xxx_messageInfo_Blob proto.InternalMessageInfo -func (m *Message) GetNamespaceId() []byte { +func (m *Blob) GetNamespaceId() []byte { if m != nil { return m.NamespaceId } return nil } -func (m *Message) GetData() []byte { +func (m *Blob) GetData() []byte { if m != nil { return m.Data } @@ -897,7 +854,7 @@ func (m *DataAvailabilityHeader) Reset() { *m = DataAvailabilityHeader{} func (m *DataAvailabilityHeader) String() string { return proto.CompactTextString(m) } func (*DataAvailabilityHeader) ProtoMessage() {} func (*DataAvailabilityHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{11} + return fileDescriptor_d3a6e55e2345de56, []int{10} } func (m *DataAvailabilityHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -957,7 +914,7 @@ func (m *Vote) Reset() { *m = Vote{} } func (m *Vote) String() string { return proto.CompactTextString(m) } func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{12} + return fileDescriptor_d3a6e55e2345de56, []int{11} } func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1054,7 +1011,7 @@ func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{13} + return fileDescriptor_d3a6e55e2345de56, []int{12} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1123,7 +1080,7 @@ func (m *CommitSig) Reset() { *m = CommitSig{} } func (m *CommitSig) String() string { return proto.CompactTextString(m) } func (*CommitSig) ProtoMessage() {} func (*CommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{14} + return fileDescriptor_d3a6e55e2345de56, []int{13} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1194,7 +1151,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{15} + return fileDescriptor_d3a6e55e2345de56, []int{14} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1281,7 +1238,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{16} + return fileDescriptor_d3a6e55e2345de56, []int{15} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1333,7 +1290,7 @@ func (m *LightBlock) Reset() { *m = LightBlock{} } func (m *LightBlock) String() string { return proto.CompactTextString(m) } func (*LightBlock) ProtoMessage() {} func (*LightBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{17} + return fileDescriptor_d3a6e55e2345de56, []int{16} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1387,7 +1344,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{18} + return fileDescriptor_d3a6e55e2345de56, []int{17} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1455,7 +1412,7 @@ func (m *TxProof) Reset() { *m = TxProof{} } func (m *TxProof) String() string { return proto.CompactTextString(m) } func (*TxProof) ProtoMessage() {} func (*TxProof) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{19} + return fileDescriptor_d3a6e55e2345de56, []int{18} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1518,7 +1475,7 @@ func (m *MalleatedTx) Reset() { *m = MalleatedTx{} } func (m *MalleatedTx) String() string { return proto.CompactTextString(m) } func (*MalleatedTx) ProtoMessage() {} func (*MalleatedTx) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{20} + return fileDescriptor_d3a6e55e2345de56, []int{19} } func (m *MalleatedTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1594,7 +1551,7 @@ func (m *NMTProof) Reset() { *m = NMTProof{} } func (m *NMTProof) String() string { return proto.CompactTextString(m) } func (*NMTProof) ProtoMessage() {} func (*NMTProof) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{21} + return fileDescriptor_d3a6e55e2345de56, []int{20} } func (m *NMTProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1663,8 +1620,7 @@ func init() { proto.RegisterType((*LightClientAttackEvidence)(nil), "tendermint.types.LightClientAttackEvidence") proto.RegisterType((*Evidence)(nil), "tendermint.types.Evidence") proto.RegisterType((*EvidenceList)(nil), "tendermint.types.EvidenceList") - proto.RegisterType((*Messages)(nil), "tendermint.types.Messages") - proto.RegisterType((*Message)(nil), "tendermint.types.Message") + proto.RegisterType((*Blob)(nil), "tendermint.types.Blob") proto.RegisterType((*DataAvailabilityHeader)(nil), "tendermint.types.DataAvailabilityHeader") proto.RegisterType((*Vote)(nil), "tendermint.types.Vote") proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") @@ -1681,123 +1637,122 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1853 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0xf7, 0x48, 0xb2, 0x3e, 0x9e, 0x24, 0x5b, 0x1e, 0x9c, 0x44, 0x76, 0x12, 0x59, 0x0c, 0x05, - 0xeb, 0xfd, 0x40, 0x0e, 0x5e, 0x8a, 0x8f, 0x2a, 0xa0, 0x56, 0xb2, 0xbd, 0xb1, 0x58, 0x4b, 0x16, - 0x23, 0x6d, 0xf8, 0xb8, 0x4c, 0xb5, 0x34, 0x6d, 0x69, 0x2a, 0xa3, 0x99, 0x61, 0xa6, 0xe5, 0xc8, - 0xf9, 0x0b, 0x28, 0x9f, 0x72, 0xe2, 0xe6, 0x13, 0x1c, 0xb8, 0xf3, 0x0f, 0x50, 0x9c, 0xf6, 0xb2, - 0x55, 0x7b, 0x83, 0x0b, 0x81, 0x4a, 0x28, 0x8a, 0x3f, 0x83, 0xea, 0xd7, 0x3d, 0xa3, 0x91, 0x25, - 0x05, 0x2a, 0x95, 0xe2, 0xa2, 0x9a, 0x7e, 0xef, 0xf7, 0xba, 0xdf, 0xf7, 0xeb, 0x16, 0x3c, 0x60, - 0xd4, 0x31, 0xa9, 0x3f, 0xb6, 0x1c, 0x76, 0xc0, 0xae, 0x3c, 0x1a, 0x88, 0xdf, 0x9a, 0xe7, 0xbb, - 0xcc, 0x55, 0x4b, 0x33, 0x6e, 0x0d, 0xe9, 0xbb, 0xdb, 0x43, 0x77, 0xe8, 0x22, 0xf3, 0x80, 0x7f, - 0x09, 0xdc, 0xee, 0xde, 0xd0, 0x75, 0x87, 0x36, 0x3d, 0xc0, 0x55, 0x7f, 0x72, 0x71, 0xc0, 0xac, - 0x31, 0x0d, 0x18, 0x19, 0x7b, 0x12, 0xf0, 0x30, 0x76, 0xcc, 0xc0, 0xbf, 0xf2, 0x98, 0xcb, 0xb1, - 0xee, 0x85, 0x64, 0x57, 0x62, 0xec, 0x4b, 0xea, 0x07, 0x96, 0xeb, 0xc4, 0xf5, 0xd8, 0xad, 0x2e, - 0x68, 0x79, 0x49, 0x6c, 0xcb, 0x24, 0xcc, 0xf5, 0x05, 0x42, 0xfb, 0x21, 0x14, 0x3b, 0xc4, 0x67, - 0x5d, 0xca, 0x4e, 0x29, 0x31, 0xa9, 0xaf, 0x6e, 0xc3, 0x3a, 0x73, 0x19, 0xb1, 0xcb, 0x4a, 0x55, - 0xd9, 0x2f, 0xea, 0x62, 0xa1, 0xaa, 0x90, 0x1a, 0x91, 0x60, 0x54, 0x4e, 0x54, 0x95, 0xfd, 0x82, - 0x8e, 0xdf, 0xda, 0x08, 0x52, 0x5c, 0x94, 0x4b, 0x58, 0x8e, 0x49, 0xa7, 0xa1, 0x04, 0x2e, 0x38, - 0xb5, 0x7f, 0xc5, 0x68, 0x20, 0x45, 0xc4, 0x42, 0xfd, 0x2e, 0xac, 0xa3, 0xfe, 0xe5, 0x64, 0x55, - 0xd9, 0xcf, 0x1f, 0x96, 0x6b, 0x31, 0x47, 0x09, 0xfb, 0x6a, 0x1d, 0xce, 0x6f, 0xa4, 0xbe, 0x78, - 0xb9, 0xb7, 0xa6, 0x0b, 0xb0, 0x66, 0x43, 0xa6, 0x61, 0xbb, 0x83, 0xa7, 0xcd, 0xe3, 0x48, 0x11, - 0x65, 0xa6, 0x88, 0xda, 0x82, 0x4d, 0x8f, 0xf8, 0xcc, 0x08, 0x28, 0x33, 0x46, 0x68, 0x05, 0x1e, - 0x9a, 0x3f, 0xdc, 0xab, 0xdd, 0x8e, 0x43, 0x6d, 0xce, 0x58, 0x79, 0x4a, 0xd1, 0x8b, 0x13, 0xb5, - 0x7f, 0xa5, 0x20, 0x2d, 0x9d, 0xf1, 0x63, 0xc8, 0x48, 0xb7, 0xe2, 0x81, 0xf9, 0xc3, 0x87, 0xf1, - 0x1d, 0x25, 0xab, 0x76, 0xe4, 0x3a, 0x01, 0x75, 0x82, 0x49, 0x20, 0xf7, 0x0b, 0x65, 0xd4, 0x6f, - 0x41, 0x76, 0x30, 0x22, 0x96, 0x63, 0x58, 0x26, 0x6a, 0x94, 0x6b, 0xe4, 0x5f, 0xbd, 0xdc, 0xcb, - 0x1c, 0x71, 0x5a, 0xf3, 0x58, 0xcf, 0x20, 0xb3, 0x69, 0xaa, 0x77, 0x21, 0x3d, 0xa2, 0xd6, 0x70, - 0xc4, 0xd0, 0x2d, 0x49, 0x5d, 0xae, 0xd4, 0x1f, 0x40, 0x8a, 0x27, 0x44, 0x39, 0x85, 0x67, 0xef, - 0xd6, 0x44, 0xb6, 0xd4, 0xc2, 0x6c, 0xa9, 0xf5, 0xc2, 0x6c, 0x69, 0x64, 0xf9, 0xc1, 0x2f, 0xfe, - 0xbe, 0xa7, 0xe8, 0x28, 0xa1, 0x1e, 0x41, 0xd1, 0x26, 0x01, 0x33, 0xfa, 0xdc, 0x6d, 0xfc, 0xf8, - 0x75, 0xdc, 0x62, 0x67, 0xd1, 0x21, 0xd2, 0xb1, 0x52, 0xf5, 0x3c, 0x97, 0x12, 0x24, 0x53, 0xdd, - 0x87, 0x12, 0x6e, 0x32, 0x70, 0xc7, 0x63, 0x8b, 0x19, 0xe8, 0xf7, 0x34, 0xfa, 0x7d, 0x83, 0xd3, - 0x8f, 0x90, 0x7c, 0xca, 0x23, 0x70, 0x1f, 0x72, 0x26, 0x61, 0x44, 0x40, 0x32, 0x08, 0xc9, 0x72, - 0x02, 0x32, 0xdf, 0x83, 0xcd, 0x28, 0xeb, 0x02, 0x01, 0xc9, 0x8a, 0x5d, 0x66, 0x64, 0x04, 0x3e, - 0x82, 0x6d, 0x87, 0x4e, 0x99, 0x71, 0x1b, 0x9d, 0x43, 0xb4, 0xca, 0x79, 0x4f, 0xe6, 0x25, 0xbe, - 0x09, 0x1b, 0x83, 0xd0, 0xf9, 0x02, 0x0b, 0x88, 0x2d, 0x46, 0x54, 0x84, 0xed, 0x40, 0x96, 0x78, - 0x9e, 0x00, 0xe4, 0x11, 0x90, 0x21, 0x9e, 0x87, 0xac, 0x0f, 0x60, 0x0b, 0x6d, 0xf4, 0x69, 0x30, - 0xb1, 0x99, 0xdc, 0xa4, 0x80, 0x98, 0x4d, 0xce, 0xd0, 0x05, 0x1d, 0xb1, 0xdf, 0x80, 0x22, 0xbd, - 0xb4, 0x4c, 0xea, 0x0c, 0xa8, 0xc0, 0x15, 0x11, 0x57, 0x08, 0x89, 0x08, 0x7a, 0x1f, 0x4a, 0x9e, - 0xef, 0x7a, 0x6e, 0x40, 0x7d, 0x83, 0x98, 0xa6, 0x4f, 0x83, 0xa0, 0xbc, 0x21, 0xf6, 0x0b, 0xe9, - 0x75, 0x41, 0xd6, 0xbe, 0x54, 0x20, 0x75, 0x4c, 0x18, 0x51, 0x4b, 0x90, 0x64, 0xd3, 0xa0, 0xac, - 0x54, 0x93, 0xfb, 0x05, 0x9d, 0x7f, 0xaa, 0x9f, 0x40, 0x36, 0xdc, 0x55, 0x96, 0x4a, 0x65, 0x31, - 0x74, 0x27, 0x12, 0x71, 0x66, 0x05, 0x4c, 0xc6, 0x2f, 0x92, 0x52, 0x7f, 0x04, 0xd9, 0x31, 0x0d, - 0x02, 0x32, 0xa4, 0x41, 0x94, 0x3f, 0x0b, 0x3b, 0xb4, 0x24, 0x22, 0x94, 0x0e, 0x25, 0xd4, 0x3d, - 0xc8, 0x07, 0xbf, 0x9e, 0x10, 0x9f, 0x1a, 0x81, 0xf5, 0x9c, 0x62, 0xf6, 0xa4, 0x74, 0x10, 0xa4, - 0xae, 0xf5, 0x9c, 0x46, 0x75, 0x98, 0x8e, 0x35, 0x84, 0x17, 0x09, 0xb8, 0x73, 0x3c, 0xf1, 0x6c, - 0x6b, 0x40, 0x18, 0x7d, 0xe2, 0x32, 0x1a, 0x2a, 0xa8, 0x7e, 0x1b, 0xd2, 0x97, 0x2e, 0xa3, 0x06, - 0x91, 0x65, 0x74, 0x77, 0x51, 0x15, 0x8e, 0xd7, 0xd7, 0x39, 0xaa, 0x1e, 0xc1, 0xfb, 0xb2, 0x8e, - 0xdf, 0x08, 0x6f, 0xa8, 0x1f, 0x81, 0x8a, 0x5d, 0xca, 0xb8, 0x74, 0x99, 0xe5, 0x0c, 0x0d, 0xcf, - 0x7d, 0x46, 0x7d, 0x59, 0x4a, 0x25, 0xe4, 0x3c, 0x41, 0x46, 0x87, 0xd3, 0xe7, 0xd2, 0x51, 0x42, - 0x53, 0x08, 0x9d, 0xa5, 0xa3, 0x00, 0x36, 0x20, 0x17, 0xb5, 0x63, 0x59, 0x3f, 0xff, 0x5b, 0x09, - 0xce, 0xc4, 0xb4, 0x2f, 0x13, 0xb0, 0x73, 0xc6, 0x6b, 0xf9, 0xc8, 0xb6, 0xa8, 0xc3, 0xea, 0x8c, - 0x91, 0xc1, 0xd3, 0xc8, 0x2d, 0x4d, 0xd8, 0x1a, 0xb8, 0xce, 0x85, 0x6d, 0x0d, 0x50, 0x6f, 0x2c, - 0x56, 0xe9, 0xa1, 0x07, 0x8b, 0x26, 0xe3, 0x3e, 0x58, 0x9b, 0x7a, 0x29, 0x26, 0x86, 0x14, 0x9e, - 0x9b, 0xbc, 0x4c, 0x5d, 0xc7, 0x90, 0x9d, 0x24, 0x81, 0x36, 0x15, 0x04, 0xf1, 0x54, 0xf4, 0x93, - 0x36, 0x6c, 0xf7, 0xaf, 0x9e, 0x13, 0x87, 0x59, 0x0e, 0x8d, 0x55, 0x59, 0x39, 0x59, 0x4d, 0xee, - 0xe7, 0x0f, 0xef, 0x2f, 0xf1, 0x72, 0x88, 0xd1, 0xbf, 0x16, 0x09, 0xce, 0x4a, 0x70, 0x85, 0xe3, - 0x53, 0x2b, 0x1c, 0xff, 0x2e, 0xfc, 0xf9, 0x4f, 0x05, 0xb2, 0x91, 0xfb, 0x08, 0xdc, 0x33, 0xc3, - 0x74, 0x33, 0x30, 0x61, 0xa2, 0x9a, 0x11, 0x4e, 0x7c, 0x6f, 0xd1, 0xa2, 0xa5, 0xf9, 0x79, 0xba, - 0xa6, 0xdf, 0x31, 0x97, 0x26, 0xae, 0x03, 0x0f, 0x6c, 0xee, 0x3a, 0x63, 0x80, 0xf1, 0x33, 0x08, - 0x06, 0x70, 0x76, 0x8e, 0xc8, 0xcf, 0x0f, 0x57, 0x04, 0x6b, 0x59, 0xd0, 0x4f, 0xd7, 0xf4, 0x1d, - 0x7b, 0x15, 0xb3, 0xb1, 0x0e, 0xc9, 0x60, 0x32, 0xd6, 0xce, 0xa0, 0x10, 0x2f, 0x6e, 0x5e, 0xcc, - 0x31, 0xd3, 0x92, 0xcb, 0x8b, 0x39, 0xda, 0xe4, 0x56, 0x2b, 0xd0, 0x7e, 0x0a, 0xd9, 0xb0, 0xd0, - 0xd5, 0x9f, 0x40, 0x31, 0x2c, 0x72, 0xc3, 0xb6, 0x02, 0x26, 0xb7, 0xdb, 0x59, 0xd9, 0x1b, 0xf4, - 0x42, 0x88, 0xe7, 0x9a, 0x68, 0x9f, 0x40, 0x46, 0x32, 0xd4, 0xaf, 0x43, 0xc1, 0x21, 0x63, 0x1a, - 0x78, 0x64, 0x40, 0xf9, 0x88, 0x11, 0x23, 0x39, 0x1f, 0xd1, 0x9a, 0x26, 0xef, 0x12, 0x7c, 0x0c, - 0x84, 0xd7, 0x06, 0xfe, 0xad, 0xfd, 0x02, 0xee, 0xf2, 0xa6, 0x57, 0xbf, 0x24, 0x96, 0x4d, 0xfa, - 0x96, 0x6d, 0xb1, 0x2b, 0x39, 0x6d, 0xef, 0x43, 0xce, 0x77, 0x9f, 0x19, 0xbe, 0xeb, 0xb2, 0xb0, - 0x19, 0x66, 0x7d, 0xf7, 0x99, 0xce, 0xd7, 0xfc, 0xb4, 0x81, 0x6b, 0x4f, 0xc6, 0x8e, 0xe4, 0x27, - 0x90, 0x9f, 0x17, 0x34, 0x84, 0x68, 0xff, 0x4e, 0x40, 0x8a, 0x47, 0x4f, 0xfd, 0x18, 0x52, 0xdc, - 0x06, 0xd4, 0x68, 0x63, 0xd9, 0x2d, 0xa0, 0x6b, 0x0d, 0x1d, 0x6a, 0xb6, 0x82, 0x61, 0xef, 0xca, - 0xa3, 0x3a, 0x82, 0x63, 0x43, 0x38, 0x31, 0x37, 0x84, 0xb7, 0x61, 0xdd, 0x77, 0x27, 0x8e, 0x89, - 0x0d, 0x65, 0x5d, 0x17, 0x0b, 0xf5, 0x04, 0xb2, 0xd1, 0x6c, 0x4d, 0xfd, 0xb7, 0xd9, 0xba, 0xc9, - 0x03, 0xc2, 0x27, 0xbf, 0x24, 0xe8, 0x99, 0xbe, 0x1c, 0xb1, 0xef, 0xa0, 0x26, 0xd4, 0x0f, 0x61, - 0x6b, 0xd6, 0xd0, 0xc2, 0x91, 0x23, 0xfa, 0x72, 0x29, 0x62, 0xc8, 0x99, 0x33, 0xdf, 0xfd, 0xc4, - 0xb5, 0x2d, 0x83, 0x76, 0xcd, 0xba, 0x5f, 0x13, 0xef, 0x6f, 0x0f, 0x20, 0x17, 0x58, 0x43, 0x87, - 0xb0, 0x89, 0x4f, 0xe5, 0xbc, 0x9e, 0x11, 0xb4, 0x3f, 0x29, 0x90, 0x16, 0xf3, 0x3f, 0xe6, 0x37, - 0x65, 0xb9, 0xdf, 0x12, 0xab, 0xfc, 0x96, 0x7c, 0x7b, 0xbf, 0xd5, 0x01, 0x22, 0x65, 0xf8, 0x7c, - 0x5b, 0xd1, 0xbf, 0x84, 0x8a, 0x5d, 0x6b, 0x28, 0x6b, 0x22, 0x26, 0xa4, 0xfd, 0x4d, 0x81, 0x5c, - 0xc4, 0x57, 0xeb, 0x50, 0x0c, 0xf5, 0x32, 0x2e, 0x6c, 0x32, 0x94, 0xb9, 0xf3, 0x70, 0xa5, 0x72, - 0x9f, 0xda, 0x64, 0xa8, 0xe7, 0xa5, 0x3e, 0x7c, 0xb1, 0x3c, 0x0e, 0x89, 0x15, 0x71, 0x98, 0x0b, - 0x7c, 0xf2, 0xed, 0x02, 0x3f, 0x17, 0xa2, 0xd4, 0xed, 0x10, 0xfd, 0x31, 0x01, 0xd9, 0x0e, 0xde, - 0x38, 0x88, 0xfd, 0xff, 0xa8, 0x88, 0xfb, 0x90, 0xf3, 0x5c, 0xdb, 0x10, 0x9c, 0x14, 0x72, 0xb2, - 0x9e, 0x6b, 0xeb, 0x0b, 0x61, 0x5f, 0x7f, 0x47, 0xe5, 0x92, 0x7e, 0x07, 0x5e, 0xcb, 0xdc, 0xf6, - 0x9a, 0x0f, 0x05, 0xe1, 0x0a, 0xd9, 0x93, 0x1e, 0x71, 0x1f, 0xe0, 0x93, 0x42, 0x59, 0x7c, 0xb1, - 0x08, 0xb5, 0x05, 0x52, 0x97, 0x38, 0x2e, 0x21, 0x2e, 0xcc, 0x72, 0x38, 0x94, 0x57, 0xa5, 0xa5, - 0x2e, 0x71, 0xda, 0x6f, 0x15, 0x80, 0xd9, 0x70, 0xe7, 0x77, 0xf7, 0x00, 0x55, 0x30, 0xe6, 0x4e, - 0xae, 0xac, 0x0a, 0x9a, 0x3c, 0xbf, 0x10, 0xc4, 0xf5, 0x3e, 0x82, 0xe2, 0x2c, 0x19, 0x03, 0x1a, - 0x2a, 0x53, 0x79, 0xc3, 0x8c, 0xef, 0x52, 0xa6, 0x17, 0x2e, 0x63, 0x2b, 0xed, 0xcf, 0x0a, 0xe4, - 0x50, 0xa7, 0x16, 0x65, 0x64, 0x2e, 0x86, 0xca, 0xdb, 0xc7, 0xf0, 0x21, 0x80, 0xd8, 0x06, 0x6f, - 0x96, 0x22, 0xb3, 0x72, 0x48, 0xc1, 0x8b, 0xe5, 0xf7, 0x22, 0x87, 0x27, 0xdf, 0xec, 0x70, 0x59, - 0xd2, 0xa1, 0xdb, 0xef, 0x41, 0xc6, 0x99, 0x8c, 0x0d, 0x7e, 0x8f, 0x16, 0x17, 0x90, 0xb4, 0x33, - 0x19, 0xf7, 0xa6, 0x81, 0xe6, 0x40, 0xa6, 0x37, 0xc5, 0x47, 0xe5, 0x9b, 0x07, 0xcc, 0x6c, 0x56, - 0x25, 0xc3, 0x59, 0xa5, 0x1e, 0x42, 0x1a, 0x5f, 0xa0, 0xe1, 0x15, 0x69, 0xc9, 0xd4, 0x6d, 0xb7, - 0x7a, 0xb8, 0xb9, 0x2e, 0x91, 0xda, 0x08, 0xf2, 0x2d, 0x62, 0xdb, 0x94, 0x30, 0x6a, 0xf6, 0xa6, - 0xfc, 0x11, 0xe5, 0xfa, 0xd6, 0xd0, 0x72, 0x88, 0x6d, 0xb0, 0xa9, 0x11, 0x7b, 0xbc, 0x6e, 0x84, - 0xf4, 0xde, 0x14, 0x5f, 0x0e, 0x1b, 0x90, 0x60, 0x53, 0xd9, 0x30, 0x12, 0x6c, 0x8a, 0x77, 0xf0, - 0x11, 0xbf, 0x82, 0x8b, 0x36, 0x9d, 0xc4, 0xd7, 0x35, 0x20, 0x09, 0x5b, 0xb4, 0x46, 0x21, 0x1b, - 0x9e, 0xce, 0x6b, 0x32, 0x60, 0xc4, 0x17, 0x4d, 0x78, 0x5d, 0x17, 0x0b, 0xfe, 0xb0, 0xa0, 0x51, - 0x07, 0xe6, 0x9f, 0x1c, 0xe7, 0xb8, 0x26, 0x15, 0x06, 0x15, 0x74, 0xb1, 0xe0, 0x8e, 0xb1, 0x29, - 0xb9, 0x10, 0xda, 0x89, 0x4e, 0x92, 0xe5, 0x04, 0xae, 0xd7, 0x07, 0x7f, 0x51, 0x20, 0x1f, 0x6b, - 0x7a, 0xea, 0x77, 0xe0, 0x4e, 0xe3, 0xec, 0xfc, 0xe8, 0x33, 0xa3, 0x79, 0x6c, 0x7c, 0x7a, 0x56, - 0x7f, 0x6c, 0x7c, 0xde, 0xfe, 0xac, 0x7d, 0xfe, 0xf3, 0x76, 0x69, 0x6d, 0xf7, 0xee, 0xf5, 0x4d, - 0x55, 0x8d, 0x61, 0x3f, 0x77, 0x9e, 0x3a, 0xee, 0x33, 0x47, 0x3d, 0x80, 0xed, 0x79, 0x91, 0x7a, - 0xa3, 0x7b, 0xd2, 0xee, 0x95, 0x94, 0xdd, 0x3b, 0xd7, 0x37, 0xd5, 0xad, 0x98, 0x44, 0xbd, 0x1f, - 0x50, 0x87, 0x2d, 0x0a, 0x1c, 0x9d, 0xb7, 0x5a, 0xcd, 0x5e, 0x29, 0xb1, 0x20, 0x20, 0xa7, 0xd0, - 0xfb, 0xb0, 0x35, 0x2f, 0xd0, 0x6e, 0x9e, 0x95, 0x92, 0xbb, 0xea, 0xf5, 0x4d, 0x75, 0x23, 0x86, - 0x6e, 0x5b, 0xf6, 0x6e, 0xf6, 0x37, 0xbf, 0xab, 0xac, 0xfd, 0xe1, 0xf7, 0x15, 0x85, 0x5b, 0x56, - 0x9c, 0x6b, 0x7c, 0xea, 0x47, 0x70, 0xaf, 0xdb, 0x7c, 0xdc, 0x3e, 0x39, 0x36, 0x5a, 0xdd, 0xc7, - 0x46, 0xef, 0x97, 0x9d, 0x93, 0x98, 0x75, 0x9b, 0xd7, 0x37, 0xd5, 0xbc, 0x34, 0x69, 0x15, 0xba, - 0xa3, 0x9f, 0x3c, 0x39, 0xef, 0x9d, 0x94, 0x14, 0x81, 0xee, 0xf8, 0x94, 0x5f, 0x4c, 0x11, 0xfd, - 0x08, 0x76, 0x96, 0xa0, 0x23, 0xc3, 0xb6, 0xae, 0x6f, 0xaa, 0xc5, 0x8e, 0x4f, 0x45, 0x53, 0x40, - 0x89, 0x1a, 0x94, 0x17, 0x25, 0xce, 0x3b, 0xe7, 0xdd, 0xfa, 0x59, 0xa9, 0xba, 0x5b, 0xba, 0xbe, - 0xa9, 0x16, 0xc2, 0x0e, 0xcf, 0xf1, 0x33, 0xcb, 0x1a, 0x3f, 0xfb, 0xe2, 0x55, 0x45, 0xf9, 0xea, - 0x55, 0x45, 0xf9, 0xc7, 0xab, 0x8a, 0xf2, 0xe2, 0x75, 0x65, 0xed, 0xab, 0xd7, 0x95, 0xb5, 0xbf, - 0xbe, 0xae, 0xac, 0xfd, 0xea, 0xfb, 0x43, 0x8b, 0x8d, 0x26, 0xfd, 0xda, 0xc0, 0x1d, 0x1f, 0xc4, - 0xff, 0x1d, 0x9a, 0x7d, 0x8a, 0x7f, 0xa9, 0x6e, 0xff, 0x73, 0xd4, 0x4f, 0x23, 0xfd, 0xe3, 0xff, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xb4, 0x1c, 0xe4, 0xfa, 0x12, 0x00, 0x00, + // 1826 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0x23, 0x4b, + 0x15, 0x4e, 0xfb, 0xed, 0x63, 0x3b, 0xe3, 0x34, 0x99, 0x19, 0xc7, 0x33, 0xe3, 0x18, 0x23, 0xb8, + 0xb9, 0x0f, 0x9c, 0x21, 0x17, 0xf1, 0x90, 0xb8, 0x12, 0x76, 0x92, 0x3b, 0xb1, 0x6e, 0x5e, 0xb4, + 0x7d, 0x87, 0xc7, 0xa6, 0x55, 0x76, 0x57, 0xec, 0xd6, 0xb4, 0xbb, 0x9a, 0xee, 0x72, 0xc6, 0x99, + 0x5f, 0x80, 0xb2, 0x9a, 0x15, 0xbb, 0xac, 0x60, 0xc1, 0x9e, 0x3f, 0x80, 0x60, 0x73, 0x37, 0x48, + 0x77, 0x07, 0x1b, 0x2e, 0x68, 0x06, 0x21, 0x7e, 0x06, 0xaa, 0x53, 0xd5, 0xed, 0x76, 0x6c, 0x0f, + 0x68, 0x34, 0x62, 0x13, 0xb9, 0xce, 0xf9, 0x4e, 0xd5, 0xa9, 0xef, 0xbc, 0xaa, 0x03, 0x0f, 0x39, + 0x75, 0x2d, 0xea, 0x8f, 0x6d, 0x97, 0xef, 0xf2, 0x2b, 0x8f, 0x06, 0xf2, 0x6f, 0xd3, 0xf3, 0x19, + 0x67, 0x7a, 0x79, 0xa6, 0x6d, 0xa2, 0xbc, 0xba, 0x39, 0x64, 0x43, 0x86, 0xca, 0x5d, 0xf1, 0x4b, + 0xe2, 0xaa, 0xdb, 0x43, 0xc6, 0x86, 0x0e, 0xdd, 0xc5, 0x55, 0x7f, 0x72, 0xb1, 0xcb, 0xed, 0x31, + 0x0d, 0x38, 0x19, 0x7b, 0x0a, 0xf0, 0x28, 0x76, 0xcc, 0xc0, 0xbf, 0xf2, 0x38, 0x13, 0x58, 0x76, + 0xa1, 0xd4, 0xb5, 0x98, 0xfa, 0x92, 0xfa, 0x81, 0xcd, 0xdc, 0xb8, 0x1f, 0xd5, 0xfa, 0x82, 0x97, + 0x97, 0xc4, 0xb1, 0x2d, 0xc2, 0x99, 0x2f, 0x11, 0x8d, 0x1f, 0x42, 0xe9, 0x9c, 0xf8, 0xbc, 0x4b, + 0xf9, 0x11, 0x25, 0x16, 0xf5, 0xf5, 0x4d, 0x48, 0x73, 0xc6, 0x89, 0x53, 0xd1, 0xea, 0xda, 0x4e, + 0xc9, 0x90, 0x0b, 0x5d, 0x87, 0xd4, 0x88, 0x04, 0xa3, 0x4a, 0xa2, 0xae, 0xed, 0x14, 0x0d, 0xfc, + 0xdd, 0x18, 0x41, 0x4a, 0x98, 0x0a, 0x0b, 0xdb, 0xb5, 0xe8, 0x34, 0xb4, 0xc0, 0x85, 0x90, 0xf6, + 0xaf, 0x38, 0x0d, 0x94, 0x89, 0x5c, 0xe8, 0xdf, 0x85, 0x34, 0xfa, 0x5f, 0x49, 0xd6, 0xb5, 0x9d, + 0xc2, 0x5e, 0xa5, 0x19, 0x23, 0x4a, 0xde, 0xaf, 0x79, 0x2e, 0xf4, 0xed, 0xd4, 0x17, 0x5f, 0x6d, + 0xaf, 0x19, 0x12, 0xdc, 0x70, 0x20, 0xdb, 0x76, 0xd8, 0xe0, 0x59, 0xe7, 0x20, 0x72, 0x44, 0x9b, + 0x39, 0xa2, 0x9f, 0xc0, 0x1d, 0x8f, 0xf8, 0xdc, 0x0c, 0x28, 0x37, 0x47, 0x78, 0x0b, 0x3c, 0xb4, + 0xb0, 0xb7, 0xdd, 0xbc, 0x1d, 0x87, 0xe6, 0xdc, 0x65, 0xd5, 0x29, 0x25, 0x2f, 0x2e, 0x6c, 0xfc, + 0x2b, 0x05, 0x19, 0x45, 0xc6, 0x27, 0x90, 0x55, 0xb4, 0xe2, 0x81, 0x85, 0xbd, 0x47, 0xf1, 0x1d, + 0x95, 0xaa, 0xb9, 0xcf, 0xdc, 0x80, 0xba, 0xc1, 0x24, 0x50, 0xfb, 0x85, 0x36, 0xfa, 0xb7, 0x20, + 0x37, 0x18, 0x11, 0xdb, 0x35, 0x6d, 0x0b, 0x3d, 0xca, 0xb7, 0x0b, 0xaf, 0xbe, 0xda, 0xce, 0xee, + 0x0b, 0x59, 0xe7, 0xc0, 0xc8, 0xa2, 0xb2, 0x63, 0xe9, 0xf7, 0x20, 0x33, 0xa2, 0xf6, 0x70, 0xc4, + 0x91, 0x96, 0xa4, 0xa1, 0x56, 0xfa, 0x0f, 0x20, 0x25, 0x12, 0xa2, 0x92, 0xc2, 0xb3, 0xab, 0x4d, + 0x99, 0x2d, 0xcd, 0x30, 0x5b, 0x9a, 0xbd, 0x30, 0x5b, 0xda, 0x39, 0x71, 0xf0, 0xcb, 0xbf, 0x6f, + 0x6b, 0x06, 0x5a, 0xe8, 0xfb, 0x50, 0x72, 0x48, 0xc0, 0xcd, 0xbe, 0xa0, 0x4d, 0x1c, 0x9f, 0xc6, + 0x2d, 0xb6, 0x16, 0x09, 0x51, 0xc4, 0x2a, 0xd7, 0x0b, 0xc2, 0x4a, 0x8a, 0x2c, 0x7d, 0x07, 0xca, + 0xb8, 0xc9, 0x80, 0x8d, 0xc7, 0x36, 0x37, 0x91, 0xf7, 0x0c, 0xf2, 0xbe, 0x2e, 0xe4, 0xfb, 0x28, + 0x3e, 0x12, 0x11, 0x78, 0x00, 0x79, 0x8b, 0x70, 0x22, 0x21, 0x59, 0x84, 0xe4, 0x84, 0x00, 0x95, + 0xef, 0xc1, 0x9d, 0x28, 0xeb, 0x02, 0x09, 0xc9, 0xc9, 0x5d, 0x66, 0x62, 0x04, 0x3e, 0x86, 0x4d, + 0x97, 0x4e, 0xb9, 0x79, 0x1b, 0x9d, 0x47, 0xb4, 0x2e, 0x74, 0x4f, 0xe7, 0x2d, 0xbe, 0x09, 0xeb, + 0x83, 0x90, 0x7c, 0x89, 0x05, 0xc4, 0x96, 0x22, 0x29, 0xc2, 0xb6, 0x20, 0x47, 0x3c, 0x4f, 0x02, + 0x0a, 0x08, 0xc8, 0x12, 0xcf, 0x43, 0xd5, 0x07, 0xb0, 0x81, 0x77, 0xf4, 0x69, 0x30, 0x71, 0xb8, + 0xda, 0xa4, 0x88, 0x98, 0x3b, 0x42, 0x61, 0x48, 0x39, 0x62, 0xbf, 0x01, 0x25, 0x7a, 0x69, 0x5b, + 0xd4, 0x1d, 0x50, 0x89, 0x2b, 0x21, 0xae, 0x18, 0x0a, 0x11, 0xf4, 0x3e, 0x94, 0x3d, 0x9f, 0x79, + 0x2c, 0xa0, 0xbe, 0x49, 0x2c, 0xcb, 0xa7, 0x41, 0x50, 0x59, 0x97, 0xfb, 0x85, 0xf2, 0x96, 0x14, + 0x37, 0xfe, 0xa4, 0x41, 0xea, 0x80, 0x70, 0xa2, 0x97, 0x21, 0xc9, 0xa7, 0x41, 0x45, 0xab, 0x27, + 0x77, 0x8a, 0x86, 0xf8, 0xa9, 0xff, 0x18, 0x72, 0xe1, 0xae, 0xaa, 0x54, 0x6a, 0x8b, 0xa1, 0x3b, + 0x54, 0x88, 0x63, 0x3b, 0xe0, 0x2a, 0x7e, 0x91, 0x95, 0xbe, 0x07, 0xe9, 0xbe, 0xc3, 0xfa, 0x41, + 0x25, 0x55, 0x4f, 0xee, 0x14, 0xf6, 0xee, 0x2d, 0x8d, 0x7c, 0x3f, 0xac, 0x33, 0x84, 0xea, 0xdb, + 0x50, 0x08, 0x7e, 0x39, 0x21, 0x3e, 0x35, 0x03, 0xfb, 0x05, 0xc5, 0x9c, 0x49, 0x19, 0x20, 0x45, + 0x5d, 0xfb, 0x05, 0x8d, 0xaa, 0x2f, 0x13, 0x6b, 0x03, 0x2f, 0x13, 0x70, 0xf7, 0x60, 0xe2, 0x39, + 0xf6, 0x80, 0x70, 0xfa, 0x94, 0x71, 0x1a, 0xba, 0xa5, 0x7f, 0x1b, 0x32, 0x97, 0x8c, 0x53, 0x93, + 0xa8, 0xe2, 0x59, 0xe2, 0x83, 0xc0, 0x1b, 0x69, 0x81, 0x6a, 0x45, 0xf0, 0xbe, 0xaa, 0xde, 0x37, + 0xc2, 0xdb, 0xfa, 0x47, 0xa0, 0x63, 0x6f, 0x32, 0x2f, 0x19, 0xb7, 0xdd, 0xa1, 0xe9, 0xb1, 0xe7, + 0xd4, 0x57, 0x05, 0x54, 0x46, 0xcd, 0x53, 0x54, 0x9c, 0x0b, 0xf9, 0x5c, 0x12, 0x2a, 0x68, 0x0a, + 0xa1, 0xb3, 0x24, 0x94, 0xc0, 0x36, 0xe4, 0xa3, 0x26, 0xac, 0xaa, 0xe6, 0x7f, 0x2b, 0xbc, 0x99, + 0x59, 0xe3, 0xcf, 0x09, 0xd8, 0x3a, 0x16, 0x15, 0xbc, 0xef, 0xd8, 0xd4, 0xe5, 0x2d, 0xce, 0xc9, + 0xe0, 0x59, 0x44, 0x4b, 0x07, 0x36, 0x06, 0xcc, 0xbd, 0x70, 0xec, 0x01, 0xfa, 0x8d, 0x25, 0xaa, + 0x18, 0x7a, 0xb8, 0x78, 0x65, 0xdc, 0x07, 0x2b, 0xd2, 0x28, 0xc7, 0xcc, 0x50, 0x22, 0x32, 0x52, + 0x14, 0x27, 0x73, 0x4d, 0xd5, 0x3f, 0x12, 0x78, 0xa7, 0xa2, 0x14, 0x1e, 0xc9, 0x2e, 0x72, 0x0a, + 0x9b, 0xfd, 0xab, 0x17, 0xc4, 0xe5, 0xb6, 0x4b, 0x63, 0xb5, 0x55, 0x49, 0x62, 0x62, 0x3c, 0x58, + 0xc2, 0x72, 0x88, 0x31, 0xbe, 0x16, 0x19, 0xce, 0x0a, 0x6f, 0x05, 0xf1, 0xa9, 0x15, 0xc4, 0xbf, + 0x0b, 0x3e, 0xff, 0xa9, 0x41, 0x2e, 0xa2, 0x8f, 0xc0, 0x7d, 0x2b, 0x4c, 0x37, 0x13, 0x13, 0x26, + 0xaa, 0x14, 0x49, 0xe2, 0x7b, 0x8b, 0x37, 0x5a, 0x9a, 0x9f, 0x47, 0x6b, 0xc6, 0x5d, 0x6b, 0x69, + 0xe2, 0xba, 0xf0, 0xd0, 0x11, 0xd4, 0x99, 0x03, 0x8c, 0x9f, 0x49, 0x30, 0x80, 0xb3, 0x73, 0x64, + 0x7e, 0x7e, 0xb8, 0x22, 0x58, 0xcb, 0x82, 0x7e, 0xb4, 0x66, 0x6c, 0x39, 0xab, 0x94, 0xed, 0x34, + 0x24, 0x83, 0xc9, 0xb8, 0x71, 0x0c, 0xc5, 0x78, 0x49, 0xeb, 0x3f, 0x8a, 0x35, 0x01, 0x0d, 0x83, + 0x55, 0x5d, 0xdd, 0x04, 0x6e, 0x37, 0x80, 0xc6, 0x27, 0x90, 0x12, 0x15, 0xae, 0x7f, 0x1d, 0x8a, + 0x2e, 0x19, 0xd3, 0xc0, 0x23, 0x03, 0x2a, 0x26, 0x81, 0x9c, 0x9c, 0x85, 0x48, 0xd6, 0xb1, 0x44, + 0x59, 0x8b, 0x6e, 0x1d, 0x4e, 0x77, 0xf1, 0xbb, 0xf1, 0x33, 0xb8, 0x27, 0x7a, 0x53, 0xeb, 0x92, + 0xd8, 0x0e, 0xe9, 0xdb, 0x8e, 0xcd, 0xaf, 0xd4, 0x50, 0x7c, 0x00, 0x79, 0x9f, 0x3d, 0x37, 0x7d, + 0xc6, 0x78, 0xd8, 0xb3, 0x72, 0x3e, 0x7b, 0x6e, 0x88, 0xb5, 0x38, 0x6d, 0xc0, 0x9c, 0xc9, 0xd8, + 0x55, 0xfa, 0x04, 0xea, 0x0b, 0x52, 0x86, 0x90, 0xc6, 0xbf, 0x13, 0x90, 0x12, 0x74, 0xeb, 0x1f, + 0x43, 0x4a, 0xdc, 0x01, 0x3d, 0x5a, 0x5f, 0x36, 0xac, 0xbb, 0xf6, 0xd0, 0xa5, 0xd6, 0x49, 0x30, + 0xec, 0x5d, 0x79, 0xd4, 0x40, 0x70, 0x6c, 0x56, 0x26, 0xe6, 0x66, 0xe5, 0x26, 0xa4, 0x7d, 0x36, + 0x71, 0x2d, 0xec, 0x00, 0x69, 0x43, 0x2e, 0xf4, 0x43, 0xc8, 0x45, 0x23, 0x30, 0xf5, 0xdf, 0x46, + 0xe0, 0x1d, 0xc1, 0xa0, 0x18, 0xd0, 0x4a, 0x60, 0x64, 0xfb, 0x6a, 0x12, 0xbe, 0x83, 0x24, 0xd6, + 0x3f, 0x84, 0x8d, 0x59, 0x07, 0x0a, 0x27, 0x83, 0x6c, 0xa4, 0xe5, 0x48, 0xa1, 0x46, 0xc3, 0x7c, + 0xbb, 0x92, 0xaf, 0xab, 0x2c, 0xde, 0x6b, 0xd6, 0xae, 0x3a, 0xf8, 0xcc, 0x7a, 0x08, 0xf9, 0xc0, + 0x1e, 0xba, 0x84, 0x4f, 0x7c, 0xaa, 0xc6, 0xea, 0x4c, 0xd0, 0xf8, 0x83, 0x06, 0x19, 0x39, 0xa6, + 0x63, 0xbc, 0x69, 0xcb, 0x79, 0x4b, 0xac, 0xe2, 0x2d, 0xf9, 0xf6, 0xbc, 0xb5, 0x00, 0x22, 0x67, + 0xc2, 0x49, 0xb4, 0xa4, 0xe1, 0x48, 0x17, 0xbb, 0xf6, 0x50, 0x25, 0x71, 0xcc, 0xa8, 0xf1, 0x37, + 0x0d, 0xf2, 0x91, 0x5e, 0x6f, 0x41, 0x29, 0xf4, 0xcb, 0xbc, 0x70, 0xc8, 0x50, 0xe5, 0xce, 0xa3, + 0x95, 0xce, 0x7d, 0xea, 0x90, 0xa1, 0x51, 0x50, 0xfe, 0x88, 0xc5, 0xf2, 0x38, 0x24, 0x56, 0xc4, + 0x61, 0x2e, 0xf0, 0xc9, 0xb7, 0x0b, 0xfc, 0x5c, 0x88, 0x52, 0xb7, 0x43, 0xf4, 0xfb, 0x04, 0xe4, + 0xce, 0xf1, 0x61, 0x40, 0x9c, 0xff, 0x47, 0x45, 0x3c, 0x80, 0xbc, 0xc7, 0x1c, 0x53, 0x6a, 0x52, + 0xa8, 0xc9, 0x79, 0xcc, 0x31, 0x16, 0xc2, 0x9e, 0x7e, 0x47, 0xe5, 0x92, 0x79, 0x07, 0xac, 0x65, + 0x6f, 0xb3, 0xe6, 0x43, 0x51, 0x52, 0xa1, 0x7a, 0xd2, 0x63, 0xc1, 0x01, 0xbe, 0xfc, 0xb5, 0xc5, + 0x0f, 0x0b, 0xe9, 0xb6, 0x44, 0x1a, 0x0a, 0x27, 0x2c, 0xe4, 0xbb, 0x56, 0x75, 0xf3, 0xca, 0xaa, + 0xb4, 0x34, 0x14, 0xae, 0xf1, 0x6b, 0x0d, 0x60, 0x36, 0x8d, 0xc5, 0x13, 0x3b, 0x40, 0x17, 0xcc, + 0xb9, 0x93, 0x6b, 0xab, 0x82, 0xa6, 0xce, 0x2f, 0x06, 0x71, 0xbf, 0xf7, 0xa1, 0x34, 0x4b, 0xc6, + 0x80, 0x86, 0xce, 0xd4, 0xde, 0x30, 0x94, 0xbb, 0x94, 0x1b, 0xc5, 0xcb, 0xd8, 0xaa, 0xf1, 0x47, + 0x0d, 0xf2, 0xe8, 0xd3, 0x09, 0xe5, 0x64, 0x2e, 0x86, 0xda, 0xdb, 0xc7, 0xf0, 0x11, 0x80, 0xdc, + 0x06, 0x9f, 0x82, 0x32, 0xb3, 0xf2, 0x28, 0xc1, 0x97, 0xe0, 0xf7, 0x22, 0xc2, 0x93, 0x6f, 0x26, + 0x5c, 0x95, 0x74, 0x48, 0xfb, 0x7d, 0xc8, 0xba, 0x93, 0xb1, 0x29, 0x9e, 0xbb, 0xf2, 0xc5, 0x90, + 0x71, 0x27, 0xe3, 0xde, 0x34, 0x68, 0xb8, 0x90, 0xed, 0x4d, 0xf1, 0xdb, 0xef, 0xcd, 0x03, 0x66, + 0x36, 0xab, 0x92, 0xe1, 0xac, 0xd2, 0xf7, 0x20, 0x83, 0x1f, 0x8a, 0xe1, 0x9b, 0x66, 0xc9, 0x98, + 0x3c, 0x3d, 0xe9, 0xe1, 0xe6, 0x86, 0x42, 0x36, 0x46, 0x50, 0x38, 0x21, 0x8e, 0x43, 0x09, 0xa7, + 0x56, 0x6f, 0x2a, 0xbe, 0x75, 0x98, 0x6f, 0x0f, 0x6d, 0x97, 0x38, 0x26, 0x9f, 0x9a, 0xb1, 0x6f, + 0xcc, 0xf5, 0x50, 0xde, 0x9b, 0xe2, 0x03, 0x7f, 0x1d, 0x12, 0x7c, 0xaa, 0x1a, 0x46, 0x82, 0x4f, + 0xf1, 0xd1, 0x3c, 0x12, 0x6f, 0x66, 0xd9, 0xa6, 0x93, 0xf8, 0x11, 0x0c, 0x28, 0xc2, 0x16, 0xdd, + 0xa0, 0x90, 0x0b, 0x4f, 0x17, 0x35, 0x19, 0x70, 0xe2, 0xcb, 0x26, 0x9c, 0x36, 0xe4, 0x42, 0xbc, + 0xff, 0x69, 0xd4, 0x81, 0xc5, 0x4f, 0x81, 0x73, 0x99, 0x45, 0xe5, 0x85, 0x8a, 0x86, 0x5c, 0x08, + 0x62, 0x1c, 0x4a, 0x2e, 0xa4, 0x77, 0xb2, 0x93, 0xe4, 0x84, 0x40, 0xf8, 0xf5, 0xc1, 0x5f, 0x34, + 0x28, 0xc4, 0x9a, 0x9e, 0xfe, 0x1d, 0xb8, 0xdb, 0x3e, 0x3e, 0xdb, 0xff, 0xcc, 0xec, 0x1c, 0x98, + 0x9f, 0x1e, 0xb7, 0x9e, 0x98, 0x9f, 0x9f, 0x7e, 0x76, 0x7a, 0xf6, 0xd3, 0xd3, 0xf2, 0x5a, 0xf5, + 0xde, 0xf5, 0x4d, 0x5d, 0x8f, 0x61, 0x3f, 0x77, 0x9f, 0xb9, 0xec, 0xb9, 0xab, 0xef, 0xc2, 0xe6, + 0xbc, 0x49, 0xab, 0xdd, 0x3d, 0x3c, 0xed, 0x95, 0xb5, 0xea, 0xdd, 0xeb, 0x9b, 0xfa, 0x46, 0xcc, + 0xa2, 0xd5, 0x0f, 0xa8, 0xcb, 0x17, 0x0d, 0xf6, 0xcf, 0x4e, 0x4e, 0x3a, 0xbd, 0x72, 0x62, 0xc1, + 0x40, 0x4d, 0xa1, 0xf7, 0x61, 0x63, 0xde, 0xe0, 0xb4, 0x73, 0x5c, 0x4e, 0x56, 0xf5, 0xeb, 0x9b, + 0xfa, 0x7a, 0x0c, 0x7d, 0x6a, 0x3b, 0xd5, 0xdc, 0xaf, 0x7e, 0x53, 0x5b, 0xfb, 0xdd, 0x6f, 0x6b, + 0x9a, 0xb8, 0x59, 0x69, 0xae, 0xf1, 0xe9, 0x1f, 0xc1, 0xfd, 0x6e, 0xe7, 0xc9, 0xe9, 0xe1, 0x81, + 0x79, 0xd2, 0x7d, 0x62, 0xf6, 0x7e, 0x7e, 0x7e, 0x18, 0xbb, 0xdd, 0x9d, 0xeb, 0x9b, 0x7a, 0x41, + 0x5d, 0x69, 0x15, 0xfa, 0xdc, 0x38, 0x7c, 0x7a, 0xd6, 0x3b, 0x2c, 0x6b, 0x12, 0x7d, 0xee, 0x53, + 0xf1, 0x92, 0x44, 0xf4, 0x63, 0xd8, 0x5a, 0x82, 0x8e, 0x2e, 0xb6, 0x71, 0x7d, 0x53, 0x2f, 0x9d, + 0xfb, 0x54, 0x36, 0x05, 0xb4, 0x68, 0x42, 0x65, 0xd1, 0xe2, 0xec, 0xfc, 0xac, 0xdb, 0x3a, 0x2e, + 0xd7, 0xab, 0xe5, 0xeb, 0x9b, 0x7a, 0x31, 0xec, 0xf0, 0x02, 0x3f, 0xbb, 0x59, 0xfb, 0x27, 0x5f, + 0xbc, 0xaa, 0x69, 0x5f, 0xbe, 0xaa, 0x69, 0xff, 0x78, 0x55, 0xd3, 0x5e, 0xbe, 0xae, 0xad, 0x7d, + 0xf9, 0xba, 0xb6, 0xf6, 0xd7, 0xd7, 0xb5, 0xb5, 0x5f, 0x7c, 0x7f, 0x68, 0xf3, 0xd1, 0xa4, 0xdf, + 0x1c, 0xb0, 0xf1, 0x6e, 0xfc, 0x9f, 0x38, 0xb3, 0x9f, 0xf2, 0x9f, 0x49, 0xb7, 0xff, 0xc1, 0xd3, + 0xcf, 0xa0, 0xfc, 0xe3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x09, 0x0c, 0xb6, 0x8a, 0xa1, 0x12, + 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -2078,16 +2033,20 @@ func (m *Data) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - { - size, err := m.Messages.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.Blobs) > 0 { + for iNdEx := len(m.Blobs) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Blobs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) } - i-- - dAtA[i] = 0x22 { size, err := m.Evidence.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -2130,12 +2089,12 @@ func (m *DuplicateVoteEvidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err8 != nil { - return 0, err8 + n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err7 != nil { + return 0, err7 } - i -= n8 - i = encodeVarintTypes(dAtA, i, uint64(n8)) + i -= n7 + i = encodeVarintTypes(dAtA, i, uint64(n7)) i-- dAtA[i] = 0x2a if m.ValidatorPower != 0 { @@ -2195,12 +2154,12 @@ func (m *LightClientAttackEvidence) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l - n11, err11 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err11 != nil { - return 0, err11 + n10, err10 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err10 != nil { + return 0, err10 } - i -= n11 - i = encodeVarintTypes(dAtA, i, uint64(n11)) + i -= n10 + i = encodeVarintTypes(dAtA, i, uint64(n10)) i-- dAtA[i] = 0x2a if m.TotalVotingPower != 0 { @@ -2353,7 +2312,7 @@ func (m *EvidenceList) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Messages) Marshal() (dAtA []byte, err error) { +func (m *Blob) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2363,49 +2322,12 @@ func (m *Messages) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Messages) MarshalTo(dAtA []byte) (int, error) { +func (m *Blob) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Messages) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.MessagesList) > 0 { - for iNdEx := len(m.MessagesList) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.MessagesList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *Message) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Message) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Message) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Blob) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2507,12 +2429,12 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n15, err15 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err15 != nil { - return 0, err15 + n14, err14 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err14 != nil { + return 0, err14 } - i -= n15 - i = encodeVarintTypes(dAtA, i, uint64(n15)) + i -= n14 + i = encodeVarintTypes(dAtA, i, uint64(n14)) i-- dAtA[i] = 0x2a { @@ -2627,12 +2549,12 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err18 != nil { - return 0, err18 + n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err17 != nil { + return 0, err17 } - i -= n18 - i = encodeVarintTypes(dAtA, i, uint64(n18)) + i -= n17 + i = encodeVarintTypes(dAtA, i, uint64(n17)) i-- dAtA[i] = 0x1a if len(m.ValidatorAddress) > 0 { @@ -2677,12 +2599,12 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err19 != nil { - return 0, err19 + n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err18 != nil { + return 0, err18 } - i -= n19 - i = encodeVarintTypes(dAtA, i, uint64(n19)) + i -= n18 + i = encodeVarintTypes(dAtA, i, uint64(n18)) i-- dAtA[i] = 0x32 { @@ -3143,8 +3065,12 @@ func (m *Data) Size() (n int) { } l = m.Evidence.Size() n += 1 + l + sovTypes(uint64(l)) - l = m.Messages.Size() - n += 1 + l + sovTypes(uint64(l)) + if len(m.Blobs) > 0 { + for _, e := range m.Blobs { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } if m.SquareSize != 0 { n += 1 + sovTypes(uint64(m.SquareSize)) } @@ -3258,22 +3184,7 @@ func (m *EvidenceList) Size() (n int) { return n } -func (m *Messages) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.MessagesList) > 0 { - for _, e := range m.MessagesList { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - return n -} - -func (m *Message) Size() (n int) { +func (m *Blob) Size() (n int) { if m == nil { return 0 } @@ -4507,7 +4418,7 @@ func (m *Data) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Messages", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Blobs", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4534,7 +4445,8 @@ func (m *Data) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Messages.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Blobs = append(m.Blobs, Blob{}) + if err := m.Blobs[len(m.Blobs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5200,91 +5112,7 @@ func (m *EvidenceList) Unmarshal(dAtA []byte) error { } return nil } -func (m *Messages) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Messages: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Messages: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MessagesList", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MessagesList = append(m.MessagesList, &Message{}) - if err := m.MessagesList[len(m.MessagesList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Message) Unmarshal(dAtA []byte) error { +func (m *Blob) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5307,10 +5135,10 @@ func (m *Message) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Message: wiretype end group for non-group") + return fmt.Errorf("proto: Blob: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Message: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Blob: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index dbf7705567..9ec48d9198 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -89,10 +89,10 @@ message Data { repeated bytes txs = 1; // field number 2 is reserved for intermediate state roots - EvidenceList evidence = 3 [(gogoproto.nullable) = false]; - Messages messages = 4 [(gogoproto.nullable) = false]; - uint64 square_size = 5; - bytes hash = 6; + EvidenceList evidence = 3 [(gogoproto.nullable) = false]; + repeated Blob blobs = 4 [(gogoproto.nullable) = false]; + uint64 square_size = 5; + bytes hash = 6; } // DuplicateVoteEvidence contains evidence of a validator signed two conflicting votes. @@ -125,11 +125,9 @@ message EvidenceList { repeated Evidence evidence = 1 [(gogoproto.nullable) = false]; } -message Messages { - repeated Message messages_list = 1; -} - -message Message { +// Blob defines a chunk of data that is attributed to a namespace and under +// usual circumstances, ends up published on-chain. +message Blob { bytes namespace_id = 1; bytes data = 2; } diff --git a/state/test/factory/block.go b/state/test/factory/block.go index 80808b5daa..a8ba78ef81 100644 --- a/state/test/factory/block.go +++ b/state/test/factory/block.go @@ -47,15 +47,13 @@ func MakeBlock(state sm.State, height int64, c *types.Commit) *types.Block { return block } -func MakeData(txs []types.Tx, evd []types.Evidence, msgs []types.Message) types.Data { +func MakeData(txs []types.Tx, evd []types.Evidence, blobs []types.Blob) types.Data { return types.Data{ Txs: txs, Evidence: types.EvidenceData{ Evidence: evd, }, - Messages: types.Messages{ - MessagesList: msgs, - }, + Blobs: blobs, } } diff --git a/state/tx_filter_test.go b/state/tx_filter_test.go index b1fb278b93..69cc19b03e 100644 --- a/state/tx_filter_test.go +++ b/state/tx_filter_test.go @@ -25,8 +25,8 @@ func TestTxFilter(t *testing.T) { tx types.Tx isErr bool }{ - {types.Tx(tmrand.Bytes(2149)), false}, - {types.Tx(tmrand.Bytes(2152)), true}, + {types.Tx(tmrand.Bytes(2151)), false}, + {types.Tx(tmrand.Bytes(2154)), true}, {types.Tx(tmrand.Bytes(3000)), true}, } diff --git a/test/factory/tx.go b/test/factory/tx.go index b6dc0b64d1..128605b152 100644 --- a/test/factory/tx.go +++ b/test/factory/tx.go @@ -15,14 +15,12 @@ func MakeTenTxs(height int64) (txs []types.Tx) { return MakeTxs(height, 10) } -func MakeData(txs []types.Tx, evd []types.Evidence, msgs []types.Message) types.Data { +func MakeData(txs []types.Tx, evd []types.Evidence, blobs []types.Blob) types.Data { return types.Data{ Txs: txs, Evidence: types.EvidenceData{ Evidence: evd, }, - Messages: types.Messages{ - MessagesList: msgs, - }, + Blobs: blobs, } } diff --git a/types/block.go b/types/block.go index 1af71bbffd..edd18e7046 100644 --- a/types/block.go +++ b/types/block.go @@ -1013,13 +1013,12 @@ type Data struct { Evidence EvidenceData `json:"evidence"` - // The messages included in this block. - // TODO: how do messages end up here? (abci) app <-> ll-core? - // A simple approach could be: include them in the Tx above and - // have a mechanism to split them out somehow? Probably better to include - // them only when necessary (before proposing the block) as messages do not - // really need to be processed by tendermint - Messages Messages `json:"msgs"` + // The messages included in this block. TODO: how do messages end up here? + // (abci) app <-> ll-core? A simple approach could be: include them in the + // Tx above and have a mechanism to split them out somehow? Probably better + // to include them only when necessary (before proposing the block) as blobs + // do not really need to be processed by tendermint + Blobs []Blob `json:"blobs"` // SquareSize is the size of the square after splitting all the block data // into shares. The erasure data is discarded after generation, and keeping this @@ -1048,41 +1047,37 @@ func (data *Data) Hash() tmbytes.HexBytes { return data.hash } -type Messages struct { - MessagesList []Message `json:"msgs"` -} - -// ByNamespace implements sort.Interface for Message -type ByNamespace []Message +// ByNamespace implements sort.Interface for Blob +type Blobs []Blob -func (s ByNamespace) Len() int { - return len(s) +func (b Blobs) Len() int { + return len(b) } -func (s ByNamespace) Swap(i, j int) { - s[i], s[j] = s[j], s[i] +func (b Blobs) Swap(i, j int) { + b[i], b[j] = b[j], b[i] } -func (s ByNamespace) Less(i, j int) bool { +func (b Blobs) Less(i, j int) bool { // The following comparison is `<` and not `<=` because bytes.Compare returns 0 for if a == b. // We want this comparison to return `false` if a == b because: // If both Less(i, j) and Less(j, i) are false, // then the elements at index i and j are considered equal. // See https://pkg.go.dev/sort#Interface - return bytes.Compare(s[i].NamespaceID, s[j].NamespaceID) < 0 + return bytes.Compare(b[i].NamespaceID, b[j].NamespaceID) < 0 } // SortMessages sorts messages by ascending namespace id -func (msgs *Messages) SortMessages() { - sort.Sort(ByNamespace(msgs.MessagesList)) +func (b *Blobs) SortMessages() { + sort.Sort(b) } // IsSorted returns whether the messages are sorted by namespace id -func (msgs *Messages) IsSorted() bool { - return sort.IsSorted(ByNamespace(msgs.MessagesList)) +func (b *Blobs) IsSorted() bool { + return sort.IsSorted(b) } -type Message struct { +type Blob struct { // NamespaceID defines the namespace of this message, i.e. the // namespace it will use in the namespaced Merkle tree. NamespaceID namespace.ID @@ -1092,32 +1087,27 @@ type Message struct { Data []byte } -var ( - MessageEmpty = Message{} - MessagesEmpty = Messages{} -) - -func MessageFromProto(p *tmproto.Message) Message { +func BlobFromProto(p *tmproto.Blob) Blob { if p == nil { - return MessageEmpty + return Blob{} } - return Message{ + return Blob{ NamespaceID: p.NamespaceId, Data: p.Data, } } -func MessagesFromProto(p *tmproto.Messages) Messages { +func BlobsFromProto(p []*tmproto.Blob) []Blob { if p == nil { - return MessagesEmpty + return []Blob{} } - msgs := make([]Message, 0, len(p.MessagesList)) + blobs := make([]Blob, 0, len(p)) - for i := 0; i < len(p.MessagesList); i++ { - msgs = append(msgs, MessageFromProto(p.MessagesList[i])) + for i := 0; i < len(p); i++ { + blobs = append(blobs, BlobFromProto(p[i])) } - return Messages{MessagesList: msgs} + return blobs } // StringIndented returns an indented string representation of the transactions. @@ -1158,14 +1148,14 @@ func (data *Data) ToProto() tmproto.Data { } tp.Evidence = *pevd - protoMsgs := make([]*tmproto.Message, len(data.Messages.MessagesList)) - for i, msg := range data.Messages.MessagesList { - protoMsgs[i] = &tmproto.Message{ - NamespaceId: msg.NamespaceID, - Data: msg.Data, + protoBlobs := make([]tmproto.Blob, len(data.Blobs)) + for i, b := range data.Blobs { + protoBlobs[i] = tmproto.Blob{ + NamespaceId: b.NamespaceID, + Data: b.Data, } } - tp.Messages = tmproto.Messages{MessagesList: protoMsgs} + tp.Blobs = protoBlobs tp.SquareSize = data.SquareSize tp.Hash = data.hash @@ -1191,14 +1181,14 @@ func DataFromProto(dp *tmproto.Data) (Data, error) { data.Txs = Txs{} } - if len(dp.Messages.MessagesList) > 0 { - msgs := make([]Message, len(dp.Messages.MessagesList)) - for i, m := range dp.Messages.MessagesList { - msgs[i] = Message{NamespaceID: m.NamespaceId, Data: m.Data} + if len(dp.Blobs) > 0 { + blobs := make([]Blob, len(dp.Blobs)) + for i, m := range dp.Blobs { + blobs[i] = Blob{NamespaceID: m.NamespaceId, Data: m.Data} } - data.Messages = Messages{MessagesList: msgs} + data.Blobs = blobs } else { - data.Messages = Messages{} + data.Blobs = []Blob{} } evdData := new(EvidenceData) diff --git a/types/block_test.go b/types/block_test.go index edbe14e5a2..45ec0a5c46 100644 --- a/types/block_test.go +++ b/types/block_test.go @@ -658,10 +658,10 @@ func TestBlockProtoBuf(t *testing.T) { func TestBlockDataProtobuf(t *testing.T) { type test struct { - name string - txs Txs - evd EvidenceData - msgs []Message + name string + txs Txs + evd EvidenceData + blobs []Blob } tests := []test{ { @@ -671,7 +671,7 @@ func TestBlockDataProtobuf(t *testing.T) { name: "everything", txs: Txs([]Tx{stdbytes.Repeat([]byte{1}, 200)}), evd: EvidenceData{Evidence: EvidenceList([]Evidence{})}, - msgs: []Message{ + blobs: []Blob{ { NamespaceID: []byte{8, 7, 6, 5, 4, 3, 2, 1}, Data: stdbytes.Repeat([]byte{3, 2, 1, 0}, 100), @@ -685,7 +685,7 @@ func TestBlockDataProtobuf(t *testing.T) { } for _, tt := range tests { - d := Data{Txs: tt.txs, Evidence: tt.evd, Messages: Messages{MessagesList: tt.msgs}} + d := Data{Txs: tt.txs, Evidence: tt.evd, Blobs: tt.blobs} firstHash := d.Hash() pd := d.ToProto() d2, err := DataFromProto(&pd) @@ -855,7 +855,7 @@ func TestBlockIDEquals(t *testing.T) { } func TestMessagesIsSorted(t *testing.T) { - sortedMessages := Messages{MessagesList: []Message{ + sortedBlobs := []Blob{ { NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8}, Data: stdbytes.Repeat([]byte{1}, 100), @@ -864,8 +864,8 @@ func TestMessagesIsSorted(t *testing.T) { NamespaceID: []byte{8, 7, 6, 5, 4, 3, 2, 1}, Data: stdbytes.Repeat([]byte{2}, 100), }, - }} - sameNamespaceMessages := Messages{MessagesList: []Message{ + } + sameNamespacedBlobs := []Blob{ { NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8}, Data: stdbytes.Repeat([]byte{1}, 100), @@ -874,8 +874,8 @@ func TestMessagesIsSorted(t *testing.T) { NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8}, Data: stdbytes.Repeat([]byte{2}, 100), }, - }} - unsortedMessages := Messages{MessagesList: []Message{ + } + unsortedBlobs := []Blob{ { NamespaceID: []byte{8, 7, 6, 5, 4, 3, 2, 1}, Data: stdbytes.Repeat([]byte{1}, 100), @@ -884,23 +884,24 @@ func TestMessagesIsSorted(t *testing.T) { NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8}, Data: stdbytes.Repeat([]byte{2}, 100), }, - }} + } type testCase struct { descripton string - messages Messages + blobs []Blob want bool } tests := []testCase{ - {"sorted messages", sortedMessages, true}, - {"same namespace messages", sameNamespaceMessages, true}, - {"unsorted messages", unsortedMessages, false}, + {"sorted blobs", sortedBlobs, true}, + {"same namespace blobs", sameNamespacedBlobs, true}, + {"unsorted blobs", unsortedBlobs, false}, } for _, tc := range tests { t.Run(tc.descripton, func(t *testing.T) { - assert.Equal(t, tc.want, tc.messages.IsSorted()) + bs := Blobs(tc.blobs) + assert.Equal(t, tc.want, bs.IsSorted()) }) } } diff --git a/types/test_util.go b/types/test_util.go index eb3cdaec85..9b3ae322d0 100644 --- a/types/test_util.go +++ b/types/test_util.go @@ -79,14 +79,15 @@ func MakeVote( return vote, nil } -func makeData(txs []Tx, evd []Evidence, msgs []Message) Data { +func makeData(txs []Tx, evd []Evidence, blobs []Blob) Data { + if blobs == nil { + blobs = []Blob{} + } return Data{ Txs: txs, Evidence: EvidenceData{ Evidence: evd, }, - Messages: Messages{ - MessagesList: msgs, - }, + Blobs: blobs, } } diff --git a/types/tx_test.go b/types/tx_test.go index ec50892fa4..add4278f4c 100644 --- a/types/tx_test.go +++ b/types/tx_test.go @@ -56,12 +56,10 @@ func TestUnwrapMalleatedTx(t *testing.T) { Evidence: EvidenceData{ Evidence: nil, }, - Messages: Messages{ - MessagesList: []Message{ - { - NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8}, - Data: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9}, - }, + Blobs: []Blob{ + { + NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8}, + Data: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9}, }, }, }