From d0db30daa5daaaed23c01990d3155330966d090b Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Tue, 9 Jul 2019 15:44:21 +0200 Subject: [PATCH] proto number fix --- abci/types/messages_test.go | 3 +- abci/types/types.pb.go | 231 ++++++++++++++-------------- abci/types/types.proto | 20 +-- docs/app-dev/abci-spec.md | 1 - docs/spec/blockchain/blockchain.md | 9 -- rpc/client/event_test.go | 2 +- tools/tm-monitor/monitor/network.go | 1 + types/proto3/block.pb.go | 88 +++++------ types/proto3/block.proto | 20 +-- 9 files changed, 182 insertions(+), 193 deletions(-) diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go index 66529f19..5d1e9287 100644 --- a/abci/types/messages_test.go +++ b/abci/types/messages_test.go @@ -63,7 +63,8 @@ func TestWriteReadMessageSimple(t *testing.T) { func TestWriteReadMessage(t *testing.T) { cases := []proto.Message{ &Header{ - Height: 4, + Height: 4, + ChainID: "test", }, // TODO: add the rest } diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index f4a04016..c25582ae 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -58,7 +58,7 @@ func (x CheckTxType) String() string { return proto.EnumName(CheckTxType_name, int32(x)) } func (CheckTxType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{0} + return fileDescriptor_types_9731eaa333cbf667, []int{0} } type Request struct { @@ -84,7 +84,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{0} + return fileDescriptor_types_9731eaa333cbf667, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -506,7 +506,7 @@ func (m *RequestEcho) Reset() { *m = RequestEcho{} } func (m *RequestEcho) String() string { return proto.CompactTextString(m) } func (*RequestEcho) ProtoMessage() {} func (*RequestEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{1} + return fileDescriptor_types_9731eaa333cbf667, []int{1} } func (m *RequestEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -552,7 +552,7 @@ func (m *RequestFlush) Reset() { *m = RequestFlush{} } func (m *RequestFlush) String() string { return proto.CompactTextString(m) } func (*RequestFlush) ProtoMessage() {} func (*RequestFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{2} + return fileDescriptor_types_9731eaa333cbf667, []int{2} } func (m *RequestFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -594,7 +594,7 @@ func (m *RequestInfo) Reset() { *m = RequestInfo{} } func (m *RequestInfo) String() string { return proto.CompactTextString(m) } func (*RequestInfo) ProtoMessage() {} func (*RequestInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{3} + return fileDescriptor_types_9731eaa333cbf667, []int{3} } func (m *RequestInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -657,7 +657,7 @@ func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } func (*RequestSetOption) ProtoMessage() {} func (*RequestSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{4} + return fileDescriptor_types_9731eaa333cbf667, []int{4} } func (m *RequestSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -715,7 +715,7 @@ func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{5} + return fileDescriptor_types_9731eaa333cbf667, []int{5} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -793,7 +793,7 @@ func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} func (*RequestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{6} + return fileDescriptor_types_9731eaa333cbf667, []int{6} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -864,7 +864,7 @@ func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} func (*RequestBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{7} + return fileDescriptor_types_9731eaa333cbf667, []int{7} } func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -933,7 +933,7 @@ func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } func (*RequestCheckTx) ProtoMessage() {} func (*RequestCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{8} + return fileDescriptor_types_9731eaa333cbf667, []int{8} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -987,7 +987,7 @@ func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } func (*RequestDeliverTx) ProtoMessage() {} func (*RequestDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{9} + return fileDescriptor_types_9731eaa333cbf667, []int{9} } func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1034,7 +1034,7 @@ func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} func (*RequestEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{10} + return fileDescriptor_types_9731eaa333cbf667, []int{10} } func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1080,7 +1080,7 @@ func (m *RequestCommit) Reset() { *m = RequestCommit{} } func (m *RequestCommit) String() string { return proto.CompactTextString(m) } func (*RequestCommit) ProtoMessage() {} func (*RequestCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{11} + return fileDescriptor_types_9731eaa333cbf667, []int{11} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1133,7 +1133,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{12} + return fileDescriptor_types_9731eaa333cbf667, []int{12} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1586,7 +1586,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{13} + return fileDescriptor_types_9731eaa333cbf667, []int{13} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1633,7 +1633,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{14} + return fileDescriptor_types_9731eaa333cbf667, []int{14} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1679,7 +1679,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{15} + return fileDescriptor_types_9731eaa333cbf667, []int{15} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1723,7 +1723,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{16} + return fileDescriptor_types_9731eaa333cbf667, []int{16} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1802,7 +1802,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{17} + return fileDescriptor_types_9731eaa333cbf667, []int{17} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1864,7 +1864,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{18} + return fileDescriptor_types_9731eaa333cbf667, []int{18} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1927,7 +1927,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{19} + return fileDescriptor_types_9731eaa333cbf667, []int{19} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2030,7 +2030,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{20} + return fileDescriptor_types_9731eaa333cbf667, []int{20} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2084,7 +2084,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{21} + return fileDescriptor_types_9731eaa333cbf667, []int{21} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2187,7 +2187,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{22} + return fileDescriptor_types_9731eaa333cbf667, []int{22} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2285,7 +2285,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{23} + return fileDescriptor_types_9731eaa333cbf667, []int{23} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2347,7 +2347,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{24} + return fileDescriptor_types_9731eaa333cbf667, []int{24} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2398,7 +2398,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{25} + return fileDescriptor_types_9731eaa333cbf667, []int{25} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2463,7 +2463,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{26} + return fileDescriptor_types_9731eaa333cbf667, []int{26} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2519,7 +2519,7 @@ func (m *EvidenceParams) Reset() { *m = EvidenceParams{} } func (m *EvidenceParams) String() string { return proto.CompactTextString(m) } func (*EvidenceParams) ProtoMessage() {} func (*EvidenceParams) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{27} + return fileDescriptor_types_9731eaa333cbf667, []int{27} } func (m *EvidenceParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2567,7 +2567,7 @@ func (m *ValidatorParams) Reset() { *m = ValidatorParams{} } func (m *ValidatorParams) String() string { return proto.CompactTextString(m) } func (*ValidatorParams) ProtoMessage() {} func (*ValidatorParams) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{28} + return fileDescriptor_types_9731eaa333cbf667, []int{28} } func (m *ValidatorParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2615,7 +2615,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{29} + return fileDescriptor_types_9731eaa333cbf667, []int{29} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2670,7 +2670,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{30} + return fileDescriptor_types_9731eaa333cbf667, []int{30} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2720,19 +2720,19 @@ type Header struct { Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` Time time.Time `protobuf:"bytes,4,opt,name=time,stdtime" json:"time"` // prev block info - LastBlockId BlockID `protobuf:"bytes,7,opt,name=last_block_id,json=lastBlockId" json:"last_block_id"` + LastBlockId BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId" json:"last_block_id"` // hashes of block data - LastCommitHash []byte `protobuf:"bytes,8,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` - DataHash []byte `protobuf:"bytes,9,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,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"` // hashes from the app output from the prev block - ValidatorsHash []byte `protobuf:"bytes,10,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` - NextValidatorsHash []byte `protobuf:"bytes,11,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` - ConsensusHash []byte `protobuf:"bytes,12,opt,name=consensus_hash,json=consensusHash,proto3" json:"consensus_hash,omitempty"` - AppHash []byte `protobuf:"bytes,13,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` - LastResultsHash []byte `protobuf:"bytes,14,opt,name=last_results_hash,json=lastResultsHash,proto3" json:"last_results_hash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,8,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` + NextValidatorsHash []byte `protobuf:"bytes,9,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` + ConsensusHash []byte `protobuf:"bytes,10,opt,name=consensus_hash,json=consensusHash,proto3" json:"consensus_hash,omitempty"` + AppHash []byte `protobuf:"bytes,11,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + LastResultsHash []byte `protobuf:"bytes,12,opt,name=last_results_hash,json=lastResultsHash,proto3" json:"last_results_hash,omitempty"` // consensus info - EvidenceHash []byte `protobuf:"bytes,15,opt,name=evidence_hash,json=evidenceHash,proto3" json:"evidence_hash,omitempty"` - ProposerAddress []byte `protobuf:"bytes,16,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` + EvidenceHash []byte `protobuf:"bytes,13,opt,name=evidence_hash,json=evidenceHash,proto3" json:"evidence_hash,omitempty"` + ProposerAddress []byte `protobuf:"bytes,14,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2742,7 +2742,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{31} + return fileDescriptor_types_9731eaa333cbf667, []int{31} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2881,7 +2881,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{32} + return fileDescriptor_types_9731eaa333cbf667, []int{32} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2936,7 +2936,7 @@ func (m *BlockID) Reset() { *m = BlockID{} } func (m *BlockID) String() string { return proto.CompactTextString(m) } func (*BlockID) ProtoMessage() {} func (*BlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{33} + return fileDescriptor_types_9731eaa333cbf667, []int{33} } func (m *BlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2991,7 +2991,7 @@ func (m *PartSetHeader) Reset() { *m = PartSetHeader{} } func (m *PartSetHeader) String() string { return proto.CompactTextString(m) } func (*PartSetHeader) ProtoMessage() {} func (*PartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{34} + return fileDescriptor_types_9731eaa333cbf667, []int{34} } func (m *PartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3048,7 +3048,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{35} + return fileDescriptor_types_9731eaa333cbf667, []int{35} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3104,7 +3104,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{36} + return fileDescriptor_types_9731eaa333cbf667, []int{36} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3160,7 +3160,7 @@ func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{37} + return fileDescriptor_types_9731eaa333cbf667, []int{37} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3215,7 +3215,7 @@ func (m *PubKey) Reset() { *m = PubKey{} } func (m *PubKey) String() string { return proto.CompactTextString(m) } func (*PubKey) ProtoMessage() {} func (*PubKey) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{38} + return fileDescriptor_types_9731eaa333cbf667, []int{38} } func (m *PubKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3273,7 +3273,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_types_e1132663b7d2a0ed, []int{39} + return fileDescriptor_types_9731eaa333cbf667, []int{39} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -7309,7 +7309,7 @@ func (m *Header) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n37 - dAtA[i] = 0x3a + dAtA[i] = 0x2a i++ i = encodeVarintTypes(dAtA, i, uint64(m.LastBlockId.Size())) n38, err := m.LastBlockId.MarshalTo(dAtA[i:]) @@ -7318,57 +7318,55 @@ func (m *Header) MarshalTo(dAtA []byte) (int, error) { } i += n38 if len(m.LastCommitHash) > 0 { - dAtA[i] = 0x42 + dAtA[i] = 0x32 i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.LastCommitHash))) i += copy(dAtA[i:], m.LastCommitHash) } if len(m.DataHash) > 0 { - dAtA[i] = 0x4a + dAtA[i] = 0x3a i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.DataHash))) i += copy(dAtA[i:], m.DataHash) } if len(m.ValidatorsHash) > 0 { - dAtA[i] = 0x52 + dAtA[i] = 0x42 i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.ValidatorsHash))) i += copy(dAtA[i:], m.ValidatorsHash) } if len(m.NextValidatorsHash) > 0 { - dAtA[i] = 0x5a + dAtA[i] = 0x4a i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.NextValidatorsHash))) i += copy(dAtA[i:], m.NextValidatorsHash) } if len(m.ConsensusHash) > 0 { - dAtA[i] = 0x62 + dAtA[i] = 0x52 i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.ConsensusHash))) i += copy(dAtA[i:], m.ConsensusHash) } if len(m.AppHash) > 0 { - dAtA[i] = 0x6a + dAtA[i] = 0x5a i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.AppHash))) i += copy(dAtA[i:], m.AppHash) } if len(m.LastResultsHash) > 0 { - dAtA[i] = 0x72 + dAtA[i] = 0x62 i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.LastResultsHash))) i += copy(dAtA[i:], m.LastResultsHash) } if len(m.EvidenceHash) > 0 { - dAtA[i] = 0x7a + dAtA[i] = 0x6a i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.EvidenceHash))) i += copy(dAtA[i:], m.EvidenceHash) } if len(m.ProposerAddress) > 0 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 + dAtA[i] = 0x72 i++ i = encodeVarintTypes(dAtA, i, uint64(len(m.ProposerAddress))) i += copy(dAtA[i:], m.ProposerAddress) @@ -8401,7 +8399,7 @@ func NewPopulatedHeader(r randyTypes, easy bool) *Header { this.ProposerAddress[i] = byte(r.Intn(256)) } if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 17) + this.XXX_unrecognized = randUnrecognizedTypes(r, 15) } return this } @@ -9602,7 +9600,7 @@ func (m *Header) Size() (n int) { } l = len(m.ProposerAddress) if l > 0 { - n += 2 + l + sovTypes(uint64(l)) + n += 1 + l + sovTypes(uint64(l)) } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -14289,7 +14287,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastBlockId", wireType) } @@ -14319,7 +14317,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastCommitHash", wireType) } @@ -14350,7 +14348,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.LastCommitHash = []byte{} } iNdEx = postIndex - case 9: + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DataHash", wireType) } @@ -14381,7 +14379,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.DataHash = []byte{} } iNdEx = postIndex - case 10: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ValidatorsHash", wireType) } @@ -14412,7 +14410,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.ValidatorsHash = []byte{} } iNdEx = postIndex - case 11: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field NextValidatorsHash", wireType) } @@ -14443,7 +14441,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.NextValidatorsHash = []byte{} } iNdEx = postIndex - case 12: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ConsensusHash", wireType) } @@ -14474,7 +14472,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.ConsensusHash = []byte{} } iNdEx = postIndex - case 13: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field AppHash", wireType) } @@ -14505,7 +14503,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.AppHash = []byte{} } iNdEx = postIndex - case 14: + case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastResultsHash", wireType) } @@ -14536,7 +14534,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.LastResultsHash = []byte{} } iNdEx = postIndex - case 15: + case 13: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EvidenceHash", wireType) } @@ -14567,7 +14565,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { m.EvidenceHash = []byte{} } iNdEx = postIndex - case 16: + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProposerAddress", wireType) } @@ -15618,13 +15616,13 @@ var ( ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_e1132663b7d2a0ed) } +func init() { proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_9731eaa333cbf667) } func init() { - golang_proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_e1132663b7d2a0ed) + golang_proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_9731eaa333cbf667) } -var fileDescriptor_types_e1132663b7d2a0ed = []byte{ - // 2257 bytes of a gzipped FileDescriptorProto +var fileDescriptor_types_9731eaa333cbf667 = []byte{ + // 2256 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x93, 0x1b, 0x47, 0x15, 0xdf, 0xd1, 0xc7, 0x4a, 0xf3, 0xb4, 0xfa, 0x70, 0x7b, 0x6d, 0xcb, 0xc2, 0xec, 0xba, 0xc6, 0xe0, 0xec, 0x26, 0x8e, 0x36, 0xd9, 0x60, 0x6a, 0x8d, 0x43, 0xaa, 0x56, 0xb6, 0x61, 0xb7, 0x62, @@ -15729,42 +15727,41 @@ var fileDescriptor_types_e1132663b7d2a0ed = []byte{ 0xa1, 0x6c, 0x65, 0x33, 0x41, 0xa6, 0xec, 0x25, 0x25, 0x6f, 0xfc, 0xbe, 0x02, 0xeb, 0xb2, 0x7c, 0x20, 0xfd, 0x6c, 0x71, 0x2a, 0x66, 0x55, 0x9b, 0x94, 0xbd, 0x6a, 0x8f, 0x31, 0xe3, 0xdf, 0xce, 0x57, 0x78, 0x83, 0xc6, 0xf9, 0xab, 0xed, 0x1a, 0xb2, 0xe5, 0xf1, 0xc3, 0xa4, 0xdc, 0x5b, 0x55, - 0x0d, 0x45, 0xb5, 0x65, 0xe5, 0x6b, 0xd7, 0x96, 0x07, 0xd0, 0x4c, 0xa5, 0x07, 0x8e, 0xad, 0xd2, - 0xcc, 0x56, 0xda, 0x6c, 0x8f, 0x1f, 0xaa, 0xfd, 0x36, 0xe2, 0x74, 0xe1, 0xd8, 0x26, 0x3b, 0xd9, - 0xa2, 0x08, 0xb3, 0x8a, 0x3a, 0x3a, 0x47, 0xaa, 0xee, 0x11, 0x39, 0x85, 0x30, 0x38, 0xe1, 0x2e, - 0x12, 0xa2, 0x23, 0xa4, 0x2e, 0x3a, 0x70, 0xf0, 0x2d, 0x68, 0x27, 0xc4, 0x2c, 0x21, 0x20, 0x67, - 0x49, 0xba, 0x11, 0xf8, 0x1e, 0x6c, 0xba, 0x6c, 0xc1, 0xad, 0x3c, 0xba, 0x81, 0x68, 0x22, 0xc6, - 0x4e, 0xb3, 0x12, 0xdf, 0x85, 0x56, 0x12, 0x54, 0x10, 0xbb, 0x21, 0x4b, 0xd3, 0xb8, 0x17, 0x61, - 0xd7, 0xa1, 0x1e, 0xa7, 0x45, 0x4d, 0x04, 0xd4, 0xa8, 0xcc, 0x86, 0xe2, 0x44, 0x2b, 0x60, 0xe1, - 0x7c, 0xca, 0xd5, 0x24, 0x2d, 0xc4, 0x60, 0xa2, 0x65, 0xca, 0x7e, 0xc4, 0xde, 0x82, 0x66, 0xe4, - 0xa7, 0x12, 0xd7, 0x46, 0xdc, 0x46, 0xd4, 0x89, 0xa0, 0x5d, 0xe8, 0xf8, 0x81, 0xe7, 0x7b, 0x21, - 0x0b, 0x2c, 0x6a, 0xdb, 0x01, 0x0b, 0xc3, 0x6e, 0x47, 0xce, 0x17, 0xf5, 0x1f, 0xca, 0x6e, 0xe3, - 0x7d, 0xa8, 0x45, 0xf9, 0xde, 0x26, 0x54, 0x07, 0x71, 0x4c, 0xa9, 0x98, 0xb2, 0x21, 0x18, 0xe5, - 0xd0, 0xf7, 0xd5, 0xeb, 0x86, 0xf8, 0x34, 0x7e, 0x01, 0x35, 0x75, 0x61, 0x85, 0x35, 0xef, 0x0f, - 0x61, 0xc3, 0xa7, 0x81, 0x38, 0x46, 0xba, 0xf2, 0x8d, 0x2a, 0x8a, 0x13, 0x1a, 0xf0, 0x27, 0x8c, - 0x67, 0x0a, 0xe0, 0x06, 0xe2, 0x65, 0x97, 0x71, 0x0f, 0x9a, 0x19, 0x8c, 0xd8, 0x16, 0xf7, 0x38, - 0x9d, 0x46, 0xee, 0x89, 0x8d, 0x78, 0xe5, 0x52, 0xb2, 0xb2, 0x71, 0x1f, 0xf4, 0xf8, 0x6e, 0x44, - 0xe2, 0x1b, 0x1d, 0x5d, 0x53, 0xea, 0x96, 0x4d, 0x2c, 0xea, 0xbd, 0x97, 0x2c, 0x50, 0xd6, 0x2d, - 0x1b, 0xc6, 0xb3, 0x54, 0x38, 0x91, 0xf1, 0x9d, 0xdc, 0x81, 0x9a, 0x0a, 0x27, 0xca, 0xbf, 0xa2, - 0xf2, 0xfd, 0x04, 0xe3, 0x49, 0x54, 0xbe, 0xcb, 0xe8, 0x92, 0x4c, 0x5b, 0x4a, 0x4f, 0x3b, 0x85, - 0x7a, 0x14, 0x32, 0xb2, 0x71, 0x55, 0xce, 0xd8, 0xc9, 0xc7, 0x55, 0x35, 0x69, 0x02, 0x14, 0xd6, - 0x11, 0x3a, 0x63, 0x97, 0xd9, 0x56, 0xe2, 0x42, 0xb8, 0x46, 0xdd, 0x6c, 0xcb, 0x81, 0xc7, 0x91, - 0xbf, 0x18, 0xef, 0xc1, 0xba, 0xdc, 0x5b, 0x61, 0x20, 0x2a, 0x22, 0x97, 0x3f, 0x6a, 0x50, 0x8f, - 0x22, 0x6e, 0xa1, 0x50, 0x66, 0xd3, 0xa5, 0xaf, 0xba, 0xe9, 0xff, 0x7f, 0x08, 0xb9, 0x03, 0x04, - 0x6f, 0xde, 0x3a, 0xf3, 0xb8, 0xe3, 0x8e, 0x2d, 0xa9, 0x6b, 0x99, 0xbb, 0x74, 0x70, 0xe4, 0x14, - 0x07, 0x4e, 0x44, 0xff, 0xdb, 0xb7, 0xa0, 0x91, 0x7a, 0x85, 0x20, 0x35, 0x28, 0x7f, 0xc2, 0x5e, - 0x76, 0xd6, 0x48, 0x03, 0x6a, 0x26, 0xc3, 0x9a, 0xb2, 0xa3, 0xed, 0x7f, 0x56, 0x85, 0xf6, 0xe1, - 0xe0, 0xc1, 0xf1, 0xa1, 0xef, 0x4f, 0x9d, 0x11, 0xc5, 0x22, 0x64, 0x0f, 0x2a, 0x58, 0x87, 0x15, - 0xbc, 0x37, 0xf7, 0x8a, 0x1e, 0x04, 0xc8, 0x3e, 0x54, 0xb1, 0x1c, 0x23, 0x45, 0xcf, 0xce, 0xbd, - 0xc2, 0x77, 0x01, 0xb1, 0x88, 0x2c, 0xd8, 0x2e, 0xbe, 0x3e, 0xf7, 0x8a, 0x1e, 0x07, 0xc8, 0x47, - 0xa0, 0x27, 0x75, 0xd2, 0xaa, 0x37, 0xe8, 0xde, 0xca, 0x67, 0x02, 0x21, 0x9f, 0xe4, 0x92, 0xab, - 0x9e, 0x52, 0x7b, 0x2b, 0xeb, 0x69, 0x72, 0x00, 0xb5, 0x28, 0x0b, 0x2f, 0x7e, 0x25, 0xee, 0xad, - 0x28, 0xe1, 0x85, 0x7a, 0x64, 0xe9, 0x53, 0xf4, 0x94, 0xdd, 0x2b, 0x7c, 0x67, 0x20, 0x77, 0x61, - 0x5d, 0xa5, 0x43, 0x85, 0x2f, 0xc5, 0xbd, 0xe2, 0x42, 0x5c, 0x1c, 0x32, 0x29, 0xfe, 0x56, 0x3d, - 0xb7, 0xf7, 0x56, 0x3e, 0x88, 0x90, 0x43, 0x80, 0x54, 0x05, 0xb3, 0xf2, 0x1d, 0xbd, 0xb7, 0xfa, - 0xa1, 0x83, 0xdc, 0x87, 0x7a, 0xf2, 0x78, 0x55, 0xfc, 0x32, 0xde, 0x5b, 0xf5, 0xf6, 0x30, 0xb8, - 0xf1, 0xaf, 0xbf, 0x6c, 0x69, 0xbf, 0x39, 0xdf, 0xd2, 0xbe, 0x38, 0xdf, 0xd2, 0xbe, 0x3c, 0xdf, - 0xd2, 0xfe, 0x70, 0xbe, 0xa5, 0xfd, 0xf9, 0x7c, 0x4b, 0xfb, 0xed, 0x5f, 0xb7, 0xb4, 0xe1, 0x3a, - 0xfa, 0xc8, 0x07, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xe0, 0x14, 0xf5, 0x09, 0x1a, 0x00, - 0x00, + 0x0d, 0x45, 0xb5, 0x65, 0xe5, 0x6b, 0xd7, 0x96, 0x07, 0xd0, 0x4c, 0xa5, 0x07, 0x8e, 0xad, 0xf2, + 0xda, 0x56, 0xda, 0x6c, 0x8f, 0x1f, 0xaa, 0xfd, 0x36, 0xe2, 0x74, 0xe1, 0xd8, 0x26, 0x3b, 0xd9, + 0xa2, 0x08, 0xb3, 0x0a, 0x49, 0x77, 0xa9, 0xba, 0x47, 0xe4, 0x14, 0xc2, 0xe0, 0x84, 0xbb, 0x48, + 0x88, 0x64, 0xbf, 0xba, 0xe8, 0xc0, 0xc1, 0xb7, 0xa0, 0x9d, 0x10, 0xb3, 0x84, 0xd4, 0xe5, 0x2c, + 0x49, 0x37, 0x02, 0xdf, 0x83, 0x4d, 0x97, 0x2d, 0xb8, 0x95, 0x47, 0xeb, 0x88, 0x26, 0x62, 0xec, + 0x34, 0x2b, 0xf1, 0x5d, 0x68, 0x25, 0x41, 0x05, 0xb1, 0x20, 0x4b, 0xd3, 0xb8, 0x17, 0x61, 0xd7, + 0xa1, 0x1e, 0xa7, 0x45, 0x0d, 0x04, 0xd4, 0xa8, 0xcc, 0x86, 0xe2, 0x44, 0x2b, 0x60, 0xe1, 0x7c, + 0xca, 0xd5, 0x24, 0x1b, 0x88, 0xc1, 0x44, 0xcb, 0x94, 0xfd, 0x88, 0xbd, 0x05, 0xcd, 0xc8, 0x4f, + 0x25, 0xae, 0x89, 0xb8, 0x8d, 0xa8, 0x13, 0x41, 0xbb, 0xd0, 0xf1, 0x03, 0xcf, 0xf7, 0x42, 0x16, + 0x58, 0xd4, 0xb6, 0x03, 0x16, 0x86, 0xdd, 0x96, 0x9c, 0x2f, 0xea, 0x3f, 0x94, 0xdd, 0xc6, 0xfb, + 0x50, 0x8b, 0xf2, 0xbd, 0x4d, 0xa8, 0x0e, 0xe2, 0x98, 0x52, 0x31, 0x65, 0x43, 0x30, 0xca, 0xa1, + 0xef, 0xab, 0xd7, 0x0d, 0xf1, 0x69, 0xfc, 0x02, 0x6a, 0xea, 0xc2, 0x0a, 0x6b, 0xde, 0x1f, 0xc2, + 0x86, 0x4f, 0x03, 0x71, 0x8c, 0x74, 0xe5, 0x1b, 0x55, 0x14, 0x27, 0x34, 0xe0, 0x4f, 0x18, 0xcf, + 0x14, 0xc0, 0x0d, 0xc4, 0xcb, 0x2e, 0xe3, 0x1e, 0x34, 0x33, 0x18, 0xb1, 0x2d, 0xee, 0x71, 0x3a, + 0x8d, 0xdc, 0x13, 0x1b, 0xf1, 0xca, 0xa5, 0x64, 0x65, 0xe3, 0x3e, 0xe8, 0xf1, 0xdd, 0x88, 0xc4, + 0x37, 0x3a, 0xba, 0xa6, 0xd4, 0x2d, 0x9b, 0x58, 0xd4, 0x7b, 0x2f, 0x59, 0xa0, 0xac, 0x5b, 0x36, + 0x8c, 0x67, 0xa9, 0x70, 0x22, 0xe3, 0x3b, 0xb9, 0x03, 0x35, 0x15, 0x4e, 0x94, 0x7f, 0x45, 0xe5, + 0xfb, 0x09, 0xc6, 0x93, 0xa8, 0x7c, 0x97, 0xd1, 0x25, 0x99, 0xb6, 0x94, 0x9e, 0x76, 0x0a, 0xf5, + 0x28, 0x64, 0x64, 0xe3, 0xaa, 0x9c, 0xb1, 0x93, 0x8f, 0xab, 0x6a, 0xd2, 0x04, 0x28, 0xac, 0x23, + 0x74, 0xc6, 0x2e, 0xb3, 0xad, 0xc4, 0x85, 0x70, 0x8d, 0xba, 0xd9, 0x96, 0x03, 0x8f, 0x23, 0x7f, + 0x31, 0xde, 0x83, 0x75, 0xb9, 0xb7, 0xc2, 0x40, 0x54, 0x44, 0x2e, 0x7f, 0xd4, 0xa0, 0x1e, 0x45, + 0xdc, 0x42, 0xa1, 0xcc, 0xa6, 0x4b, 0x5f, 0x75, 0xd3, 0xff, 0xff, 0x10, 0x72, 0x07, 0x08, 0xde, + 0xbc, 0x75, 0xe6, 0x71, 0xc7, 0x1d, 0x5b, 0x52, 0xd7, 0x32, 0x77, 0xe9, 0xe0, 0xc8, 0x29, 0x0e, + 0x9c, 0x88, 0xfe, 0xb7, 0x6f, 0x41, 0x23, 0xf5, 0x0a, 0x41, 0x6a, 0x50, 0xfe, 0x84, 0xbd, 0xec, + 0xac, 0x91, 0x06, 0xd4, 0x4c, 0x86, 0x35, 0x65, 0x47, 0xdb, 0xff, 0xac, 0x0a, 0xed, 0xc3, 0xc1, + 0x83, 0xe3, 0x43, 0xdf, 0x9f, 0x3a, 0x23, 0x8a, 0x45, 0xc8, 0x1e, 0x54, 0xb0, 0x0e, 0x2b, 0x78, + 0x6f, 0xee, 0x15, 0x3d, 0x08, 0x90, 0x7d, 0xa8, 0x62, 0x39, 0x46, 0x8a, 0x9e, 0x9d, 0x7b, 0x85, + 0xef, 0x02, 0x62, 0x11, 0x59, 0xb0, 0x5d, 0x7c, 0x7d, 0xee, 0x15, 0x3d, 0x0e, 0x90, 0x8f, 0x40, + 0x4f, 0xea, 0xa4, 0x55, 0x6f, 0xd0, 0xbd, 0x95, 0xcf, 0x04, 0x42, 0x3e, 0xc9, 0x25, 0x57, 0x3d, + 0xa5, 0xf6, 0x56, 0xd6, 0xd3, 0xe4, 0x00, 0x6a, 0x51, 0x16, 0x5e, 0xfc, 0x4a, 0xdc, 0x5b, 0x51, + 0xc2, 0x0b, 0xf5, 0xc8, 0xd2, 0xa7, 0xe8, 0x29, 0xbb, 0x57, 0xf8, 0xce, 0x40, 0xee, 0xc2, 0xba, + 0x4a, 0x87, 0x0a, 0x5f, 0x8a, 0x7b, 0xc5, 0x85, 0xb8, 0x38, 0x64, 0x52, 0xfc, 0xad, 0x7a, 0x6e, + 0xef, 0xad, 0x7c, 0x10, 0x21, 0x87, 0x00, 0xa9, 0x0a, 0x66, 0xe5, 0x3b, 0x7a, 0x6f, 0xf5, 0x43, + 0x07, 0xb9, 0x0f, 0xf5, 0xe4, 0xf1, 0xaa, 0xf8, 0x65, 0xbc, 0xb7, 0xea, 0xed, 0x61, 0x70, 0xe3, + 0x5f, 0x7f, 0xd9, 0xd2, 0x7e, 0x73, 0xbe, 0xa5, 0x7d, 0x71, 0xbe, 0xa5, 0x7d, 0x79, 0xbe, 0xa5, + 0xfd, 0xe1, 0x7c, 0x4b, 0xfb, 0xf3, 0xf9, 0x96, 0xf6, 0xdb, 0xbf, 0x6e, 0x69, 0xc3, 0x75, 0xf4, + 0x91, 0x0f, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x06, 0xa9, 0xd3, 0x15, 0x09, 0x1a, 0x00, 0x00, } diff --git a/abci/types/types.proto b/abci/types/types.proto index 7a95fbc2..1c72a857 100644 --- a/abci/types/types.proto +++ b/abci/types/types.proto @@ -258,22 +258,22 @@ message Header { google.protobuf.Timestamp time = 4 [(gogoproto.nullable)=false, (gogoproto.stdtime)=true]; // prev block info - BlockID last_block_id = 7 [(gogoproto.nullable)=false]; + BlockID last_block_id = 5 [(gogoproto.nullable)=false]; // hashes of block data - bytes last_commit_hash = 8; // commit from validators from the last block - bytes data_hash = 9; // transactions + bytes last_commit_hash = 6; // commit from validators from the last block + bytes data_hash = 7; // transactions // hashes from the app output from the prev block - bytes validators_hash = 10; // validators for the current block - bytes next_validators_hash = 11; // validators for the next block - bytes consensus_hash = 12; // consensus params for current block - bytes app_hash = 13; // state after txs from the previous block - bytes last_results_hash = 14;// root hash of all results from the txs from the previous block + bytes validators_hash = 8; // validators for the current block + bytes next_validators_hash = 9; // validators for the next block + bytes consensus_hash = 10; // consensus params for current block + bytes app_hash = 11; // state after txs from the previous block + bytes last_results_hash = 12;// root hash of all results from the txs from the previous block // consensus info - bytes evidence_hash = 15; // evidence included in the block - bytes proposer_address = 16; // original proposer of the block + bytes evidence_hash = 13; // evidence included in the block + bytes proposer_address = 14; // original proposer of the block } message Version { diff --git a/docs/app-dev/abci-spec.md b/docs/app-dev/abci-spec.md index c1b463dd..80262ed0 100644 --- a/docs/app-dev/abci-spec.md +++ b/docs/app-dev/abci-spec.md @@ -284,7 +284,6 @@ See below for more details on the message types and how they are used. - `Height (int64)`: Height of the block in the chain - `Time (google.protobuf.Timestamp)`: Time of the block. It is the proposer's local time when block was created. - - `NumTxs (int32)`: Number of transactions in the block - `LastBlockID (BlockID)`: Hash of the previous (parent) block - `LastCommitHash ([]byte)`: Hash of the previous block's commit - `ValidatorsHash ([]byte)`: Hash of the validator set for this block diff --git a/docs/spec/blockchain/blockchain.md b/docs/spec/blockchain/blockchain.md index f4df581b..162181e1 100644 --- a/docs/spec/blockchain/blockchain.md +++ b/docs/spec/blockchain/blockchain.md @@ -43,7 +43,6 @@ type Header struct { ChainID string Height int64 Time Time - NumTxs int64 // prev block info LastBlockID BlockID @@ -263,14 +262,6 @@ if block.Header.Height == 1 { See the section on [BFT time](../consensus/bft-time.md) for more details. -### NumTxs - -```go -block.Header.NumTxs == len(block.Txs.Txs) -``` - -Number of transactions included in the block. - ### LastBlockID LastBlockID is the previous block's BlockID: diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go index a34a11b3..b0a40fc2 100644 --- a/rpc/client/event_test.go +++ b/rpc/client/event_test.go @@ -39,7 +39,7 @@ func TestHeaderEvents(t *testing.T) { evtTyp := types.EventNewBlockHeader evt, err := client.WaitForOneEvent(c, evtTyp, waitForEventTimeout) require.Nil(t, err, "%d: %+v", i, err) - _, ok := evt.(types.EventDataNewBlock) + _, ok := evt.(types.EventDataNewBlockHeader) require.True(t, ok, "%d: %#v", i, evt) // TODO: more checks... }) diff --git a/tools/tm-monitor/monitor/network.go b/tools/tm-monitor/monitor/network.go index 4753ab05..9228c828 100644 --- a/tools/tm-monitor/monitor/network.go +++ b/tools/tm-monitor/monitor/network.go @@ -85,6 +85,7 @@ func (n *Network) NewBlock(b tmtypes.Header) { } else { n.AvgBlockTime = 0.0 } + // n.txThroughputMeter.Mark(int64(b.NumTxs)) TODO: n.AvgTxThroughput = n.txThroughputMeter.Rate1() } diff --git a/types/proto3/block.pb.go b/types/proto3/block.pb.go index 08c745a4..70d7c522 100644 --- a/types/proto3/block.pb.go +++ b/types/proto3/block.pb.go @@ -30,7 +30,7 @@ func (m *PartSetHeader) Reset() { *m = PartSetHeader{} } func (m *PartSetHeader) String() string { return proto.CompactTextString(m) } func (*PartSetHeader) ProtoMessage() {} func (*PartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_block_91c2f34d0a2cd23a, []int{0} + return fileDescriptor_block_b863c498f3706603, []int{0} } func (m *PartSetHeader) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PartSetHeader.Unmarshal(m, b) @@ -76,7 +76,7 @@ func (m *BlockID) Reset() { *m = BlockID{} } func (m *BlockID) String() string { return proto.CompactTextString(m) } func (*BlockID) ProtoMessage() {} func (*BlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_block_91c2f34d0a2cd23a, []int{1} + return fileDescriptor_block_b863c498f3706603, []int{1} } func (m *BlockID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlockID.Unmarshal(m, b) @@ -117,19 +117,19 @@ type Header struct { Height int64 `protobuf:"varint,3,opt,name=Height,proto3" json:"Height,omitempty"` Time *Timestamp `protobuf:"bytes,4,opt,name=Time" json:"Time,omitempty"` // prev block info - LastBlockID *BlockID `protobuf:"bytes,7,opt,name=LastBlockID" json:"LastBlockID,omitempty"` + LastBlockID *BlockID `protobuf:"bytes,5,opt,name=LastBlockID" json:"LastBlockID,omitempty"` // hashes of block data - LastCommitHash []byte `protobuf:"bytes,8,opt,name=LastCommitHash,proto3" json:"LastCommitHash,omitempty"` - DataHash []byte `protobuf:"bytes,9,opt,name=DataHash,proto3" json:"DataHash,omitempty"` + LastCommitHash []byte `protobuf:"bytes,6,opt,name=LastCommitHash,proto3" json:"LastCommitHash,omitempty"` + DataHash []byte `protobuf:"bytes,7,opt,name=DataHash,proto3" json:"DataHash,omitempty"` // hashes from the app output from the prev block - ValidatorsHash []byte `protobuf:"bytes,10,opt,name=ValidatorsHash,proto3" json:"ValidatorsHash,omitempty"` - NextValidatorsHash []byte `protobuf:"bytes,11,opt,name=NextValidatorsHash,proto3" json:"NextValidatorsHash,omitempty"` - ConsensusHash []byte `protobuf:"bytes,12,opt,name=ConsensusHash,proto3" json:"ConsensusHash,omitempty"` - AppHash []byte `protobuf:"bytes,13,opt,name=AppHash,proto3" json:"AppHash,omitempty"` - LastResultsHash []byte `protobuf:"bytes,14,opt,name=LastResultsHash,proto3" json:"LastResultsHash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,8,opt,name=ValidatorsHash,proto3" json:"ValidatorsHash,omitempty"` + NextValidatorsHash []byte `protobuf:"bytes,9,opt,name=NextValidatorsHash,proto3" json:"NextValidatorsHash,omitempty"` + ConsensusHash []byte `protobuf:"bytes,10,opt,name=ConsensusHash,proto3" json:"ConsensusHash,omitempty"` + AppHash []byte `protobuf:"bytes,11,opt,name=AppHash,proto3" json:"AppHash,omitempty"` + LastResultsHash []byte `protobuf:"bytes,12,opt,name=LastResultsHash,proto3" json:"LastResultsHash,omitempty"` // consensus info - EvidenceHash []byte `protobuf:"bytes,15,opt,name=EvidenceHash,proto3" json:"EvidenceHash,omitempty"` - ProposerAddress []byte `protobuf:"bytes,16,opt,name=ProposerAddress,proto3" json:"ProposerAddress,omitempty"` + EvidenceHash []byte `protobuf:"bytes,13,opt,name=EvidenceHash,proto3" json:"EvidenceHash,omitempty"` + ProposerAddress []byte `protobuf:"bytes,14,opt,name=ProposerAddress,proto3" json:"ProposerAddress,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -139,7 +139,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_block_91c2f34d0a2cd23a, []int{2} + return fileDescriptor_block_b863c498f3706603, []int{2} } func (m *Header) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Header.Unmarshal(m, b) @@ -269,7 +269,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_block_91c2f34d0a2cd23a, []int{3} + return fileDescriptor_block_b863c498f3706603, []int{3} } func (m *Version) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Version.Unmarshal(m, b) @@ -320,7 +320,7 @@ func (m *Timestamp) Reset() { *m = Timestamp{} } func (m *Timestamp) String() string { return proto.CompactTextString(m) } func (*Timestamp) ProtoMessage() {} func (*Timestamp) Descriptor() ([]byte, []int) { - return fileDescriptor_block_91c2f34d0a2cd23a, []int{4} + return fileDescriptor_block_b863c498f3706603, []int{4} } func (m *Timestamp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Timestamp.Unmarshal(m, b) @@ -362,35 +362,35 @@ func init() { proto.RegisterType((*Timestamp)(nil), "proto3.Timestamp") } -func init() { proto.RegisterFile("types/proto3/block.proto", fileDescriptor_block_91c2f34d0a2cd23a) } +func init() { proto.RegisterFile("types/proto3/block.proto", fileDescriptor_block_b863c498f3706603) } -var fileDescriptor_block_91c2f34d0a2cd23a = []byte{ +var fileDescriptor_block_b863c498f3706603 = []byte{ // 432 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0xd1, 0x6f, 0xd3, 0x30, - 0x10, 0xc6, 0x15, 0x9a, 0xae, 0xeb, 0xa5, 0x5d, 0xc7, 0x09, 0x50, 0xc4, 0x53, 0x15, 0x01, 0x2a, - 0x2f, 0x9d, 0xb6, 0x3d, 0x20, 0xc4, 0x53, 0x69, 0x91, 0x36, 0x09, 0xa1, 0xc9, 0x4c, 0x7d, 0xf7, - 0x1a, 0x8b, 0x46, 0xb4, 0xb6, 0xe5, 0xf3, 0x10, 0xfc, 0x1d, 0xfc, 0xc3, 0xc8, 0xe7, 0xa4, 0x34, - 0xd1, 0xde, 0xf2, 0x7d, 0xf7, 0xdd, 0xcf, 0xf6, 0xd9, 0x81, 0xdc, 0xff, 0xb1, 0x8a, 0x2e, 0xac, - 0x33, 0xde, 0x5c, 0x5f, 0x3c, 0xec, 0xcc, 0xe6, 0xe7, 0x9c, 0x05, 0x9e, 0x44, 0xaf, 0xf8, 0x08, - 0xe3, 0x3b, 0xe9, 0xfc, 0x77, 0xe5, 0x6f, 0x94, 0x2c, 0x95, 0xc3, 0x17, 0xd0, 0xbf, 0x37, 0x5e, - 0xee, 0xf2, 0x64, 0x9a, 0xcc, 0xfa, 0x22, 0x0a, 0x44, 0x48, 0x6f, 0x24, 0x6d, 0xf3, 0x67, 0xd3, - 0x64, 0x36, 0x12, 0xfc, 0x5d, 0xac, 0x61, 0xf0, 0x39, 0x10, 0x6f, 0x57, 0x87, 0x72, 0xf2, 0xbf, - 0x8c, 0x1f, 0x20, 0x0b, 0x64, 0x8a, 0x5c, 0xee, 0xcc, 0xae, 0x5e, 0xc6, 0xe5, 0xaf, 0xe7, 0xad, - 0x45, 0xc5, 0x71, 0xb2, 0xf8, 0x9b, 0xc2, 0x49, 0xbd, 0x99, 0xf7, 0x30, 0x58, 0x2b, 0x47, 0x95, - 0xd1, 0x8c, 0xce, 0xae, 0x26, 0x4d, 0x7f, 0x6d, 0x8b, 0xa6, 0x8e, 0x39, 0x0c, 0x96, 0x5b, 0x59, - 0xe9, 0xdb, 0x15, 0x2f, 0x35, 0x14, 0x8d, 0xc4, 0x57, 0x01, 0x57, 0xfd, 0xd8, 0xfa, 0xbc, 0x37, - 0x4d, 0x66, 0x3d, 0x51, 0x2b, 0x7c, 0x0b, 0xe9, 0x7d, 0xb5, 0x57, 0x79, 0xca, 0xe4, 0xe7, 0x0d, - 0x39, 0x78, 0xe4, 0xe5, 0xde, 0x0a, 0x2e, 0xe3, 0x25, 0x64, 0x5f, 0x25, 0xf9, 0xfa, 0xa8, 0xf9, - 0xa0, 0xbd, 0x8f, 0xda, 0x16, 0xc7, 0x19, 0x7c, 0x07, 0x67, 0x41, 0x2e, 0xcd, 0x7e, 0x5f, 0x79, - 0x1e, 0xcc, 0x29, 0x0f, 0xa6, 0xe3, 0xe2, 0x6b, 0x38, 0x5d, 0x49, 0x2f, 0x39, 0x31, 0xe4, 0xc4, - 0x41, 0x07, 0xc6, 0x5a, 0xee, 0xaa, 0x52, 0x7a, 0xe3, 0x88, 0x13, 0x10, 0x19, 0x6d, 0x17, 0xe7, - 0x80, 0xdf, 0xd4, 0x6f, 0xdf, 0xc9, 0x66, 0x9c, 0x7d, 0xa2, 0x82, 0x6f, 0x60, 0xbc, 0x34, 0x9a, - 0x94, 0xa6, 0xc7, 0x18, 0x1d, 0x71, 0xb4, 0x6d, 0x86, 0x69, 0x2e, 0xac, 0xe5, 0xfa, 0x98, 0xeb, - 0x8d, 0xc4, 0x19, 0x4c, 0xc2, 0x29, 0x84, 0xa2, 0xc7, 0x9d, 0x8f, 0x84, 0x33, 0x4e, 0x74, 0x6d, - 0x2c, 0x60, 0xf4, 0xe5, 0x57, 0x55, 0x2a, 0xbd, 0x51, 0x1c, 0x9b, 0x70, 0xac, 0xe5, 0x05, 0xda, - 0x9d, 0x33, 0xd6, 0x90, 0x72, 0x8b, 0xb2, 0x74, 0x8a, 0x28, 0x3f, 0x8f, 0xb4, 0x8e, 0x5d, 0x5c, - 0x1e, 0x9e, 0x42, 0x78, 0xa2, 0x3c, 0x69, 0x7e, 0x13, 0xa9, 0x88, 0x02, 0xcf, 0xa1, 0xb7, 0xb0, - 0x96, 0x2f, 0x3f, 0x15, 0xe1, 0xb3, 0xf8, 0x04, 0xc3, 0xc3, 0x65, 0x86, 0x13, 0x91, 0xda, 0x18, - 0x5d, 0x12, 0xb7, 0xf5, 0x44, 0x23, 0x03, 0x4e, 0x4b, 0x6d, 0x88, 0x5b, 0xfb, 0x22, 0x8a, 0x87, - 0xfa, 0x07, 0xf9, 0x17, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xb9, 0xeb, 0x00, 0x43, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x41, 0x6f, 0x13, 0x31, + 0x10, 0x85, 0xb5, 0x64, 0x93, 0x34, 0xb3, 0x49, 0x0b, 0x23, 0x40, 0x16, 0xa7, 0x68, 0x05, 0x28, + 0x5c, 0x52, 0xb5, 0x3d, 0x20, 0xc4, 0x29, 0x24, 0x48, 0xad, 0x84, 0x50, 0x65, 0xaa, 0xdc, 0xdd, + 0xac, 0x45, 0x56, 0x24, 0xb6, 0xe5, 0x71, 0x11, 0xfc, 0x0e, 0xfe, 0x30, 0xf2, 0x78, 0x37, 0x74, + 0x23, 0x6e, 0xfb, 0xde, 0xbc, 0xf9, 0x6c, 0x8f, 0xbd, 0x20, 0xc2, 0x6f, 0xa7, 0xe9, 0xdc, 0x79, + 0x1b, 0xec, 0xd5, 0xf9, 0xfd, 0xce, 0x6e, 0x7e, 0xcc, 0x59, 0xe0, 0x20, 0x79, 0xe5, 0x07, 0x98, + 0xdc, 0x2a, 0x1f, 0xbe, 0xe9, 0x70, 0xad, 0x55, 0xa5, 0x3d, 0x3e, 0x87, 0xfe, 0x9d, 0x0d, 0x6a, + 0x27, 0xb2, 0x69, 0x36, 0xeb, 0xcb, 0x24, 0x10, 0x21, 0xbf, 0x56, 0xb4, 0x15, 0x4f, 0xa6, 0xd9, + 0x6c, 0x2c, 0xf9, 0xbb, 0x5c, 0xc3, 0xf0, 0x53, 0x24, 0xde, 0xac, 0x0e, 0xe5, 0xec, 0x5f, 0x19, + 0xdf, 0x43, 0x11, 0xc9, 0x94, 0xb8, 0xdc, 0x59, 0x5c, 0xbe, 0x48, 0xcb, 0x5f, 0xcd, 0x3b, 0x8b, + 0xca, 0xc7, 0xc9, 0xf2, 0x4f, 0x0e, 0x83, 0x66, 0x33, 0xef, 0x60, 0xb8, 0xd6, 0x9e, 0x6a, 0x6b, + 0x18, 0x5d, 0x5c, 0x9e, 0xb5, 0xfd, 0x8d, 0x2d, 0xdb, 0x3a, 0x0a, 0x18, 0x2e, 0xb7, 0xaa, 0x36, + 0x37, 0x2b, 0x5e, 0x6a, 0x24, 0x5b, 0x89, 0x2f, 0x23, 0xae, 0xfe, 0xbe, 0x0d, 0xa2, 0x37, 0xcd, + 0x66, 0x3d, 0xd9, 0x28, 0x7c, 0x03, 0xf9, 0x5d, 0xbd, 0xd7, 0x22, 0x67, 0xf2, 0xb3, 0x96, 0x1c, + 0x3d, 0x0a, 0x6a, 0xef, 0x24, 0x97, 0xf1, 0x02, 0x8a, 0x2f, 0x8a, 0x42, 0x73, 0x54, 0xd1, 0xef, + 0xee, 0xa3, 0xb1, 0xe5, 0xe3, 0x0c, 0xbe, 0x85, 0xd3, 0x28, 0x97, 0x76, 0xbf, 0xaf, 0x03, 0x0f, + 0x66, 0xc0, 0x83, 0x39, 0x72, 0xf1, 0x15, 0x9c, 0xac, 0x54, 0x50, 0x9c, 0x18, 0x72, 0xe2, 0xa0, + 0x23, 0x63, 0xad, 0x76, 0x75, 0xa5, 0x82, 0xf5, 0xc4, 0x89, 0x93, 0xc4, 0xe8, 0xba, 0x38, 0x07, + 0xfc, 0xaa, 0x7f, 0x85, 0xa3, 0xec, 0x88, 0xb3, 0xff, 0xa9, 0xe0, 0x6b, 0x98, 0x2c, 0xad, 0x21, + 0x6d, 0xe8, 0x21, 0x45, 0x81, 0xa3, 0x5d, 0x33, 0x4e, 0x73, 0xe1, 0x1c, 0xd7, 0x0b, 0xae, 0xb7, + 0x12, 0x67, 0x70, 0x16, 0x4f, 0x21, 0x35, 0x3d, 0xec, 0x42, 0x22, 0x8c, 0x39, 0x71, 0x6c, 0x63, + 0x09, 0xe3, 0xcf, 0x3f, 0xeb, 0x4a, 0x9b, 0x8d, 0xe6, 0xd8, 0x84, 0x63, 0x1d, 0x2f, 0xd2, 0x6e, + 0xbd, 0x75, 0x96, 0xb4, 0x5f, 0x54, 0x95, 0xd7, 0x44, 0xe2, 0x34, 0xd1, 0x8e, 0xec, 0xf2, 0xe2, + 0xf0, 0x14, 0xe2, 0x13, 0xe5, 0x49, 0xf3, 0x9b, 0xc8, 0x65, 0x12, 0xf8, 0x14, 0x7a, 0x0b, 0xe7, + 0xf8, 0xf2, 0x73, 0x19, 0x3f, 0xcb, 0x8f, 0x30, 0x3a, 0x5c, 0x66, 0x3c, 0x11, 0xe9, 0x8d, 0x35, + 0x15, 0x71, 0x5b, 0x4f, 0xb6, 0x32, 0xe2, 0x8c, 0x32, 0x96, 0xb8, 0xb5, 0x2f, 0x93, 0xb8, 0x6f, + 0x7e, 0x90, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x17, 0xe4, 0x46, 0x43, 0x03, 0x00, 0x00, } diff --git a/types/proto3/block.proto b/types/proto3/block.proto index 93fb8630..382fce56 100644 --- a/types/proto3/block.proto +++ b/types/proto3/block.proto @@ -21,22 +21,22 @@ message Header { Timestamp Time = 4; // prev block info - BlockID LastBlockID = 7; + BlockID LastBlockID = 5; // hashes of block data - bytes LastCommitHash = 8; // commit from validators from the last block - bytes DataHash = 9; // transactions + bytes LastCommitHash = 6; // commit from validators from the last block + bytes DataHash = 7; // transactions // hashes from the app output from the prev block - bytes ValidatorsHash = 10; // validators for the current block - bytes NextValidatorsHash = 11; // validators for the next block - bytes ConsensusHash = 12; // consensus params for current block - bytes AppHash = 13; // state after txs from the previous block - bytes LastResultsHash = 14; // root hash of all results from the txs from the previous block + bytes ValidatorsHash = 8; // validators for the current block + bytes NextValidatorsHash = 9; // validators for the next block + bytes ConsensusHash = 10; // consensus params for current block + bytes AppHash = 11; // state after txs from the previous block + bytes LastResultsHash = 12; // root hash of all results from the txs from the previous block // consensus info - bytes EvidenceHash = 15; // evidence included in the block - bytes ProposerAddress = 16; // original proposer of the block + bytes EvidenceHash = 13; // evidence included in the block + bytes ProposerAddress = 14; // original proposer of the block } message Version {