Merge pull request #149 from tendermint/gogo-int

Gogo int

CHANGELOG.md

@@ -13,7 +13,8 @@ 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` -> `int64`
+ - [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`
 
 FEATURES:

Makefile

@@ -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

types/messages_test.go

@@ -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)
 

types/result.go

@@ -8,6 +8,11 @@ const (
 	CodeTypeOK uint32 = 0
 )
 
+// IsOK returns true if Code is OK.
+func (r ResponseCheckTx) IsOK() bool {
+	return r.Code == CodeTypeOK
+}
+
 // IsErr returns true if Code is something other than OK.
 func (r ResponseCheckTx) IsErr() bool {
 	return r.Code != CodeTypeOK
@@ -18,6 +23,11 @@ func (r ResponseCheckTx) Error() string {
 	return fmtError(r.Code, r.Log)
 }
 
+// IsOK returns true if Code is OK.
+func (r ResponseDeliverTx) IsOK() bool {
+	return r.Code == CodeTypeOK
+}
+
 // IsErr returns true if Code is something other than OK.
 func (r ResponseDeliverTx) IsErr() bool {
 	return r.Code != CodeTypeOK
@@ -28,6 +38,11 @@ func (r ResponseDeliverTx) Error() string {
 	return fmtError(r.Code, r.Log)
 }
 
+// IsOK returns true if Code is OK.
+func (r ResponseCommit) IsOK() bool {
+	return r.Code == CodeTypeOK
+}
+
 // IsErr returns true if Code is something other than OK.
 func (r ResponseCommit) IsErr() bool {
 	return r.Code != CodeTypeOK
@@ -38,6 +53,11 @@ func (r ResponseCommit) Error() string {
 	return fmtError(r.Code, r.Log)
 }
 
+// IsOK returns true if Code is OK.
+func (r ResponseQuery) IsOK() bool {
+	return r.Code == CodeTypeOK
+}
+
 // IsErr returns true if Code is something other than OK.
 func (r ResponseQuery) IsErr() bool {
 	return r.Code != CodeTypeOK

types/types.pb.go

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

types/types.proto

@@ -166,7 +166,7 @@ message Header {
   string chain_id = 1;
   int64 height = 2;
   int64 time = 3;
-  int64 num_txs = 4;
+  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 {
-  int64 total = 1;
+  int32 total = 1;
   bytes hash = 2;
 }