Browse Source

remove custom type int https://github.com/gogo/protobuf/issues/359

pull/1780/head
Ethan Buchman 7 years ago
parent
commit
2b804bb5a1
5 changed files with 132 additions and 108 deletions
  1. +1
    -1
      CHANGELOG.md
  2. +1
    -0
      Makefile
  3. +4
    -2
      types/messages_test.go
  4. +123
    -102
      types/types.pb.go
  5. +3
    -3
      types/types.proto

+ 1
- 1
CHANGELOG.md View File

@ -13,7 +13,7 @@ BREAKING CHANGES:
- [types] use `customtype` feature of `gogo/protobuf` to replace `[]byte` with `data.Bytes` in all generated types :)
- this eliminates the need for additional types like ResultQuery
- [types] `pubKey` -> `pub_key`
- [types] `uint64` -> `int32` for `Header.num_txs` and `PartSetHeader.total`, but generated code uses `int`
- [types] `uint64` -> `int32` for `Header.num_txs` and `PartSetHeader.total`
- [types] `uint64` -> `int64` for everything else
- [abci-cli] codes are printed as their number instead of a message, except for `code == 0`, which is still printed as `OK`


+ 1
- 0
Makefile View File

@ -23,6 +23,7 @@ install_protoc:
rm -rf protobuf-3.4.1
protoc:
## Note to self:
## On "error while loading shared libraries: libprotobuf.so.14: cannot open shared object file: No such file or directory"
## ldconfig (may require sudo)
## https://stackoverflow.com/a/25518702


+ 4
- 2
types/messages_test.go View File

@ -10,7 +10,9 @@ import (
func TestWriteReadMessage(t *testing.T) {
cases := []proto.Message{
&RequestEcho{"hello"},
&Header{
NumTxs: 4,
},
// TODO: add the rest
}
@ -19,7 +21,7 @@ func TestWriteReadMessage(t *testing.T) {
err := WriteMessage(c, buf)
assert.Nil(t, err)
msg := new(RequestEcho)
msg := new(Header)
err = ReadMessage(buf, msg)
assert.Nil(t, err)


+ 123
- 102
types/types.pb.go View File

@ -647,7 +647,7 @@ func (m *RequestInitChain) GetValidators() []*Validator {
type RequestBeginBlock struct {
Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
Header *Header `protobuf:"bytes,2,opt,name=header" json:"header,omitempty"`
AbsentValidators []int `protobuf:"varint,3,rep,packed,name=absent_validators,json=absentValidators,customtype=int" json:"absent_validators"`
AbsentValidators []int32 `protobuf:"varint,3,rep,packed,name=absent_validators,json=absentValidators" json:"absent_validators,omitempty"`
ByzantineValidators []*Evidence `protobuf:"bytes,4,rep,name=byzantine_validators,json=byzantineValidators" json:"byzantine_validators,omitempty"`
}
@ -670,6 +670,13 @@ func (m *RequestBeginBlock) GetHeader() *Header {
return nil
}
func (m *RequestBeginBlock) GetAbsentValidators() []int32 {
if m != nil {
return m.AbsentValidators
}
return nil
}
func (m *RequestBeginBlock) GetByzantineValidators() []*Evidence {
if m != nil {
return m.ByzantineValidators
@ -1398,7 +1405,7 @@ type Header struct {
ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"`
NumTxs int `protobuf:"varint,4,opt,name=num_txs,json=numTxs,proto3,customtype=int" json:"num_txs"`
NumTxs int32 `protobuf:"varint,4,opt,name=num_txs,json=numTxs,proto3" json:"num_txs,omitempty"`
LastBlockId *BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId" json:"last_block_id,omitempty"`
LastCommitHash []byte `protobuf:"bytes,6,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"`
DataHash []byte `protobuf:"bytes,7,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"`
@ -1432,6 +1439,13 @@ func (m *Header) GetTime() int64 {
return 0
}
func (m *Header) GetNumTxs() int32 {
if m != nil {
return m.NumTxs
}
return 0
}
func (m *Header) GetLastBlockId() *BlockID {
if m != nil {
return m.LastBlockId
@ -1492,7 +1506,7 @@ func (m *BlockID) GetParts() *PartSetHeader {
}
type PartSetHeader struct {
Total int `protobuf:"varint,1,opt,name=total,proto3,customtype=int" json:"total"`
Total int32 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"`
}
@ -1501,6 +1515,13 @@ func (m *PartSetHeader) String() string { return proto.CompactTextStr
func (*PartSetHeader) ProtoMessage() {}
func (*PartSetHeader) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{27} }
func (m *PartSetHeader) GetTotal() int32 {
if m != nil {
return m.Total
}
return 0
}
func (m *PartSetHeader) GetHash() []byte {
if m != nil {
return m.Hash
@ -2036,103 +2057,103 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) }
var fileDescriptorTypes = []byte{
// 1565 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0x4d, 0x6f, 0xdb, 0x46,
0x13, 0xc7, 0x2d, 0x51, 0x12, 0xa5, 0x91, 0x5f, 0xe4, 0xb5, 0x9f, 0x44, 0x51, 0x0e, 0x71, 0x88,
0x27, 0x4f, 0xec, 0x3c, 0x89, 0x95, 0x3a, 0x48, 0xe1, 0x24, 0x45, 0x01, 0x2b, 0x4e, 0x2a, 0x21,
0x40, 0x9a, 0x32, 0x46, 0xae, 0x02, 0x25, 0xae, 0xa4, 0x45, 0x24, 0x92, 0x21, 0x57, 0x8e, 0x5c,
0xf4, 0x23, 0xe4, 0xde, 0x73, 0x7b, 0xec, 0xb9, 0x40, 0xbf, 0x41, 0xd1, 0x43, 0x3f, 0x41, 0x0f,
0xf9, 0x2c, 0xc5, 0xce, 0x2e, 0x5f, 0x4d, 0xe6, 0x90, 0x43, 0x2e, 0xc6, 0x2e, 0x67, 0xfe, 0xab,
0xd9, 0xe5, 0xf0, 0x37, 0xb3, 0x86, 0x6d, 0x7e, 0xe1, 0xd1, 0xa0, 0x8b, 0x7f, 0x0f, 0x3d, 0xdf,
0xe5, 0x2e, 0xa9, 0xe2, 0xa4, 0x73, 0x6f, 0xca, 0xf8, 0x6c, 0x39, 0x3a, 0x1c, 0xbb, 0x8b, 0xee,
0xd4, 0x9d, 0xba, 0x5d, 0xb4, 0x8e, 0x96, 0x13, 0x9c, 0xe1, 0x04, 0x47, 0x52, 0x65, 0xfc, 0x59,
0x01, 0xdd, 0xa4, 0xef, 0x96, 0x34, 0xe0, 0x64, 0x1f, 0x2a, 0x74, 0x3c, 0x73, 0xdb, 0xa5, 0xbd,
0xd2, 0x7e, 0xf3, 0x88, 0x1c, 0xca, 0xd5, 0x95, 0xf5, 0xd9, 0x78, 0xe6, 0xf6, 0xd7, 0x4c, 0xf4,
0x20, 0xff, 0x87, 0xea, 0x64, 0xbe, 0x0c, 0x66, 0xed, 0x32, 0xba, 0xee, 0xa4, 0x5d, 0x9f, 0x0b,
0x53, 0x7f, 0xcd, 0x94, 0x3e, 0x62, 0x59, 0xe6, 0x4c, 0xdc, 0xb6, 0x96, 0xb7, 0xec, 0xc0, 0x99,
0xe0, 0xb2, 0xc2, 0x83, 0x1c, 0x03, 0x04, 0x94, 0x0f, 0x5d, 0x8f, 0x33, 0xd7, 0x69, 0x57, 0xd0,
0xff, 0x6a, 0xda, 0xff, 0x35, 0xe5, 0xdf, 0xa3, 0xb9, 0xbf, 0x66, 0x36, 0x82, 0x70, 0x22, 0x94,
0x36, 0x9d, 0xb3, 0x73, 0xea, 0x0f, 0xf9, 0xaa, 0x5d, 0xcd, 0x53, 0x9e, 0x4a, 0xfb, 0xd9, 0x4a,
0x28, 0xed, 0x70, 0x42, 0x8e, 0xa0, 0x3e, 0x9e, 0xd1, 0xf1, 0x5b, 0xa1, 0xab, 0xa1, 0xee, 0x3f,
0x69, 0xdd, 0x53, 0x61, 0x45, 0x95, 0x3e, 0x96, 0x43, 0x72, 0x08, 0xb5, 0xb1, 0xbb, 0x58, 0x30,
0xde, 0xd6, 0x51, 0xb1, 0x9b, 0x51, 0xa0, 0xad, 0xbf, 0x66, 0x2a, 0x2f, 0x71, 0x5c, 0xef, 0x96,
0xd4, 0xbf, 0x68, 0xd7, 0xf3, 0x8e, 0xeb, 0x07, 0x61, 0x12, 0xc7, 0x85, 0x3e, 0x62, 0x2b, 0xcc,
0x61, 0x7c, 0x38, 0x9e, 0x59, 0xcc, 0x69, 0x37, 0xf2, 0xb6, 0x32, 0x70, 0x18, 0x7f, 0x2a, 0xcc,
0x62, 0x2b, 0x2c, 0x9c, 0x90, 0x27, 0xd0, 0x1c, 0xd1, 0x29, 0x73, 0x86, 0xa3, 0xb9, 0x3b, 0x7e,
0xdb, 0x06, 0x94, 0xb6, 0xd3, 0xd2, 0x9e, 0x70, 0xe8, 0x09, 0x7b, 0x7f, 0xcd, 0x84, 0x51, 0x34,
0x23, 0x0f, 0xa1, 0x41, 0x1d, 0x5b, 0x49, 0x9b, 0x28, 0xbd, 0x92, 0xc9, 0x00, 0xc7, 0x0e, 0x85,
0x75, 0xaa, 0xc6, 0x3d, 0x1d, 0xaa, 0xe7, 0xd6, 0x7c, 0x49, 0x8d, 0xdb, 0xd0, 0x4c, 0x64, 0x0a,
0x69, 0x83, 0xbe, 0xa0, 0x41, 0x60, 0x4d, 0x29, 0xa6, 0x53, 0xc3, 0x0c, 0xa7, 0xc6, 0x26, 0xac,
0x27, 0xf3, 0x24, 0x21, 0x14, 0xb9, 0x20, 0x84, 0xe7, 0xd4, 0x0f, 0x44, 0x02, 0x28, 0xa1, 0x9a,
0x1a, 0x8f, 0xa1, 0x95, 0x4d, 0x02, 0xd2, 0x02, 0xed, 0x2d, 0xbd, 0x50, 0x9e, 0x62, 0x48, 0x76,
0x55, 0x40, 0x98, 0x9a, 0x0d, 0x53, 0x45, 0x67, 0x44, 0xda, 0x28, 0x0d, 0xc8, 0x26, 0x94, 0xf9,
0x0a, 0xa5, 0xeb, 0x66, 0x99, 0xaf, 0x8c, 0x3d, 0xd8, 0x4c, 0xbf, 0xf2, 0x4b, 0x1e, 0x76, 0x14,
0x3a, 0xbe, 0x33, 0x42, 0xa0, 0x62, 0x5b, 0xdc, 0x52, 0x1e, 0x38, 0x16, 0xcf, 0x3c, 0x8b, 0xcf,
0xd4, 0xcf, 0xe3, 0x98, 0x5c, 0x81, 0xda, 0x8c, 0xb2, 0xe9, 0x8c, 0xe3, 0x37, 0xa0, 0x99, 0x6a,
0x26, 0x62, 0xf5, 0x7c, 0xf7, 0x9c, 0x62, 0xaa, 0xd7, 0x4d, 0x39, 0x31, 0xb6, 0x60, 0x23, 0x95,
0x48, 0xc6, 0x69, 0x14, 0x7c, 0xf4, 0xe2, 0xc9, 0x7d, 0x80, 0x73, 0x6b, 0xce, 0x6c, 0x8b, 0xbb,
0x7e, 0xd0, 0x2e, 0xed, 0x69, 0xfb, 0xcd, 0xa3, 0x96, 0x7a, 0x5f, 0x6f, 0x42, 0x83, 0x99, 0xf0,
0x31, 0xfe, 0x2e, 0xc1, 0xf6, 0xa5, 0x24, 0x10, 0xe1, 0xce, 0xac, 0x60, 0x16, 0x6e, 0x41, 0x8c,
0xc9, 0x2d, 0x11, 0xae, 0x65, 0x53, 0x5f, 0x7d, 0xde, 0x1b, 0x6a, 0xdd, 0x3e, 0x3e, 0x34, 0x95,
0x91, 0x1c, 0xc3, 0xb6, 0x35, 0x0a, 0xa8, 0xc3, 0x87, 0x89, 0x48, 0xb4, 0x3d, 0x6d, 0xbf, 0xda,
0x6b, 0xfe, 0xf5, 0xf1, 0xc6, 0xda, 0x3f, 0x1f, 0x6f, 0x68, 0xcc, 0xe1, 0x66, 0x4b, 0x7a, 0x45,
0x51, 0x05, 0xa4, 0x07, 0xbb, 0xa3, 0x8b, 0x1f, 0x2d, 0x87, 0x33, 0x87, 0x26, 0xc5, 0x15, 0xdc,
0xc6, 0x96, 0xfa, 0xb9, 0x67, 0xe7, 0xcc, 0xa6, 0xce, 0x98, 0x9a, 0x3b, 0x91, 0x73, 0xbc, 0x86,
0x71, 0x00, 0x5b, 0x99, 0xbc, 0x4c, 0x1c, 0x73, 0x29, 0x79, 0xcc, 0xc6, 0x87, 0x2a, 0xd4, 0x4d,
0x1a, 0x78, 0xae, 0x13, 0x50, 0x72, 0x0c, 0x0d, 0xba, 0x1a, 0x53, 0x89, 0x98, 0x52, 0xe6, 0x13,
0x91, 0x3e, 0xcf, 0x42, 0xbb, 0xf8, 0xbc, 0x22, 0x67, 0x72, 0xa0, 0xf0, 0x98, 0x65, 0x9e, 0x12,
0x25, 0xf9, 0x78, 0x37, 0xe4, 0xa3, 0x96, 0xe1, 0x83, 0xf4, 0xcd, 0x00, 0xf2, 0x40, 0x01, 0xb2,
0x92, 0xbb, 0x70, 0x8a, 0x90, 0x8f, 0x52, 0x84, 0xac, 0xe6, 0x86, 0x5f, 0x80, 0xc8, 0x47, 0x29,
0x44, 0xd6, 0x72, 0xa5, 0x05, 0x8c, 0x7c, 0x90, 0x60, 0xa4, 0x9e, 0x41, 0x83, 0x14, 0xe6, 0x40,
0xb2, 0x1b, 0x41, 0xb2, 0x9e, 0xc1, 0xaa, 0x92, 0x64, 0x29, 0x79, 0x37, 0xa4, 0x64, 0x23, 0xf7,
0xd0, 0x32, 0x98, 0x7c, 0x94, 0xc2, 0x24, 0xe4, 0x6e, 0xa7, 0x80, 0x93, 0xdf, 0xa4, 0x39, 0x29,
0x61, 0x77, 0x2d, 0xa3, 0x2d, 0x04, 0xe5, 0xd7, 0x49, 0x50, 0xae, 0x67, 0xf0, 0xac, 0x72, 0xe1,
0x93, 0xa4, 0x3c, 0x10, 0xdf, 0x61, 0x26, 0xd3, 0x04, 0x0a, 0xa8, 0xef, 0xbb, 0xbe, 0x42, 0x99,
0x9c, 0x18, 0xfb, 0x02, 0x38, 0x71, 0x7e, 0x7d, 0x82, 0xaa, 0x08, 0x8d, 0x44, 0x76, 0x19, 0x3f,
0x97, 0x62, 0x2d, 0x82, 0x35, 0x09, 0xab, 0x86, 0x82, 0x55, 0x02, 0xb6, 0xe5, 0x14, 0x6c, 0xc9,
0x1d, 0xd8, 0x9e, 0x5b, 0x01, 0x97, 0xdb, 0x1c, 0xa6, 0xe8, 0xb5, 0x25, 0x0c, 0x72, 0x7f, 0x12,
0x63, 0xf7, 0x60, 0x27, 0xe1, 0x6b, 0x79, 0xde, 0x10, 0x91, 0x52, 0x41, 0xa4, 0xb4, 0x22, 0xef,
0x13, 0xcf, 0xeb, 0x5b, 0xc1, 0xcc, 0xb8, 0x15, 0xef, 0x3f, 0x05, 0xf2, 0xb9, 0x3b, 0x0d, 0x41,
0x3e, 0x77, 0xa7, 0xc6, 0xaf, 0xa5, 0xd8, 0x2f, 0x86, 0x36, 0x81, 0xca, 0xd8, 0xb5, 0xe5, 0xf6,
0x37, 0x4c, 0x1c, 0x93, 0x53, 0xb5, 0x33, 0xb1, 0x85, 0xf5, 0xde, 0x7d, 0xc5, 0x9e, 0xfd, 0x44,
0x23, 0xc4, 0xa9, 0x63, 0x53, 0x7f, 0xc1, 0x1c, 0xde, 0x9d, 0xba, 0xf7, 0xde, 0x33, 0x9f, 0x76,
0x85, 0xe2, 0xb0, 0x77, 0xc1, 0x69, 0xa0, 0xce, 0x42, 0x45, 0xa0, 0x45, 0x11, 0x90, 0x9b, 0x50,
0xe1, 0xd6, 0x34, 0xc4, 0x52, 0x48, 0xc1, 0x17, 0x6f, 0x5e, 0x59, 0xcc, 0x37, 0xd1, 0x64, 0xfc,
0x52, 0x12, 0x18, 0x4a, 0x7d, 0x03, 0x5f, 0x34, 0xc4, 0x16, 0x68, 0x53, 0x2b, 0xc0, 0xa3, 0xd6,
0x4c, 0x31, 0x14, 0x4f, 0x26, 0x94, 0x22, 0x1a, 0x34, 0x53, 0x0c, 0x8d, 0x3f, 0xca, 0x71, 0x6e,
0x44, 0x75, 0xeb, 0x52, 0x84, 0xbb, 0x50, 0x65, 0x8e, 0x4d, 0x57, 0x18, 0xa2, 0x66, 0xca, 0x09,
0xe9, 0xc9, 0xfa, 0xaa, 0x7d, 0x66, 0xd8, 0x58, 0x91, 0x9f, 0x87, 0x15, 0xb9, 0xf2, 0x99, 0xab,
0x48, 0xb9, 0x58, 0xc7, 0xf3, 0x5d, 0x77, 0x82, 0x7b, 0xfb, 0xac, 0x75, 0x50, 0x9e, 0x28, 0x13,
0xb5, 0x54, 0x35, 0x56, 0xa7, 0xab, 0xc7, 0x29, 0xf8, 0x93, 0xe8, 0x08, 0x92, 0xb4, 0xfa, 0x92,
0xef, 0xd6, 0xd8, 0x89, 0xf3, 0x3f, 0x02, 0x99, 0xb1, 0x0b, 0xe4, 0x32, 0xa1, 0x64, 0x6b, 0x94,
0x66, 0x0f, 0xf9, 0x1f, 0x54, 0x6d, 0x36, 0x99, 0x14, 0x37, 0x07, 0xd2, 0x6c, 0xfc, 0x5e, 0x86,
0x9a, 0xac, 0xec, 0xe4, 0x9a, 0xe0, 0xbc, 0xc5, 0x9c, 0x21, 0xb3, 0x43, 0xbe, 0xe0, 0x7c, 0x60,
0x27, 0x0e, 0xad, 0x9c, 0x3a, 0x34, 0x02, 0x15, 0xce, 0x16, 0x54, 0xa1, 0x01, 0xc7, 0xe4, 0xbf,
0xa0, 0x3b, 0xcb, 0xc5, 0x90, 0xaf, 0x64, 0x62, 0x66, 0xda, 0x81, 0x9a, 0xb3, 0x5c, 0x9c, 0xad,
0x02, 0x72, 0x04, 0x1b, 0x09, 0x6a, 0x30, 0x5b, 0x55, 0xb3, 0x4d, 0x15, 0x27, 0x6e, 0x62, 0x70,
0x6a, 0x36, 0x23, 0x7e, 0x0c, 0x6c, 0xb2, 0x0f, 0x88, 0x93, 0xa1, 0xac, 0x18, 0x12, 0x33, 0x35,
0xc4, 0xcc, 0xa6, 0x78, 0xae, 0x4a, 0x8a, 0xe8, 0x61, 0xae, 0x43, 0x43, 0x1c, 0xab, 0x74, 0xd1,
0xd1, 0xa5, 0x2e, 0x1e, 0xa0, 0xf1, 0x36, 0x6c, 0xc5, 0x5d, 0x87, 0x74, 0xa9, 0xcb, 0x55, 0xe2,
0xc7, 0xe8, 0x78, 0x0d, 0xea, 0x11, 0xce, 0x1a, 0xe8, 0xa1, 0x5b, 0x8a, 0x62, 0x03, 0xd0, 0x55,
0x88, 0xb9, 0x3d, 0xd4, 0x1d, 0xa8, 0x7a, 0x96, 0xcf, 0x03, 0xd5, 0x2d, 0x84, 0xc5, 0xec, 0x95,
0xe5, 0x8b, 0xee, 0x55, 0x75, 0x52, 0xd2, 0xc5, 0x78, 0x0e, 0x1b, 0xa9, 0xe7, 0xe4, 0x26, 0x54,
0xb9, 0xcb, 0xad, 0x39, 0xae, 0x98, 0x39, 0x3e, 0x69, 0x89, 0x7e, 0xb3, 0x1c, 0xff, 0xa6, 0xf1,
0x18, 0x1a, 0xd1, 0xdb, 0x25, 0x57, 0x41, 0xf7, 0x96, 0xa3, 0x61, 0xd8, 0x1d, 0xaf, 0x9b, 0x35,
0x6f, 0x39, 0x7a, 0x21, 0x1b, 0x64, 0xcf, 0x7d, 0xaf, 0x9a, 0x3b, 0xcd, 0x94, 0x13, 0xe3, 0x09,
0xd4, 0xc3, 0x7e, 0xab, 0x58, 0x5a, 0x90, 0x04, 0xc6, 0x6f, 0x25, 0xa8, 0x49, 0x2c, 0xe6, 0x34,
0xe4, 0x5f, 0x61, 0xa7, 0xba, 0xa4, 0x43, 0x71, 0x02, 0x28, 0xdc, 0x8c, 0x2e, 0x81, 0x52, 0x74,
0x78, 0x76, 0xe1, 0x51, 0xb3, 0x81, 0x5e, 0x62, 0x48, 0x6e, 0xc2, 0xba, 0x94, 0x04, 0xdc, 0x67,
0x4e, 0xf8, 0x51, 0x34, 0xf1, 0xd9, 0x6b, 0x7c, 0x24, 0xde, 0xaf, 0x74, 0x61, 0x0e, 0x57, 0xf8,
0xab, 0xe3, 0x83, 0x81, 0xc3, 0x8d, 0xeb, 0x50, 0xc1, 0x75, 0x00, 0x6a, 0xaf, 0xcf, 0xcc, 0xc1,
0xcb, 0xef, 0x5a, 0x6b, 0x44, 0x07, 0x6d, 0xf0, 0xf2, 0xac, 0x55, 0x3a, 0xfa, 0x50, 0x85, 0xad,
0x93, 0xde, 0xd3, 0xc1, 0x89, 0xe7, 0xcd, 0xd9, 0xd8, 0xc2, 0xea, 0xd3, 0x85, 0x0a, 0xd6, 0xd7,
0x9c, 0x3b, 0x6f, 0x27, 0xaf, 0xd1, 0x23, 0x47, 0x50, 0xc5, 0x32, 0x4b, 0xf2, 0xae, 0xbe, 0x9d,
0xdc, 0x7e, 0x4f, 0xfc, 0x88, 0x2c, 0xc4, 0x97, 0x6f, 0xc0, 0x9d, 0xbc, 0xa6, 0x8f, 0x7c, 0x0b,
0x8d, 0xb8, 0x40, 0x16, 0xdd, 0x83, 0x3b, 0x85, 0xed, 0x9f, 0xd0, 0xc7, 0x85, 0xb3, 0xe8, 0x36,
0xdc, 0x29, 0xec, 0x01, 0xc9, 0x31, 0xe8, 0x61, 0x4d, 0xcb, 0xbf, 0x13, 0x77, 0x0a, 0xda, 0x40,
0x71, 0x3c, 0xb2, 0xd2, 0xe4, 0x5d, 0x75, 0x3b, 0xb9, 0x9d, 0x1d, 0x79, 0x08, 0x35, 0x05, 0xd9,
0xdc, 0xeb, 0x74, 0x27, 0xbf, 0x7f, 0x14, 0x9b, 0x8c, 0x6f, 0x45, 0x45, 0xf7, 0xe4, 0x4e, 0x61,
0x67, 0x48, 0x4e, 0x00, 0x12, 0xd7, 0xa1, 0xc2, 0xdb, 0x72, 0xa7, 0xb8, 0x3f, 0x24, 0xe2, 0xdb,
0x89, 0xee, 0x20, 0xf9, 0x77, 0xe6, 0x4e, 0x51, 0x8b, 0x38, 0xaa, 0xe1, 0xff, 0x61, 0x1e, 0xfc,
0x1b, 0x00, 0x00, 0xff, 0xff, 0x93, 0x8a, 0xe6, 0x33, 0xd2, 0x11, 0x00, 0x00,
// 1554 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0xcb, 0x6e, 0xdb, 0x46,
0x17, 0xc7, 0x2d, 0x51, 0xd4, 0xe5, 0xf8, 0x26, 0x8f, 0xfd, 0x25, 0x8a, 0xb2, 0x88, 0x43, 0x20,
0x5f, 0xe4, 0x5c, 0xac, 0x7c, 0x0e, 0xf2, 0x21, 0x4e, 0x8a, 0x02, 0x56, 0x9c, 0x54, 0x42, 0x80,
0x34, 0x9d, 0x18, 0xd9, 0x0a, 0x94, 0x38, 0x92, 0x88, 0x48, 0x24, 0x43, 0x8e, 0x1c, 0xb9, 0xe8,
0x23, 0x64, 0xdf, 0x75, 0xbb, 0x29, 0xd0, 0x17, 0xe8, 0xb2, 0xbb, 0xa2, 0xcf, 0xd0, 0x45, 0x9e,
0xa5, 0x98, 0x33, 0xc3, 0xab, 0xc9, 0x2c, 0xb2, 0xc8, 0xc6, 0x98, 0xcb, 0xf9, 0x8f, 0xce, 0x0c,
0xcf, 0xfc, 0xce, 0x19, 0xc3, 0x0e, 0xbf, 0xf0, 0x58, 0xd0, 0xc5, 0xbf, 0x87, 0x9e, 0xef, 0x72,
0x97, 0xe8, 0xd8, 0x69, 0xdf, 0x9f, 0xda, 0x7c, 0xb6, 0x1c, 0x1d, 0x8e, 0xdd, 0x45, 0x77, 0xea,
0x4e, 0xdd, 0x2e, 0xce, 0x8e, 0x96, 0x13, 0xec, 0x61, 0x07, 0x5b, 0x52, 0x65, 0xfc, 0x55, 0x81,
0x1a, 0x65, 0xef, 0x97, 0x2c, 0xe0, 0xa4, 0x03, 0x15, 0x36, 0x9e, 0xb9, 0xad, 0xd2, 0x7e, 0xa9,
0xb3, 0x7e, 0x44, 0x0e, 0xe5, 0xea, 0x6a, 0xf6, 0xf9, 0x78, 0xe6, 0xf6, 0xd7, 0x28, 0x5a, 0x90,
0xbb, 0xa0, 0x4f, 0xe6, 0xcb, 0x60, 0xd6, 0x2a, 0xa3, 0xe9, 0x6e, 0xda, 0xf4, 0x85, 0x98, 0xea,
0xaf, 0x51, 0x69, 0x23, 0x96, 0xb5, 0x9d, 0x89, 0xdb, 0xd2, 0xf2, 0x96, 0x1d, 0x38, 0x13, 0x5c,
0x56, 0x58, 0x90, 0xc7, 0x00, 0x01, 0xe3, 0x43, 0xd7, 0xe3, 0xb6, 0xeb, 0xb4, 0x2a, 0x68, 0x7f,
0x35, 0x6d, 0xff, 0x86, 0xf1, 0xef, 0x71, 0xba, 0xbf, 0x46, 0x1b, 0x41, 0xd8, 0x11, 0x4a, 0x8b,
0xcd, 0xed, 0x73, 0xe6, 0x0f, 0xf9, 0xaa, 0xa5, 0xe7, 0x29, 0x4f, 0xe5, 0xfc, 0xd9, 0x4a, 0x28,
0xad, 0xb0, 0x43, 0x8e, 0xa0, 0x3e, 0x9e, 0xb1, 0xf1, 0x3b, 0xa1, 0xab, 0xa2, 0xee, 0x3f, 0x69,
0xdd, 0x33, 0x31, 0x8b, 0xaa, 0xda, 0x58, 0x36, 0xc9, 0x21, 0x54, 0xc7, 0xee, 0x62, 0x61, 0xf3,
0x56, 0x0d, 0x15, 0x7b, 0x19, 0x05, 0xce, 0xf5, 0xd7, 0xa8, 0xb2, 0x12, 0xc7, 0xf5, 0x7e, 0xc9,
0xfc, 0x8b, 0x56, 0x3d, 0xef, 0xb8, 0x7e, 0x10, 0x53, 0xe2, 0xb8, 0xd0, 0x46, 0x6c, 0xc5, 0x76,
0x6c, 0x3e, 0x1c, 0xcf, 0x4c, 0xdb, 0x69, 0x35, 0xf2, 0xb6, 0x32, 0x70, 0x6c, 0xfe, 0x4c, 0x4c,
0x8b, 0xad, 0xd8, 0x61, 0x87, 0x3c, 0x85, 0xf5, 0x11, 0x9b, 0xda, 0xce, 0x70, 0x34, 0x77, 0xc7,
0xef, 0x5a, 0x80, 0xd2, 0x56, 0x5a, 0xda, 0x13, 0x06, 0x3d, 0x31, 0xdf, 0x5f, 0xa3, 0x30, 0x8a,
0x7a, 0xe4, 0x11, 0x34, 0x98, 0x63, 0x29, 0xe9, 0x3a, 0x4a, 0xaf, 0x64, 0x22, 0xc0, 0xb1, 0x42,
0x61, 0x9d, 0xa9, 0x76, 0xaf, 0x06, 0xfa, 0xb9, 0x39, 0x5f, 0x32, 0xe3, 0x36, 0xac, 0x27, 0x22,
0x85, 0xb4, 0xa0, 0xb6, 0x60, 0x41, 0x60, 0x4e, 0x19, 0x86, 0x53, 0x83, 0x86, 0x5d, 0x63, 0x0b,
0x36, 0x92, 0x71, 0x92, 0x10, 0x8a, 0x58, 0x10, 0xc2, 0x73, 0xe6, 0x07, 0x22, 0x00, 0x94, 0x50,
0x75, 0x8d, 0x27, 0xd0, 0xcc, 0x06, 0x01, 0x69, 0x82, 0xf6, 0x8e, 0x5d, 0x28, 0x4b, 0xd1, 0x24,
0x7b, 0xca, 0x21, 0x0c, 0xcd, 0x06, 0x55, 0xde, 0x19, 0x91, 0x36, 0x0a, 0x03, 0xb2, 0x05, 0x65,
0xbe, 0x42, 0xe9, 0x06, 0x2d, 0xf3, 0x95, 0xb1, 0x0f, 0x5b, 0xe9, 0x4f, 0x7e, 0xc9, 0xc2, 0x8a,
0x5c, 0xc7, 0x6f, 0x46, 0x08, 0x54, 0x2c, 0x93, 0x9b, 0xca, 0x02, 0xdb, 0x62, 0xcc, 0x33, 0xf9,
0x4c, 0xfd, 0x3c, 0xb6, 0xc9, 0x15, 0xa8, 0xce, 0x98, 0x3d, 0x9d, 0x71, 0xbc, 0x03, 0x1a, 0x55,
0x3d, 0xe1, 0xab, 0xe7, 0xbb, 0xe7, 0x0c, 0x43, 0xbd, 0x4e, 0x65, 0xc7, 0xd8, 0x86, 0xcd, 0x54,
0x20, 0x19, 0xa7, 0x91, 0xf3, 0xd1, 0x87, 0x27, 0x0f, 0x00, 0xce, 0xcd, 0xb9, 0x6d, 0x99, 0xdc,
0xf5, 0x83, 0x56, 0x69, 0x5f, 0xeb, 0xac, 0x1f, 0x35, 0xd5, 0xf7, 0x7a, 0x1b, 0x4e, 0xd0, 0x84,
0x8d, 0xf1, 0x67, 0x09, 0x76, 0x2e, 0x05, 0x81, 0x70, 0x77, 0x66, 0x06, 0xb3, 0x70, 0x0b, 0xa2,
0x4d, 0x6e, 0x09, 0x77, 0x4d, 0x8b, 0xf9, 0xea, 0x7a, 0x6f, 0xaa, 0x75, 0xfb, 0x38, 0x48, 0xd5,
0x24, 0xb9, 0x0b, 0x3b, 0xe6, 0x28, 0x60, 0x0e, 0x1f, 0x26, 0x3c, 0xd1, 0xf6, 0xb5, 0x8e, 0x4e,
0x9b, 0x72, 0x22, 0x72, 0x24, 0x20, 0x3d, 0xd8, 0x1b, 0x5d, 0xfc, 0x68, 0x3a, 0xdc, 0x76, 0x58,
0xd2, 0xbe, 0x82, 0x9e, 0x6f, 0xab, 0x5f, 0x78, 0x7e, 0x6e, 0x5b, 0xcc, 0x19, 0x33, 0xba, 0x1b,
0x19, 0xc7, 0x6b, 0x18, 0x07, 0xb0, 0x9d, 0x09, 0xc5, 0xc4, 0xc9, 0x96, 0x92, 0x27, 0x6b, 0x7c,
0xd4, 0xa1, 0x4e, 0x59, 0xe0, 0xb9, 0x4e, 0xc0, 0xc8, 0x63, 0x68, 0xb0, 0xd5, 0x98, 0x49, 0xaa,
0x94, 0x32, 0xb7, 0x42, 0xda, 0x3c, 0x0f, 0xe7, 0xc5, 0x8d, 0x8a, 0x8c, 0xc9, 0x81, 0x22, 0x62,
0x16, 0x73, 0x4a, 0x94, 0x44, 0xe2, 0xbd, 0x10, 0x89, 0x5a, 0x06, 0x09, 0xd2, 0x36, 0xc3, 0xc4,
0x03, 0xc5, 0xc4, 0x4a, 0xee, 0xc2, 0x29, 0x28, 0x1e, 0xa7, 0xa0, 0xa8, 0xe7, 0xba, 0x5f, 0x40,
0xc5, 0xe3, 0x14, 0x15, 0xab, 0xb9, 0xd2, 0x02, 0x2c, 0x3e, 0x4c, 0x60, 0xb1, 0x96, 0xa1, 0x81,
0x14, 0xe6, 0x70, 0xb1, 0x1b, 0x71, 0xb1, 0x9e, 0x21, 0xa9, 0x92, 0x64, 0xc1, 0x78, 0x2f, 0x04,
0x63, 0x23, 0xf7, 0xd0, 0x32, 0x64, 0x3c, 0x4e, 0x91, 0x11, 0x72, 0xb7, 0x53, 0x80, 0xc6, 0x6f,
0xd2, 0x68, 0x94, 0x7c, 0xbb, 0x96, 0xd1, 0x16, 0xb2, 0xf1, 0xff, 0x49, 0x36, 0x6e, 0x64, 0x88,
0xac, 0x62, 0xe1, 0xb3, 0x70, 0x3c, 0x10, 0x57, 0x2f, 0x13, 0x69, 0xe2, 0xf6, 0x33, 0xdf, 0x77,
0x7d, 0x45, 0x2f, 0xd9, 0x31, 0x3a, 0x82, 0x31, 0x71, 0x7c, 0x7d, 0x06, 0xa4, 0xc8, 0x89, 0x44,
0x74, 0x19, 0x3f, 0x97, 0x62, 0x2d, 0xb2, 0x34, 0xc9, 0xa7, 0x86, 0xe2, 0x53, 0x82, 0xaf, 0xe5,
0x14, 0x5f, 0xc9, 0x1d, 0xd8, 0x99, 0x9b, 0x01, 0x97, 0xdb, 0x1c, 0xa6, 0x80, 0xb5, 0x2d, 0x26,
0xe4, 0xfe, 0x24, 0xb9, 0xee, 0xc3, 0x6e, 0xc2, 0xd6, 0xf4, 0xbc, 0x21, 0x52, 0xa4, 0x82, 0x14,
0x69, 0x46, 0xd6, 0x27, 0x9e, 0xd7, 0x37, 0x83, 0x99, 0x71, 0x2b, 0xde, 0x7f, 0x8a, 0xdd, 0x73,
0x77, 0x1a, 0xb2, 0x7b, 0xee, 0x4e, 0x8d, 0x5f, 0x4b, 0xb1, 0x5d, 0xcc, 0x69, 0x02, 0x95, 0xb1,
0x6b, 0xc9, 0xed, 0x6f, 0x52, 0x6c, 0x93, 0x53, 0xb5, 0x33, 0xb1, 0x85, 0x8d, 0xde, 0x83, 0xbf,
0x3f, 0xdd, 0x58, 0xfb, 0xe7, 0xd3, 0x8d, 0x4e, 0xa2, 0xf6, 0xe1, 0xcc, 0xb1, 0x98, 0xbf, 0xb0,
0x1d, 0xde, 0x9d, 0xba, 0xf7, 0x3f, 0xd8, 0x3e, 0xeb, 0x0a, 0xc5, 0x61, 0xef, 0x82, 0xb3, 0x40,
0x9d, 0x85, 0xf2, 0x40, 0x8b, 0x3c, 0x20, 0x37, 0xa1, 0xc2, 0xcd, 0x69, 0x88, 0xa5, 0x10, 0x7c,
0x2f, 0xdf, 0xbe, 0x36, 0x6d, 0x9f, 0xe2, 0x94, 0xf1, 0x4b, 0x49, 0x60, 0x28, 0x75, 0x07, 0xbe,
0xaa, 0x8b, 0x4d, 0xd0, 0xa6, 0x66, 0x80, 0x47, 0xad, 0x51, 0xd1, 0x14, 0x23, 0x13, 0xc6, 0x10,
0x0d, 0x1a, 0x15, 0x4d, 0xe3, 0x8f, 0x72, 0x1c, 0x1b, 0x51, 0xaa, 0xba, 0xe4, 0xe1, 0x1e, 0xe8,
0xb6, 0x63, 0xb1, 0x15, 0xba, 0xa8, 0x51, 0xd9, 0x21, 0x3d, 0x99, 0x52, 0xb5, 0x2f, 0x74, 0x1b,
0x93, 0xf0, 0x8b, 0x30, 0x09, 0x57, 0xbe, 0x70, 0x15, 0x29, 0x17, 0xeb, 0x78, 0xbe, 0xeb, 0x4e,
0x70, 0x6f, 0x5f, 0xb4, 0x0e, 0xca, 0x13, 0x69, 0xa2, 0x9a, 0x4a, 0xc0, 0xea, 0x74, 0x6b, 0x71,
0x08, 0xfe, 0x24, 0x8a, 0x80, 0x24, 0xad, 0xbe, 0xe6, 0xb7, 0x35, 0x76, 0xe3, 0xf8, 0x8f, 0x40,
0x66, 0xec, 0x01, 0xb9, 0x4c, 0x28, 0x59, 0x0d, 0xa5, 0xd9, 0x43, 0xfe, 0x0b, 0xba, 0x65, 0x4f,
0x26, 0xc5, 0xf5, 0x80, 0x9c, 0x36, 0x7e, 0x2b, 0x43, 0x55, 0x26, 0x73, 0x72, 0x4d, 0x70, 0xde,
0xb4, 0x9d, 0xa1, 0x6d, 0x85, 0x7c, 0xc1, 0xfe, 0xc0, 0x4a, 0x1c, 0x5a, 0x39, 0x75, 0x68, 0x04,
0x2a, 0xdc, 0x5e, 0x30, 0x85, 0x06, 0x6c, 0x93, 0xab, 0x50, 0x73, 0x96, 0x8b, 0x21, 0x5f, 0xc9,
0xc0, 0xd4, 0x69, 0xd5, 0x59, 0x2e, 0xce, 0x56, 0x01, 0x39, 0x82, 0xcd, 0x04, 0x28, 0x6c, 0x4b,
0x25, 0xb0, 0x2d, 0xe5, 0x1a, 0xfa, 0x3d, 0x38, 0xa5, 0xeb, 0x11, 0x32, 0x06, 0x16, 0xe9, 0x00,
0x12, 0x64, 0x28, 0x93, 0x84, 0x24, 0x4b, 0x15, 0xc9, 0xb2, 0x25, 0xc6, 0x55, 0x16, 0x11, 0x95,
0xca, 0x75, 0x68, 0x88, 0x93, 0x94, 0x26, 0x35, 0x34, 0xa9, 0x8b, 0x01, 0x9c, 0xbc, 0x0d, 0xdb,
0x71, 0xa1, 0x21, 0x4d, 0xea, 0x72, 0x95, 0x78, 0x18, 0x0d, 0xaf, 0x41, 0x3d, 0x22, 0x58, 0x03,
0x2d, 0x6a, 0xa6, 0x02, 0xd7, 0x00, 0x6a, 0xca, 0xc5, 0xdc, 0x4a, 0xe9, 0x0e, 0xe8, 0x9e, 0xe9,
0xf3, 0x40, 0x15, 0x08, 0x61, 0xfe, 0x7a, 0x6d, 0xfa, 0xa2, 0x46, 0x55, 0xf5, 0x92, 0x34, 0x31,
0x8e, 0x61, 0x33, 0x35, 0x2e, 0xae, 0x1f, 0x77, 0xb9, 0x39, 0xc7, 0x15, 0x75, 0x2a, 0x3b, 0xd1,
0xcf, 0x94, 0xe3, 0x9f, 0x31, 0x9e, 0x40, 0x23, 0xfa, 0x86, 0xe2, 0xa8, 0xbd, 0xe5, 0x68, 0x18,
0x96, 0xbd, 0x1b, 0xb4, 0xea, 0x2d, 0x47, 0x2f, 0x65, 0xe5, 0xeb, 0xb9, 0x1f, 0x54, 0xd5, 0xa6,
0x51, 0xd9, 0x31, 0x9e, 0x42, 0x3d, 0xac, 0xaa, 0x8a, 0xa5, 0x05, 0x9f, 0xda, 0xf8, 0xbd, 0x04,
0x55, 0x09, 0xbf, 0x9c, 0x4a, 0xfb, 0x7f, 0x58, 0x82, 0x2e, 0xd9, 0x50, 0x6c, 0x1a, 0x85, 0x5b,
0xd1, 0xeb, 0x4e, 0x8a, 0x0e, 0xcf, 0x2e, 0x3c, 0x46, 0x1b, 0x68, 0x25, 0x9a, 0xe4, 0x26, 0x6c,
0x48, 0x49, 0xc0, 0x7d, 0xdb, 0x09, 0x43, 0x7f, 0x1d, 0xc7, 0xde, 0xe0, 0x90, 0xf8, 0xa4, 0xd2,
0xc4, 0x76, 0xb8, 0x82, 0x5c, 0x1d, 0x07, 0x06, 0x0e, 0x37, 0xae, 0x43, 0x05, 0xd7, 0x01, 0xa8,
0xbe, 0x39, 0xa3, 0x83, 0x57, 0xdf, 0x35, 0xd7, 0x48, 0x0d, 0xb4, 0xc1, 0xab, 0xb3, 0x66, 0xe9,
0xe8, 0xa3, 0x0e, 0xdb, 0x27, 0xbd, 0x67, 0x83, 0x13, 0xcf, 0x9b, 0xdb, 0x63, 0x13, 0x73, 0x4c,
0x17, 0x2a, 0x98, 0x45, 0x73, 0x1e, 0xb3, 0xed, 0xbc, 0x72, 0x8e, 0x1c, 0x81, 0x8e, 0xc9, 0x94,
0xe4, 0xbd, 0x69, 0xdb, 0xb9, 0x55, 0x9d, 0xf8, 0x11, 0x99, 0x6e, 0x2f, 0x3f, 0x6d, 0xdb, 0x79,
0xa5, 0x1d, 0xf9, 0x16, 0x1a, 0x71, 0x1a, 0x2c, 0x7a, 0xe0, 0xb6, 0x0b, 0x8b, 0x3c, 0xa1, 0x8f,
0xd3, 0x63, 0xd1, 0x33, 0xb7, 0x5d, 0x58, 0xe9, 0x91, 0xc7, 0x50, 0x0b, 0x33, 0x57, 0xfe, 0x63,
0xb7, 0x5d, 0x50, 0xec, 0x89, 0xe3, 0x91, 0xf9, 0x24, 0xef, 0x0d, 0xdb, 0xce, 0xad, 0xdf, 0xc8,
0x23, 0xa8, 0x2a, 0x94, 0xe6, 0xbe, 0x93, 0xdb, 0xf9, 0x55, 0xa2, 0xd8, 0x64, 0xfc, 0xdc, 0x29,
0x7a, 0x00, 0xb7, 0x0b, 0xeb, 0x3f, 0x72, 0x02, 0x90, 0x78, 0xe7, 0x14, 0x3e, 0x83, 0xdb, 0xc5,
0x55, 0x20, 0x11, 0x77, 0x27, 0x7a, 0x69, 0xe4, 0x3f, 0x86, 0xdb, 0x45, 0x85, 0xe0, 0xa8, 0x8a,
0xff, 0x60, 0x79, 0xf8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x15, 0x2f, 0x59, 0xab, 0x11,
0x00, 0x00,
}

+ 3
- 3
types/types.proto View File

@ -66,7 +66,7 @@ message RequestInitChain{
message RequestBeginBlock{
bytes hash = 1;
Header header = 2;
repeated int32 absent_validators = 3 [(gogoproto.customtype) = "int", (gogoproto.nullable) = false];
repeated int32 absent_validators = 3;
repeated Evidence byzantine_validators = 4;
}
@ -166,7 +166,7 @@ message Header {
string chain_id = 1;
int64 height = 2;
int64 time = 3;
int32 num_txs = 4 [(gogoproto.customtype) = "int", (gogoproto.nullable) = false];
int32 num_txs = 4;
BlockID last_block_id = 5;
bytes last_commit_hash = 6;
bytes data_hash = 7;
@ -180,7 +180,7 @@ message BlockID {
}
message PartSetHeader {
int32 total = 1 [(gogoproto.customtype) = "int", (gogoproto.nullable) = false];
int32 total = 1;
bytes hash = 2;
}


Loading…
Cancel
Save