proto: move all proto dirs to /proto (#5012)

## Description

This PR moves all proto files under one dir (`/proto`). The script to generate adding functionality to copy the files that still need to be in the same place. (abci & rpc)

renames every proto package from `tendermint.proto.<pkg_name>` to `tendermint.<pkg_name>`

Removes unneeded types in privval proto directory

Closes: #XXX

abci/types/types.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: abci/types/types.proto
+// source: proto/abci/types.proto
 
 package types
 
@@ -56,7 +56,7 @@ func (x CheckTxType) String() string {
 }
 
 func (CheckTxType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{0}
+	return fileDescriptor_5056eb770c93415b, []int{0}
 }
 
 type ResponseOfferSnapshot_Result int32
@@ -90,7 +90,7 @@ func (x ResponseOfferSnapshot_Result) String() string {
 }
 
 func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{30, 0}
+	return fileDescriptor_5056eb770c93415b, []int{30, 0}
 }
 
 type ResponseApplySnapshotChunk_Result int32
@@ -124,7 +124,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string {
 }
 
 func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{32, 0}
+	return fileDescriptor_5056eb770c93415b, []int{32, 0}
 }
 
 type Request struct {
@@ -151,7 +151,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_9f1eaa49c51fa1ac, []int{0}
+	return fileDescriptor_5056eb770c93415b, []int{0}
 }
 func (m *Request) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -389,7 +389,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_9f1eaa49c51fa1ac, []int{1}
+	return fileDescriptor_5056eb770c93415b, []int{1}
 }
 func (m *RequestEcho) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -432,7 +432,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_9f1eaa49c51fa1ac, []int{2}
+	return fileDescriptor_5056eb770c93415b, []int{2}
 }
 func (m *RequestFlush) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -471,7 +471,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_9f1eaa49c51fa1ac, []int{3}
+	return fileDescriptor_5056eb770c93415b, []int{3}
 }
 func (m *RequestInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -531,7 +531,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_9f1eaa49c51fa1ac, []int{4}
+	return fileDescriptor_5056eb770c93415b, []int{4}
 }
 func (m *RequestSetOption) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -586,7 +586,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_9f1eaa49c51fa1ac, []int{5}
+	return fileDescriptor_5056eb770c93415b, []int{5}
 }
 func (m *RequestInitChain) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -661,7 +661,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_9f1eaa49c51fa1ac, []int{6}
+	return fileDescriptor_5056eb770c93415b, []int{6}
 }
 func (m *RequestQuery) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -729,7 +729,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_9f1eaa49c51fa1ac, []int{7}
+	return fileDescriptor_5056eb770c93415b, []int{7}
 }
 func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -795,7 +795,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_9f1eaa49c51fa1ac, []int{8}
+	return fileDescriptor_5056eb770c93415b, []int{8}
 }
 func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -846,7 +846,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_9f1eaa49c51fa1ac, []int{9}
+	return fileDescriptor_5056eb770c93415b, []int{9}
 }
 func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -890,7 +890,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_9f1eaa49c51fa1ac, []int{10}
+	return fileDescriptor_5056eb770c93415b, []int{10}
 }
 func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -933,7 +933,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_9f1eaa49c51fa1ac, []int{11}
+	return fileDescriptor_5056eb770c93415b, []int{11}
 }
 func (m *RequestCommit) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -970,7 +970,7 @@ func (m *RequestListSnapshots) Reset()         { *m = RequestListSnapshots{} }
 func (m *RequestListSnapshots) String() string { return proto.CompactTextString(m) }
 func (*RequestListSnapshots) ProtoMessage()    {}
 func (*RequestListSnapshots) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{12}
+	return fileDescriptor_5056eb770c93415b, []int{12}
 }
 func (m *RequestListSnapshots) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1009,7 +1009,7 @@ func (m *RequestOfferSnapshot) Reset()         { *m = RequestOfferSnapshot{} }
 func (m *RequestOfferSnapshot) String() string { return proto.CompactTextString(m) }
 func (*RequestOfferSnapshot) ProtoMessage()    {}
 func (*RequestOfferSnapshot) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{13}
+	return fileDescriptor_5056eb770c93415b, []int{13}
 }
 func (m *RequestOfferSnapshot) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1063,7 +1063,7 @@ func (m *RequestLoadSnapshotChunk) Reset()         { *m = RequestLoadSnapshotChu
 func (m *RequestLoadSnapshotChunk) String() string { return proto.CompactTextString(m) }
 func (*RequestLoadSnapshotChunk) ProtoMessage()    {}
 func (*RequestLoadSnapshotChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{14}
+	return fileDescriptor_5056eb770c93415b, []int{14}
 }
 func (m *RequestLoadSnapshotChunk) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1124,7 +1124,7 @@ func (m *RequestApplySnapshotChunk) Reset()         { *m = RequestApplySnapshotC
 func (m *RequestApplySnapshotChunk) String() string { return proto.CompactTextString(m) }
 func (*RequestApplySnapshotChunk) ProtoMessage()    {}
 func (*RequestApplySnapshotChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{15}
+	return fileDescriptor_5056eb770c93415b, []int{15}
 }
 func (m *RequestApplySnapshotChunk) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1199,7 +1199,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_9f1eaa49c51fa1ac, []int{16}
+	return fileDescriptor_5056eb770c93415b, []int{16}
 }
 func (m *Response) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1450,7 +1450,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_9f1eaa49c51fa1ac, []int{17}
+	return fileDescriptor_5056eb770c93415b, []int{17}
 }
 func (m *ResponseException) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1494,7 +1494,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_9f1eaa49c51fa1ac, []int{18}
+	return fileDescriptor_5056eb770c93415b, []int{18}
 }
 func (m *ResponseEcho) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1537,7 +1537,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_9f1eaa49c51fa1ac, []int{19}
+	return fileDescriptor_5056eb770c93415b, []int{19}
 }
 func (m *ResponseFlush) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1578,7 +1578,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_9f1eaa49c51fa1ac, []int{20}
+	return fileDescriptor_5056eb770c93415b, []int{20}
 }
 func (m *ResponseInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1654,7 +1654,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_9f1eaa49c51fa1ac, []int{21}
+	return fileDescriptor_5056eb770c93415b, []int{21}
 }
 func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1713,7 +1713,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_9f1eaa49c51fa1ac, []int{22}
+	return fileDescriptor_5056eb770c93415b, []int{22}
 }
 func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1773,7 +1773,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_9f1eaa49c51fa1ac, []int{23}
+	return fileDescriptor_5056eb770c93415b, []int{23}
 }
 func (m *ResponseQuery) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1873,7 +1873,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_9f1eaa49c51fa1ac, []int{24}
+	return fileDescriptor_5056eb770c93415b, []int{24}
 }
 func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1924,7 +1924,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_9f1eaa49c51fa1ac, []int{25}
+	return fileDescriptor_5056eb770c93415b, []int{25}
 }
 func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2024,7 +2024,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_9f1eaa49c51fa1ac, []int{26}
+	return fileDescriptor_5056eb770c93415b, []int{26}
 }
 func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2119,7 +2119,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_9f1eaa49c51fa1ac, []int{27}
+	return fileDescriptor_5056eb770c93415b, []int{27}
 }
 func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2179,7 +2179,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_9f1eaa49c51fa1ac, []int{28}
+	return fileDescriptor_5056eb770c93415b, []int{28}
 }
 func (m *ResponseCommit) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2230,7 +2230,7 @@ func (m *ResponseListSnapshots) Reset()         { *m = ResponseListSnapshots{} }
 func (m *ResponseListSnapshots) String() string { return proto.CompactTextString(m) }
 func (*ResponseListSnapshots) ProtoMessage()    {}
 func (*ResponseListSnapshots) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{29}
+	return fileDescriptor_5056eb770c93415b, []int{29}
 }
 func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2274,7 +2274,7 @@ func (m *ResponseOfferSnapshot) Reset()         { *m = ResponseOfferSnapshot{} }
 func (m *ResponseOfferSnapshot) String() string { return proto.CompactTextString(m) }
 func (*ResponseOfferSnapshot) ProtoMessage()    {}
 func (*ResponseOfferSnapshot) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{30}
+	return fileDescriptor_5056eb770c93415b, []int{30}
 }
 func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2318,7 +2318,7 @@ func (m *ResponseLoadSnapshotChunk) Reset()         { *m = ResponseLoadSnapshotC
 func (m *ResponseLoadSnapshotChunk) String() string { return proto.CompactTextString(m) }
 func (*ResponseLoadSnapshotChunk) ProtoMessage()    {}
 func (*ResponseLoadSnapshotChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{31}
+	return fileDescriptor_5056eb770c93415b, []int{31}
 }
 func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2364,7 +2364,7 @@ func (m *ResponseApplySnapshotChunk) Reset()         { *m = ResponseApplySnapsho
 func (m *ResponseApplySnapshotChunk) String() string { return proto.CompactTextString(m) }
 func (*ResponseApplySnapshotChunk) ProtoMessage()    {}
 func (*ResponseApplySnapshotChunk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{32}
+	return fileDescriptor_5056eb770c93415b, []int{32}
 }
 func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2426,7 +2426,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_9f1eaa49c51fa1ac, []int{33}
+	return fileDescriptor_5056eb770c93415b, []int{33}
 }
 func (m *ConsensusParams) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2488,7 +2488,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_9f1eaa49c51fa1ac, []int{34}
+	return fileDescriptor_5056eb770c93415b, []int{34}
 }
 func (m *BlockParams) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2540,7 +2540,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_9f1eaa49c51fa1ac, []int{35}
+	return fileDescriptor_5056eb770c93415b, []int{35}
 }
 func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2594,7 +2594,7 @@ func (m *EventAttribute) Reset()         { *m = EventAttribute{} }
 func (m *EventAttribute) String() string { return proto.CompactTextString(m) }
 func (*EventAttribute) ProtoMessage()    {}
 func (*EventAttribute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{36}
+	return fileDescriptor_5056eb770c93415b, []int{36}
 }
 func (m *EventAttribute) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2653,7 +2653,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_9f1eaa49c51fa1ac, []int{37}
+	return fileDescriptor_5056eb770c93415b, []int{37}
 }
 func (m *Event) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2710,7 +2710,7 @@ func (m *TxResult) Reset()         { *m = TxResult{} }
 func (m *TxResult) String() string { return proto.CompactTextString(m) }
 func (*TxResult) ProtoMessage()    {}
 func (*TxResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{38}
+	return fileDescriptor_5056eb770c93415b, []int{38}
 }
 func (m *TxResult) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2776,7 +2776,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_9f1eaa49c51fa1ac, []int{39}
+	return fileDescriptor_5056eb770c93415b, []int{39}
 }
 func (m *BlockID) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2828,7 +2828,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_9f1eaa49c51fa1ac, []int{40}
+	return fileDescriptor_5056eb770c93415b, []int{40}
 }
 func (m *PartSetHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2882,7 +2882,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_9f1eaa49c51fa1ac, []int{41}
+	return fileDescriptor_5056eb770c93415b, []int{41}
 }
 func (m *Validator) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2935,7 +2935,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_9f1eaa49c51fa1ac, []int{42}
+	return fileDescriptor_5056eb770c93415b, []int{42}
 }
 func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2988,7 +2988,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_9f1eaa49c51fa1ac, []int{43}
+	return fileDescriptor_5056eb770c93415b, []int{43}
 }
 func (m *VoteInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -3043,7 +3043,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_9f1eaa49c51fa1ac, []int{44}
+	return fileDescriptor_5056eb770c93415b, []int{44}
 }
 func (m *Evidence) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -3119,7 +3119,7 @@ func (m *Snapshot) Reset()         { *m = Snapshot{} }
 func (m *Snapshot) String() string { return proto.CompactTextString(m) }
 func (*Snapshot) ProtoMessage()    {}
 func (*Snapshot) Descriptor() ([]byte, []int) {
-	return fileDescriptor_9f1eaa49c51fa1ac, []int{45}
+	return fileDescriptor_5056eb770c93415b, []int{45}
 }
 func (m *Snapshot) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -3235,180 +3235,179 @@ func init() {
 	proto.RegisterType((*Snapshot)(nil), "tendermint.abci.types.Snapshot")
 }
 
-func init() { proto.RegisterFile("abci/types/types.proto", fileDescriptor_9f1eaa49c51fa1ac) }
-
-var fileDescriptor_9f1eaa49c51fa1ac = []byte{
-	// 2706 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x6f, 0x1b, 0xc9,
-	0xf1, 0xe7, 0x4b, 0x7c, 0x14, 0x45, 0x8a, 0x6a, 0x7b, 0xbd, 0x5c, 0xfe, 0x77, 0x25, 0x63, 0xbc,
-	0x7e, 0xed, 0xfa, 0x4f, 0xed, 0x6a, 0x81, 0xc0, 0x8e, 0x9d, 0x04, 0xa2, 0x2c, 0x87, 0x8a, 0x1f,
-	0x92, 0x47, 0x92, 0xe3, 0x4d, 0x80, 0x9d, 0x34, 0x67, 0x5a, 0xe4, 0xac, 0xc8, 0x99, 0xd9, 0x99,
-	0xa6, 0x2c, 0x06, 0x39, 0x04, 0x41, 0x80, 0x20, 0x37, 0xe7, 0x92, 0x5b, 0xbe, 0x43, 0x0e, 0x01,
-	0x36, 0x5f, 0x20, 0xc0, 0x1e, 0xf7, 0x14, 0xe4, 0xb4, 0x09, 0xec, 0x9c, 0x92, 0x2f, 0x11, 0xf4,
-	0x63, 0x5e, 0x14, 0x1f, 0xc3, 0x8d, 0x6f, 0xb9, 0x10, 0xdd, 0x35, 0x55, 0xd5, 0xdd, 0xd5, 0xdd,
-	0x55, 0xbf, 0xaa, 0x26, 0x5c, 0xc2, 0x1d, 0xdd, 0xdc, 0xa0, 0x23, 0x87, 0x78, 0xe2, 0xb7, 0xe9,
-	0xb8, 0x36, 0xb5, 0xd1, 0x5b, 0x94, 0x58, 0x06, 0x71, 0x07, 0xa6, 0x45, 0x9b, 0x8c, 0xa5, 0xc9,
-	0x3f, 0x36, 0xd6, 0xf9, 0xd7, 0x0d, 0xdd, 0x1d, 0x39, 0xd4, 0xde, 0x18, 0x10, 0xf7, 0xa4, 0x4f,
-	0xa2, 0x72, 0x8d, 0xb7, 0x05, 0xc3, 0x39, 0x85, 0x8d, 0xf7, 0x62, 0x92, 0x27, 0x64, 0x14, 0xff,
-	0x5c, 0x8f, 0xca, 0x39, 0xd8, 0xc5, 0x03, 0xff, 0xcb, 0x7a, 0xd7, 0xb6, 0xbb, 0x7d, 0xb2, 0xc1,
-	0x7b, 0x9d, 0xe1, 0xf1, 0x06, 0x35, 0x07, 0xc4, 0xa3, 0x78, 0xe0, 0x48, 0x86, 0x6b, 0xb4, 0x67,
-	0xba, 0x86, 0xe6, 0x60, 0x97, 0x8e, 0x04, 0xd7, 0x46, 0xd7, 0xee, 0xda, 0x61, 0x4b, 0xf0, 0x29,
-	0xff, 0x2e, 0x42, 0x41, 0x25, 0x5f, 0x0c, 0x89, 0x47, 0xd1, 0x6d, 0xc8, 0x11, 0xbd, 0x67, 0xd7,
-	0x33, 0x97, 0xd3, 0x37, 0xca, 0x9b, 0x4a, 0x73, 0xe2, 0x6a, 0x9b, 0x92, 0x7b, 0x47, 0xef, 0xd9,
-	0xed, 0x94, 0xca, 0x25, 0xd0, 0x5d, 0x58, 0x3a, 0xee, 0x0f, 0xbd, 0x5e, 0x3d, 0xcb, 0x45, 0xaf,
-	0xcc, 0x16, 0x7d, 0xc0, 0x58, 0xdb, 0x29, 0x55, 0xc8, 0xb0, 0x61, 0x4d, 0xeb, 0xd8, 0xae, 0xe7,
-	0x92, 0x0c, 0xbb, 0x6b, 0x1d, 0xf3, 0x61, 0x99, 0x04, 0x6a, 0x03, 0x78, 0x84, 0x6a, 0xb6, 0x43,
-	0x4d, 0xdb, 0xaa, 0x2f, 0x71, 0xf9, 0xeb, 0xb3, 0xe5, 0x0f, 0x08, 0xdd, 0xe3, 0xec, 0xed, 0x94,
-	0x5a, 0xf2, 0xfc, 0x0e, 0xd3, 0x64, 0x5a, 0x26, 0xd5, 0xf4, 0x1e, 0x36, 0xad, 0x7a, 0x3e, 0x89,
-	0xa6, 0x5d, 0xcb, 0xa4, 0xdb, 0x8c, 0x9d, 0x69, 0x32, 0xfd, 0x0e, 0x33, 0xc5, 0x17, 0x43, 0xe2,
-	0x8e, 0xea, 0x85, 0x24, 0xa6, 0x78, 0xca, 0x58, 0x99, 0x29, 0xb8, 0x0c, 0x7a, 0x08, 0xe5, 0x0e,
-	0xe9, 0x9a, 0x96, 0xd6, 0xe9, 0xdb, 0xfa, 0x49, 0xbd, 0xc8, 0x55, 0xdc, 0x98, 0xad, 0xa2, 0xc5,
-	0x04, 0x5a, 0x8c, 0xbf, 0x9d, 0x52, 0xa1, 0x13, 0xf4, 0x50, 0x0b, 0x8a, 0x7a, 0x8f, 0xe8, 0x27,
-	0x1a, 0x3d, 0xab, 0x97, 0xb8, 0xa6, 0xab, 0xb3, 0x35, 0x6d, 0x33, 0xee, 0xc3, 0xb3, 0x76, 0x4a,
-	0x2d, 0xe8, 0xa2, 0xc9, 0xec, 0x62, 0x90, 0xbe, 0x79, 0x4a, 0x5c, 0xa6, 0xe5, 0x42, 0x12, 0xbb,
-	0xdc, 0x17, 0xfc, 0x5c, 0x4f, 0xc9, 0xf0, 0x3b, 0x68, 0x07, 0x4a, 0xc4, 0x32, 0xe4, 0xc2, 0xca,
-	0x5c, 0xd1, 0xb5, 0x39, 0x27, 0xcc, 0x32, 0xfc, 0x65, 0x15, 0x89, 0x6c, 0xa3, 0xef, 0x43, 0x5e,
-	0xb7, 0x07, 0x03, 0x93, 0xd6, 0x97, 0xb9, 0x8e, 0xf7, 0xe7, 0x2c, 0x89, 0xf3, 0xb6, 0x53, 0xaa,
-	0x94, 0x42, 0x87, 0x50, 0xed, 0x9b, 0x1e, 0xd5, 0x3c, 0x0b, 0x3b, 0x5e, 0xcf, 0xa6, 0x5e, 0xbd,
-	0xc2, 0xf5, 0x7c, 0x38, 0x5b, 0xcf, 0x23, 0xd3, 0xa3, 0x07, 0xbe, 0x48, 0x3b, 0xa5, 0x56, 0xfa,
-	0x51, 0x02, 0xd3, 0x6a, 0x1f, 0x1f, 0x13, 0x37, 0x50, 0x5b, 0xaf, 0x26, 0xd1, 0xba, 0xc7, 0x64,
-	0x7c, 0x2d, 0x4c, 0xab, 0x1d, 0x25, 0x20, 0x0c, 0x17, 0xfa, 0x36, 0x36, 0x02, 0xa5, 0x9a, 0xde,
-	0x1b, 0x5a, 0x27, 0xf5, 0x15, 0xae, 0x7a, 0x63, 0xce, 0x84, 0x6d, 0x6c, 0xf8, 0x8a, 0xb6, 0x99,
-	0x58, 0x3b, 0xa5, 0xae, 0xf6, 0xc7, 0x89, 0xc8, 0x80, 0x8b, 0xd8, 0x71, 0xfa, 0xa3, 0xf1, 0x31,
-	0x6a, 0x7c, 0x8c, 0x8f, 0x66, 0x8f, 0xb1, 0xc5, 0x24, 0xc7, 0x07, 0x41, 0xf8, 0x1c, 0xb5, 0x55,
-	0x80, 0xa5, 0x53, 0xdc, 0x1f, 0x12, 0xe5, 0x3a, 0x94, 0x23, 0xee, 0x03, 0xd5, 0xa1, 0x30, 0x20,
-	0x9e, 0x87, 0xbb, 0xa4, 0x9e, 0xbe, 0x9c, 0xbe, 0x51, 0x52, 0xfd, 0xae, 0x52, 0x85, 0xe5, 0xa8,
-	0xb3, 0x50, 0x06, 0x81, 0x20, 0x73, 0x00, 0x4c, 0xf0, 0x94, 0xb8, 0x1e, 0xbb, 0xf5, 0x52, 0x50,
-	0x76, 0xd1, 0x15, 0xa8, 0xf0, 0x23, 0xa6, 0xf9, 0xdf, 0x99, 0x33, 0xcb, 0xa9, 0xcb, 0x9c, 0xf8,
-	0x4c, 0x32, 0xad, 0x43, 0xd9, 0xd9, 0x74, 0x02, 0x96, 0x2c, 0x67, 0x01, 0x67, 0xd3, 0x91, 0x0c,
-	0xca, 0x77, 0xa1, 0x36, 0xee, 0x2f, 0x50, 0x0d, 0xb2, 0x27, 0x64, 0x24, 0xc7, 0x63, 0x4d, 0x74,
-	0x51, 0x2e, 0x8b, 0x8f, 0x51, 0x52, 0xe5, 0x1a, 0xff, 0x98, 0x09, 0x84, 0x03, 0x17, 0xc1, 0x7c,
-	0x1c, 0xf3, 0xd0, 0x5c, 0xba, 0xbc, 0xd9, 0x68, 0x0a, 0xf7, 0xdd, 0xf4, 0xdd, 0x77, 0xf3, 0xd0,
-	0x77, 0xdf, 0xad, 0xe2, 0x57, 0xdf, 0xac, 0xa7, 0x5e, 0xfe, 0x7d, 0x3d, 0xad, 0x72, 0x09, 0xf4,
-	0x0e, 0xbb, 0xc5, 0xd8, 0xb4, 0x34, 0xd3, 0x90, 0xe3, 0x14, 0x78, 0x7f, 0xd7, 0x40, 0x4f, 0xa1,
-	0xa6, 0xdb, 0x96, 0x47, 0x2c, 0x6f, 0xe8, 0x69, 0x22, 0x3c, 0x48, 0x07, 0x3c, 0xed, 0x66, 0x6d,
-	0xfb, 0xec, 0xfb, 0x9c, 0x5b, 0x5d, 0xd1, 0xe3, 0x04, 0xf4, 0x08, 0xe0, 0x14, 0xf7, 0x4d, 0x03,
-	0x53, 0xdb, 0xf5, 0xea, 0xb9, 0xcb, 0xd9, 0x19, 0xca, 0x9e, 0xf9, 0x8c, 0x47, 0x8e, 0x81, 0x29,
-	0x69, 0xe5, 0xd8, 0xcc, 0xd5, 0x88, 0x3c, 0xba, 0x06, 0x2b, 0xd8, 0x71, 0x34, 0x8f, 0x62, 0x4a,
-	0xb4, 0xce, 0x88, 0x12, 0x8f, 0x3b, 0xe9, 0x65, 0xb5, 0x82, 0x1d, 0xe7, 0x80, 0x51, 0x5b, 0x8c,
-	0xa8, 0x18, 0xc1, 0x6e, 0x73, 0x7f, 0x88, 0x10, 0xe4, 0x0c, 0x4c, 0x31, 0xb7, 0xd6, 0xb2, 0xca,
-	0xdb, 0x8c, 0xe6, 0x60, 0xda, 0x93, 0x36, 0xe0, 0x6d, 0x74, 0x09, 0xf2, 0x3d, 0x62, 0x76, 0x7b,
-	0x94, 0x2f, 0x3b, 0xab, 0xca, 0x1e, 0xdb, 0x18, 0xc7, 0xb5, 0x4f, 0x09, 0x0f, 0x29, 0x45, 0x55,
-	0x74, 0x94, 0xdf, 0x67, 0x60, 0xf5, 0x9c, 0xcf, 0x64, 0x7a, 0x7b, 0xd8, 0xeb, 0xf9, 0x63, 0xb1,
-	0x36, 0xba, 0xc7, 0xf4, 0x62, 0x83, 0xb8, 0x32, 0x14, 0xae, 0x45, 0x2d, 0xc0, 0xf7, 0x4c, 0x9a,
-	0xa0, 0xcd, 0xb9, 0xe4, 0xca, 0xa5, 0x0c, 0x3a, 0x82, 0x5a, 0x1f, 0x7b, 0x54, 0x13, 0x1e, 0x47,
-	0xe3, 0xb1, 0x2d, 0x3b, 0xd3, 0xff, 0x3e, 0xc2, 0xbe, 0xa7, 0x62, 0xa7, 0x5b, 0xaa, 0xab, 0xf6,
-	0x63, 0x54, 0xf4, 0x1c, 0x2e, 0x76, 0x46, 0x3f, 0xc7, 0x16, 0x35, 0x2d, 0xa2, 0x9d, 0xdb, 0xa4,
-	0xf5, 0x29, 0xaa, 0x77, 0x4e, 0x4d, 0x83, 0x58, 0xba, 0xbf, 0x3b, 0x17, 0x02, 0x15, 0xc1, 0xee,
-	0x79, 0xca, 0x73, 0xa8, 0xc6, 0x23, 0x00, 0xaa, 0x42, 0x86, 0x9e, 0x49, 0x93, 0x64, 0xe8, 0x19,
-	0xfa, 0x0e, 0xe4, 0x98, 0x3a, 0x6e, 0x8e, 0xea, 0xd4, 0x10, 0x2d, 0xa5, 0x0f, 0x47, 0x0e, 0x51,
-	0x39, 0xbf, 0xa2, 0x04, 0x57, 0x21, 0x88, 0x0a, 0xe3, 0xba, 0x95, 0x9b, 0xb0, 0x32, 0xe6, 0xf0,
-	0x23, 0xfb, 0x9a, 0x8e, 0xee, 0xab, 0xb2, 0x02, 0x95, 0x98, 0x5f, 0x57, 0x2e, 0xc1, 0xc5, 0x49,
-	0x0e, 0x5a, 0xb1, 0x02, 0x7a, 0xcc, 0xc5, 0xa2, 0xbb, 0x50, 0x0c, 0x3c, 0xb4, 0xb8, 0x8a, 0xd3,
-	0xec, 0xe6, 0x8b, 0xa8, 0x81, 0x00, 0xbb, 0x89, 0xec, 0x34, 0xf3, 0xd3, 0x92, 0xe1, 0xd3, 0x2f,
-	0x60, 0xc7, 0x69, 0x63, 0xaf, 0xa7, 0xfc, 0x0c, 0xea, 0xd3, 0xfc, 0xee, 0xd8, 0x62, 0x72, 0xc1,
-	0x21, 0xbd, 0x04, 0xf9, 0x63, 0xdb, 0x1d, 0x60, 0xca, 0x95, 0x55, 0x54, 0xd9, 0x63, 0x87, 0x57,
-	0xf8, 0xe0, 0x2c, 0x27, 0x8b, 0x8e, 0xa2, 0xc1, 0x3b, 0x53, 0xbd, 0x2e, 0x13, 0x31, 0x2d, 0x83,
-	0x08, 0xab, 0x56, 0x54, 0xd1, 0x09, 0x15, 0x89, 0xc9, 0x8a, 0x0e, 0x1b, 0xd6, 0xe3, 0x2b, 0xe6,
-	0xfa, 0x4b, 0xaa, 0xec, 0x29, 0x7f, 0x29, 0x41, 0x51, 0x25, 0x9e, 0xc3, 0x1c, 0x02, 0x6a, 0x43,
-	0x89, 0x9c, 0xe9, 0x44, 0xe0, 0xaa, 0xf4, 0x1c, 0x14, 0x22, 0x64, 0x76, 0x7c, 0x7e, 0x16, 0xf6,
-	0x03, 0x61, 0x74, 0x27, 0x86, 0x29, 0xaf, 0xcc, 0x53, 0x12, 0x05, 0x95, 0xf7, 0xe2, 0xa0, 0xf2,
-	0xfd, 0x39, 0xb2, 0x63, 0xa8, 0xf2, 0x4e, 0x0c, 0x55, 0xce, 0x1b, 0x38, 0x06, 0x2b, 0x77, 0x27,
-	0xc0, 0xca, 0x79, 0xcb, 0x9f, 0x82, 0x2b, 0x77, 0x27, 0xe0, 0xca, 0x1b, 0x73, 0xe7, 0x32, 0x11,
-	0x58, 0xde, 0x8b, 0x03, 0xcb, 0x79, 0xe6, 0x18, 0x43, 0x96, 0x8f, 0x26, 0x21, 0xcb, 0x9b, 0x73,
-	0x74, 0x4c, 0x85, 0x96, 0xdb, 0xe7, 0xa0, 0xe5, 0xb5, 0x39, 0xaa, 0x26, 0x60, 0xcb, 0xdd, 0x18,
-	0xb6, 0x84, 0x44, 0xb6, 0x99, 0x02, 0x2e, 0x1f, 0x9c, 0x07, 0x97, 0xd7, 0xe7, 0x1d, 0xb5, 0x49,
-	0xe8, 0xf2, 0x07, 0x63, 0xe8, 0xf2, 0xea, 0xbc, 0x55, 0x8d, 0xc3, 0xcb, 0xa3, 0x29, 0xf0, 0xf2,
-	0xd6, 0x1c, 0x45, 0x73, 0xf0, 0xe5, 0xd1, 0x14, 0x7c, 0x39, 0x4f, 0xed, 0x1c, 0x80, 0xd9, 0x99,
-	0x05, 0x30, 0x3f, 0x9a, 0x37, 0xe5, 0x64, 0x08, 0x93, 0xcc, 0x44, 0x98, 0x1f, 0xcf, 0x19, 0x64,
-	0x71, 0x88, 0x79, 0x93, 0x05, 0xf9, 0x31, 0x97, 0xc4, 0x5c, 0x21, 0x71, 0x5d, 0xdb, 0x95, 0xe8,
-	0x4d, 0x74, 0x94, 0x1b, 0x0c, 0x76, 0x84, 0x8e, 0x67, 0x06, 0x1c, 0xe5, 0x81, 0x27, 0xe2, 0x66,
-	0x94, 0x3f, 0xa7, 0x43, 0x59, 0x1e, 0x9d, 0xa3, 0x90, 0xa5, 0x24, 0x21, 0x4b, 0x04, 0xa5, 0x66,
-	0xe2, 0x28, 0x75, 0x1d, 0xca, 0x2c, 0x94, 0x8c, 0x01, 0x50, 0xec, 0xf8, 0x00, 0x14, 0x7d, 0x00,
-	0xab, 0x1c, 0x43, 0x08, 0x2c, 0x2b, 0xe3, 0x47, 0x8e, 0x07, 0xc3, 0x15, 0xf6, 0x41, 0x1c, 0x5d,
-	0x11, 0x48, 0xfe, 0x1f, 0x2e, 0x44, 0x78, 0x83, 0x10, 0x25, 0x90, 0x56, 0x2d, 0xe0, 0xde, 0x92,
-	0xb1, 0xea, 0x71, 0x68, 0xa0, 0x10, 0xdc, 0x22, 0xc8, 0xe9, 0xb6, 0x41, 0x64, 0x00, 0xe1, 0x6d,
-	0x06, 0x78, 0xfb, 0x76, 0x57, 0x86, 0x09, 0xd6, 0x64, 0x5c, 0x81, 0x4f, 0x2d, 0x09, 0x67, 0xa9,
-	0xfc, 0x29, 0x1d, 0xea, 0x0b, 0xf1, 0xee, 0x24, 0x68, 0x9a, 0x7e, 0x93, 0xd0, 0x34, 0xf3, 0xdf,
-	0x41, 0x53, 0xe5, 0xd7, 0x99, 0x70, 0x4b, 0x03, 0xd0, 0xf9, 0xed, 0x4c, 0x10, 0x86, 0xdf, 0x25,
-	0xbe, 0x41, 0x32, 0xfc, 0xca, 0x7c, 0x21, 0xcf, 0xb7, 0x21, 0x9e, 0x2f, 0x14, 0x44, 0x40, 0xe6,
-	0x1d, 0x96, 0x18, 0x3b, 0xae, 0x6d, 0x1f, 0x6b, 0xb6, 0xe3, 0x4d, 0xca, 0xf8, 0x05, 0xde, 0x14,
-	0x25, 0xa2, 0xa6, 0x28, 0x2e, 0x35, 0xf7, 0x99, 0xc0, 0x9e, 0xe3, 0xa9, 0x45, 0x47, 0xb6, 0x22,
-	0x30, 0xa3, 0x14, 0xc3, 0xc2, 0xef, 0x42, 0x89, 0x2d, 0xc5, 0x73, 0xb0, 0x4e, 0xb8, 0x93, 0x2d,
-	0xa9, 0x21, 0x41, 0x31, 0x00, 0x9d, 0x77, 0xf6, 0xe8, 0x09, 0xe4, 0xc9, 0x29, 0xb1, 0x28, 0xdb,
-	0x33, 0x66, 0xe6, 0x77, 0xa7, 0x82, 0x4b, 0x62, 0xd1, 0x56, 0x9d, 0x19, 0xf7, 0x5f, 0xdf, 0xac,
-	0xd7, 0x84, 0xcc, 0x2d, 0x7b, 0x60, 0x52, 0x32, 0x70, 0xe8, 0x48, 0x95, 0x5a, 0x94, 0xdf, 0x64,
-	0x18, 0xc6, 0x8b, 0x05, 0x82, 0x89, 0xe6, 0xf6, 0x2f, 0x51, 0x26, 0x82, 0xfb, 0x93, 0x6d, 0xc1,
-	0x7b, 0x00, 0x5d, 0xec, 0x69, 0x2f, 0xb0, 0x45, 0x89, 0x21, 0xf7, 0xa1, 0xd4, 0xc5, 0xde, 0x8f,
-	0x39, 0x81, 0x41, 0x37, 0xf6, 0x79, 0xe8, 0x11, 0x83, 0x6f, 0x48, 0x56, 0x2d, 0x74, 0xb1, 0x77,
-	0xe4, 0x11, 0x23, 0xb2, 0xd6, 0xc2, 0x9b, 0x58, 0x6b, 0xdc, 0xde, 0xc5, 0x71, 0x7b, 0xff, 0x36,
-	0x13, 0xde, 0x96, 0x10, 0x12, 0xff, 0x6f, 0xda, 0xe2, 0x0f, 0x3c, 0x51, 0x8e, 0x47, 0x63, 0xf4,
-	0x29, 0xac, 0x06, 0xb7, 0x54, 0x1b, 0xf2, 0xdb, 0xeb, 0x9f, 0xc2, 0xc5, 0x2e, 0x7b, 0xed, 0x34,
-	0x4e, 0xf6, 0xd0, 0x67, 0xf0, 0xf6, 0x98, 0x4f, 0x0a, 0x06, 0xc8, 0x2c, 0xe4, 0x9a, 0xde, 0x8a,
-	0xbb, 0x26, 0x5f, 0x7f, 0x68, 0xbd, 0xec, 0x1b, 0xb9, 0x35, 0xbb, 0x2c, 0x2d, 0x8b, 0xe2, 0x8c,
-	0x89, 0x67, 0xe2, 0x0a, 0x54, 0x5c, 0x42, 0xb1, 0x69, 0x69, 0xb1, 0x54, 0x78, 0x59, 0x10, 0x45,
-	0x88, 0x50, 0x9e, 0xc1, 0x5b, 0x13, 0x91, 0x06, 0xfa, 0x1e, 0x94, 0x42, 0xa8, 0x92, 0x9e, 0x99,
-	0x49, 0x06, 0x19, 0x51, 0x28, 0xa1, 0x7c, 0x99, 0x0e, 0x15, 0xc7, 0x33, 0xad, 0x87, 0x90, 0x77,
-	0x89, 0x37, 0xec, 0x8b, 0xac, 0xa7, 0xba, 0xf9, 0xc9, 0x22, 0x48, 0x85, 0x51, 0x87, 0x7d, 0xaa,
-	0x4a, 0x15, 0xca, 0x53, 0xc8, 0x0b, 0x0a, 0x02, 0xc8, 0x6f, 0x6d, 0x6f, 0xef, 0xec, 0x1f, 0xd6,
-	0x52, 0xa8, 0x04, 0x4b, 0x5b, 0xad, 0x3d, 0xf5, 0xb0, 0x96, 0x66, 0x64, 0x75, 0xe7, 0x47, 0x3b,
-	0xdb, 0x87, 0xb5, 0x0c, 0x5a, 0x85, 0x8a, 0x68, 0x6b, 0x0f, 0xf6, 0xd4, 0xc7, 0x5b, 0x87, 0xb5,
-	0x6c, 0x84, 0x74, 0xb0, 0xf3, 0xe4, 0xfe, 0x8e, 0x5a, 0xcb, 0x29, 0x1f, 0xb3, 0x7c, 0x6a, 0x0a,
-	0x90, 0x09, 0x33, 0xa7, 0x74, 0x24, 0x73, 0x52, 0x7e, 0x97, 0x81, 0xc6, 0x74, 0x5c, 0x82, 0xf6,
-	0xc7, 0x56, 0x7c, 0x7b, 0x61, 0x68, 0x33, 0xb6, 0x6c, 0x74, 0x15, 0xaa, 0x2e, 0x39, 0x26, 0x54,
-	0xef, 0x09, 0xcc, 0x24, 0xa2, 0x5e, 0x45, 0xad, 0x48, 0x2a, 0x17, 0xf2, 0x04, 0xdb, 0xe7, 0x44,
-	0xa7, 0x9a, 0x48, 0xe5, 0xc4, 0xf9, 0x2b, 0x31, 0x36, 0x46, 0x3d, 0x10, 0x44, 0xe5, 0x60, 0x9e,
-	0x11, 0x4b, 0xb0, 0xa4, 0xee, 0x1c, 0xaa, 0x9f, 0xd6, 0x32, 0x08, 0x41, 0x95, 0x37, 0xb5, 0x83,
-	0x27, 0x5b, 0xfb, 0x07, 0xed, 0x3d, 0x66, 0xc4, 0x0b, 0xb0, 0xe2, 0x1b, 0xd1, 0x27, 0xe6, 0x94,
-	0xbf, 0xa6, 0x61, 0x65, 0xec, 0x7a, 0xa0, 0xdb, 0xb0, 0x24, 0x80, 0x78, 0x7a, 0x66, 0x41, 0x9f,
-	0xdf, 0x77, 0x79, 0xa3, 0x84, 0x00, 0x6a, 0x41, 0x91, 0xc8, 0x7a, 0xc5, 0xa4, 0x2b, 0x19, 0xad,
-	0xbc, 0xf8, 0x75, 0x0d, 0xa9, 0x20, 0x90, 0x63, 0xe1, 0x34, 0xb8, 0xf9, 0x32, 0x73, 0xbc, 0x3e,
-	0x4d, 0x49, 0xe0, 0x39, 0xa4, 0x96, 0x50, 0x52, 0xd9, 0x86, 0x72, 0x64, 0x82, 0xe8, 0xff, 0xa0,
-	0x34, 0xc0, 0x67, 0xb2, 0x86, 0x25, 0x8a, 0x12, 0xc5, 0x01, 0x3e, 0xe3, 0xe5, 0x2b, 0xf4, 0x36,
-	0x14, 0xd8, 0xc7, 0x2e, 0x16, 0x8e, 0x24, 0xab, 0xe6, 0x07, 0xf8, 0xec, 0x87, 0xd8, 0x53, 0x74,
-	0xa8, 0xc6, 0x4b, 0x3b, 0xec, 0x64, 0xb9, 0xf6, 0xd0, 0x32, 0xb8, 0x8e, 0x25, 0x55, 0x74, 0xd0,
-	0x5d, 0x58, 0x3a, 0xb5, 0x85, 0x1f, 0x9a, 0x75, 0x03, 0x9f, 0xd9, 0x94, 0x44, 0x0a, 0x44, 0x42,
-	0x46, 0x79, 0x02, 0x55, 0xee, 0x51, 0xb6, 0x28, 0x75, 0xcd, 0xce, 0x90, 0x92, 0x68, 0xa5, 0x72,
-	0x79, 0x42, 0xa5, 0x32, 0x40, 0x1e, 0x01, 0x6e, 0xc9, 0x8a, 0x32, 0x19, 0xef, 0x28, 0xbf, 0x4c,
-	0xc3, 0x12, 0x57, 0xc8, 0xdc, 0x0d, 0xaf, 0xfa, 0x48, 0x4c, 0xcb, 0xda, 0x48, 0x07, 0xc0, 0xfe,
-	0x40, 0xfe, 0x7c, 0xaf, 0xce, 0x72, 0x74, 0xc1, 0xb4, 0x5a, 0xef, 0x4a, 0x8f, 0x77, 0x31, 0x54,
-	0x10, 0xf1, 0x7a, 0x11, 0xb5, 0xca, 0xcb, 0x34, 0x14, 0x0f, 0xcf, 0xe4, 0x69, 0x9d, 0x52, 0x0c,
-	0x62, 0xb3, 0xdf, 0xe5, 0xb3, 0x17, 0xe5, 0x13, 0xd1, 0x91, 0xd5, 0xa5, 0x6c, 0x50, 0xb9, 0x7a,
-	0x10, 0xdc, 0xca, 0xdc, 0x62, 0x09, 0xa6, 0x5f, 0xd4, 0x93, 0x2e, 0xa8, 0x0f, 0x05, 0x7e, 0x1e,
-	0x76, 0xef, 0x4f, 0xac, 0x18, 0x3e, 0x86, 0x65, 0x07, 0xbb, 0xd4, 0xd3, 0x62, 0x75, 0xc3, 0x69,
-	0x39, 0xfa, 0x3e, 0x76, 0xe9, 0x01, 0xa1, 0xb1, 0xea, 0x61, 0x99, 0xcb, 0x0b, 0x92, 0x72, 0x07,
-	0x2a, 0x31, 0x1e, 0xb6, 0x58, 0x6a, 0x53, 0xdc, 0xf7, 0xcf, 0x0d, 0xef, 0x04, 0x33, 0xc9, 0x84,
-	0x33, 0x51, 0xee, 0x42, 0x29, 0x38, 0xd6, 0x2c, 0x03, 0xc1, 0x86, 0xe1, 0x12, 0xcf, 0x93, 0xb3,
-	0xf5, 0xbb, 0xbc, 0x44, 0x6a, 0xbf, 0x90, 0x55, 0xa0, 0xac, 0x2a, 0x3a, 0x8a, 0x0d, 0x2b, 0x63,
-	0xd1, 0x14, 0x3d, 0x80, 0x82, 0x33, 0xec, 0x68, 0xfe, 0x81, 0x9a, 0x78, 0x9b, 0x24, 0x38, 0x3d,
-	0x21, 0x23, 0xaf, 0xb9, 0x3f, 0xec, 0xf4, 0x4d, 0xfd, 0x21, 0x19, 0xf9, 0x06, 0x74, 0x86, 0x9d,
-	0x87, 0xe2, 0x08, 0x8a, 0x01, 0x33, 0xd1, 0x01, 0x7f, 0x01, 0x45, 0xff, 0x54, 0xa3, 0xfb, 0xd1,
-	0x9b, 0x2b, 0xc6, 0xba, 0x3c, 0x2f, 0xe4, 0xcb, 0x41, 0x42, 0x41, 0x96, 0x39, 0x79, 0x66, 0xd7,
-	0x22, 0x86, 0x16, 0x26, 0x45, 0x7c, 0xcc, 0xa2, 0xba, 0x22, 0x3e, 0x3c, 0xf2, 0x33, 0x22, 0xe5,
-	0x9f, 0x69, 0x28, 0xfa, 0x8e, 0x64, 0xe2, 0x69, 0x8f, 0x4d, 0x29, 0xf3, 0x6d, 0xa7, 0x34, 0xad,
-	0x4c, 0xed, 0x3f, 0x0a, 0xe4, 0x16, 0x7e, 0x14, 0xb8, 0x05, 0x88, 0x9f, 0x00, 0xed, 0xd4, 0xa6,
-	0xa6, 0xd5, 0xd5, 0x84, 0x65, 0x05, 0xd4, 0xab, 0xf1, 0x2f, 0xcf, 0xf8, 0x87, 0x7d, 0x6e, 0xe4,
-	0x5f, 0xa5, 0xa1, 0x18, 0x04, 0xe6, 0x45, 0xcb, 0x91, 0x97, 0x20, 0x2f, 0x83, 0x8f, 0xa8, 0x47,
-	0xca, 0x5e, 0x70, 0xf6, 0x72, 0x91, 0x5b, 0xd0, 0x80, 0xe2, 0x80, 0x50, 0xcc, 0x31, 0x8a, 0x48,
-	0x3f, 0x83, 0xfe, 0x07, 0x57, 0xa0, 0x1c, 0xa9, 0x0f, 0xa3, 0x02, 0x64, 0x9f, 0x90, 0x17, 0xb5,
-	0x14, 0x2a, 0x43, 0x41, 0x25, 0xbc, 0x24, 0x54, 0x4b, 0x6f, 0x7e, 0x59, 0x86, 0x95, 0xad, 0xd6,
-	0xf6, 0x2e, 0x8b, 0x8d, 0xa6, 0x8e, 0x79, 0x6a, 0xba, 0x07, 0x39, 0x9e, 0x9d, 0x27, 0x78, 0x8f,
-	0x6e, 0x24, 0xa9, 0x2f, 0x22, 0x15, 0x96, 0x78, 0x12, 0x8f, 0x92, 0x3c, 0x53, 0x37, 0x12, 0x95,
-	0x1d, 0xd9, 0x24, 0xf9, 0x19, 0x4e, 0xf0, 0x7a, 0xdd, 0x48, 0x52, 0x8b, 0x44, 0x9f, 0x41, 0x29,
-	0xcc, 0xce, 0x93, 0xbe, 0x69, 0x37, 0x12, 0x57, 0x29, 0x99, 0xfe, 0x30, 0xff, 0x48, 0xfa, 0xa2,
-	0xdb, 0x48, 0xec, 0x3d, 0xd1, 0x73, 0x28, 0xf8, 0x99, 0x5e, 0xb2, 0x57, 0xe7, 0x46, 0xc2, 0x0a,
-	0x22, 0xdb, 0x3e, 0x91, 0xb0, 0x27, 0x79, 0x5a, 0x6f, 0x24, 0x2a, 0x93, 0xa2, 0x23, 0xc8, 0x4b,
-	0x88, 0x9d, 0xe8, 0x3d, 0xb9, 0x91, 0xac, 0x2e, 0xc8, 0x8c, 0x1c, 0x96, 0x44, 0x92, 0xfe, 0x9d,
-	0xa0, 0x91, 0xb8, 0x3e, 0x8c, 0x30, 0x40, 0x24, 0x6b, 0x4f, 0xfc, 0x3f, 0x81, 0x46, 0xf2, 0xba,
-	0x2f, 0xfa, 0x29, 0x14, 0x83, 0xdc, 0x2c, 0xe1, 0x7b, 0x7d, 0x23, 0x69, 0xe9, 0x15, 0x7d, 0x0e,
-	0x95, 0x78, 0x3a, 0xb2, 0xc8, 0x2b, 0x7c, 0x63, 0xa1, 0x9a, 0x2a, 0x1b, 0x2b, 0x9e, 0xa1, 0x2c,
-	0xf2, 0x36, 0xdf, 0x58, 0xa8, 0xd0, 0x8a, 0x4e, 0x61, 0xf5, 0x7c, 0x52, 0xb1, 0xe8, 0x83, 0x7d,
-	0x63, 0xe1, 0x02, 0x2c, 0x1a, 0x01, 0x9a, 0x90, 0x98, 0x2c, 0xfc, 0x8a, 0xdf, 0x58, 0xbc, 0x2a,
-	0xdb, 0xda, 0xf9, 0xea, 0xd5, 0x5a, 0xfa, 0xeb, 0x57, 0x6b, 0xe9, 0x7f, 0xbc, 0x5a, 0x4b, 0xbf,
-	0x7c, 0xbd, 0x96, 0xfa, 0xfa, 0xf5, 0x5a, 0xea, 0x6f, 0xaf, 0xd7, 0x52, 0x3f, 0xf9, 0xb0, 0x6b,
-	0xd2, 0xde, 0xb0, 0xd3, 0xd4, 0xed, 0xc1, 0x46, 0xa8, 0x36, 0xda, 0x0c, 0xff, 0x6d, 0xd5, 0xc9,
-	0xf3, 0xe0, 0xf7, 0xc9, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x75, 0x7a, 0xc6, 0x83, 0x82, 0x25,
-	0x00, 0x00,
+func init() { proto.RegisterFile("proto/abci/types.proto", fileDescriptor_5056eb770c93415b) }
+
+var fileDescriptor_5056eb770c93415b = []byte{
+	// 2704 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x1b, 0xc7,
+	0x11, 0xc6, 0x02, 0x20, 0x1e, 0x0d, 0x02, 0x04, 0x47, 0xb2, 0x0c, 0x23, 0x36, 0xa9, 0xac, 0x2c,
+	0x59, 0x7e, 0x04, 0xb4, 0xe9, 0x2a, 0x97, 0x1d, 0x39, 0x71, 0x08, 0x8a, 0x0a, 0x18, 0xc9, 0x22,
+	0xbd, 0x24, 0x15, 0x3b, 0xa9, 0xf2, 0x66, 0xb0, 0x3b, 0x04, 0xd6, 0x04, 0x76, 0xd7, 0xbb, 0x03,
+	0x9a, 0x48, 0xe5, 0x90, 0xca, 0x25, 0x95, 0x9b, 0xf2, 0x03, 0xf2, 0x1f, 0x72, 0x48, 0x95, 0xf3,
+	0x07, 0x52, 0xe5, 0xca, 0xc9, 0xc7, 0x9c, 0x9c, 0x94, 0x94, 0x53, 0xf2, 0x1f, 0x52, 0xa9, 0x79,
+	0xec, 0x0b, 0xc4, 0x63, 0xe1, 0xe8, 0x96, 0xdb, 0x4c, 0x6f, 0x77, 0xcf, 0x4c, 0xcf, 0x4c, 0xf7,
+	0xd7, 0x3d, 0x0b, 0xd7, 0x5c, 0xcf, 0xa1, 0xce, 0x16, 0xee, 0x1a, 0xd6, 0x16, 0x1d, 0xbb, 0xc4,
+	0x6f, 0x71, 0x02, 0x7a, 0x8e, 0x12, 0xdb, 0x24, 0xde, 0xd0, 0xb2, 0x69, 0x8b, 0x7d, 0x6c, 0xf1,
+	0x8f, 0xcd, 0x4d, 0xc1, 0x6e, 0x78, 0x63, 0x97, 0x3a, 0x5b, 0x43, 0xe2, 0x9d, 0x0d, 0x48, 0x5c,
+	0xae, 0xf9, 0xbc, 0x60, 0xe0, 0xa4, 0xc4, 0x87, 0x97, 0x12, 0x92, 0x67, 0x64, 0x9c, 0xfc, 0xdc,
+	0x88, 0xcb, 0xb9, 0xd8, 0xc3, 0xc3, 0xe0, 0xcb, 0x66, 0xcf, 0x71, 0x7a, 0x03, 0xb2, 0xc5, 0x7b,
+	0xdd, 0xd1, 0xe9, 0x16, 0xb5, 0x86, 0xc4, 0xa7, 0x78, 0xe8, 0x4a, 0x86, 0x5b, 0xb4, 0x6f, 0x79,
+	0xa6, 0xee, 0x62, 0x8f, 0x8e, 0x05, 0xd7, 0x56, 0xcf, 0xe9, 0x39, 0x51, 0x4b, 0xf0, 0xa9, 0xff,
+	0x2e, 0x41, 0x51, 0x23, 0x9f, 0x8f, 0x88, 0x4f, 0xd1, 0xbb, 0x90, 0x27, 0x46, 0xdf, 0x69, 0x64,
+	0xaf, 0x2b, 0xb7, 0x2b, 0xdb, 0x6a, 0x6b, 0xea, 0x6a, 0x5b, 0x92, 0x7b, 0xcf, 0xe8, 0x3b, 0x9d,
+	0x8c, 0xc6, 0x25, 0xd0, 0x1d, 0x58, 0x39, 0x1d, 0x8c, 0xfc, 0x7e, 0x23, 0xc7, 0x45, 0x6f, 0xcc,
+	0x17, 0xbd, 0xc7, 0x58, 0x3b, 0x19, 0x4d, 0xc8, 0xb0, 0x61, 0x2d, 0xfb, 0xd4, 0x69, 0xe4, 0xd3,
+	0x0c, 0xbb, 0x6f, 0x9f, 0xf2, 0x61, 0x99, 0x04, 0xea, 0x00, 0xf8, 0x84, 0xea, 0x8e, 0x4b, 0x2d,
+	0xc7, 0x6e, 0xac, 0x70, 0xf9, 0x57, 0xe6, 0xcb, 0x1f, 0x11, 0x7a, 0xc0, 0xd9, 0x3b, 0x19, 0xad,
+	0xec, 0x07, 0x1d, 0xa6, 0xc9, 0xb2, 0x2d, 0xaa, 0x1b, 0x7d, 0x6c, 0xd9, 0x8d, 0x42, 0x1a, 0x4d,
+	0xfb, 0xb6, 0x45, 0x77, 0x19, 0x3b, 0xd3, 0x64, 0x05, 0x1d, 0x66, 0x8a, 0xcf, 0x47, 0xc4, 0x1b,
+	0x37, 0x8a, 0x69, 0x4c, 0xf1, 0x11, 0x63, 0x65, 0xa6, 0xe0, 0x32, 0xe8, 0x3e, 0x54, 0xba, 0xa4,
+	0x67, 0xd9, 0x7a, 0x77, 0xe0, 0x18, 0x67, 0x8d, 0x12, 0x57, 0x71, 0x7b, 0xbe, 0x8a, 0x36, 0x13,
+	0x68, 0x33, 0xfe, 0x4e, 0x46, 0x83, 0x6e, 0xd8, 0x43, 0x6d, 0x28, 0x19, 0x7d, 0x62, 0x9c, 0xe9,
+	0xf4, 0xa2, 0x51, 0xe6, 0x9a, 0x6e, 0xce, 0xd7, 0xb4, 0xcb, 0xb8, 0x8f, 0x2f, 0x3a, 0x19, 0xad,
+	0x68, 0x88, 0x26, 0xb3, 0x8b, 0x49, 0x06, 0xd6, 0x39, 0xf1, 0x98, 0x96, 0x2b, 0x69, 0xec, 0x72,
+	0x57, 0xf0, 0x73, 0x3d, 0x65, 0x33, 0xe8, 0xa0, 0x3d, 0x28, 0x13, 0xdb, 0x94, 0x0b, 0xab, 0x70,
+	0x45, 0xb7, 0x16, 0x9c, 0x30, 0xdb, 0x0c, 0x96, 0x55, 0x22, 0xb2, 0x8d, 0x7e, 0x08, 0x05, 0xc3,
+	0x19, 0x0e, 0x2d, 0xda, 0x58, 0xe5, 0x3a, 0x5e, 0x5e, 0xb0, 0x24, 0xce, 0xdb, 0xc9, 0x68, 0x52,
+	0x0a, 0x1d, 0x43, 0x6d, 0x60, 0xf9, 0x54, 0xf7, 0x6d, 0xec, 0xfa, 0x7d, 0x87, 0xfa, 0x8d, 0x2a,
+	0xd7, 0xf3, 0xfa, 0x7c, 0x3d, 0x0f, 0x2c, 0x9f, 0x1e, 0x05, 0x22, 0x9d, 0x8c, 0x56, 0x1d, 0xc4,
+	0x09, 0x4c, 0xab, 0x73, 0x7a, 0x4a, 0xbc, 0x50, 0x6d, 0xa3, 0x96, 0x46, 0xeb, 0x01, 0x93, 0x09,
+	0xb4, 0x30, 0xad, 0x4e, 0x9c, 0x80, 0x30, 0x5c, 0x19, 0x38, 0xd8, 0x0c, 0x95, 0xea, 0x46, 0x7f,
+	0x64, 0x9f, 0x35, 0xd6, 0xb8, 0xea, 0xad, 0x05, 0x13, 0x76, 0xb0, 0x19, 0x28, 0xda, 0x65, 0x62,
+	0x9d, 0x8c, 0xb6, 0x3e, 0x98, 0x24, 0x22, 0x13, 0xae, 0x62, 0xd7, 0x1d, 0x8c, 0x27, 0xc7, 0xa8,
+	0xf3, 0x31, 0xde, 0x9c, 0x3f, 0xc6, 0x0e, 0x93, 0x9c, 0x1c, 0x04, 0xe1, 0x4b, 0xd4, 0x76, 0x11,
+	0x56, 0xce, 0xf1, 0x60, 0x44, 0xd4, 0x57, 0xa0, 0x12, 0x73, 0x1f, 0xa8, 0x01, 0xc5, 0x21, 0xf1,
+	0x7d, 0xdc, 0x23, 0x0d, 0xe5, 0xba, 0x72, 0xbb, 0xac, 0x05, 0x5d, 0xb5, 0x06, 0xab, 0x71, 0x67,
+	0xa1, 0x0e, 0x43, 0x41, 0xe6, 0x00, 0x98, 0xe0, 0x39, 0xf1, 0x7c, 0x76, 0xeb, 0xa5, 0xa0, 0xec,
+	0xa2, 0x1b, 0x50, 0xe5, 0x47, 0x4c, 0x0f, 0xbe, 0x33, 0x67, 0x96, 0xd7, 0x56, 0x39, 0xf1, 0x91,
+	0x64, 0xda, 0x84, 0x8a, 0xbb, 0xed, 0x86, 0x2c, 0x39, 0xce, 0x02, 0xee, 0xb6, 0x2b, 0x19, 0xd4,
+	0xef, 0x43, 0x7d, 0xd2, 0x5f, 0xa0, 0x3a, 0xe4, 0xce, 0xc8, 0x58, 0x8e, 0xc7, 0x9a, 0xe8, 0xaa,
+	0x5c, 0x16, 0x1f, 0xa3, 0xac, 0xc9, 0x35, 0xfe, 0x31, 0x1b, 0x0a, 0x87, 0x2e, 0x82, 0xf9, 0x38,
+	0xe6, 0xa1, 0xb9, 0x74, 0x65, 0xbb, 0xd9, 0x12, 0xee, 0xbb, 0x15, 0xb8, 0xef, 0xd6, 0x71, 0xe0,
+	0xbe, 0xdb, 0xa5, 0xaf, 0xbe, 0xd9, 0xcc, 0x3c, 0xfe, 0xfb, 0xa6, 0xa2, 0x71, 0x09, 0xf4, 0x02,
+	0xbb, 0xc5, 0xd8, 0xb2, 0x75, 0xcb, 0x94, 0xe3, 0x14, 0x79, 0x7f, 0xdf, 0x44, 0x1f, 0x41, 0xdd,
+	0x70, 0x6c, 0x9f, 0xd8, 0xfe, 0xc8, 0xd7, 0x45, 0x78, 0x90, 0x0e, 0x78, 0xd6, 0xcd, 0xda, 0x0d,
+	0xd8, 0x0f, 0x39, 0xb7, 0xb6, 0x66, 0x24, 0x09, 0xe8, 0x01, 0xc0, 0x39, 0x1e, 0x58, 0x26, 0xa6,
+	0x8e, 0xe7, 0x37, 0xf2, 0xd7, 0x73, 0x73, 0x94, 0x3d, 0x0a, 0x18, 0x4f, 0x5c, 0x13, 0x53, 0xd2,
+	0xce, 0xb3, 0x99, 0x6b, 0x31, 0x79, 0x74, 0x0b, 0xd6, 0xb0, 0xeb, 0xea, 0x3e, 0xc5, 0x94, 0xe8,
+	0xdd, 0x31, 0x25, 0x3e, 0x77, 0xd2, 0xab, 0x5a, 0x15, 0xbb, 0xee, 0x11, 0xa3, 0xb6, 0x19, 0x51,
+	0x35, 0xc3, 0xdd, 0xe6, 0xfe, 0x10, 0x21, 0xc8, 0x9b, 0x98, 0x62, 0x6e, 0xad, 0x55, 0x8d, 0xb7,
+	0x19, 0xcd, 0xc5, 0xb4, 0x2f, 0x6d, 0xc0, 0xdb, 0xe8, 0x1a, 0x14, 0xfa, 0xc4, 0xea, 0xf5, 0x29,
+	0x5f, 0x76, 0x4e, 0x93, 0x3d, 0xb6, 0x31, 0xae, 0xe7, 0x9c, 0x13, 0x1e, 0x52, 0x4a, 0x9a, 0xe8,
+	0xa8, 0x8f, 0xb3, 0xb0, 0x7e, 0xc9, 0x67, 0x32, 0xbd, 0x7d, 0xec, 0xf7, 0x83, 0xb1, 0x58, 0x1b,
+	0xbd, 0xc3, 0xf4, 0x62, 0x93, 0x78, 0x32, 0x14, 0x36, 0xe2, 0x16, 0x10, 0x8b, 0xef, 0xf0, 0xef,
+	0x72, 0xcd, 0x92, 0x1b, 0x9d, 0x40, 0x7d, 0x80, 0x7d, 0xaa, 0x0b, 0x5f, 0xa3, 0xf3, 0xa8, 0x96,
+	0x9b, 0xeb, 0x79, 0x1f, 0xe0, 0xc0, 0x47, 0xb1, 0x73, 0x2d, 0xd5, 0xd5, 0x06, 0x09, 0x2a, 0xfa,
+	0x18, 0xae, 0x76, 0xc7, 0xbf, 0xc4, 0x36, 0xb5, 0x6c, 0xa2, 0x5f, 0xda, 0x9e, 0xcd, 0x19, 0xaa,
+	0xf7, 0xce, 0x2d, 0x93, 0xd8, 0x46, 0xb0, 0x2f, 0x57, 0x42, 0x15, 0xe1, 0xbe, 0xf9, 0xea, 0xc7,
+	0x50, 0x4b, 0xfa, 0x7e, 0x54, 0x83, 0x2c, 0xbd, 0x90, 0xc6, 0xc8, 0xd2, 0x0b, 0xf4, 0x0e, 0xe4,
+	0x99, 0x3a, 0x6e, 0x88, 0xda, 0xcc, 0xe0, 0x2c, 0xa5, 0x8f, 0xc7, 0x2e, 0xd1, 0x38, 0xbf, 0xaa,
+	0x86, 0x97, 0x20, 0x8c, 0x07, 0x93, 0xba, 0xd5, 0x57, 0x61, 0x6d, 0xc2, 0xd5, 0xc7, 0x76, 0x54,
+	0x89, 0xef, 0xa8, 0xba, 0x06, 0xd5, 0x84, 0x47, 0x57, 0xaf, 0xc1, 0xd5, 0x69, 0xae, 0x59, 0xb5,
+	0x43, 0x7a, 0xc2, 0xb9, 0xa2, 0x3b, 0x50, 0x0a, 0x7d, 0xb3, 0xb8, 0x84, 0xb3, 0xec, 0x16, 0x88,
+	0x68, 0xa1, 0x00, 0xbb, 0x83, 0xec, 0x1c, 0xf3, 0x73, 0x92, 0xe5, 0xd3, 0x2f, 0x62, 0xd7, 0xed,
+	0x60, 0xbf, 0xaf, 0xfe, 0x02, 0x1a, 0xb3, 0x3c, 0xee, 0xc4, 0x62, 0xf2, 0xe1, 0xf1, 0xbc, 0x06,
+	0x85, 0x53, 0xc7, 0x1b, 0x62, 0xca, 0x95, 0x55, 0x35, 0xd9, 0x63, 0xc7, 0x56, 0x78, 0xdf, 0x1c,
+	0x27, 0x8b, 0x8e, 0xaa, 0xc3, 0x0b, 0x33, 0xfd, 0x2d, 0x13, 0xb1, 0x6c, 0x93, 0x08, 0xab, 0x56,
+	0x35, 0xd1, 0x89, 0x14, 0x89, 0xc9, 0x8a, 0x0e, 0x1b, 0xd6, 0xe7, 0x2b, 0xe6, 0xfa, 0xcb, 0x9a,
+	0xec, 0xa9, 0x7f, 0x29, 0x43, 0x49, 0x23, 0xbe, 0xcb, 0x5c, 0x01, 0xea, 0x40, 0x99, 0x5c, 0x18,
+	0x44, 0x20, 0x2a, 0x65, 0x01, 0xfe, 0x10, 0x32, 0x7b, 0x01, 0x3f, 0x0b, 0xf8, 0xa1, 0x30, 0x7a,
+	0x2f, 0x81, 0x26, 0x6f, 0x2c, 0x52, 0x12, 0x87, 0x93, 0xef, 0x27, 0xe1, 0xe4, 0xcb, 0x0b, 0x64,
+	0x27, 0xf0, 0xe4, 0x7b, 0x09, 0x3c, 0xb9, 0x68, 0xe0, 0x04, 0xa0, 0xdc, 0x9f, 0x02, 0x28, 0x17,
+	0x2d, 0x7f, 0x06, 0xa2, 0xdc, 0x9f, 0x82, 0x28, 0x6f, 0x2f, 0x9c, 0xcb, 0x54, 0x48, 0xf9, 0x7e,
+	0x12, 0x52, 0x2e, 0x32, 0xc7, 0x04, 0xa6, 0x7c, 0x30, 0x0d, 0x53, 0xbe, 0xba, 0x40, 0xc7, 0x4c,
+	0x50, 0xb9, 0x7b, 0x09, 0x54, 0xde, 0x5a, 0xa0, 0x6a, 0x0a, 0xaa, 0xdc, 0x4f, 0xa0, 0x4a, 0x48,
+	0x65, 0x9b, 0x19, 0xb0, 0xf2, 0xde, 0x65, 0x58, 0xf9, 0xca, 0xa2, 0xa3, 0x36, 0x0d, 0x57, 0x7e,
+	0x30, 0x81, 0x2b, 0x6f, 0x2e, 0x5a, 0xd5, 0x24, 0xb0, 0x3c, 0x99, 0x01, 0x2c, 0xdf, 0x58, 0xa0,
+	0x68, 0x01, 0xb2, 0x3c, 0x99, 0x81, 0x2c, 0x17, 0xa9, 0x5d, 0x00, 0x2d, 0xbb, 0xf3, 0xa0, 0xe5,
+	0x9b, 0x8b, 0xa6, 0x9c, 0x0e, 0x5b, 0x92, 0xb9, 0xd8, 0xf2, 0xad, 0x05, 0x83, 0x2c, 0x0f, 0x2e,
+	0x5f, 0x65, 0xe1, 0x7d, 0xc2, 0x25, 0x31, 0x57, 0x48, 0x3c, 0xcf, 0xf1, 0x24, 0x6e, 0x13, 0x1d,
+	0xf5, 0x36, 0x03, 0x1c, 0x91, 0xe3, 0x99, 0x03, 0x44, 0x79, 0xe0, 0x89, 0xb9, 0x19, 0xf5, 0xcf,
+	0x4a, 0x24, 0xcb, 0xa3, 0x73, 0x1c, 0xac, 0x94, 0x25, 0x58, 0x89, 0xe1, 0xd3, 0x6c, 0x12, 0x9f,
+	0x6e, 0x42, 0x85, 0x85, 0x92, 0x09, 0xe8, 0x89, 0xdd, 0x00, 0x7a, 0xa2, 0xd7, 0x60, 0x9d, 0x63,
+	0x08, 0x81, 0x62, 0x65, 0xfc, 0xc8, 0xf3, 0x60, 0xb8, 0xc6, 0x3e, 0x88, 0xa3, 0x2b, 0x02, 0xc9,
+	0xf7, 0xe0, 0x4a, 0x8c, 0x37, 0x0c, 0x51, 0x02, 0x63, 0xd5, 0x43, 0xee, 0x1d, 0x19, 0xab, 0x3e,
+	0x8c, 0x0c, 0x14, 0xc1, 0x5a, 0x04, 0x79, 0xc3, 0x31, 0x89, 0x0c, 0x20, 0xbc, 0xcd, 0xa0, 0xee,
+	0xc0, 0xe9, 0xc9, 0x30, 0xc1, 0x9a, 0x8c, 0x2b, 0xf4, 0xa9, 0x65, 0xe1, 0x2c, 0xd5, 0x3f, 0x29,
+	0x91, 0xbe, 0x08, 0xe9, 0x4e, 0x03, 0xa5, 0xca, 0xb3, 0x04, 0xa5, 0xd9, 0xff, 0x0d, 0x94, 0xaa,
+	0xff, 0x51, 0xa2, 0x2d, 0x0d, 0xe1, 0xe6, 0xb7, 0x33, 0x41, 0x14, 0x7e, 0x57, 0xf8, 0x06, 0xc9,
+	0xf0, 0x2b, 0x33, 0x85, 0x02, 0xdf, 0x86, 0x64, 0xa6, 0x50, 0x14, 0x01, 0x99, 0x77, 0xd0, 0x07,
+	0x50, 0x76, 0x3d, 0xc7, 0x39, 0xd5, 0x1d, 0xd7, 0x97, 0x7e, 0x39, 0x01, 0xb0, 0x44, 0x59, 0xa8,
+	0x25, 0x0a, 0x4a, 0xad, 0x43, 0xc6, 0x7a, 0xe0, 0xfa, 0x5a, 0xc9, 0x95, 0xad, 0x18, 0xc0, 0x28,
+	0x27, 0xf0, 0xef, 0x8b, 0x50, 0x66, 0x8b, 0xf0, 0x5d, 0x6c, 0x10, 0xee, 0x5e, 0xcb, 0x5a, 0x44,
+	0x50, 0x4d, 0x40, 0x97, 0xdd, 0x3c, 0x7a, 0x08, 0x05, 0x72, 0x4e, 0x6c, 0xca, 0x76, 0x8b, 0x19,
+	0xf8, 0xc5, 0x99, 0xb0, 0x92, 0xd8, 0xb4, 0xdd, 0x60, 0x66, 0xfd, 0xd7, 0x37, 0x9b, 0x75, 0x21,
+	0xf3, 0x86, 0x33, 0xb4, 0x28, 0x19, 0xba, 0x74, 0xac, 0x49, 0x2d, 0xea, 0x6f, 0xb3, 0x0c, 0xdd,
+	0x25, 0x42, 0xc0, 0x54, 0x43, 0x07, 0xd7, 0x27, 0x1b, 0xc3, 0xfa, 0xe9, 0x8c, 0xff, 0x12, 0x40,
+	0x0f, 0xfb, 0xfa, 0x17, 0xd8, 0xa6, 0xc4, 0x94, 0x3b, 0x50, 0xee, 0x61, 0xff, 0xa7, 0x9c, 0xc0,
+	0x40, 0x1b, 0xfb, 0x3c, 0xf2, 0x89, 0xc9, 0xb7, 0x22, 0xa7, 0x15, 0x7b, 0xd8, 0x3f, 0xf1, 0x89,
+	0x19, 0x5b, 0x6b, 0xf1, 0x59, 0xac, 0x35, 0x69, 0xef, 0xd2, 0xa4, 0xbd, 0x7f, 0x97, 0x8d, 0xee,
+	0x49, 0x04, 0x86, 0xff, 0x3f, 0x6d, 0xf1, 0x07, 0x9e, 0x1c, 0x27, 0xe3, 0x30, 0xfa, 0x04, 0xd6,
+	0xc3, 0xfb, 0xa9, 0x8f, 0xf8, 0xbd, 0x0d, 0x4e, 0xe1, 0x72, 0xd7, 0xbc, 0x7e, 0x9e, 0x24, 0xfb,
+	0xe8, 0x53, 0x78, 0x7e, 0xc2, 0x1b, 0x85, 0x03, 0x64, 0x97, 0x72, 0x4a, 0xcf, 0x25, 0x9d, 0x52,
+	0xa0, 0x3f, 0xb2, 0x5e, 0xee, 0x99, 0xdc, 0x9a, 0x7d, 0x96, 0x90, 0xc5, 0x11, 0xc6, 0xd4, 0x33,
+	0x71, 0x03, 0xaa, 0x1e, 0xa1, 0xd8, 0xb2, 0xf5, 0x44, 0xfa, 0xbb, 0x2a, 0x88, 0x22, 0x38, 0xa8,
+	0x8f, 0xe0, 0xb9, 0xa9, 0x18, 0x03, 0xfd, 0x00, 0xca, 0x11, 0x48, 0x51, 0xe6, 0xe6, 0x90, 0x61,
+	0x2e, 0x14, 0x49, 0xa8, 0x5f, 0x2a, 0x91, 0xe2, 0x64, 0x8e, 0x75, 0x1f, 0x0a, 0x1e, 0xf1, 0x47,
+	0x03, 0x91, 0xef, 0xd4, 0xb6, 0xdf, 0x5e, 0x06, 0xa3, 0x30, 0xea, 0x68, 0x40, 0x35, 0xa9, 0x42,
+	0xfd, 0x08, 0x0a, 0x82, 0x82, 0x00, 0x0a, 0x3b, 0xbb, 0xbb, 0x7b, 0x87, 0xc7, 0xf5, 0x0c, 0x2a,
+	0xc3, 0xca, 0x4e, 0xfb, 0x40, 0x3b, 0xae, 0x2b, 0x8c, 0xac, 0xed, 0xfd, 0x64, 0x6f, 0xf7, 0xb8,
+	0x9e, 0x45, 0xeb, 0x50, 0x15, 0x6d, 0xfd, 0xde, 0x81, 0xf6, 0xe1, 0xce, 0x71, 0x3d, 0x17, 0x23,
+	0x1d, 0xed, 0x3d, 0xbc, 0xbb, 0xa7, 0xd5, 0xf3, 0xea, 0x5b, 0x2c, 0x93, 0x9a, 0x01, 0x61, 0xa2,
+	0x9c, 0x49, 0x89, 0xe5, 0x4c, 0xea, 0xef, 0xb3, 0xd0, 0x9c, 0x8d, 0x48, 0xd0, 0xe1, 0xc4, 0x8a,
+	0xdf, 0x5d, 0x1a, 0xd4, 0x4c, 0x2c, 0x1b, 0xdd, 0x84, 0x9a, 0x47, 0x4e, 0x09, 0x35, 0xfa, 0x02,
+	0x2d, 0x89, 0x78, 0x57, 0xd5, 0xaa, 0x92, 0xca, 0x85, 0x7c, 0xc1, 0xf6, 0x19, 0x31, 0xa8, 0x2e,
+	0x92, 0x38, 0x71, 0xfe, 0xca, 0x8c, 0x8d, 0x51, 0x8f, 0x04, 0x51, 0x3d, 0x5a, 0x64, 0xc4, 0x32,
+	0xac, 0x68, 0x7b, 0xc7, 0xda, 0x27, 0xf5, 0x2c, 0x42, 0x50, 0xe3, 0x4d, 0xfd, 0xe8, 0xe1, 0xce,
+	0xe1, 0x51, 0xe7, 0x80, 0x19, 0xf1, 0x0a, 0xac, 0x05, 0x46, 0x0c, 0x88, 0x79, 0xf5, 0xaf, 0x0a,
+	0xac, 0x4d, 0x5c, 0x0f, 0xf4, 0x2e, 0xac, 0x08, 0x08, 0xae, 0xcc, 0x2d, 0xe2, 0xf3, 0xfb, 0x2e,
+	0x6f, 0x94, 0x10, 0x40, 0xef, 0x43, 0x89, 0xc8, 0x4a, 0x85, 0xbc, 0x92, 0xd7, 0x2f, 0x57, 0x5b,
+	0x82, 0x5a, 0x86, 0x14, 0x0d, 0x25, 0x58, 0x08, 0x0d, 0xef, 0xbc, 0xcc, 0x16, 0xbf, 0x7b, 0x59,
+	0x3c, 0xf4, 0x16, 0x52, 0x3e, 0x92, 0x51, 0x77, 0xa1, 0x12, 0x9b, 0x14, 0xfa, 0x0e, 0x94, 0x87,
+	0xf8, 0x42, 0xd6, 0xaa, 0x44, 0x09, 0xa2, 0x34, 0xc4, 0x17, 0xbc, 0x4c, 0x85, 0x9e, 0x87, 0x22,
+	0xfb, 0xd8, 0xc3, 0xc2, 0x79, 0xe4, 0xb4, 0xc2, 0x10, 0x5f, 0xfc, 0x18, 0xfb, 0xaa, 0x01, 0xb5,
+	0x64, 0x21, 0x87, 0x9d, 0x26, 0xcf, 0x19, 0xd9, 0x26, 0xd7, 0xb1, 0xa2, 0x89, 0x0e, 0xba, 0x03,
+	0x2b, 0xe7, 0x8e, 0xf0, 0x3d, 0xf3, 0x6e, 0xdd, 0x23, 0x87, 0x92, 0x58, 0x39, 0x48, 0xc8, 0xa8,
+	0x0f, 0xa1, 0xc6, 0xbd, 0xc8, 0x0e, 0xa5, 0x9e, 0xd5, 0x1d, 0x51, 0x12, 0xaf, 0x48, 0xae, 0x4e,
+	0xa9, 0x48, 0x86, 0x38, 0x23, 0x44, 0x29, 0x39, 0x51, 0x0e, 0xe3, 0x1d, 0xf5, 0xd7, 0x0a, 0xac,
+	0x70, 0x85, 0xcc, 0xc5, 0xf0, 0x1a, 0x8f, 0x44, 0xb0, 0xac, 0x8d, 0x0c, 0x00, 0x1c, 0x0c, 0x14,
+	0xcc, 0xf7, 0xe6, 0x3c, 0xe7, 0x16, 0x4e, 0xab, 0xfd, 0xa2, 0xf4, 0x72, 0x57, 0x23, 0x05, 0x31,
+	0x4f, 0x17, 0x53, 0xab, 0x3e, 0x56, 0xa0, 0x74, 0x7c, 0x21, 0x4f, 0xe8, 0x8c, 0xd2, 0x0f, 0x9b,
+	0xfd, 0x3e, 0x9f, 0xbd, 0x28, 0x96, 0x88, 0x8e, 0xac, 0x25, 0xe5, 0xc2, 0x3a, 0xd5, 0xbd, 0xf0,
+	0x26, 0xe6, 0x97, 0x4b, 0x27, 0x83, 0x12, 0x9e, 0x74, 0x3b, 0x03, 0x28, 0xf2, 0xf3, 0xb0, 0x7f,
+	0x77, 0x6a, 0x65, 0xf0, 0x43, 0x58, 0x75, 0xb1, 0x47, 0x7d, 0x3d, 0x51, 0x1f, 0x9c, 0x95, 0x91,
+	0x1f, 0x62, 0x8f, 0x1e, 0x11, 0x9a, 0xa8, 0x15, 0x56, 0xb8, 0xbc, 0x20, 0xa9, 0xef, 0x41, 0x35,
+	0xc1, 0xc3, 0x16, 0x4b, 0x1d, 0x8a, 0x07, 0xc1, 0xb9, 0xe1, 0x9d, 0x70, 0x26, 0xd9, 0x68, 0x26,
+	0xea, 0x1d, 0x28, 0x87, 0xc7, 0x9a, 0xe5, 0x1b, 0xd8, 0x34, 0x3d, 0xe2, 0xfb, 0x72, 0xb6, 0x41,
+	0x97, 0x97, 0x42, 0x9d, 0x2f, 0x64, 0xcd, 0x27, 0xa7, 0x89, 0x8e, 0x6a, 0xc1, 0xda, 0x44, 0x04,
+	0x45, 0x3f, 0x82, 0xa2, 0x3b, 0xea, 0xea, 0xc1, 0x81, 0x9a, 0xb8, 0x47, 0x12, 0x8a, 0x9e, 0x91,
+	0xb1, 0xdf, 0x3a, 0x1c, 0x75, 0x07, 0x96, 0x71, 0x9f, 0x8c, 0x03, 0xd3, 0xb9, 0xa3, 0xee, 0x7d,
+	0x71, 0xf8, 0xc4, 0x50, 0xd9, 0xf8, 0x50, 0xbf, 0x82, 0x52, 0x70, 0x9e, 0xd1, 0xdd, 0xf8, 0x6d,
+	0x55, 0x2e, 0x5f, 0xf6, 0x69, 0x01, 0x5e, 0x0e, 0x12, 0x09, 0xb2, 0x0c, 0xc9, 0xb7, 0x7a, 0x36,
+	0x31, 0xf5, 0x28, 0xf9, 0xe1, 0x63, 0x96, 0xb4, 0x35, 0xf1, 0xe1, 0x41, 0x90, 0xf9, 0xa8, 0xff,
+	0x54, 0xa0, 0x14, 0x38, 0x8f, 0xa9, 0xe7, 0x3c, 0x31, 0xa5, 0xec, 0xb7, 0x9d, 0xd2, 0xac, 0x42,
+	0x74, 0x50, 0xf6, 0xcf, 0x2f, 0x5d, 0xf6, 0x7f, 0x03, 0x10, 0xdf, 0x7b, 0xfd, 0xdc, 0xa1, 0x96,
+	0xdd, 0xd3, 0x85, 0x65, 0x05, 0xb0, 0xab, 0xf3, 0x2f, 0x8f, 0xf8, 0x87, 0x43, 0x6e, 0xe4, 0xdf,
+	0x28, 0x50, 0x0a, 0xc3, 0xf0, 0xb2, 0x65, 0xc7, 0x6b, 0x50, 0x90, 0xa1, 0x46, 0xd4, 0x1d, 0x65,
+	0x2f, 0x3c, 0x75, 0xf9, 0xd8, 0xf9, 0x6f, 0x42, 0x69, 0x48, 0x28, 0xe6, 0x88, 0x44, 0xa4, 0x99,
+	0x61, 0xff, 0xb5, 0x1b, 0x50, 0x89, 0xd5, 0x81, 0x51, 0x11, 0x72, 0x0f, 0xc9, 0x17, 0xf5, 0x0c,
+	0xaa, 0x40, 0x51, 0x23, 0xbc, 0xf4, 0x53, 0x57, 0xb6, 0xbf, 0xac, 0xc0, 0xda, 0x4e, 0x7b, 0x77,
+	0x9f, 0x45, 0x42, 0xcb, 0xc0, 0x3c, 0x05, 0x3d, 0x80, 0x3c, 0xcf, 0xc2, 0x53, 0xbc, 0x38, 0x37,
+	0xd3, 0xd4, 0x11, 0x91, 0x06, 0x2b, 0x3c, 0x59, 0x47, 0x69, 0x1e, 0xa2, 0x9b, 0xa9, 0xca, 0x8b,
+	0x6c, 0x92, 0xfc, 0x0c, 0xa7, 0x78, 0x9f, 0x6e, 0xa6, 0xa9, 0x39, 0xa2, 0x4f, 0xa1, 0x1c, 0x65,
+	0xe1, 0x69, 0x5f, 0xad, 0x9b, 0xa9, 0xab, 0x91, 0x4c, 0x7f, 0x94, 0x6d, 0xa4, 0x7d, 0xb3, 0x6d,
+	0xa6, 0xf6, 0x9b, 0xe8, 0x63, 0x28, 0x06, 0x79, 0x5d, 0xba, 0x77, 0xe5, 0x66, 0xca, 0x4a, 0x21,
+	0xdb, 0x3e, 0x91, 0x98, 0xa7, 0x79, 0x3c, 0x6f, 0xa6, 0x2a, 0x87, 0xa2, 0x13, 0x28, 0x48, 0x40,
+	0x9d, 0xea, 0xc5, 0xb8, 0x99, 0xae, 0xfe, 0xc7, 0x8c, 0x1c, 0x95, 0x3e, 0xd2, 0xfe, 0x30, 0xd0,
+	0x4c, 0x5d, 0x07, 0x46, 0x18, 0x20, 0x96, 0xa3, 0xa7, 0xfe, 0x13, 0xa0, 0x99, 0xbe, 0xbe, 0x8b,
+	0x7e, 0x0e, 0xa5, 0x30, 0x13, 0x4b, 0xf9, 0x22, 0xdf, 0x4c, 0x5b, 0x62, 0x45, 0x9f, 0x41, 0x35,
+	0x99, 0x7c, 0x2c, 0xf3, 0xce, 0xde, 0x5c, 0xaa, 0x76, 0xca, 0xc6, 0x4a, 0xe6, 0x23, 0xcb, 0xbc,
+	0xbe, 0x37, 0x97, 0x2a, 0xa8, 0xa2, 0x73, 0x58, 0xbf, 0x9c, 0x42, 0x2c, 0xfb, 0x24, 0xdf, 0x5c,
+	0xba, 0xd0, 0x8a, 0xc6, 0x80, 0xa6, 0xa4, 0x21, 0x4b, 0xbf, 0xd3, 0x37, 0x97, 0xaf, 0xbe, 0xb6,
+	0xf7, 0xbe, 0x7a, 0xb2, 0xa1, 0x7c, 0xfd, 0x64, 0x43, 0xf9, 0xc7, 0x93, 0x0d, 0xe5, 0xf1, 0xd3,
+	0x8d, 0xcc, 0xd7, 0x4f, 0x37, 0x32, 0x7f, 0x7b, 0xba, 0x91, 0xf9, 0xd9, 0xeb, 0x3d, 0x8b, 0xf6,
+	0x47, 0xdd, 0x96, 0xe1, 0x0c, 0xb7, 0x22, 0xb5, 0xf1, 0x66, 0xf4, 0x27, 0x55, 0xb7, 0xc0, 0x83,
+	0xdf, 0xdb, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x52, 0xf1, 0x66, 0x15, 0x64, 0x25, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -3992,7 +3991,7 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "abci/types/types.proto",
+	Metadata: "proto/abci/types.proto",
 }
 
 func (m *Request) Marshal() (dAtA []byte, err error) {

proto/blockchain/msgs.pb.go

@@ -389,42 +389,42 @@ func (*Message) XXX_OneofWrappers() []interface{} {
 }
 
 func init() {
-	proto.RegisterType((*BlockRequest)(nil), "tendermint.proto.blockchain.BlockRequest")
-	proto.RegisterType((*NoBlockResponse)(nil), "tendermint.proto.blockchain.NoBlockResponse")
-	proto.RegisterType((*BlockResponse)(nil), "tendermint.proto.blockchain.BlockResponse")
-	proto.RegisterType((*StatusRequest)(nil), "tendermint.proto.blockchain.StatusRequest")
-	proto.RegisterType((*StatusResponse)(nil), "tendermint.proto.blockchain.StatusResponse")
-	proto.RegisterType((*Message)(nil), "tendermint.proto.blockchain.Message")
+	proto.RegisterType((*BlockRequest)(nil), "tendermint.blockchain.BlockRequest")
+	proto.RegisterType((*NoBlockResponse)(nil), "tendermint.blockchain.NoBlockResponse")
+	proto.RegisterType((*BlockResponse)(nil), "tendermint.blockchain.BlockResponse")
+	proto.RegisterType((*StatusRequest)(nil), "tendermint.blockchain.StatusRequest")
+	proto.RegisterType((*StatusResponse)(nil), "tendermint.blockchain.StatusResponse")
+	proto.RegisterType((*Message)(nil), "tendermint.blockchain.Message")
 }
 
 func init() { proto.RegisterFile("proto/blockchain/msgs.proto", fileDescriptor_ecf660069f8bb334) }
 
 var fileDescriptor_ecf660069f8bb334 = []byte{
-	// 371 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xc1, 0x4e, 0xf2, 0x40,
-	0x14, 0x85, 0xdb, 0xbf, 0xc0, 0x9f, 0x5c, 0x28, 0xc4, 0x2e, 0x94, 0x48, 0x6c, 0x4c, 0x17, 0x46,
-	0xd4, 0x0c, 0x11, 0x96, 0xba, 0x22, 0x2e, 0x48, 0x8c, 0xc6, 0x94, 0xc4, 0x05, 0x1b, 0xd2, 0xe2,
-	0xa4, 0x6d, 0xb4, 0x1d, 0xe4, 0x4e, 0x17, 0xbe, 0x85, 0x8f, 0xe4, 0xd2, 0x25, 0x4b, 0x97, 0x06,
-	0x5e, 0xc4, 0x30, 0x53, 0x0a, 0xad, 0x8a, 0xec, 0x66, 0x6e, 0xce, 0xf9, 0xe6, 0xf4, 0xdc, 0x14,
-	0x1a, 0xe3, 0x09, 0xe3, 0xac, 0xe5, 0x3e, 0xb1, 0xd1, 0xe3, 0xc8, 0x77, 0x82, 0xa8, 0x15, 0xa2,
-	0x87, 0x44, 0x4c, 0x8d, 0x06, 0xa7, 0xd1, 0x03, 0x9d, 0x84, 0x41, 0xc4, 0xe5, 0x84, 0xac, 0x74,
-	0xfb, 0x7b, 0xd2, 0xc9, 0x5f, 0xc6, 0x14, 0xa5, 0x5f, 0x6a, 0xac, 0x23, 0xa8, 0x74, 0x17, 0x57,
-	0x9b, 0x3e, 0xc7, 0x14, 0xb9, 0xb1, 0x0b, 0x25, 0x9f, 0x06, 0x9e, 0xcf, 0xeb, 0xea, 0xa1, 0x7a,
-	0xac, 0xd9, 0xc9, 0xcd, 0x6a, 0x42, 0xed, 0x96, 0x25, 0x4a, 0x1c, 0xb3, 0x08, 0xe9, 0xaf, 0xd2,
-	0x2b, 0xd0, 0xb3, 0xc2, 0x0e, 0x14, 0xc5, 0x93, 0x42, 0x57, 0x6e, 0x1f, 0x90, 0x6f, 0x49, 0x45,
-	0x2e, 0x22, 0x5d, 0x52, 0x6b, 0x5d, 0x80, 0xde, 0xe7, 0x0e, 0x8f, 0xf1, 0x8f, 0x64, 0x86, 0x01,
-	0x05, 0xd7, 0x41, 0x5a, 0xff, 0x27, 0xa6, 0xe2, 0x6c, 0x5d, 0x42, 0x75, 0x69, 0xde, 0x1c, 0xf6,
-	0x47, 0xf7, 0x9b, 0x06, 0xff, 0x6f, 0x28, 0xa2, 0xe3, 0x51, 0xe3, 0x0e, 0x74, 0x91, 0x67, 0x38,
-	0x91, 0x31, 0x92, 0x6f, 0x68, 0x92, 0x0d, 0x6d, 0x93, 0xf5, 0x46, 0x7b, 0x8a, 0x5d, 0x71, 0xd7,
-	0x1b, 0x1e, 0xc0, 0x4e, 0xc4, 0x86, 0x4b, 0xa8, 0x8c, 0x27, 0x9e, 0x2f, 0xb7, 0xcf, 0x36, 0x52,
-	0x73, 0xfd, 0xf7, 0x14, 0xbb, 0x16, 0xe5, 0x56, 0xd2, 0x87, 0x6a, 0x0e, 0xac, 0x09, 0xf0, 0xc9,
-	0x36, 0x71, 0x53, 0xac, 0xee, 0xe6, 0xa1, 0x28, 0xca, 0x4c, 0x3b, 0x28, 0x6c, 0x01, 0xcd, 0x2c,
-	0x6f, 0x01, 0xc5, 0xcc, 0x36, 0xef, 0xa1, 0x96, 0x42, 0x93, 0xa8, 0x45, 0x41, 0x3d, 0xdd, 0x8a,
-	0x9a, 0x66, 0xad, 0x62, 0x66, 0xd2, 0x2d, 0x82, 0x86, 0x71, 0xd8, 0xbd, 0x7e, 0x9f, 0x99, 0xea,
-	0x74, 0x66, 0xaa, 0x9f, 0x33, 0x53, 0x7d, 0x9d, 0x9b, 0xca, 0x74, 0x6e, 0x2a, 0x1f, 0x73, 0x53,
-	0x19, 0x9c, 0x7b, 0x01, 0xf7, 0x63, 0x97, 0x8c, 0x58, 0xd8, 0x5a, 0xbd, 0xb4, 0x7e, 0xcc, 0xff,
-	0x64, 0x6e, 0x49, 0x4c, 0x3a, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x55, 0x3b, 0x57, 0xfa, 0x7f,
-	0x03, 0x00, 0x00,
+	// 370 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcf, 0x4e, 0xea, 0x40,
+	0x14, 0x87, 0xdb, 0x5b, 0xe0, 0x26, 0x07, 0x0a, 0xb9, 0x4d, 0xee, 0x85, 0x5c, 0x93, 0xc6, 0x54,
+	0x25, 0xba, 0x70, 0x88, 0xb8, 0xd4, 0xb8, 0x60, 0x45, 0x34, 0x18, 0x53, 0x5d, 0xb9, 0x21, 0x2d,
+	0x4e, 0xda, 0x46, 0xdb, 0x41, 0xce, 0x74, 0xe1, 0x5b, 0xf8, 0x0c, 0x3e, 0x8d, 0x4b, 0x96, 0x2e,
+	0x0d, 0xbc, 0x88, 0x61, 0xa6, 0x94, 0xb6, 0xe1, 0xcf, 0x6e, 0xe6, 0xe4, 0x77, 0xbe, 0xf9, 0x7a,
+	0x4e, 0x0a, 0x7b, 0xe3, 0x09, 0xe3, 0xac, 0xe3, 0xbe, 0xb0, 0xd1, 0xf3, 0xc8, 0x77, 0x82, 0xa8,
+	0x13, 0xa2, 0x87, 0x44, 0x54, 0x8d, 0xbf, 0x9c, 0x46, 0x4f, 0x74, 0x12, 0x06, 0x11, 0x27, 0xab,
+	0xc4, 0xff, 0xa6, 0xec, 0xe1, 0x6f, 0x63, 0x8a, 0xb2, 0x53, 0xe6, 0xad, 0x36, 0xd4, 0x7a, 0x8b,
+	0xab, 0x4d, 0x5f, 0x63, 0x8a, 0xdc, 0xf8, 0x07, 0x15, 0x9f, 0x06, 0x9e, 0xcf, 0x5b, 0xea, 0xbe,
+	0x7a, 0xac, 0xd9, 0xc9, 0xcd, 0x3a, 0x81, 0xc6, 0x2d, 0x4b, 0x92, 0x38, 0x66, 0x11, 0xd2, 0x8d,
+	0xd1, 0x2b, 0xd0, 0xf3, 0xc1, 0x53, 0x28, 0x8b, 0x27, 0x45, 0xae, 0xda, 0x6d, 0x92, 0x8c, 0xa3,
+	0x30, 0x22, 0x32, 0x2f, 0x53, 0xd6, 0x05, 0xe8, 0xf7, 0xdc, 0xe1, 0x31, 0xee, 0x70, 0x32, 0x0c,
+	0x28, 0xb9, 0x0e, 0xd2, 0xd6, 0x2f, 0x51, 0x15, 0x67, 0xeb, 0x12, 0xea, 0xcb, 0xe6, 0xed, 0x9a,
+	0x6b, 0xbb, 0x3f, 0x34, 0xf8, 0x3d, 0xa0, 0x88, 0x8e, 0x47, 0x8d, 0x6b, 0xd0, 0x85, 0xcf, 0x70,
+	0x22, 0x35, 0x12, 0xfb, 0x03, 0xb2, 0x76, 0xc2, 0x24, 0x3b, 0xc5, 0xbe, 0x62, 0xd7, 0xdc, 0xec,
+	0x54, 0x1f, 0xe0, 0x4f, 0xc4, 0x86, 0x4b, 0x9c, 0x14, 0x13, 0x0f, 0x57, 0xbb, 0xed, 0x0d, 0xbc,
+	0xc2, 0xb4, 0xfb, 0x8a, 0xdd, 0x88, 0x0a, 0x0b, 0x18, 0x40, 0xbd, 0x80, 0xd4, 0x04, 0xf2, 0x70,
+	0xbb, 0x62, 0x0a, 0xd4, 0xdd, 0x22, 0x0e, 0xc5, 0xe8, 0xd2, 0x2f, 0x2e, 0x6d, 0xc5, 0xe5, 0x96,
+	0xb4, 0xc0, 0x61, 0x6e, 0x6b, 0x77, 0xd0, 0x48, 0x71, 0x89, 0x5e, 0x59, 0xf0, 0x8e, 0x76, 0xf0,
+	0x52, 0xbf, 0x3a, 0xe6, 0x2a, 0xbd, 0x32, 0x68, 0x18, 0x87, 0xbd, 0x9b, 0xcf, 0x99, 0xa9, 0x4e,
+	0x67, 0xa6, 0xfa, 0x3d, 0x33, 0xd5, 0xf7, 0xb9, 0xa9, 0x4c, 0xe7, 0xa6, 0xf2, 0x35, 0x37, 0x95,
+	0xc7, 0x33, 0x2f, 0xe0, 0x7e, 0xec, 0x92, 0x11, 0x0b, 0x3b, 0xab, 0x37, 0xb2, 0xc7, 0xe2, 0xaf,
+	0xe3, 0x56, 0x44, 0xe5, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xe0, 0xf2, 0x5a, 0x55, 0x03,
+	0x00, 0x00,
 }
 
 func (m *BlockRequest) Marshal() (dAtA []byte, err error) {

proto/blockchain/msgs.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.blockchain;
+package tendermint.blockchain;
 
 option go_package = "github.com/tendermint/tendermint/proto/blockchain";
 
@@ -17,7 +17,7 @@ message NoBlockResponse {
 
 // BlockResponse returns block to the requested
 message BlockResponse {
-  tendermint.proto.types.Block block = 1;
+  tendermint.types.Block block = 1;
 }
 
 // StatusRequest requests the status of a node (Height & Base)

proto/consensus/msgs.pb.go

@@ -398,7 +398,7 @@ func (m *Vote) GetVote() *types.Vote {
 type HasVote struct {
 	Height int64               `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
 	Round  int32               `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"`
-	Type   types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.proto.types.SignedMsgType" json:"type,omitempty"`
+	Type   types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"`
 	Index  int32               `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
 }
 
@@ -467,7 +467,7 @@ func (m *HasVote) GetIndex() int32 {
 type VoteSetMaj23 struct {
 	Height  int64               `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
 	Round   int32               `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"`
-	Type    types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.proto.types.SignedMsgType" json:"type,omitempty"`
+	Type    types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"`
 	BlockID types.BlockID       `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"`
 }
 
@@ -536,7 +536,7 @@ func (m *VoteSetMaj23) GetBlockID() types.BlockID {
 type VoteSetBits struct {
 	Height  int64               `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
 	Round   int32               `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"`
-	Type    types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.proto.types.SignedMsgType" json:"type,omitempty"`
+	Type    types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"`
 	BlockID types.BlockID       `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"`
 	Votes   bits.BitArray       `protobuf:"bytes,5,opt,name=votes,proto3" json:"votes"`
 }
@@ -786,76 +786,76 @@ func (*Message) XXX_OneofWrappers() []interface{} {
 }
 
 func init() {
-	proto.RegisterType((*NewRoundStep)(nil), "tendermint.proto.consensus.NewRoundStep")
-	proto.RegisterType((*NewValidBlock)(nil), "tendermint.proto.consensus.NewValidBlock")
-	proto.RegisterType((*Proposal)(nil), "tendermint.proto.consensus.Proposal")
-	proto.RegisterType((*ProposalPOL)(nil), "tendermint.proto.consensus.ProposalPOL")
-	proto.RegisterType((*BlockPart)(nil), "tendermint.proto.consensus.BlockPart")
-	proto.RegisterType((*Vote)(nil), "tendermint.proto.consensus.Vote")
-	proto.RegisterType((*HasVote)(nil), "tendermint.proto.consensus.HasVote")
-	proto.RegisterType((*VoteSetMaj23)(nil), "tendermint.proto.consensus.VoteSetMaj23")
-	proto.RegisterType((*VoteSetBits)(nil), "tendermint.proto.consensus.VoteSetBits")
-	proto.RegisterType((*Message)(nil), "tendermint.proto.consensus.Message")
+	proto.RegisterType((*NewRoundStep)(nil), "tendermint.consensus.NewRoundStep")
+	proto.RegisterType((*NewValidBlock)(nil), "tendermint.consensus.NewValidBlock")
+	proto.RegisterType((*Proposal)(nil), "tendermint.consensus.Proposal")
+	proto.RegisterType((*ProposalPOL)(nil), "tendermint.consensus.ProposalPOL")
+	proto.RegisterType((*BlockPart)(nil), "tendermint.consensus.BlockPart")
+	proto.RegisterType((*Vote)(nil), "tendermint.consensus.Vote")
+	proto.RegisterType((*HasVote)(nil), "tendermint.consensus.HasVote")
+	proto.RegisterType((*VoteSetMaj23)(nil), "tendermint.consensus.VoteSetMaj23")
+	proto.RegisterType((*VoteSetBits)(nil), "tendermint.consensus.VoteSetBits")
+	proto.RegisterType((*Message)(nil), "tendermint.consensus.Message")
 }
 
 func init() { proto.RegisterFile("proto/consensus/msgs.proto", fileDescriptor_9de64017f8b3fc88) }
 
 var fileDescriptor_9de64017f8b3fc88 = []byte{
-	// 863 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcb, 0x8e, 0xe3, 0x44,
-	0x14, 0xb5, 0xa7, 0x93, 0x4e, 0xfa, 0xba, 0x1f, 0x43, 0x89, 0x47, 0xd4, 0x83, 0xd2, 0x91, 0x61,
-	0x20, 0x20, 0xe4, 0x8c, 0x32, 0x12, 0x8f, 0xdd, 0x60, 0x1e, 0xf2, 0x40, 0xa7, 0x27, 0x72, 0x46,
-	0x23, 0xc1, 0xc6, 0x72, 0xe2, 0x92, 0x53, 0x10, 0xbb, 0x8c, 0xab, 0x92, 0x26, 0x1f, 0x80, 0xc4,
-	0x92, 0x6f, 0x60, 0xcd, 0x96, 0x3f, 0x60, 0x31, 0xcb, 0x59, 0xb2, 0x1a, 0xa1, 0xf4, 0x6f, 0xb0,
-	0x40, 0xf5, 0x48, 0xec, 0x9e, 0x91, 0xbb, 0x3b, 0x1b, 0xa4, 0xd9, 0x44, 0x55, 0xf7, 0x71, 0xea,
-	0xd6, 0xb9, 0x75, 0x4f, 0x0c, 0xc7, 0x59, 0x4e, 0x39, 0xed, 0x4d, 0x68, 0xca, 0x70, 0xca, 0xe6,
-	0xac, 0x97, 0xb0, 0x98, 0x39, 0xd2, 0x88, 0x8e, 0x39, 0x4e, 0x23, 0x9c, 0x27, 0x24, 0xe5, 0xca,
-	0xe2, 0x6c, 0xc2, 0x8e, 0xdf, 0xe3, 0x53, 0x92, 0x47, 0x41, 0x16, 0xe6, 0x7c, 0xd9, 0x53, 0x18,
-	0x31, 0x8d, 0x69, 0xb1, 0x52, 0x19, 0xc7, 0x6f, 0x29, 0x0b, 0x5f, 0x66, 0x98, 0xa9, 0x5f, 0xed,
-	0xb8, 0xa3, 0x1c, 0x33, 0x32, 0x66, 0xbd, 0x31, 0xe1, 0x97, 0x9c, 0xf6, 0x9f, 0x26, 0xec, 0x9f,
-	0xe1, 0x73, 0x9f, 0xce, 0xd3, 0x68, 0xc4, 0x71, 0x86, 0xde, 0x84, 0xdd, 0x29, 0x26, 0xf1, 0x94,
-	0xb7, 0xcc, 0x8e, 0xd9, 0xdd, 0xf1, 0xf5, 0x0e, 0xbd, 0x0e, 0xf5, 0x5c, 0x04, 0xb5, 0x6e, 0x75,
-	0xcc, 0x6e, 0xdd, 0x57, 0x1b, 0x84, 0xa0, 0xc6, 0x38, 0xce, 0x5a, 0x3b, 0x1d, 0xb3, 0x7b, 0xe0,
-	0xcb, 0x35, 0xfa, 0x04, 0x5a, 0x0c, 0x4f, 0x68, 0x1a, 0xb1, 0x80, 0x91, 0x74, 0x82, 0x03, 0xc6,
-	0xc3, 0x9c, 0x07, 0x9c, 0x24, 0xb8, 0x55, 0x93, 0x98, 0x6f, 0x68, 0xff, 0x48, 0xb8, 0x47, 0xc2,
-	0xfb, 0x98, 0x24, 0x18, 0x7d, 0x08, 0xaf, 0xcd, 0x42, 0xc6, 0x83, 0x09, 0x4d, 0x12, 0xc2, 0x03,
-	0x75, 0x5c, 0x5d, 0x1e, 0x77, 0x24, 0x1c, 0x5f, 0x48, 0xbb, 0x2c, 0xd5, 0xfe, 0xd7, 0x84, 0x83,
-	0x33, 0x7c, 0xfe, 0x24, 0x9c, 0x91, 0xc8, 0x9d, 0xd1, 0xc9, 0x8f, 0x5b, 0x16, 0xfe, 0x1d, 0xa0,
-	0xb1, 0x48, 0x93, 0xbc, 0xb2, 0x60, 0x8a, 0xc3, 0x08, 0xe7, 0xf2, 0x1a, 0x56, 0xff, 0xae, 0xf3,
-	0x52, 0x3b, 0x14, 0x65, 0xc3, 0x30, 0xe7, 0x23, 0xcc, 0x3d, 0x19, 0xec, 0xd6, 0x9e, 0x3e, 0x3f,
-	0x31, 0xfc, 0xdb, 0x12, 0x46, 0x78, 0x98, 0xb2, 0xa3, 0xaf, 0xc0, 0x2a, 0x41, 0xcb, 0x2b, 0x5b,
-	0xfd, 0x77, 0x5f, 0xc6, 0x14, 0x0d, 0x71, 0x44, 0x43, 0x1c, 0x97, 0xf0, 0xcf, 0xf3, 0x3c, 0x5c,
-	0xfa, 0x50, 0x80, 0xa1, 0x3b, 0xb0, 0x47, 0x98, 0xe6, 0x42, 0xb2, 0xd0, 0xf4, 0x9b, 0x84, 0x29,
-	0x0e, 0xec, 0x33, 0x68, 0x0e, 0x73, 0x9a, 0x51, 0x16, 0xce, 0x90, 0x0b, 0xcd, 0x4c, 0xaf, 0xe5,
-	0xd5, 0xad, 0x7e, 0xa7, 0xf2, 0x02, 0x3a, 0x4e, 0xd7, 0xbe, 0xc9, 0xb3, 0x7f, 0x37, 0xc1, 0x5a,
-	0x3b, 0x87, 0x8f, 0x4e, 0x2b, 0xc9, 0xfc, 0x08, 0xd0, 0x3a, 0x27, 0xc8, 0xe8, 0x2c, 0x28, 0x33,
-	0x7b, 0x7b, 0xed, 0x19, 0xd2, 0x99, 0x6c, 0x12, 0x1a, 0xc0, 0x7e, 0x39, 0x5a, 0xd3, 0x7b, 0x23,
-	0x2a, 0x74, 0x85, 0x56, 0x09, 0xd3, 0xfe, 0x09, 0xf6, 0xdc, 0x35, 0x3f, 0x5b, 0xb6, 0xfb, 0x63,
-	0xa8, 0x89, 0x6e, 0xe8, 0x0a, 0xde, 0xbe, 0xaa, 0xc1, 0xfa, 0x64, 0x19, 0x6f, 0x7f, 0x0a, 0xb5,
-	0x27, 0x94, 0x63, 0x74, 0x0f, 0x6a, 0x0b, 0xca, 0xb1, 0xe6, 0xb7, 0x32, 0x5f, 0xc4, 0xfa, 0x32,
-	0xd2, 0xfe, 0xd5, 0x84, 0x86, 0x17, 0x32, 0x99, 0xbd, 0x5d, 0xad, 0x9f, 0x41, 0x4d, 0xa0, 0xc9,
-	0x5a, 0x0f, 0xab, 0x1f, 0xe3, 0x88, 0xc4, 0x29, 0x8e, 0x06, 0x2c, 0x7e, 0xbc, 0xcc, 0xb0, 0x2f,
-	0x53, 0x04, 0x20, 0x49, 0x23, 0xfc, 0xb3, 0x7c, 0x74, 0x75, 0x5f, 0x6d, 0xec, 0xbf, 0x4c, 0xd8,
-	0x17, 0x75, 0x8c, 0x30, 0x1f, 0x84, 0x3f, 0xf4, 0xef, 0xff, 0x7f, 0xf5, 0x7c, 0x0b, 0x4d, 0x35,
-	0x0a, 0x24, 0xd2, 0x73, 0x70, 0x52, 0x95, 0x2e, 0x3b, 0xfb, 0xf0, 0x4b, 0xf7, 0x48, 0xb0, 0xbf,
-	0x7a, 0x7e, 0xd2, 0xd0, 0x06, 0xbf, 0x21, 0x11, 0x1e, 0x46, 0xf6, 0x2f, 0xb7, 0xc0, 0xd2, 0xd7,
-	0x70, 0x09, 0x67, 0xaf, 0xe6, 0x2d, 0xd0, 0x03, 0xa8, 0x8b, 0xf7, 0xc1, 0xe4, 0x48, 0x6f, 0x37,
-	0x0c, 0x2a, 0xd1, 0xfe, 0xa3, 0x0e, 0x8d, 0x01, 0x66, 0x2c, 0x8c, 0x31, 0x1a, 0xc2, 0x61, 0x8a,
-	0xcf, 0xd5, 0x18, 0x06, 0x52, 0x89, 0xd5, 0x0b, 0xed, 0x3a, 0xd5, 0xff, 0x28, 0x4e, 0x59, 0xef,
-	0x3d, 0xc3, 0xdf, 0x4f, 0xcb, 0xfa, 0x3f, 0x82, 0x23, 0x81, 0xb8, 0x10, 0xc2, 0x1a, 0xc8, 0xa2,
-	0x25, 0x8f, 0x56, 0xff, 0x83, 0x6b, 0x20, 0x0b, 0x29, 0xf6, 0x0c, 0xff, 0x20, 0xbd, 0xa4, 0xcd,
-	0x65, 0x89, 0xaa, 0x14, 0x81, 0x02, 0x6d, 0xad, 0x44, 0x5e, 0x49, 0xa2, 0xd0, 0xe9, 0x0b, 0x62,
-	0xa2, 0x3a, 0xf1, 0xfe, 0x4d, 0x70, 0x86, 0x8f, 0x4e, 0xbd, 0xcb, 0x5a, 0x82, 0xbe, 0x06, 0x28,
-	0x44, 0x5a, 0xf7, 0xe2, 0xee, 0x55, 0x58, 0x1b, 0xe5, 0xf1, 0x0c, 0x7f, 0x6f, 0x23, 0xd3, 0x42,
-	0x58, 0xa4, 0x30, 0xec, 0x56, 0x09, 0x6f, 0x81, 0x20, 0xde, 0xae, 0x67, 0x28, 0x79, 0x40, 0x0f,
-	0xa0, 0x39, 0x0d, 0x59, 0x20, 0x73, 0x1b, 0x32, 0xf7, 0x9d, 0xab, 0x72, 0xb5, 0x92, 0x78, 0x86,
-	0xdf, 0x98, 0x6a, 0x51, 0x19, 0xc2, 0xa1, 0xc8, 0x0e, 0x18, 0xe6, 0x41, 0x22, 0xc6, 0xba, 0xd5,
-	0xbc, 0xbe, 0xf5, 0x65, 0x19, 0x10, 0xad, 0x5f, 0x94, 0x65, 0x61, 0x00, 0x07, 0x1b, 0x44, 0xf1,
-	0xfe, 0x5a, 0x7b, 0xd7, 0x53, 0x5c, 0x1a, 0x48, 0x41, 0xf1, 0xa2, 0xd8, 0xba, 0x75, 0xd8, 0x61,
-	0xf3, 0xc4, 0xfd, 0xe6, 0xe9, 0xaa, 0x6d, 0x3e, 0x5b, 0xb5, 0xcd, 0x7f, 0x56, 0x6d, 0xf3, 0xb7,
-	0x8b, 0xb6, 0xf1, 0xec, 0xa2, 0x6d, 0xfc, 0x7d, 0xd1, 0x36, 0xbe, 0xbf, 0x17, 0x13, 0x3e, 0x9d,
-	0x8f, 0x9d, 0x09, 0x4d, 0x7a, 0xc5, 0x11, 0xe5, 0xe5, 0x0b, 0x9f, 0x4c, 0xe3, 0x5d, 0x69, 0xb8,
-	0xff, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xb5, 0xc3, 0x75, 0x4c, 0x09, 0x00, 0x00,
+	// 858 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x8f, 0xdb, 0x44,
+	0x18, 0xb6, 0x59, 0x67, 0x93, 0x7d, 0xbd, 0x1f, 0x65, 0x54, 0x4a, 0x48, 0x45, 0xb2, 0x18, 0x09,
+	0xad, 0x10, 0x72, 0xaa, 0xec, 0x01, 0xa9, 0x42, 0x02, 0xcc, 0x47, 0xdd, 0x55, 0xd3, 0x46, 0x4e,
+	0xd5, 0x03, 0x17, 0xcb, 0x89, 0x47, 0xce, 0xd0, 0xd8, 0x63, 0x79, 0x26, 0x59, 0x72, 0xe5, 0x17,
+	0xf0, 0x03, 0xf8, 0x1b, 0x48, 0xfc, 0x84, 0x1e, 0x7b, 0xe4, 0x54, 0xa1, 0xec, 0x1f, 0x40, 0x42,
+	0xe2, 0x8c, 0xe6, 0x23, 0xb1, 0xb7, 0xf5, 0x2e, 0xec, 0x05, 0x89, 0xcb, 0xca, 0x33, 0xef, 0xfb,
+	0x3c, 0xf3, 0x7e, 0x3e, 0x1b, 0xe8, 0xe4, 0x05, 0xe5, 0xb4, 0x3f, 0xa5, 0x19, 0xc3, 0x19, 0x5b,
+	0xb0, 0x7e, 0xca, 0x12, 0xe6, 0xca, 0x4b, 0x74, 0x9b, 0xe3, 0x2c, 0xc6, 0x45, 0x4a, 0x32, 0xee,
+	0x6e, 0x1d, 0x3a, 0x1f, 0xf1, 0x19, 0x29, 0xe2, 0x30, 0x8f, 0x0a, 0xbe, 0xea, 0x2b, 0x74, 0x42,
+	0x13, 0x5a, 0x7e, 0x29, 0x74, 0xe7, 0x5d, 0x75, 0xc3, 0x57, 0x39, 0x66, 0xea, 0xaf, 0x36, 0xdc,
+	0x55, 0x86, 0x39, 0x99, 0xb0, 0xfe, 0x84, 0xf0, 0x4b, 0x46, 0xe7, 0x17, 0x13, 0xf6, 0x1f, 0xe3,
+	0xf3, 0x80, 0x2e, 0xb2, 0x78, 0xcc, 0x71, 0x8e, 0xee, 0xc0, 0xee, 0x0c, 0x93, 0x64, 0xc6, 0xdb,
+	0xe6, 0xb1, 0x79, 0xb2, 0x13, 0xe8, 0x13, 0xba, 0x0d, 0x8d, 0x42, 0x38, 0xb5, 0xdf, 0x3a, 0x36,
+	0x4f, 0x1a, 0x81, 0x3a, 0x20, 0x04, 0x16, 0xe3, 0x38, 0x6f, 0xef, 0x1c, 0x9b, 0x27, 0x07, 0x81,
+	0xfc, 0x46, 0x9f, 0x42, 0x9b, 0xe1, 0x29, 0xcd, 0x62, 0x16, 0x32, 0x92, 0x4d, 0x71, 0xc8, 0x78,
+	0x54, 0xf0, 0x90, 0x93, 0x14, 0xb7, 0x2d, 0xc9, 0xf9, 0x8e, 0xb6, 0x8f, 0x85, 0x79, 0x2c, 0xac,
+	0x4f, 0x49, 0x8a, 0xd1, 0xc7, 0xf0, 0xf6, 0x3c, 0x62, 0x3c, 0x9c, 0xd2, 0x34, 0x25, 0x3c, 0x54,
+	0xcf, 0x35, 0xe4, 0x73, 0x47, 0xc2, 0xf0, 0x95, 0xbc, 0x97, 0xa1, 0x3a, 0x7f, 0x98, 0x70, 0xf0,
+	0x18, 0x9f, 0x3f, 0x8b, 0xe6, 0x24, 0xf6, 0xe6, 0x74, 0xfa, 0xfc, 0x86, 0x81, 0x8f, 0x01, 0x4d,
+	0x04, 0x4c, 0xd6, 0x95, 0x85, 0x33, 0x1c, 0xc5, 0xb8, 0x90, 0x69, 0xd8, 0x83, 0x9e, 0x5b, 0x69,
+	0x84, 0x2a, 0xd6, 0x28, 0x2a, 0xf8, 0x18, 0x73, 0x5f, 0xba, 0x79, 0xd6, 0x8b, 0x57, 0x3d, 0x23,
+	0xb8, 0x25, 0x09, 0x84, 0x85, 0xa9, 0x7b, 0xf4, 0x39, 0xd8, 0x15, 0x52, 0x99, 0xac, 0x3d, 0xe8,
+	0x56, 0xd9, 0x44, 0x13, 0x5c, 0xd1, 0x04, 0xd7, 0x23, 0xfc, 0xcb, 0xa2, 0x88, 0x56, 0x01, 0x94,
+	0x34, 0xe8, 0x2e, 0xec, 0x11, 0xa6, 0xf3, 0x97, 0x99, 0xb7, 0x82, 0x16, 0x61, 0x2a, 0x6f, 0xc7,
+	0x87, 0xd6, 0xa8, 0xa0, 0x39, 0x65, 0xd1, 0x1c, 0x7d, 0x06, 0xad, 0x5c, 0x7f, 0xcb, 0x74, 0xed,
+	0x41, 0xa7, 0x26, 0x68, 0xed, 0xa1, 0xe3, 0xdd, 0x22, 0x9c, 0x9f, 0x4d, 0xb0, 0x37, 0xc6, 0xd1,
+	0x93, 0x47, 0x57, 0x96, 0xee, 0x13, 0x40, 0x1b, 0x4c, 0x98, 0xd3, 0x79, 0x58, 0xad, 0xe3, 0xad,
+	0x8d, 0x65, 0x44, 0xe7, 0xb2, 0x25, 0xe8, 0x01, 0xec, 0x57, 0xbd, 0x75, 0x31, 0xff, 0x21, 0x7d,
+	0x1d, 0x9b, 0x5d, 0x61, 0x73, 0x9e, 0xc3, 0x9e, 0xb7, 0xa9, 0xc9, 0x0d, 0xdb, 0x7a, 0x0f, 0x2c,
+	0x51, 0x7b, 0xfd, 0xf6, 0x9d, 0xfa, 0x46, 0xea, 0x37, 0xa5, 0xa7, 0x33, 0x00, 0xeb, 0x19, 0xe5,
+	0x62, 0xf8, 0xac, 0x25, 0xe5, 0x58, 0x57, 0xb3, 0x06, 0x29, 0xbc, 0x02, 0xe9, 0xe3, 0xfc, 0x68,
+	0x42, 0xd3, 0x8f, 0x98, 0xc4, 0xdd, 0x2c, 0xbe, 0x53, 0xb0, 0x04, 0x9b, 0x8c, 0xef, 0xb0, 0x6e,
+	0xd0, 0xc6, 0x24, 0xc9, 0x70, 0x3c, 0x64, 0xc9, 0xd3, 0x55, 0x8e, 0x03, 0xe9, 0x2c, 0xa8, 0x48,
+	0x16, 0xe3, 0x1f, 0xe4, 0x40, 0x35, 0x02, 0x75, 0x70, 0x7e, 0x35, 0x61, 0x5f, 0x44, 0x30, 0xc6,
+	0x7c, 0x18, 0x7d, 0x3f, 0x38, 0xfd, 0x2f, 0x22, 0xf9, 0x06, 0x5a, 0x6a, 0xc0, 0x49, 0xac, 0xa7,
+	0xfb, 0xbd, 0x37, 0x81, 0xb2, 0x77, 0x0f, 0xbf, 0xf6, 0x8e, 0x44, 0x95, 0xd7, 0xaf, 0x7a, 0x4d,
+	0x7d, 0x11, 0x34, 0x25, 0xf6, 0x61, 0xec, 0xfc, 0x69, 0x82, 0xad, 0x43, 0xf7, 0x08, 0x67, 0xff,
+	0x9f, 0xc8, 0xd1, 0x7d, 0x68, 0x88, 0x09, 0x60, 0x72, 0x39, 0xff, 0xed, 0x70, 0x2b, 0x88, 0xf3,
+	0x97, 0x05, 0xcd, 0x21, 0x66, 0x2c, 0x4a, 0x30, 0x3a, 0x83, 0xc3, 0x0c, 0x9f, 0xab, 0x85, 0x0a,
+	0xa5, 0x82, 0xaa, 0xb9, 0x73, 0xdc, 0xba, 0xff, 0x01, 0x6e, 0x55, 0xa1, 0x7d, 0x23, 0xd8, 0xcf,
+	0xaa, 0x8a, 0x3d, 0x84, 0x23, 0xc1, 0xb5, 0x14, 0x52, 0x18, 0xca, 0x40, 0x65, 0xbd, 0xec, 0xc1,
+	0x87, 0x57, 0x92, 0x95, 0xb2, 0xe9, 0x1b, 0xc1, 0x41, 0x76, 0x49, 0x47, 0xab, 0xd2, 0x52, 0xb3,
+	0xc2, 0x25, 0xcf, 0x46, 0x41, 0xfc, 0x8a, 0xb4, 0xa0, 0x6f, 0x5f, 0x13, 0x01, 0x55, 0xeb, 0x0f,
+	0xae, 0x67, 0x18, 0x3d, 0x79, 0xe4, 0x5f, 0xd6, 0x00, 0xf4, 0x05, 0x40, 0x29, 0xa5, 0xba, 0xda,
+	0xbd, 0x7a, 0x96, 0xad, 0x56, 0xf8, 0x46, 0xb0, 0xb7, 0x15, 0x53, 0x21, 0x05, 0x72, 0xa1, 0x77,
+	0xdf, 0x94, 0xc7, 0x12, 0x2b, 0xa6, 0xd0, 0x37, 0xd4, 0x5a, 0xa3, 0xfb, 0xd0, 0x9a, 0x45, 0x2c,
+	0x94, 0xa8, 0xa6, 0x44, 0xbd, 0x5f, 0x8f, 0xd2, 0xbb, 0xef, 0x1b, 0x41, 0x73, 0xa6, 0x65, 0xe0,
+	0x0c, 0x0e, 0x05, 0x2e, 0x64, 0x98, 0x87, 0xa9, 0x58, 0xc7, 0x76, 0xeb, 0xba, 0x86, 0x56, 0x17,
+	0x57, 0x34, 0x74, 0x59, 0x5d, 0xe4, 0x07, 0x70, 0xb0, 0xe5, 0x12, 0xf3, 0xd4, 0xde, 0xbb, 0xae,
+	0x88, 0x95, 0x45, 0x12, 0x45, 0x5c, 0x96, 0x47, 0xaf, 0x01, 0x3b, 0x6c, 0x91, 0x7a, 0x67, 0x2f,
+	0xd6, 0x5d, 0xf3, 0xe5, 0xba, 0x6b, 0xfe, 0xbe, 0xee, 0x9a, 0x3f, 0x5d, 0x74, 0x8d, 0x97, 0x17,
+	0x5d, 0xe3, 0xb7, 0x8b, 0xae, 0xf1, 0xdd, 0xbd, 0x84, 0xf0, 0xd9, 0x62, 0xe2, 0x4e, 0x69, 0xda,
+	0x2f, 0xc9, 0xab, 0x9f, 0xaf, 0xfd, 0x5c, 0x99, 0xec, 0xca, 0x8b, 0xd3, 0xbf, 0x03, 0x00, 0x00,
+	0xff, 0xff, 0x6c, 0xa7, 0x03, 0xea, 0xc8, 0x08, 0x00, 0x00,
 }
 
 func (m *NewRoundStep) Marshal() (dAtA []byte, err error) {

proto/consensus/msgs.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.consensus;
+package tendermint.consensus;
 
 option go_package = "github.com/tendermint/tendermint/proto/consensus";
 
@@ -21,60 +21,60 @@ message NewRoundStep {
 //i.e., there is a Proposal for block B and 2/3+ prevotes for the block B in the round r.
 // In case the block is also committed, then IsCommit flag is set to true.
 message NewValidBlock {
-  int64                                height             = 1;
-  int32                                round              = 2;
-  tendermint.proto.types.PartSetHeader block_parts_header = 3 [(gogoproto.nullable) = false];
-  tendermint.proto.libs.bits.BitArray  block_parts        = 4;
-  bool                                 is_commit          = 5;
+  int64                          height             = 1;
+  int32                          round              = 2;
+  tendermint.types.PartSetHeader block_parts_header = 3 [(gogoproto.nullable) = false];
+  tendermint.libs.bits.BitArray  block_parts        = 4;
+  bool                           is_commit          = 5;
 }
 
 // ProposalMessage is sent when a new block is proposed.
 message Proposal {
-  tendermint.proto.types.Proposal proposal = 1 [(gogoproto.nullable) = false];
+  tendermint.types.Proposal proposal = 1 [(gogoproto.nullable) = false];
 }
 
 // ProposalPOLMessage is sent when a previous proposal is re-proposed.
 message ProposalPOL {
-  int64                               height             = 1;
-  int32                               proposal_pol_round = 2;
-  tendermint.proto.libs.bits.BitArray proposal_pol       = 3 [(gogoproto.nullable) = false];
+  int64                         height             = 1;
+  int32                         proposal_pol_round = 2;
+  tendermint.libs.bits.BitArray proposal_pol       = 3 [(gogoproto.nullable) = false];
 }
 
 // BlockPartMessage is sent when gossipping a piece of the proposed block.
 message BlockPart {
-  int64                       height = 1;
-  int32                       round  = 2;
-  tendermint.proto.types.Part part   = 3 [(gogoproto.nullable) = false];
+  int64                 height = 1;
+  int32                 round  = 2;
+  tendermint.types.Part part   = 3 [(gogoproto.nullable) = false];
 }
 
 // VoteMessage is sent when voting for a proposal (or lack thereof).
 message Vote {
-  tendermint.proto.types.Vote vote = 1;
+  tendermint.types.Vote vote = 1;
 }
 
 // HasVoteMessage is sent to indicate that a particular vote has been received.
 message HasVote {
-  int64                                height = 1;
-  int32                                round  = 2;
-  tendermint.proto.types.SignedMsgType type   = 3;
-  int32                                index  = 4;
+  int64                          height = 1;
+  int32                          round  = 2;
+  tendermint.types.SignedMsgType type   = 3;
+  int32                          index  = 4;
 }
 
 // VoteSetMaj23Message is sent to indicate that a given BlockID has seen +2/3 votes.
 message VoteSetMaj23 {
-  int64                                height   = 1;
-  int32                                round    = 2;
-  tendermint.proto.types.SignedMsgType type     = 3;
-  tendermint.proto.types.BlockID       block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false];
+  int64                          height   = 1;
+  int32                          round    = 2;
+  tendermint.types.SignedMsgType type     = 3;
+  tendermint.types.BlockID       block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false];
 }
 
 // VoteSetBitsMessage is sent to communicate the bit-array of votes seen for the BlockID.
 message VoteSetBits {
-  int64                                height   = 1;
-  int32                                round    = 2;
-  tendermint.proto.types.SignedMsgType type     = 3;
-  tendermint.proto.types.BlockID       block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false];
-  tendermint.proto.libs.bits.BitArray  votes    = 5 [(gogoproto.nullable) = false];
+  int64                          height   = 1;
+  int32                          round    = 2;
+  tendermint.types.SignedMsgType type     = 3;
+  tendermint.types.BlockID       block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false];
+  tendermint.libs.bits.BitArray  votes    = 5 [(gogoproto.nullable) = false];
 }
 
 message Message {

proto/consensus/walmsgs.pb.go

@@ -362,52 +362,52 @@ func (m *TimedWALMessage) GetMsg() *WALMessage {
 }
 
 func init() {
-	proto.RegisterType((*MsgInfo)(nil), "tendermint.proto.consensus.MsgInfo")
-	proto.RegisterType((*TimeoutInfo)(nil), "tendermint.proto.consensus.TimeoutInfo")
-	proto.RegisterType((*EndHeight)(nil), "tendermint.proto.consensus.EndHeight")
-	proto.RegisterType((*WALMessage)(nil), "tendermint.proto.consensus.WALMessage")
-	proto.RegisterType((*TimedWALMessage)(nil), "tendermint.proto.consensus.TimedWALMessage")
+	proto.RegisterType((*MsgInfo)(nil), "tendermint.consensus.MsgInfo")
+	proto.RegisterType((*TimeoutInfo)(nil), "tendermint.consensus.TimeoutInfo")
+	proto.RegisterType((*EndHeight)(nil), "tendermint.consensus.EndHeight")
+	proto.RegisterType((*WALMessage)(nil), "tendermint.consensus.WALMessage")
+	proto.RegisterType((*TimedWALMessage)(nil), "tendermint.consensus.TimedWALMessage")
 }
 
 func init() { proto.RegisterFile("proto/consensus/walmsgs.proto", fileDescriptor_60ad80fa14e37285) }
 
 var fileDescriptor_60ad80fa14e37285 = []byte{
-	// 551 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xcf, 0x8b, 0xd3, 0x40,
-	0x14, 0xce, 0x6c, 0x7f, 0x4f, 0x15, 0x21, 0xca, 0x52, 0x03, 0xa6, 0xa5, 0xc5, 0xb5, 0x20, 0x24,
-	0xa2, 0x97, 0x05, 0x0f, 0x6a, 0xe9, 0x4a, 0x2b, 0xbb, 0x20, 0xe3, 0x82, 0xe0, 0x25, 0xa4, 0x9b,
-	0xd7, 0x69, 0x70, 0x33, 0x13, 0x32, 0x13, 0x65, 0xff, 0x00, 0xef, 0x3d, 0xfa, 0x27, 0xed, 0xcd,
-	0x3d, 0x7a, 0x5a, 0xa5, 0xfd, 0x47, 0x24, 0x33, 0x69, 0x1b, 0x5a, 0xec, 0xde, 0x66, 0xde, 0x9b,
-	0xef, 0xfb, 0xde, 0x7b, 0xdf, 0x1b, 0xfc, 0x24, 0x4e, 0xb8, 0xe4, 0xee, 0x05, 0x67, 0x02, 0x98,
-	0x48, 0x85, 0xfb, 0xdd, 0xbf, 0x8c, 0x04, 0x15, 0x8e, 0x8a, 0x9b, 0x96, 0x04, 0x16, 0x40, 0x12,
-	0x85, 0x4c, 0xea, 0x88, 0xb3, 0x7e, 0x69, 0x1d, 0xc9, 0x59, 0x98, 0x04, 0x5e, 0xec, 0x27, 0xf2,
-	0xca, 0xd5, 0x34, 0x94, 0x53, 0xbe, 0x39, 0x69, 0x84, 0x65, 0x6d, 0x4b, 0x6c, 0xf8, 0xad, 0x96,
-	0xce, 0xc9, 0xab, 0x18, 0x84, 0x0b, 0xdf, 0x80, 0xc9, 0x55, 0xc6, 0xa6, 0x9c, 0xd3, 0x4b, 0xd0,
-	0xc4, 0x93, 0x74, 0xea, 0x06, 0x69, 0xe2, 0xcb, 0x90, 0xb3, 0x3c, 0xdf, 0xde, 0xce, 0xcb, 0x30,
-	0x02, 0x21, 0xfd, 0x28, 0xd6, 0x0f, 0xba, 0x5f, 0x71, 0xed, 0x4c, 0xd0, 0x31, 0x9b, 0x72, 0xf3,
-	0x35, 0x2e, 0x45, 0x82, 0xb6, 0x50, 0x07, 0xf5, 0x9b, 0x2f, 0x7b, 0xce, 0xff, 0x7b, 0x72, 0xce,
-	0x40, 0x08, 0x9f, 0xc2, 0xa0, 0x7c, 0x7d, 0xdb, 0x36, 0x48, 0x86, 0x32, 0x7b, 0xb8, 0x16, 0x03,
-	0x24, 0x5e, 0x18, 0xb4, 0x0e, 0x3a, 0xa8, 0xdf, 0x18, 0xe0, 0xc5, 0x6d, 0xbb, 0xfa, 0x11, 0x20,
-	0x19, 0x0f, 0x49, 0x35, 0x4b, 0x8d, 0x83, 0xee, 0x1c, 0xe1, 0xe6, 0x79, 0x18, 0x01, 0x4f, 0xa5,
-	0x52, 0x7c, 0x83, 0xeb, 0xab, 0x7a, 0x73, 0xd9, 0xc7, 0x8e, 0x2e, 0xd8, 0x59, 0x15, 0xec, 0x0c,
-	0xf3, 0x07, 0x83, 0x7a, 0x26, 0xf6, 0xf3, 0x4f, 0x1b, 0x91, 0x35, 0xc8, 0x3c, 0xc4, 0xd5, 0x19,
-	0x84, 0x74, 0x26, 0x95, 0x68, 0x89, 0xe4, 0x37, 0xf3, 0x11, 0xae, 0x24, 0x3c, 0x65, 0x41, 0xab,
-	0xd4, 0x41, 0xfd, 0x0a, 0xd1, 0x17, 0xd3, 0xc4, 0x65, 0x21, 0x21, 0x6e, 0x95, 0x3b, 0xa8, 0x7f,
-	0x9f, 0xa8, 0x73, 0xb7, 0x87, 0x1b, 0x27, 0x2c, 0x18, 0x69, 0xd8, 0x86, 0x0e, 0x15, 0xe9, 0xba,
-	0xbf, 0x0e, 0x30, 0xfe, 0xfc, 0xee, 0x34, 0x6f, 0xdb, 0x9c, 0xe0, 0x43, 0x65, 0x82, 0x17, 0xf8,
-	0xd2, 0xf7, 0x14, 0xb7, 0x27, 0xa4, 0x2f, 0x21, 0x6f, 0xe2, 0xf9, 0xee, 0xec, 0x94, 0x75, 0xce,
-	0x49, 0x86, 0x1a, 0xfa, 0xd2, 0x27, 0x19, 0xe6, 0x53, 0x06, 0x19, 0x19, 0xe4, 0x21, 0xec, 0x86,
-	0xcd, 0xb7, 0xb8, 0x1e, 0x09, 0xea, 0x85, 0x6c, 0xca, 0x55, 0x6f, 0x77, 0x39, 0xa2, 0x3d, 0x1c,
-	0x19, 0xa4, 0x16, 0xe5, 0x76, 0x9e, 0xe2, 0x7b, 0x52, 0xcf, 0x5a, 0xb3, 0x94, 0x14, 0xcb, 0xb3,
-	0x7d, 0x2c, 0x05, 0x6f, 0x46, 0x06, 0x69, 0xca, 0x82, 0x55, 0xef, 0x31, 0x06, 0x16, 0x78, 0xf9,
-	0x78, 0xca, 0x8a, 0xeb, 0xe9, 0x3e, 0xae, 0xf5, 0x54, 0x47, 0x06, 0x69, 0xc0, 0xea, 0x32, 0xa8,
-	0xe0, 0x92, 0x48, 0xa3, 0xee, 0x0f, 0x84, 0x1f, 0x64, 0x6a, 0x41, 0x61, 0xac, 0xc7, 0xb8, 0x9c,
-	0x29, 0xe6, 0x43, 0xb4, 0x76, 0x36, 0xe1, 0x7c, 0xb5, 0xba, 0x7a, 0x15, 0xe6, 0xd9, 0x2a, 0x28,
-	0x84, 0x79, 0xac, 0x37, 0x57, 0xcf, 0xe9, 0x68, 0x5f, 0x55, 0x1b, 0x39, 0xb5, 0xb6, 0x83, 0x0f,
-	0xd7, 0x0b, 0x1b, 0xdd, 0x2c, 0x6c, 0xf4, 0x77, 0x61, 0xa3, 0xf9, 0xd2, 0x36, 0x6e, 0x96, 0xb6,
-	0xf1, 0x7b, 0x69, 0x1b, 0x5f, 0x5e, 0xd0, 0x50, 0xce, 0xd2, 0x89, 0x73, 0xc1, 0x23, 0x77, 0x43,
-	0x58, 0x3c, 0x6e, 0x7d, 0xd8, 0x49, 0x55, 0x05, 0x5e, 0xfd, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x47,
-	0x68, 0x76, 0x15, 0x2d, 0x04, 0x00, 0x00,
+	// 549 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xd1, 0x6a, 0x13, 0x41,
+	0x14, 0xdd, 0x69, 0xd2, 0xb4, 0xb9, 0x51, 0x84, 0xb5, 0x94, 0x18, 0xe8, 0x26, 0xa6, 0x28, 0x79,
+	0xda, 0x95, 0x8a, 0x20, 0xbe, 0xa8, 0x21, 0x95, 0x44, 0x2c, 0xc8, 0x58, 0x10, 0x44, 0x58, 0x36,
+	0xdd, 0x9b, 0xc9, 0x42, 0x77, 0x66, 0xd9, 0x99, 0x55, 0xfa, 0xe4, 0x2f, 0xe4, 0xd1, 0x3f, 0xf1,
+	0x17, 0xfa, 0xd8, 0x47, 0x9f, 0xaa, 0x24, 0x3f, 0x22, 0x3b, 0xb3, 0x49, 0x96, 0x34, 0xbe, 0xed,
+	0xcc, 0xbd, 0xe7, 0x9c, 0x7b, 0xcf, 0x99, 0x85, 0xa3, 0x24, 0x15, 0x4a, 0x78, 0x17, 0x82, 0x4b,
+	0xe4, 0x32, 0x93, 0xde, 0xf7, 0xe0, 0x32, 0x96, 0x4c, 0xba, 0xfa, 0xde, 0x3e, 0x50, 0xc8, 0x43,
+	0x4c, 0xe3, 0x88, 0x2b, 0x77, 0xd5, 0xd3, 0x7a, 0xaa, 0xa6, 0x51, 0x1a, 0xfa, 0x49, 0x90, 0xaa,
+	0x2b, 0xcf, 0x10, 0x30, 0xc1, 0xc4, 0xfa, 0xcb, 0xa0, 0x5b, 0xad, 0x4d, 0xf2, 0x35, 0x73, 0xab,
+	0x69, 0x6a, 0xea, 0x2a, 0x41, 0xe9, 0xe1, 0x37, 0xe4, 0x6a, 0x59, 0x71, 0x98, 0x10, 0xec, 0x12,
+	0x0d, 0xf1, 0x38, 0x9b, 0x78, 0x61, 0x96, 0x06, 0x2a, 0x12, 0xbc, 0xa8, 0xb7, 0x37, 0xeb, 0x2a,
+	0x8a, 0x51, 0xaa, 0x20, 0x4e, 0x4c, 0x43, 0x17, 0x61, 0xef, 0x4c, 0xb2, 0x11, 0x9f, 0x08, 0xfb,
+	0x05, 0x54, 0x62, 0xc9, 0x9a, 0xa4, 0x43, 0x7a, 0x8d, 0x93, 0x23, 0x77, 0xdb, 0x36, 0xee, 0x19,
+	0x4a, 0x19, 0x30, 0xec, 0x57, 0xaf, 0x6f, 0xdb, 0x16, 0xcd, 0xfb, 0xed, 0x63, 0xd8, 0x4b, 0x10,
+	0x53, 0x3f, 0x0a, 0x9b, 0x3b, 0x1d, 0xd2, 0xab, 0xf7, 0x61, 0x7e, 0xdb, 0xae, 0x7d, 0x44, 0x4c,
+	0x47, 0x03, 0x5a, 0xcb, 0x4b, 0xa3, 0xb0, 0x3b, 0x23, 0xd0, 0x38, 0x8f, 0x62, 0x14, 0x99, 0xd2,
+	0x5a, 0xaf, 0x61, 0x7f, 0x39, 0x69, 0x21, 0xf8, 0xc8, 0x35, 0xa3, 0xba, 0xcb, 0x51, 0xdd, 0x41,
+	0xd1, 0xd0, 0xdf, 0xcf, 0xc5, 0x7e, 0xfe, 0x69, 0x13, 0xba, 0x02, 0xd9, 0x87, 0x50, 0x9b, 0x62,
+	0xc4, 0xa6, 0x4a, 0x8b, 0x56, 0x68, 0x71, 0xb2, 0x0f, 0x60, 0x37, 0x15, 0x19, 0x0f, 0x9b, 0x95,
+	0x0e, 0xe9, 0xed, 0x52, 0x73, 0xb0, 0x6d, 0xa8, 0x4a, 0x85, 0x49, 0xb3, 0xda, 0x21, 0xbd, 0xfb,
+	0x54, 0x7f, 0x77, 0x8f, 0xa1, 0x7e, 0xca, 0xc3, 0xa1, 0x81, 0xad, 0xe9, 0x48, 0x99, 0xae, 0xfb,
+	0x6b, 0x07, 0xe0, 0xf3, 0xdb, 0x0f, 0xc5, 0xda, 0xf6, 0x57, 0x38, 0xd4, 0xf6, 0xfb, 0x61, 0xa0,
+	0x02, 0x5f, 0x73, 0xfb, 0x52, 0x05, 0x0a, 0x8b, 0x25, 0x9e, 0x94, 0x5d, 0xd3, 0x71, 0xb9, 0xa7,
+	0x79, 0xff, 0x20, 0x50, 0x01, 0xcd, 0xbb, 0x3f, 0xe5, 0xcd, 0x43, 0x8b, 0x3e, 0xc4, 0xbb, 0xd7,
+	0xf6, 0x2b, 0xd8, 0x8f, 0x25, 0xf3, 0x23, 0x3e, 0x11, 0x7a, 0xab, 0xff, 0xa7, 0x60, 0x12, 0x1b,
+	0x5a, 0x74, 0x2f, 0x2e, 0xc2, 0x7b, 0x07, 0xf7, 0x94, 0xf1, 0xd7, 0xe0, 0x2b, 0x1a, 0xff, 0x78,
+	0x3b, 0xbe, 0x94, 0xc4, 0xd0, 0xa2, 0x0d, 0x55, 0x0a, 0xe6, 0x0d, 0x00, 0xf2, 0xd0, 0x2f, 0xcc,
+	0xa8, 0x6a, 0x96, 0xf6, 0x76, 0x96, 0x95, 0x7b, 0x43, 0x8b, 0xd6, 0x71, 0x79, 0xe8, 0xef, 0x42,
+	0x45, 0x66, 0x71, 0xf7, 0x07, 0x3c, 0xc8, 0x65, 0xc2, 0x92, 0x7b, 0x2f, 0xa1, 0x9a, 0x4b, 0x15,
+	0x5e, 0xb5, 0xee, 0x04, 0x7e, 0xbe, 0x7c, 0x9b, 0x26, 0xf1, 0x59, 0x9e, 0xb8, 0x46, 0xd8, 0x27,
+	0xe6, 0x69, 0x1a, 0x53, 0x3a, 0xdb, 0xc7, 0x59, 0x0b, 0xe9, 0x77, 0xd9, 0x7f, 0x7f, 0x3d, 0x77,
+	0xc8, 0xcd, 0xdc, 0x21, 0x7f, 0xe7, 0x0e, 0x99, 0x2d, 0x1c, 0xeb, 0x66, 0xe1, 0x58, 0xbf, 0x17,
+	0x8e, 0xf5, 0xe5, 0x19, 0x8b, 0xd4, 0x34, 0x1b, 0xbb, 0x17, 0x22, 0xf6, 0xd6, 0x54, 0xe5, 0xcf,
+	0x8d, 0x7f, 0x71, 0x5c, 0xd3, 0x17, 0xcf, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x16, 0x65,
+	0xf3, 0x02, 0x04, 0x00, 0x00,
 }
 
 func (m *MsgInfo) Marshal() (dAtA []byte, err error) {

proto/consensus/walmsgs.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.consensus;
+package tendermint.consensus;
 
 option go_package = "github.com/tendermint/tendermint/proto/consensus";
 
@@ -32,10 +32,10 @@ message EndHeight {
 
 message WALMessage {
   oneof sum {
-    tendermint.proto.types.EventDataRoundState event_data_round_state = 1;
-    MsgInfo                                    msg_info               = 2;
-    TimeoutInfo                                timeout_info           = 3;
-    EndHeight                                  end_height             = 4;
+    tendermint.types.EventDataRoundState event_data_round_state = 1;
+    MsgInfo                              msg_info               = 2;
+    TimeoutInfo                          timeout_info           = 3;
+    EndHeight                            end_height             = 4;
   }
 }
 

proto/crypto/keys/types.pb.go

@@ -174,28 +174,28 @@ func (*PrivateKey) XXX_OneofWrappers() []interface{} {
 }
 
 func init() {
-	proto.RegisterType((*PublicKey)(nil), "tendermint.proto.crypto.keys.PublicKey")
-	proto.RegisterType((*PrivateKey)(nil), "tendermint.proto.crypto.keys.PrivateKey")
+	proto.RegisterType((*PublicKey)(nil), "tendermint.crypto.keys.PublicKey")
+	proto.RegisterType((*PrivateKey)(nil), "tendermint.crypto.keys.PrivateKey")
 }
 
 func init() { proto.RegisterFile("proto/crypto/keys/types.proto", fileDescriptor_943d79b57ec0188f) }
 
 var fileDescriptor_943d79b57ec0188f = []byte{
-	// 215 bytes of a gzipped FileDescriptorProto
+	// 213 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x28, 0xca, 0x2f,
 	0xc9, 0xd7, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2f, 0xa9,
-	0x2c, 0x48, 0x2d, 0xd6, 0x03, 0x8b, 0x0b, 0xc9, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66,
-	0xe6, 0x95, 0x40, 0x44, 0xf4, 0x20, 0x2a, 0xf5, 0x40, 0x2a, 0xa5, 0xd4, 0x4a, 0x32, 0x32, 0x8b,
-	0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a, 0xf5, 0x21, 0x06, 0xa5, 0xe7, 0xa7, 0xe7, 0x23, 0x58,
-	0x10, 0x3d, 0x4a, 0x16, 0x5c, 0x9c, 0x01, 0xa5, 0x49, 0x39, 0x99, 0xc9, 0xde, 0xa9, 0x95, 0x42,
-	0x52, 0x5c, 0xec, 0xa9, 0x29, 0x46, 0xa6, 0xa6, 0x86, 0x96, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c,
-	0x1e, 0x0c, 0x41, 0x30, 0x01, 0x2b, 0x8e, 0x17, 0x0b, 0xe4, 0x19, 0x5f, 0x2c, 0x94, 0x67, 0x74,
-	0x62, 0xe5, 0x62, 0x2e, 0x2e, 0xcd, 0x55, 0xd2, 0xe7, 0xe2, 0x0a, 0x28, 0xca, 0x2c, 0x4b, 0x2c,
-	0x49, 0x25, 0xa0, 0x15, 0xaa, 0xc1, 0xc9, 0xe7, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18,
-	0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5,
-	0x18, 0xa2, 0x8c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x11, 0xbe,
-	0x42, 0x66, 0x62, 0x04, 0x45, 0x12, 0x1b, 0x58, 0xc8, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x85,
-	0x0d, 0xee, 0x82, 0x26, 0x01, 0x00, 0x00,
+	0x2c, 0x48, 0x2d, 0xd6, 0x03, 0x8b, 0x0b, 0x89, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66,
+	0xe6, 0x95, 0xe8, 0x41, 0xd4, 0xe8, 0x81, 0xd4, 0x48, 0xa9, 0x95, 0x64, 0x64, 0x16, 0xa5, 0xc4,
+	0x17, 0x24, 0x16, 0x95, 0x54, 0xea, 0x43, 0x8c, 0x48, 0xcf, 0x4f, 0xcf, 0x47, 0xb0, 0x20, 0xfa,
+	0x95, 0x2c, 0xb8, 0x38, 0x03, 0x4a, 0x93, 0x72, 0x32, 0x93, 0xbd, 0x53, 0x2b, 0x85, 0xa4, 0xb8,
+	0xd8, 0x53, 0x53, 0x8c, 0x4c, 0x4d, 0x0d, 0x2d, 0x25, 0x18, 0x15, 0x18, 0x35, 0x78, 0x3c, 0x18,
+	0x82, 0x60, 0x02, 0x56, 0x1c, 0x2f, 0x16, 0xc8, 0x33, 0xbe, 0x58, 0x28, 0xcf, 0xe8, 0xc4, 0xca,
+	0xc5, 0x5c, 0x5c, 0x9a, 0xab, 0xa4, 0xcf, 0xc5, 0x15, 0x50, 0x94, 0x59, 0x96, 0x58, 0x92, 0x4a,
+	0x40, 0x2b, 0x54, 0x83, 0x93, 0xcf, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78,
+	0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44,
+	0x19, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0xfc, 0x83, 0xcc,
+	0xc4, 0x08, 0x84, 0x24, 0x36, 0xb0, 0x90, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x65, 0xc0, 0xc2,
+	0x6d, 0x20, 0x01, 0x00, 0x00,
 }
 
 func (this *PublicKey) Compare(that interface{}) int {

proto/crypto/keys/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.crypto.keys;
+package tendermint.crypto.keys;
 
 option go_package = "github.com/tendermint/tendermint/proto/crypto/keys";
 

proto/crypto/merkle/types.pb.go

@@ -314,41 +314,41 @@ func (m *ProofOps) GetOps() []ProofOp {
 }
 
 func init() {
-	proto.RegisterType((*Proof)(nil), "tendermint.proto.crypto.merkle.Proof")
-	proto.RegisterType((*ValueOp)(nil), "tendermint.proto.crypto.merkle.ValueOp")
-	proto.RegisterType((*DominoOp)(nil), "tendermint.proto.crypto.merkle.DominoOp")
-	proto.RegisterType((*ProofOp)(nil), "tendermint.proto.crypto.merkle.ProofOp")
-	proto.RegisterType((*ProofOps)(nil), "tendermint.proto.crypto.merkle.ProofOps")
+	proto.RegisterType((*Proof)(nil), "tendermint.crypto.merkle.Proof")
+	proto.RegisterType((*ValueOp)(nil), "tendermint.crypto.merkle.ValueOp")
+	proto.RegisterType((*DominoOp)(nil), "tendermint.crypto.merkle.DominoOp")
+	proto.RegisterType((*ProofOp)(nil), "tendermint.crypto.merkle.ProofOp")
+	proto.RegisterType((*ProofOps)(nil), "tendermint.crypto.merkle.ProofOps")
 }
 
 func init() { proto.RegisterFile("proto/crypto/merkle/types.proto", fileDescriptor_57e39eefdaf7ae96) }
 
 var fileDescriptor_57e39eefdaf7ae96 = []byte{
-	// 372 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4f, 0x4b, 0xc3, 0x30,
-	0x18, 0xc6, 0xdb, 0xb5, 0xfb, 0x97, 0xed, 0x20, 0x41, 0xa4, 0x28, 0x74, 0xa5, 0xa0, 0xf6, 0xd4,
-	0xc2, 0xf4, 0xe6, 0x41, 0x98, 0x1e, 0x44, 0xc1, 0x49, 0x0f, 0x22, 0x5e, 0x46, 0xb6, 0x66, 0x6b,
-	0x59, 0xdb, 0x84, 0x34, 0x05, 0xfb, 0x2d, 0xfc, 0x58, 0x3b, 0xee, 0xe8, 0x49, 0x64, 0xfb, 0x22,
-	0x92, 0xa4, 0x32, 0x05, 0x11, 0x6f, 0xcf, 0xf3, 0x34, 0xcf, 0x2f, 0xef, 0x1b, 0x0a, 0x06, 0x94,
-	0x11, 0x4e, 0x82, 0x19, 0xab, 0x28, 0x27, 0x41, 0x86, 0xd9, 0x32, 0xc5, 0x01, 0xaf, 0x28, 0x2e,
-	0x7c, 0xf9, 0x05, 0xda, 0x1c, 0xe7, 0x11, 0x66, 0x59, 0x92, 0x73, 0x95, 0xf8, 0xea, 0xac, 0xaf,
-	0xce, 0x1e, 0x9e, 0xf0, 0x38, 0x61, 0xd1, 0x84, 0x22, 0xc6, 0xab, 0x40, 0xc1, 0x16, 0x64, 0x41,
-	0x76, 0x4a, 0xb5, 0xdc, 0x39, 0x68, 0x3e, 0x30, 0x42, 0xe6, 0x70, 0x1f, 0x34, 0x39, 0xe1, 0x28,
-	0xb5, 0x74, 0x47, 0xf7, 0x8c, 0x50, 0x19, 0x91, 0x26, 0x79, 0x84, 0x5f, 0xac, 0x86, 0x4a, 0xa5,
-	0x81, 0x47, 0xa0, 0x9b, 0x62, 0x34, 0x9f, 0xc4, 0xa8, 0x88, 0x2d, 0xc3, 0xd1, 0xbd, 0x7e, 0xd8,
-	0x11, 0xc1, 0x0d, 0x2a, 0x62, 0x51, 0x41, 0x65, 0xce, 0x0b, 0xcb, 0x74, 0x0c, 0xaf, 0x1f, 0x2a,
-	0xe3, 0x3e, 0x81, 0xf6, 0x23, 0x4a, 0x4b, 0x3c, 0xa6, 0x70, 0x0f, 0x18, 0x4b, 0x5c, 0xc9, 0x7b,
-	0xfa, 0xa1, 0x90, 0xf0, 0x02, 0x34, 0xa9, 0x18, 0x42, 0xde, 0xd2, 0x1b, 0x1e, 0xfb, 0x7f, 0x2f,
-	0xe7, 0xcb, 0x89, 0x43, 0xd5, 0x71, 0x6f, 0x41, 0xe7, 0x9a, 0x64, 0x49, 0x4e, 0x7e, 0xa2, 0xbb,
-	0x0a, 0x2d, 0x17, 0xa0, 0x25, 0x97, 0xe8, 0x6e, 0xa8, 0x0c, 0x3c, 0x00, 0x2d, 0x52, 0x72, 0x11,
-	0x1b, 0x32, 0xae, 0x9d, 0x7b, 0x05, 0xda, 0x92, 0x3d, 0xa6, 0x10, 0x02, 0x53, 0xbc, 0x77, 0xcd,
-	0x92, 0xfa, 0x0b, 0xdf, 0xd8, 0x4d, 0x0e, 0x81, 0x19, 0x21, 0x8e, 0xea, 0x47, 0x90, 0xda, 0xbd,
-	0x03, 0x9d, 0x1a, 0x52, 0xc0, 0x4b, 0x60, 0x10, 0x5a, 0x58, 0xba, 0x63, 0x78, 0xbd, 0xe1, 0xe9,
-	0xbf, 0xf6, 0x1a, 0xd3, 0x91, 0xb9, 0x7a, 0x1f, 0x68, 0xa1, 0x68, 0x8e, 0xee, 0x57, 0x1b, 0x5b,
-	0x5f, 0x6f, 0x6c, 0xfd, 0x63, 0x63, 0xeb, 0xaf, 0x5b, 0x5b, 0x5b, 0x6f, 0x6d, 0xed, 0x6d, 0x6b,
-	0x6b, 0xcf, 0xe7, 0x8b, 0x84, 0xc7, 0xe5, 0xd4, 0x9f, 0x91, 0x2c, 0xd8, 0x71, 0xbf, 0xcb, 0x5f,
-	0xfe, 0xa1, 0x69, 0x4b, 0x86, 0x67, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xee, 0x66, 0x38, 0xd7,
-	0x61, 0x02, 0x00, 0x00,
+	// 371 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x4e, 0xeb, 0x30,
+	0x18, 0xc5, 0x93, 0x26, 0xfd, 0xe7, 0x76, 0xb8, 0xb2, 0xae, 0xae, 0xa2, 0x8b, 0x94, 0x86, 0x0c,
+	0x28, 0x53, 0x22, 0x15, 0x18, 0x58, 0x0b, 0x48, 0x88, 0x81, 0x22, 0x0f, 0x0c, 0x2c, 0x95, 0xdb,
+	0xb8, 0x4d, 0xd4, 0x24, 0xb6, 0x1c, 0x47, 0x22, 0x6f, 0xc1, 0x63, 0x75, 0xec, 0xc8, 0x84, 0x50,
+	0xfb, 0x22, 0xc8, 0x76, 0x50, 0x41, 0x02, 0xb1, 0x9d, 0x73, 0xf2, 0xf9, 0xe7, 0xf3, 0x45, 0x06,
+	0x23, 0xc6, 0xa9, 0xa0, 0xd1, 0x82, 0xd7, 0x4c, 0xd0, 0x28, 0x27, 0x7c, 0x9d, 0x91, 0x48, 0xd4,
+	0x8c, 0x94, 0xa1, 0xfa, 0x02, 0x1d, 0x41, 0x8a, 0x98, 0xf0, 0x3c, 0x2d, 0x44, 0xa8, 0xa7, 0x42,
+	0x3d, 0xf5, 0xff, 0x44, 0x24, 0x29, 0x8f, 0x67, 0x0c, 0x73, 0x51, 0x47, 0x1a, 0xb3, 0xa2, 0x2b,
+	0x7a, 0x50, 0x9a, 0xe0, 0x2f, 0x41, 0xfb, 0x9e, 0x53, 0xba, 0x84, 0x7f, 0x41, 0x5b, 0x50, 0x81,
+	0x33, 0xc7, 0xf4, 0xcc, 0xc0, 0x42, 0xda, 0xc8, 0x34, 0x2d, 0x62, 0xf2, 0xe4, 0xb4, 0x74, 0xaa,
+	0x0c, 0x3c, 0x02, 0xfd, 0x8c, 0xe0, 0xe5, 0x2c, 0xc1, 0x65, 0xe2, 0x58, 0x9e, 0x19, 0x0c, 0x51,
+	0x4f, 0x06, 0x37, 0xb8, 0x4c, 0xe4, 0x11, 0x5c, 0x15, 0xa2, 0x74, 0x6c, 0xcf, 0x0a, 0x86, 0x48,
+	0x1b, 0x1f, 0x81, 0xee, 0x03, 0xce, 0x2a, 0x32, 0x65, 0xf0, 0x0f, 0xb0, 0xd6, 0xa4, 0x56, 0xf7,
+	0x0c, 0x91, 0x94, 0xf0, 0x1c, 0xb4, 0x99, 0x2c, 0xa1, 0x6e, 0x19, 0x8c, 0x47, 0xe1, 0x4f, 0x6b,
+	0x85, 0xaa, 0x2b, 0xd2, 0xd3, 0xfe, 0x2d, 0xe8, 0x5d, 0xd1, 0x3c, 0x2d, 0xe8, 0x57, 0x68, 0x5f,
+	0x43, 0x55, 0x75, 0x56, 0x09, 0x05, 0xed, 0x23, 0x6d, 0xe0, 0x3f, 0xd0, 0xa1, 0x95, 0x90, 0xb1,
+	0xa5, 0xe2, 0xc6, 0xf9, 0x97, 0xa0, 0xab, 0xd8, 0x53, 0x06, 0x21, 0xb0, 0xe5, 0x3f, 0x6e, 0x58,
+	0x4a, 0x7f, 0xe0, 0x5b, 0x87, 0xce, 0x10, 0xd8, 0x31, 0x16, 0xb8, 0x59, 0x5f, 0x69, 0xff, 0x1a,
+	0xf4, 0x1a, 0x48, 0x09, 0x2f, 0x80, 0x45, 0x59, 0xe9, 0x98, 0x9e, 0x15, 0x0c, 0xc6, 0xc7, 0xbf,
+	0x6c, 0x34, 0x65, 0x13, 0x7b, 0xf3, 0x3a, 0x32, 0x90, 0x3c, 0x33, 0xb9, 0xdb, 0xec, 0x5c, 0x73,
+	0xbb, 0x73, 0xcd, 0xb7, 0x9d, 0x6b, 0x3e, 0xef, 0x5d, 0x63, 0xbb, 0x77, 0x8d, 0x97, 0xbd, 0x6b,
+	0x3c, 0x9e, 0xad, 0x52, 0x91, 0x54, 0xf3, 0x70, 0x41, 0xf3, 0xe8, 0x40, 0xfc, 0x2c, 0xbf, 0x79,
+	0x31, 0xf3, 0x8e, 0x0a, 0x4f, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x94, 0xcb, 0xb9, 0x4f,
+	0x02, 0x00, 0x00,
 }
 
 func (m *Proof) Marshal() (dAtA []byte, err error) {

proto/crypto/merkle/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.crypto.merkle;
+package tendermint.crypto.merkle;
 
 option go_package = "github.com/tendermint/tendermint/proto/crypto/merkle";
 

proto/evidence/msgs.pb.go

@@ -129,31 +129,30 @@ func (m *Info) GetEvidence() types.Evidence {
 }
 
 func init() {
-	proto.RegisterType((*List)(nil), "tendermint.proto.evidence.List")
-	proto.RegisterType((*Info)(nil), "tendermint.proto.evidence.Info")
+	proto.RegisterType((*List)(nil), "tendermint.evidence.List")
+	proto.RegisterType((*Info)(nil), "tendermint.evidence.Info")
 }
 
 func init() { proto.RegisterFile("proto/evidence/msgs.proto", fileDescriptor_df8322769b0bd7d6) }
 
 var fileDescriptor_df8322769b0bd7d6 = []byte{
-	// 258 bytes of a gzipped FileDescriptorProto
+	// 254 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x28, 0xca, 0x2f,
 	0xc9, 0xd7, 0x4f, 0x2d, 0xcb, 0x4c, 0x49, 0xcd, 0x4b, 0x4e, 0xd5, 0xcf, 0x2d, 0x4e, 0x2f, 0xd6,
-	0x03, 0x8b, 0x09, 0x49, 0x96, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0x40, 0x44,
-	0xf4, 0x60, 0xaa, 0xa4, 0xd4, 0x4a, 0x32, 0x32, 0x8b, 0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a,
-	0xf5, 0x21, 0x26, 0xa4, 0xe7, 0xa7, 0xe7, 0x23, 0x58, 0x10, 0x0d, 0x52, 0x52, 0x10, 0x91, 0x92,
-	0xca, 0x82, 0xd4, 0x62, 0xb8, 0x1d, 0x10, 0x39, 0x25, 0x17, 0x2e, 0x16, 0x9f, 0xcc, 0xe2, 0x12,
-	0x21, 0x1b, 0x2e, 0x0e, 0x98, 0x8c, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0x82, 0x1e, 0x86,
-	0xcd, 0x60, 0x13, 0xf4, 0x5c, 0xa1, 0xea, 0x82, 0xe0, 0x3a, 0x94, 0x5a, 0x18, 0xb9, 0x58, 0x3c,
-	0xf3, 0xd2, 0xf2, 0x85, 0x64, 0xb8, 0x38, 0x93, 0xf3, 0x73, 0x73, 0x33, 0x4b, 0x4a, 0x52, 0x53,
-	0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x82, 0x10, 0x02, 0x42, 0x52, 0x5c, 0x1c, 0x05, 0x45, 0x99,
-	0xf9, 0x45, 0x99, 0x25, 0x95, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x70, 0xbe, 0x90, 0x13,
-	0x92, 0x03, 0x98, 0x15, 0x18, 0x89, 0x71, 0x80, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x08, 0x67,
-	0x38, 0x79, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13,
-	0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x7e, 0x7a, 0x66,
-	0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xc2, 0x54, 0x64, 0x26, 0x6a, 0x0c, 0x24,
-	0xb1, 0x81, 0xf9, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0x46, 0xba, 0xe0, 0x9a, 0x01,
-	0x00, 0x00,
+	0x03, 0x8b, 0x09, 0x09, 0x97, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0xc1,
+	0xe4, 0xa5, 0xd4, 0x4a, 0x32, 0x32, 0x8b, 0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a, 0xf5, 0x21,
+	0x7a, 0xd3, 0xf3, 0xd3, 0xf3, 0x11, 0x2c, 0x88, 0x66, 0x29, 0x29, 0x88, 0x48, 0x49, 0x65, 0x41,
+	0x6a, 0x31, 0xdc, 0x74, 0x88, 0x9c, 0x92, 0x1d, 0x17, 0x8b, 0x4f, 0x66, 0x71, 0x89, 0x90, 0x19,
+	0x17, 0x07, 0x4c, 0x46, 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x4a, 0x0f, 0xc9, 0x4e, 0xb0,
+	0x5e, 0x3d, 0x57, 0xa8, 0x8a, 0x20, 0xb8, 0x5a, 0xa5, 0x3a, 0x2e, 0x16, 0xcf, 0xbc, 0xb4, 0x7c,
+	0x21, 0x19, 0x2e, 0xce, 0xe4, 0xfc, 0xdc, 0xdc, 0xcc, 0x92, 0x92, 0xd4, 0x14, 0x09, 0x46, 0x05,
+	0x46, 0x0d, 0x8e, 0x20, 0x84, 0x80, 0x90, 0x14, 0x17, 0x47, 0x41, 0x51, 0x66, 0x7e, 0x51, 0x66,
+	0x49, 0xa5, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x73, 0x10, 0x9c, 0x2f, 0x64, 0x83, 0x64, 0x33, 0xb3,
+	0x02, 0x23, 0x7e, 0x9b, 0x9d, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x40, 0xd8, 0xef, 0xe4, 0x79, 0xe2,
+	0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70,
+	0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0xfa, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49,
+	0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0xf3, 0x90, 0x99, 0xa8, 0xc1, 0x9d, 0xc4, 0x06, 0xe6, 0x1b,
+	0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x48, 0xa8, 0xde, 0xed, 0x87, 0x01, 0x00, 0x00,
 }
 
 func (m *List) Marshal() (dAtA []byte, err error) {

proto/evidence/msgs.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.evidence;
+package tendermint.evidence;
 
 option go_package = "github.com/tendermint/tendermint/proto/evidence";
 
@@ -7,11 +7,11 @@ import "third_party/proto/gogoproto/gogo.proto";
 import "proto/types/evidence.proto";
 
 message List {
-  repeated tendermint.proto.types.Evidence evidence = 1;
+  repeated tendermint.types.Evidence evidence = 1;
 }
 
 message Info {
-  bool                            committed = 1;
-  int64                           priority  = 2;
-  tendermint.proto.types.Evidence evidence  = 3 [(gogoproto.nullable) = false];
+  bool                      committed = 1;
+  int64                     priority  = 2;
+  tendermint.types.Evidence evidence  = 3 [(gogoproto.nullable) = false];
 }

proto/libs/bits/types.pb.go

@@ -75,24 +75,24 @@ func (m *BitArray) GetElems() []uint64 {
 }
 
 func init() {
-	proto.RegisterType((*BitArray)(nil), "tendermint.proto.libs.bits.BitArray")
+	proto.RegisterType((*BitArray)(nil), "tendermint.libs.bits.BitArray")
 }
 
 func init() { proto.RegisterFile("proto/libs/bits/types.proto", fileDescriptor_3f1fbe70d7999e09) }
 
 var fileDescriptor_3f1fbe70d7999e09 = []byte{
-	// 166 bytes of a gzipped FileDescriptorProto
+	// 164 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x28, 0xca, 0x2f,
 	0xc9, 0xd7, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, 0x4f, 0xca, 0x2c, 0x29, 0xd6, 0x2f, 0xa9, 0x2c, 0x48,
-	0x2d, 0xd6, 0x03, 0x8b, 0x0a, 0x49, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95,
-	0x40, 0x44, 0xf4, 0x40, 0xea, 0xf4, 0x40, 0xea, 0x94, 0x4c, 0xb8, 0x38, 0x9c, 0x32, 0x4b, 0x1c,
-	0x8b, 0x8a, 0x12, 0x2b, 0x85, 0x84, 0xb8, 0x58, 0x40, 0x62, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xcc,
-	0x41, 0x60, 0xb6, 0x90, 0x08, 0x17, 0x6b, 0x6a, 0x4e, 0x6a, 0x6e, 0xb1, 0x04, 0x93, 0x02, 0xb3,
-	0x06, 0x4b, 0x10, 0x84, 0xe3, 0xe4, 0x75, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f,
-	0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c,
-	0x51, 0x06, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0x6b, 0x91,
-	0x99, 0x68, 0x2e, 0x4d, 0x62, 0x03, 0x0b, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x2c,
-	0xa7, 0xda, 0xc3, 0x00, 0x00, 0x00,
+	0x2d, 0xd6, 0x03, 0x8b, 0x0a, 0x89, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95,
+	0xe8, 0x81, 0x54, 0xe8, 0x81, 0x54, 0x28, 0x99, 0x70, 0x71, 0x38, 0x65, 0x96, 0x38, 0x16, 0x15,
+	0x25, 0x56, 0x0a, 0x09, 0x71, 0xb1, 0x80, 0xc4, 0x24, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xc0,
+	0x6c, 0x21, 0x11, 0x2e, 0xd6, 0xd4, 0x9c, 0xd4, 0xdc, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x96,
+	0x20, 0x08, 0xc7, 0xc9, 0xeb, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92,
+	0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x0c,
+	0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x11, 0x16, 0x22, 0x33, 0xd1,
+	0xdc, 0x98, 0xc4, 0x06, 0x16, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x77, 0x8d, 0x7a, 0x08,
+	0xbd, 0x00, 0x00, 0x00,
 }
 
 func (m *BitArray) Marshal() (dAtA []byte, err error) {

proto/libs/bits/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.libs.bits;
+package tendermint.libs.bits;
 
 option go_package = "github.com/tendermint/tendermint/proto/libs/bits";
 

proto/p2p/conn_msgs.pb.go

@@ -307,43 +307,43 @@ func (m *AuthSigMessage) GetSig() []byte {
 }
 
 func init() {
-	proto.RegisterType((*PacketPing)(nil), "tendermint.proto.p2p.PacketPing")
-	proto.RegisterType((*PacketPong)(nil), "tendermint.proto.p2p.PacketPong")
-	proto.RegisterType((*PacketMsg)(nil), "tendermint.proto.p2p.PacketMsg")
-	proto.RegisterType((*Packet)(nil), "tendermint.proto.p2p.Packet")
-	proto.RegisterType((*AuthSigMessage)(nil), "tendermint.proto.p2p.AuthSigMessage")
+	proto.RegisterType((*PacketPing)(nil), "tendermint.p2p.PacketPing")
+	proto.RegisterType((*PacketPong)(nil), "tendermint.p2p.PacketPong")
+	proto.RegisterType((*PacketMsg)(nil), "tendermint.p2p.PacketMsg")
+	proto.RegisterType((*Packet)(nil), "tendermint.p2p.Packet")
+	proto.RegisterType((*AuthSigMessage)(nil), "tendermint.p2p.AuthSigMessage")
 }
 
 func init() { proto.RegisterFile("proto/p2p/conn_msgs.proto", fileDescriptor_8c680f0b24d73fe7) }
 
 var fileDescriptor_8c680f0b24d73fe7 = []byte{
-	// 409 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xdf, 0x6a, 0xd4, 0x40,
-	0x14, 0xc6, 0x13, 0xd3, 0x6e, 0xd9, 0xb3, 0xab, 0xc8, 0xe0, 0xc5, 0xb6, 0x60, 0x76, 0xc9, 0x85,
-	0x16, 0x91, 0x04, 0xe2, 0x0b, 0x68, 0x5a, 0x8b, 0xa5, 0x2c, 0x2e, 0xf1, 0xce, 0x9b, 0x90, 0x3f,
-	0xe3, 0x64, 0xdc, 0x66, 0x66, 0xc8, 0x4c, 0x2e, 0xf2, 0x16, 0x3e, 0x56, 0x2f, 0x7b, 0x29, 0x08,
-	0x8b, 0x64, 0x5f, 0x44, 0x32, 0x13, 0x77, 0x57, 0x14, 0x7b, 0xf7, 0x7d, 0x1f, 0x27, 0xbf, 0x73,
-	0x4e, 0xce, 0xc0, 0xa9, 0xa8, 0xb9, 0xe2, 0x81, 0x08, 0x45, 0x90, 0x73, 0xc6, 0x92, 0x4a, 0x12,
-	0xe9, 0xeb, 0x0c, 0x3d, 0x53, 0x98, 0x15, 0xb8, 0xae, 0x28, 0x53, 0x26, 0xf1, 0x45, 0x28, 0xce,
-	0x5e, 0xa8, 0x92, 0xd6, 0x45, 0x22, 0xd2, 0x5a, 0xb5, 0x81, 0xf9, 0x98, 0x70, 0xc2, 0xf7, 0xca,
-	0xd4, 0x9e, 0x3d, 0x37, 0x49, 0x5e, 0xb7, 0x42, 0xf1, 0x60, 0x8d, 0x5b, 0x19, 0xa8, 0x56, 0xe0,
-	0x01, 0xee, 0x4d, 0x01, 0x56, 0x69, 0xbe, 0xc6, 0x6a, 0x45, 0x19, 0x39, 0x70, 0x9c, 0x11, 0xaf,
-	0x84, 0xb1, 0x71, 0x4b, 0x49, 0xd0, 0x6b, 0x80, 0xbc, 0x4c, 0x19, 0xc3, 0xb7, 0x09, 0x2d, 0x66,
-	0xf6, 0xc2, 0x3e, 0x3f, 0x8e, 0x1e, 0x77, 0x9b, 0xf9, 0xf8, 0xc2, 0xa4, 0xd7, 0x97, 0xf1, 0x78,
-	0x28, 0xb8, 0x2e, 0xd0, 0x29, 0x38, 0x98, 0x7f, 0x99, 0x3d, 0xd2, 0x65, 0x27, 0xdd, 0x66, 0xee,
-	0xbc, 0xff, 0x78, 0x15, 0xf7, 0x19, 0x42, 0x70, 0x54, 0xa4, 0x2a, 0x9d, 0x39, 0x0b, 0xfb, 0x7c,
-	0x1a, 0x6b, 0xed, 0xfd, 0xb0, 0x61, 0x64, 0x5a, 0xa1, 0x0b, 0x98, 0x08, 0xad, 0x12, 0x41, 0x19,
-	0xd1, 0x8d, 0x26, 0xe1, 0xc2, 0xff, 0xd7, 0x3f, 0xf0, 0xf7, 0x93, 0x7f, 0xb0, 0x62, 0x10, 0x3b,
-	0x77, 0x08, 0xe1, 0x8c, 0xe8, 0x31, 0x1e, 0x82, 0xf0, 0x3f, 0x20, 0x9c, 0x11, 0xf4, 0x16, 0x06,
-	0xd7, 0x1f, 0x43, 0x8f, 0x3b, 0x09, 0xe7, 0xff, 0x63, 0x2c, 0x65, 0x8f, 0x18, 0x8b, 0xdf, 0x26,
-	0x3a, 0x06, 0x47, 0x36, 0x95, 0xf7, 0x15, 0x9e, 0xbc, 0x6b, 0x54, 0xf9, 0x89, 0x92, 0x25, 0x96,
-	0x32, 0x25, 0x18, 0x5d, 0xc1, 0x89, 0x68, 0xb2, 0x64, 0x8d, 0xdb, 0x61, 0xc1, 0x97, 0x7f, 0x73,
-	0xcd, 0xc5, 0xfc, 0xfe, 0x62, 0xfe, 0xaa, 0xc9, 0x6e, 0x69, 0x7e, 0x83, 0xdb, 0xe8, 0xe8, 0x6e,
-	0x33, 0xb7, 0xe2, 0x91, 0x68, 0xb2, 0x1b, 0xdc, 0xa2, 0xa7, 0xe0, 0x48, 0x6a, 0xf6, 0x9b, 0xc6,
-	0xbd, 0x8c, 0x2e, 0xef, 0x3a, 0xd7, 0xbe, 0xef, 0x5c, 0xfb, 0x67, 0xe7, 0xda, 0xdf, 0xb6, 0xae,
-	0x75, 0xbf, 0x75, 0xad, 0xef, 0x5b, 0xd7, 0xfa, 0xfc, 0x8a, 0x50, 0x55, 0x36, 0x99, 0x9f, 0xf3,
-	0x2a, 0xd8, 0x37, 0x3b, 0x94, 0xbb, 0x27, 0x98, 0x8d, 0xb4, 0x7c, 0xf3, 0x2b, 0x00, 0x00, 0xff,
-	0xff, 0xd2, 0xaa, 0xb3, 0xc0, 0x96, 0x02, 0x00, 0x00,
+	// 405 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x8b, 0xd3, 0x40,
+	0x18, 0xc6, 0x13, 0xb3, 0xdb, 0xa5, 0x6f, 0xeb, 0x22, 0x73, 0x6a, 0x0b, 0xa6, 0x6b, 0x0f, 0xb2,
+	0x88, 0x24, 0x10, 0x6f, 0x82, 0xa0, 0x71, 0x15, 0x97, 0xa5, 0x58, 0xe2, 0xcd, 0x4b, 0xc8, 0x9f,
+	0x71, 0x32, 0x74, 0x33, 0x33, 0x64, 0x26, 0x87, 0x7c, 0x0b, 0x3f, 0xd6, 0x7a, 0xdb, 0xa3, 0xa7,
+	0x22, 0xe9, 0x17, 0x91, 0xcc, 0xc4, 0x6d, 0x0a, 0xee, 0xed, 0x79, 0x1e, 0xe6, 0xf7, 0xfe, 0xc9,
+	0x1b, 0x98, 0x8b, 0x8a, 0x2b, 0xee, 0x8b, 0x40, 0xf8, 0x19, 0x67, 0x2c, 0x2e, 0x25, 0x91, 0x9e,
+	0xce, 0xd0, 0xb9, 0xc2, 0x2c, 0xc7, 0x55, 0x49, 0x99, 0xf2, 0x44, 0x20, 0x16, 0x2f, 0x55, 0x41,
+	0xab, 0x3c, 0x16, 0x49, 0xa5, 0x1a, 0xdf, 0x60, 0x84, 0x13, 0x7e, 0x50, 0x86, 0x5b, 0x3c, 0x37,
+	0x49, 0x56, 0x35, 0x42, 0x71, 0x7f, 0x8b, 0x1b, 0xe9, 0xab, 0x46, 0xe0, 0xbe, 0xec, 0x6a, 0x0a,
+	0xb0, 0x49, 0xb2, 0x2d, 0x56, 0x1b, 0xca, 0xc8, 0xc0, 0x71, 0x46, 0x56, 0x05, 0x8c, 0x8d, 0x5b,
+	0x4b, 0x82, 0x5e, 0x03, 0x64, 0x45, 0xc2, 0x18, 0xbe, 0x8d, 0x69, 0x3e, 0xb3, 0x2f, 0xec, 0xcb,
+	0xd3, 0xf0, 0x69, 0xbb, 0x5b, 0x8e, 0x3f, 0x9a, 0xf4, 0xfa, 0x2a, 0x1a, 0xf7, 0x0f, 0xae, 0x73,
+	0x34, 0x07, 0x07, 0xf3, 0x1f, 0xb3, 0x27, 0xfa, 0xd9, 0x59, 0xbb, 0x5b, 0x3a, 0x9f, 0xbe, 0x7e,
+	0x8e, 0xba, 0x0c, 0x21, 0x38, 0xc9, 0x13, 0x95, 0xcc, 0x9c, 0x0b, 0xfb, 0x72, 0x1a, 0x69, 0xbd,
+	0xfa, 0x65, 0xc3, 0xc8, 0xb4, 0x42, 0xef, 0x60, 0x22, 0xb4, 0x8a, 0x05, 0x65, 0x44, 0x37, 0x9a,
+	0x04, 0x0b, 0xef, 0x78, 0x7b, 0xef, 0x30, 0xf3, 0x17, 0x2b, 0x02, 0xf1, 0xe0, 0x86, 0x38, 0x67,
+	0x44, 0x0f, 0xf0, 0x38, 0xce, 0x8f, 0x70, 0xce, 0x08, 0x7a, 0x0b, 0xbd, 0xeb, 0x3e, 0xbd, 0x1e,
+	0x71, 0x12, 0xcc, 0xff, 0x4f, 0xaf, 0x65, 0x07, 0x8f, 0xc5, 0x3f, 0x13, 0x9e, 0x82, 0x23, 0xeb,
+	0x72, 0x95, 0xc3, 0xf9, 0x87, 0x5a, 0x15, 0xdf, 0x28, 0x59, 0x63, 0x29, 0x13, 0x82, 0xd1, 0x7b,
+	0x38, 0x13, 0x75, 0x1a, 0x6f, 0x71, 0xd3, 0xaf, 0xf3, 0x62, 0x58, 0xd1, 0x5c, 0xc6, 0xeb, 0x2e,
+	0xe3, 0x6d, 0xea, 0xf4, 0x96, 0x66, 0x37, 0xb8, 0x09, 0x4f, 0xee, 0x76, 0x4b, 0x2b, 0x1a, 0x89,
+	0x3a, 0xbd, 0xc1, 0x0d, 0x7a, 0x06, 0x8e, 0xa4, 0x66, 0x9b, 0x69, 0xd4, 0xc9, 0xf0, 0xea, 0xae,
+	0x75, 0xed, 0xfb, 0xd6, 0xb5, 0xff, 0xb4, 0xae, 0xfd, 0x73, 0xef, 0x5a, 0xf7, 0x7b, 0xd7, 0xfa,
+	0xbd, 0x77, 0xad, 0xef, 0xaf, 0x08, 0x55, 0x45, 0x9d, 0x7a, 0x19, 0x2f, 0xfd, 0x43, 0x9b, 0xa1,
+	0x7c, 0xf8, 0xc9, 0xd2, 0x91, 0x96, 0x6f, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x52, 0x09,
+	0x89, 0x78, 0x02, 0x00, 0x00,
 }
 
 func (m *PacketPing) Marshal() (dAtA []byte, err error) {

proto/p2p/conn_msgs.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.p2p;
+package tendermint.p2p;
 
 option go_package = "github.com/tendermint/tendermint/proto/p2p";
 
@@ -25,6 +25,6 @@ message Packet {
 }
 
 message AuthSigMessage {
-  tendermint.proto.crypto.keys.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
-  bytes                                  sig     = 2;
+  tendermint.crypto.keys.PublicKey pub_key = 1 [(gogoproto.nullable) = false];
+  bytes                            sig     = 2;
 }

proto/p2p/pex_msgs.pb.go

@@ -189,33 +189,33 @@ func (*Message) XXX_OneofWrappers() []interface{} {
 }
 
 func init() {
-	proto.RegisterType((*PexRequest)(nil), "tendermint.proto.p2p.PexRequest")
-	proto.RegisterType((*PexAddrs)(nil), "tendermint.proto.p2p.PexAddrs")
-	proto.RegisterType((*Message)(nil), "tendermint.proto.p2p.Message")
+	proto.RegisterType((*PexRequest)(nil), "tendermint.p2p.PexRequest")
+	proto.RegisterType((*PexAddrs)(nil), "tendermint.p2p.PexAddrs")
+	proto.RegisterType((*Message)(nil), "tendermint.p2p.Message")
 }
 
 func init() { proto.RegisterFile("proto/p2p/pex_msgs.proto", fileDescriptor_b4d6fe6b009e47d8) }
 
 var fileDescriptor_b4d6fe6b009e47d8 = []byte{
-	// 280 bytes of a gzipped FileDescriptorProto
+	// 278 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x28, 0xca, 0x2f,
 	0xc9, 0xd7, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, 0x88, 0xcf, 0x2d, 0x4e, 0x2f, 0xd6, 0x03,
-	0x0b, 0x09, 0x89, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0x40, 0x44, 0xf4,
-	0x0a, 0x8c, 0x0a, 0xa4, 0x44, 0x11, 0xea, 0x4b, 0x2a, 0x0b, 0x52, 0xa1, 0x8a, 0xa5, 0xd4, 0x4a,
-	0x32, 0x32, 0x8b, 0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a, 0xf5, 0x21, 0x4a, 0xd2, 0xf3, 0xd3,
-	0xf3, 0x11, 0x2c, 0x88, 0x3a, 0x25, 0x1e, 0x2e, 0xae, 0x80, 0xd4, 0x8a, 0xa0, 0xd4, 0xc2, 0xd2,
-	0xd4, 0xe2, 0x12, 0x25, 0x0f, 0x2e, 0x8e, 0x80, 0xd4, 0x0a, 0xc7, 0x94, 0x94, 0xa2, 0x62, 0x21,
-	0x1b, 0x2e, 0xd6, 0x44, 0x10, 0x43, 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x41, 0x0f, 0x9b,
-	0xf5, 0x7a, 0x7e, 0xa9, 0x25, 0x20, 0xe5, 0xa9, 0xc5, 0xc5, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33,
-	0x04, 0x41, 0x34, 0x29, 0x4d, 0x61, 0xe4, 0x62, 0xf7, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x15,
-	0x72, 0xe6, 0xe2, 0x06, 0x79, 0xa5, 0x08, 0x62, 0x89, 0x04, 0xa3, 0x02, 0x23, 0x6e, 0xf3, 0x10,
-	0x8e, 0xf1, 0x60, 0x08, 0xe2, 0x2a, 0x80, 0xf3, 0x84, 0x6c, 0xb9, 0x38, 0x41, 0x86, 0x40, 0x9c,
-	0xc4, 0x04, 0x36, 0x42, 0x0e, 0xa7, 0x11, 0x60, 0x1f, 0x78, 0x30, 0x04, 0x71, 0x14, 0x40, 0xd9,
-	0x4e, 0xac, 0x5c, 0xcc, 0xc5, 0xa5, 0xb9, 0x4e, 0x2e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24,
-	0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78,
-	0x2c, 0xc7, 0x10, 0xa5, 0x95, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f,
-	0x30, 0x16, 0x99, 0x09, 0x0f, 0xe8, 0x24, 0x36, 0x30, 0xd3, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff,
-	0xb1, 0x53, 0x9c, 0x92, 0xac, 0x01, 0x00, 0x00,
+	0x0b, 0x09, 0xf1, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x15, 0x18,
+	0x15, 0x48, 0x89, 0x22, 0x54, 0x96, 0x54, 0x16, 0xa4, 0x42, 0x95, 0x49, 0xa9, 0x95, 0x64, 0x64,
+	0x16, 0xa5, 0xc4, 0x17, 0x24, 0x16, 0x95, 0x54, 0xea, 0x43, 0x94, 0xa4, 0xe7, 0xa7, 0xe7, 0x23,
+	0x58, 0x10, 0x75, 0x4a, 0x3c, 0x5c, 0x5c, 0x01, 0xa9, 0x15, 0x41, 0xa9, 0x85, 0xa5, 0xa9, 0xc5,
+	0x25, 0x4a, 0x4e, 0x5c, 0x1c, 0x01, 0xa9, 0x15, 0x8e, 0x29, 0x29, 0x45, 0xc5, 0x42, 0x66, 0x5c,
+	0xac, 0x89, 0x20, 0x86, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0x94, 0x1e, 0xaa, 0xc5, 0x7a,
+	0x7e, 0xa9, 0x25, 0x20, 0x85, 0xa9, 0xc5, 0xc5, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41,
+	0x94, 0x2b, 0x75, 0x30, 0x72, 0xb1, 0xfb, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, 0xd9, 0x72,
+	0x71, 0x83, 0x9c, 0x5f, 0x04, 0x31, 0x5e, 0x82, 0x51, 0x81, 0x11, 0x9b, 0x49, 0x08, 0x07, 0x78,
+	0x30, 0x04, 0x71, 0x15, 0xc0, 0x79, 0x42, 0xe6, 0x5c, 0x9c, 0x20, 0xed, 0x10, 0x67, 0x30, 0x81,
+	0x35, 0x4b, 0x60, 0xd1, 0x0c, 0x76, 0xaf, 0x07, 0x43, 0x10, 0x47, 0x01, 0x94, 0xed, 0xc4, 0xca,
+	0xc5, 0x5c, 0x5c, 0x9a, 0xeb, 0xe4, 0x72, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f,
+	0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c,
+	0x51, 0x5a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0x03, 0x91,
+	0x99, 0xf0, 0x60, 0x4d, 0x62, 0x03, 0x33, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x15, 0x30,
+	0x3c, 0xbc, 0x94, 0x01, 0x00, 0x00,
 }
 
 func (m *PexRequest) Marshal() (dAtA []byte, err error) {

proto/p2p/pex_msgs.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.p2p;
+package tendermint.p2p;
 
 option go_package = "github.com/tendermint/tendermint/proto/p2p";
 

proto/p2p/types.pb.go

@@ -304,47 +304,47 @@ func (m *DefaultNodeInfoOther) GetRPCAddress() string {
 }
 
 func init() {
-	proto.RegisterType((*NetAddress)(nil), "tendermint.proto.p2p.NetAddress")
-	proto.RegisterType((*ProtocolVersion)(nil), "tendermint.proto.p2p.ProtocolVersion")
-	proto.RegisterType((*DefaultNodeInfo)(nil), "tendermint.proto.p2p.DefaultNodeInfo")
-	proto.RegisterType((*DefaultNodeInfoOther)(nil), "tendermint.proto.p2p.DefaultNodeInfoOther")
+	proto.RegisterType((*NetAddress)(nil), "tendermint.p2p.NetAddress")
+	proto.RegisterType((*ProtocolVersion)(nil), "tendermint.p2p.ProtocolVersion")
+	proto.RegisterType((*DefaultNodeInfo)(nil), "tendermint.p2p.DefaultNodeInfo")
+	proto.RegisterType((*DefaultNodeInfoOther)(nil), "tendermint.p2p.DefaultNodeInfoOther")
 }
 
 func init() { proto.RegisterFile("proto/p2p/types.proto", fileDescriptor_5c4320c1810ca85c) }
 
 var fileDescriptor_5c4320c1810ca85c = []byte{
-	// 496 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x4f, 0x6f, 0xda, 0x30,
-	0x18, 0xc6, 0x49, 0x08, 0x7f, 0xfa, 0x32, 0x46, 0x67, 0xb1, 0x29, 0xed, 0x21, 0x41, 0x48, 0x9b,
-	0x50, 0x0f, 0x20, 0xb1, 0xd3, 0x8e, 0x63, 0x68, 0x12, 0x97, 0x0e, 0x59, 0x53, 0x0f, 0xbb, 0x44,
-	0x10, 0xbb, 0x60, 0x01, 0xb6, 0xe5, 0xb8, 0x1b, 0xfd, 0x16, 0xfb, 0x58, 0x3d, 0xf6, 0xb8, 0x13,
-	0x9a, 0xc2, 0x87, 0xd8, 0x75, 0xb2, 0x9d, 0xb6, 0x08, 0x71, 0x7b, 0x9e, 0xd7, 0x7e, 0xf3, 0xbc,
-	0xef, 0x4f, 0x0e, 0xbc, 0x95, 0x4a, 0x68, 0x31, 0x90, 0x43, 0x39, 0xd0, 0xf7, 0x92, 0x66, 0x7d,
-	0xeb, 0x51, 0x5b, 0x53, 0x4e, 0xa8, 0xda, 0x30, 0xae, 0x5d, 0xa5, 0x2f, 0x87, 0xf2, 0xf2, 0x83,
-	0x5e, 0x32, 0x45, 0x12, 0x39, 0x53, 0xfa, 0x7e, 0xe0, 0x1a, 0x17, 0x62, 0x21, 0x5e, 0x94, 0xbb,
-	0xdb, 0x9d, 0x03, 0x5c, 0x53, 0xfd, 0x99, 0x10, 0x45, 0xb3, 0x0c, 0xbd, 0x03, 0x9f, 0x91, 0xd0,
-	0xeb, 0x78, 0xbd, 0xb3, 0x51, 0x35, 0xdf, 0xc5, 0xfe, 0x64, 0x8c, 0x7d, 0x46, 0x6c, 0x5d, 0x86,
-	0xfe, 0x41, 0x7d, 0x8a, 0x7d, 0x26, 0x11, 0x82, 0x40, 0x0a, 0xa5, 0xc3, 0x72, 0xc7, 0xeb, 0x35,
-	0xb1, 0xd5, 0xe8, 0x1c, 0xca, 0x99, 0x56, 0x61, 0x60, 0x2e, 0x63, 0x23, 0xbb, 0xdf, 0xa1, 0x35,
-	0x35, 0x61, 0xa9, 0x58, 0xdf, 0x50, 0x95, 0x31, 0xc1, 0xd1, 0x05, 0x94, 0xe5, 0x50, 0xda, 0xa4,
-	0x60, 0x54, 0xcb, 0x77, 0x71, 0x79, 0x3a, 0x9c, 0x62, 0x53, 0x43, 0x6d, 0xa8, 0xcc, 0xd7, 0x22,
-	0x5d, 0xd9, 0xb8, 0x00, 0x3b, 0x63, 0xbe, 0x3a, 0x93, 0xd2, 0x06, 0x05, 0xd8, 0xc8, 0xee, 0x3f,
-	0x1f, 0x5a, 0x63, 0x7a, 0x3b, 0xbb, 0x5b, 0xeb, 0x6b, 0x41, 0xe8, 0x84, 0xdf, 0x0a, 0x74, 0x03,
-	0xe7, 0xb2, 0x48, 0x4a, 0x7e, 0xba, 0x28, 0x9b, 0xd1, 0x18, 0xbe, 0xef, 0x9f, 0xc2, 0xd4, 0x3f,
-	0x9a, 0x6b, 0x14, 0x3c, 0xec, 0xe2, 0x12, 0x6e, 0xc9, 0xa3, 0x71, 0x3f, 0x41, 0x8b, 0xb8, 0xa8,
-	0x84, 0x0b, 0x42, 0x13, 0x46, 0x0a, 0x18, 0x6f, 0xf2, 0x5d, 0xdc, 0x3c, 0x9c, 0x62, 0x8c, 0x9b,
-	0xe4, 0xc0, 0x12, 0x14, 0x43, 0x63, 0xcd, 0x32, 0x4d, 0x79, 0x32, 0x23, 0x44, 0xd9, 0x05, 0xce,
-	0x30, 0xb8, 0x92, 0xc1, 0x8e, 0x42, 0xa8, 0x71, 0xaa, 0x7f, 0x09, 0xb5, 0x2a, 0x98, 0x3d, 0x59,
-	0x73, 0xf2, 0xb4, 0x44, 0xc5, 0x9d, 0x14, 0x16, 0x5d, 0x42, 0x3d, 0x5d, 0xce, 0x38, 0xa7, 0xeb,
-	0x2c, 0xac, 0x76, 0xbc, 0xde, 0x2b, 0xfc, 0xec, 0x4d, 0xd7, 0x46, 0x70, 0xb6, 0xa2, 0x2a, 0xac,
-	0xb9, 0xae, 0xc2, 0xa2, 0xaf, 0x50, 0x11, 0x7a, 0x49, 0x55, 0x58, 0xb7, 0x48, 0xae, 0x4e, 0x23,
-	0x39, 0x62, 0xfa, 0xcd, 0x74, 0x14, 0x5c, 0x5c, 0x7b, 0x77, 0x0e, 0xed, 0x53, 0x97, 0xd0, 0x05,
-	0xd4, 0xf5, 0x36, 0x61, 0x9c, 0xd0, 0xad, 0x7b, 0x43, 0xb8, 0xa6, 0xb7, 0x13, 0x63, 0xd1, 0x00,
-	0x1a, 0x4a, 0xa6, 0x16, 0x01, 0xcd, 0xb2, 0x02, 0xde, 0xeb, 0x7c, 0x17, 0x03, 0x9e, 0x7e, 0x29,
-	0x5e, 0x1f, 0x06, 0x25, 0xd3, 0x42, 0x8f, 0xc6, 0x0f, 0x79, 0xe4, 0x3d, 0xe6, 0x91, 0xf7, 0x37,
-	0x8f, 0xbc, 0xdf, 0xfb, 0xa8, 0xf4, 0xb8, 0x8f, 0x4a, 0x7f, 0xf6, 0x51, 0xe9, 0xc7, 0xd5, 0x82,
-	0xe9, 0xe5, 0xdd, 0xbc, 0x9f, 0x8a, 0xcd, 0xe0, 0x65, 0x81, 0x43, 0xf9, 0xfc, 0x9f, 0xcc, 0xab,
-	0x56, 0x7e, 0xfc, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x57, 0xdb, 0x7b, 0x33, 0x3b, 0x03, 0x00, 0x00,
+	// 493 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x4f, 0x6f, 0xda, 0x30,
+	0x1c, 0x25, 0x21, 0xfc, 0xe9, 0x8f, 0x51, 0x3a, 0xab, 0x9b, 0xd2, 0x1e, 0x12, 0x84, 0xa6, 0x09,
+	0xed, 0x00, 0x12, 0x3b, 0xed, 0xb6, 0x31, 0x2e, 0x5c, 0xba, 0xc8, 0x9a, 0x76, 0xd8, 0x25, 0x82,
+	0xd8, 0x05, 0x0b, 0xb0, 0x2d, 0xc7, 0xdd, 0xe8, 0xb7, 0xd8, 0xc7, 0xea, 0xb1, 0xc7, 0x9d, 0xd0,
+	0x14, 0x8e, 0xfb, 0x12, 0x93, 0xed, 0xb4, 0x65, 0xa8, 0xb7, 0xf7, 0x7e, 0xfe, 0xbd, 0xbc, 0x97,
+	0x27, 0x1b, 0x5e, 0x49, 0x25, 0xb4, 0x18, 0xca, 0x91, 0x1c, 0xea, 0x5b, 0x49, 0xf3, 0x81, 0xe5,
+	0xe8, 0x54, 0x53, 0x4e, 0xa8, 0xda, 0x30, 0xae, 0x07, 0x72, 0x24, 0x2f, 0xdf, 0xea, 0x25, 0x53,
+	0x24, 0x95, 0x33, 0xa5, 0x6f, 0x87, 0x4e, 0xb2, 0x10, 0x0b, 0xf1, 0x84, 0x9c, 0xae, 0x37, 0x07,
+	0xb8, 0xa2, 0xfa, 0x13, 0x21, 0x8a, 0xe6, 0x39, 0x7a, 0x0d, 0x3e, 0x23, 0xa1, 0xd7, 0xf5, 0xfa,
+	0x27, 0xe3, 0x7a, 0xb1, 0x8b, 0xfd, 0xe9, 0x04, 0xfb, 0x8c, 0xd8, 0xb9, 0x0c, 0xfd, 0x83, 0x79,
+	0x82, 0x7d, 0x26, 0x11, 0x82, 0x40, 0x0a, 0xa5, 0xc3, 0x6a, 0xd7, 0xeb, 0xb7, 0xb1, 0xc5, 0xe8,
+	0x0c, 0xaa, 0xb9, 0x56, 0x61, 0x60, 0x96, 0xb1, 0x81, 0xbd, 0xaf, 0xd0, 0x49, 0x8c, 0x59, 0x26,
+	0xd6, 0xdf, 0xa8, 0xca, 0x99, 0xe0, 0xe8, 0x02, 0xaa, 0x72, 0x24, 0xad, 0x53, 0x30, 0x6e, 0x14,
+	0xbb, 0xb8, 0x9a, 0x8c, 0x12, 0x6c, 0x66, 0xe8, 0x1c, 0x6a, 0xf3, 0xb5, 0xc8, 0x56, 0xd6, 0x2e,
+	0xc0, 0x8e, 0x98, 0xaf, 0xce, 0xa4, 0xb4, 0x46, 0x01, 0x36, 0xb0, 0xf7, 0xd7, 0x87, 0xce, 0x84,
+	0x5e, 0xcf, 0x6e, 0xd6, 0xfa, 0x4a, 0x10, 0x3a, 0xe5, 0xd7, 0x02, 0x25, 0x70, 0x26, 0x4b, 0xa7,
+	0xf4, 0x87, 0xb3, 0xb2, 0x1e, 0xad, 0x51, 0x3c, 0xf8, 0xbf, 0xa0, 0xc1, 0x51, 0xa2, 0x71, 0x70,
+	0xb7, 0x8b, 0x2b, 0xb8, 0x23, 0x8f, 0x82, 0x7e, 0x80, 0x0e, 0x71, 0x26, 0x29, 0x17, 0x84, 0xa6,
+	0x8c, 0x94, 0x35, 0xbc, 0x2c, 0x76, 0x71, 0xfb, 0xd0, 0x7f, 0x82, 0xdb, 0xe4, 0x80, 0x12, 0x14,
+	0x43, 0x6b, 0xcd, 0x72, 0x4d, 0x79, 0x3a, 0x23, 0x44, 0xd9, 0xe8, 0x27, 0x18, 0xdc, 0xc8, 0x14,
+	0x8e, 0x42, 0x68, 0x70, 0xaa, 0x7f, 0x0a, 0xb5, 0x2a, 0xdb, 0x7a, 0xa0, 0xe6, 0xe4, 0x21, 0x7e,
+	0xcd, 0x9d, 0x94, 0x14, 0x5d, 0x42, 0x33, 0x5b, 0xce, 0x38, 0xa7, 0xeb, 0x3c, 0xac, 0x77, 0xbd,
+	0xfe, 0x0b, 0xfc, 0xc8, 0x8d, 0x6a, 0x23, 0x38, 0x5b, 0x51, 0x15, 0x36, 0x9c, 0xaa, 0xa4, 0xe8,
+	0x23, 0xd4, 0x84, 0x5e, 0x52, 0x15, 0x36, 0x6d, 0x19, 0x6f, 0x8e, 0xcb, 0x38, 0xea, 0xf1, 0x8b,
+	0xd9, 0x2d, 0x1b, 0x71, 0xc2, 0xde, 0x1c, 0xce, 0x9f, 0x5b, 0x42, 0x17, 0xd0, 0xd4, 0xdb, 0x94,
+	0x71, 0x42, 0xb7, 0xee, 0xde, 0xe0, 0x86, 0xde, 0x4e, 0x0d, 0x45, 0x43, 0x68, 0x29, 0x99, 0xd9,
+	0x9f, 0xa7, 0x79, 0x5e, 0xd6, 0x76, 0x5a, 0xec, 0x62, 0xc0, 0xc9, 0xe7, 0xf2, 0xc6, 0x61, 0x50,
+	0x32, 0x2b, 0xf1, 0x78, 0x72, 0x57, 0x44, 0xde, 0x7d, 0x11, 0x79, 0x7f, 0x8a, 0xc8, 0xfb, 0xb5,
+	0x8f, 0x2a, 0xf7, 0xfb, 0xa8, 0xf2, 0x7b, 0x1f, 0x55, 0xbe, 0xbf, 0x5b, 0x30, 0xbd, 0xbc, 0x99,
+	0x0f, 0x32, 0xb1, 0x19, 0x3e, 0x45, 0x3f, 0x84, 0x8f, 0xaf, 0x62, 0x5e, 0xb7, 0xf0, 0xfd, 0xbf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x9d, 0xcd, 0x35, 0x29, 0x03, 0x00, 0x00,
 }
 
 func (m *NetAddress) Marshal() (dAtA []byte, err error) {

proto/p2p/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.p2p;
+package tendermint.p2p;
 
 option go_package = "github.com/tendermint/tendermint/proto/p2p";
 

proto/privval/msgs.pb.go

@@ -601,62 +601,62 @@ func (*Message) XXX_OneofWrappers() []interface{} {
 }
 
 func init() {
-	proto.RegisterType((*RemoteSignerError)(nil), "tendermint.proto.privval.RemoteSignerError")
-	proto.RegisterType((*PubKeyRequest)(nil), "tendermint.proto.privval.PubKeyRequest")
-	proto.RegisterType((*PubKeyResponse)(nil), "tendermint.proto.privval.PubKeyResponse")
-	proto.RegisterType((*SignVoteRequest)(nil), "tendermint.proto.privval.SignVoteRequest")
-	proto.RegisterType((*SignedVoteResponse)(nil), "tendermint.proto.privval.SignedVoteResponse")
-	proto.RegisterType((*SignProposalRequest)(nil), "tendermint.proto.privval.SignProposalRequest")
-	proto.RegisterType((*SignedProposalResponse)(nil), "tendermint.proto.privval.SignedProposalResponse")
-	proto.RegisterType((*PingRequest)(nil), "tendermint.proto.privval.PingRequest")
-	proto.RegisterType((*PingResponse)(nil), "tendermint.proto.privval.PingResponse")
-	proto.RegisterType((*Message)(nil), "tendermint.proto.privval.Message")
+	proto.RegisterType((*RemoteSignerError)(nil), "tendermint.privval.RemoteSignerError")
+	proto.RegisterType((*PubKeyRequest)(nil), "tendermint.privval.PubKeyRequest")
+	proto.RegisterType((*PubKeyResponse)(nil), "tendermint.privval.PubKeyResponse")
+	proto.RegisterType((*SignVoteRequest)(nil), "tendermint.privval.SignVoteRequest")
+	proto.RegisterType((*SignedVoteResponse)(nil), "tendermint.privval.SignedVoteResponse")
+	proto.RegisterType((*SignProposalRequest)(nil), "tendermint.privval.SignProposalRequest")
+	proto.RegisterType((*SignedProposalResponse)(nil), "tendermint.privval.SignedProposalResponse")
+	proto.RegisterType((*PingRequest)(nil), "tendermint.privval.PingRequest")
+	proto.RegisterType((*PingResponse)(nil), "tendermint.privval.PingResponse")
+	proto.RegisterType((*Message)(nil), "tendermint.privval.Message")
 }
 
 func init() { proto.RegisterFile("proto/privval/msgs.proto", fileDescriptor_9ec52cc5e378f9a4) }
 
 var fileDescriptor_9ec52cc5e378f9a4 = []byte{
-	// 629 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x41, 0x6f, 0xd3, 0x3c,
-	0x1c, 0xc6, 0x93, 0x77, 0xed, 0xb6, 0xf7, 0xdf, 0x75, 0x65, 0x1e, 0x8c, 0x6a, 0x82, 0x52, 0x45,
-	0x62, 0x0c, 0x01, 0xe9, 0x34, 0xae, 0x1c, 0xa0, 0x08, 0x29, 0x80, 0x26, 0x15, 0x83, 0x40, 0x70,
-	0x29, 0x6d, 0x6a, 0x65, 0xd1, 0xda, 0xd8, 0xd8, 0xce, 0xa4, 0x7c, 0x04, 0x6e, 0x5c, 0x38, 0xf0,
-	0x8d, 0x76, 0xdc, 0x91, 0x13, 0x42, 0xdd, 0x17, 0x41, 0xb1, 0x9d, 0x26, 0x6d, 0xd7, 0x4d, 0x93,
-	0x76, 0x8b, 0x9f, 0xd8, 0xbf, 0xff, 0xf3, 0xc4, 0x4f, 0x55, 0xa8, 0x33, 0x4e, 0x25, 0x6d, 0x31,
-	0x1e, 0x1e, 0x1f, 0xf7, 0x86, 0xad, 0x91, 0x08, 0x84, 0xab, 0x24, 0x54, 0x97, 0x24, 0x1a, 0x10,
-	0x3e, 0x0a, 0x23, 0xa9, 0x15, 0xd7, 0x6c, 0xda, 0xde, 0x91, 0x87, 0x21, 0x1f, 0x74, 0x59, 0x8f,
-	0xcb, 0xa4, 0xa5, 0xcf, 0x07, 0x34, 0xa0, 0xf9, 0x93, 0xde, 0xbf, 0x7d, 0x57, 0x2b, 0x3e, 0x4f,
-	0x98, 0xa4, 0xad, 0x23, 0x92, 0x88, 0x96, 0x4c, 0x18, 0x31, 0x03, 0xb6, 0x6f, 0xeb, 0xd7, 0x4a,
-	0x2a, 0xbe, 0x70, 0x5e, 0xc3, 0x06, 0x26, 0x23, 0x2a, 0xc9, 0xfb, 0x30, 0x88, 0x08, 0x7f, 0xc5,
-	0x39, 0xe5, 0x08, 0x41, 0xc9, 0xa7, 0x03, 0x52, 0xb7, 0x9b, 0xf6, 0x6e, 0x19, 0xab, 0x67, 0xd4,
-	0x84, 0xca, 0x80, 0x08, 0x9f, 0x87, 0x4c, 0x86, 0x34, 0xaa, 0xff, 0xd7, 0xb4, 0x77, 0xff, 0xc7,
-	0x45, 0xc9, 0xa9, 0x41, 0xb5, 0x13, 0xf7, 0xdf, 0x92, 0x04, 0x93, 0x6f, 0x31, 0x11, 0xd2, 0xf9,
-	0x69, 0xc3, 0x7a, 0xa6, 0x08, 0x46, 0x23, 0x41, 0xd0, 0x73, 0x58, 0x61, 0x71, 0xbf, 0x7b, 0x44,
-	0x12, 0x05, 0xaf, 0xec, 0x3f, 0x70, 0xe7, 0xa2, 0xeb, 0x0c, 0x6e, 0x9a, 0xc1, 0xed, 0xc4, 0xfd,
-	0x61, 0xe8, 0xa7, 0x84, 0x65, 0xa6, 0x48, 0xe8, 0x05, 0x94, 0x49, 0x6a, 0x52, 0x39, 0xa8, 0xec,
-	0x3f, 0x72, 0x17, 0x7d, 0x3a, 0x77, 0x2e, 0x17, 0xd6, 0x27, 0x9d, 0x97, 0x50, 0x4b, 0xd5, 0x8f,
-	0x54, 0x12, 0x63, 0x15, 0xed, 0x41, 0xe9, 0x98, 0x4a, 0x62, 0x4c, 0xdd, 0x99, 0x87, 0xea, 0x6f,
-	0xa6, 0x8e, 0xa8, 0x9d, 0xce, 0x77, 0x1b, 0x90, 0x62, 0x0f, 0x34, 0xc7, 0x04, 0xbc, 0x32, 0xe8,
-	0x3a, 0x02, 0x7d, 0x86, 0xcd, 0x54, 0xed, 0x70, 0xca, 0xa8, 0xe8, 0x0d, 0xb3, 0x50, 0x6d, 0x58,
-	0x65, 0x46, 0x32, 0x7e, 0x9a, 0x8b, 0xfc, 0x64, 0x47, 0xdb, 0xa5, 0x93, 0x3f, 0xf7, 0x2c, 0x3c,
-	0x39, 0xe7, 0xfc, 0xb2, 0x61, 0x4b, 0xc7, 0xcc, 0xe9, 0x26, 0xea, 0xb3, 0xab, 0xe3, 0x73, 0xf0,
-	0x75, 0xc4, 0xae, 0x42, 0xa5, 0x13, 0x46, 0x41, 0x56, 0xb7, 0x75, 0x58, 0xd3, 0x4b, 0xed, 0xcf,
-	0x19, 0x97, 0x61, 0xe5, 0x80, 0x08, 0xd1, 0x0b, 0x08, 0x7a, 0x07, 0x35, 0xd3, 0xbb, 0x2e, 0xd7,
-	0xdb, 0x17, 0xf7, 0x2f, 0x9b, 0x3b, 0x55, 0x66, 0xcf, 0xc2, 0x55, 0x56, 0x14, 0xd0, 0x07, 0xb8,
-	0x91, 0x23, 0xf5, 0x48, 0x93, 0x65, 0xf7, 0x72, 0xa6, 0xde, 0xef, 0x59, 0x78, 0x9d, 0x4d, 0xff,
-	0x40, 0x3e, 0xc1, 0x86, 0x08, 0x83, 0xa8, 0x9b, 0x56, 0x63, 0x62, 0x75, 0x49, 0x61, 0x1f, 0x2e,
-	0xc6, 0xce, 0xd4, 0xd9, 0xb3, 0x70, 0x4d, 0xcc, 0x34, 0xfc, 0x2b, 0xdc, 0x14, 0xea, 0x1e, 0x33,
-	0xb4, 0xb1, 0x5c, 0x52, 0xec, 0xc7, 0x17, 0xb3, 0xa7, 0x4b, 0xee, 0x59, 0x18, 0x89, 0xf9, 0xea,
-	0xfb, 0x70, 0x4b, 0x59, 0xcf, 0xae, 0x78, 0x62, 0xbf, 0xac, 0x46, 0x3c, 0xb9, 0x78, 0xc4, 0x4c,
-	0x79, 0x3d, 0x0b, 0x6f, 0x8a, 0x73, 0x3a, 0x3d, 0x84, 0xba, 0x89, 0x51, 0x18, 0x63, 0xa2, 0x2c,
-	0xab, 0x39, 0x7b, 0x97, 0x45, 0x99, 0x2d, 0xb2, 0x67, 0xe1, 0x2d, 0x71, 0x7e, 0xc5, 0xdf, 0xc0,
-	0x1a, 0x0b, 0xa3, 0x60, 0x92, 0x64, 0x45, 0x4d, 0xb8, 0x7f, 0xc1, 0xfd, 0xe6, 0x7d, 0xf4, 0x2c,
-	0x5c, 0x61, 0xf9, 0x12, 0x1d, 0x40, 0xd5, 0xb0, 0x8c, 0xdd, 0x55, 0x05, 0xdb, 0xb9, 0x0c, 0x36,
-	0x31, 0xb9, 0xc6, 0x0a, 0xeb, 0x76, 0x19, 0x96, 0x44, 0x3c, 0x6a, 0x7b, 0x27, 0xe3, 0x86, 0x7d,
-	0x3a, 0x6e, 0xd8, 0x7f, 0xc7, 0x0d, 0xfb, 0xc7, 0x59, 0xc3, 0x3a, 0x3d, 0x6b, 0x58, 0xbf, 0xcf,
-	0x1a, 0xd6, 0x17, 0x37, 0x08, 0xe5, 0x61, 0xdc, 0x77, 0x7d, 0x3a, 0x6a, 0xe5, 0x23, 0x8a, 0x8f,
-	0x53, 0x7f, 0x47, 0xfd, 0x65, 0xb5, 0x7c, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x18, 0x03, 0x41,
-	0x2e, 0xa6, 0x06, 0x00, 0x00,
+	// 625 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x6b, 0x13, 0x41,
+	0x18, 0xc7, 0x77, 0x6d, 0xd2, 0xd6, 0x27, 0x4d, 0x63, 0xa7, 0x5a, 0x43, 0xc0, 0x34, 0xae, 0x58,
+	0x4b, 0x0f, 0xbb, 0x50, 0xc1, 0x83, 0x2f, 0x97, 0xa2, 0xb8, 0x52, 0x94, 0x38, 0x05, 0x0f, 0x05,
+	0x09, 0x79, 0x19, 0xb7, 0x4b, 0x9b, 0x9d, 0x71, 0x66, 0xb6, 0xb0, 0x07, 0x3f, 0x80, 0x07, 0xc1,
+	0xcf, 0xe2, 0xa7, 0xe8, 0xb1, 0x47, 0x4f, 0x22, 0xcd, 0x17, 0x91, 0x9d, 0x99, 0xcd, 0x6e, 0xde,
+	0x84, 0xd2, 0xdb, 0xce, 0x33, 0xf3, 0xfc, 0xe6, 0xf7, 0x64, 0xfe, 0x10, 0xa8, 0x33, 0x4e, 0x25,
+	0xf5, 0x18, 0x0f, 0xcf, 0xcf, 0xbb, 0x67, 0xde, 0x50, 0x04, 0xc2, 0x55, 0x25, 0x84, 0x24, 0x89,
+	0x06, 0x84, 0x0f, 0xc3, 0x48, 0xba, 0x66, 0xbb, 0xb1, 0x23, 0x4f, 0x42, 0x3e, 0xe8, 0xb0, 0x2e,
+	0x97, 0x89, 0xa7, 0x3b, 0x03, 0x1a, 0xd0, 0xfc, 0x4b, 0xf7, 0x36, 0x1e, 0xe8, 0x4a, 0x9f, 0x27,
+	0x4c, 0x52, 0xef, 0x94, 0x24, 0xc2, 0x93, 0x09, 0x23, 0x06, 0xdd, 0xb8, 0xaf, 0xb7, 0x55, 0xa9,
+	0xb8, 0xe1, 0xbc, 0x83, 0x0d, 0x4c, 0x86, 0x54, 0x92, 0xa3, 0x30, 0x88, 0x08, 0x7f, 0xc3, 0x39,
+	0xe5, 0x08, 0x41, 0xa9, 0x4f, 0x07, 0xa4, 0x6e, 0xb7, 0xec, 0xdd, 0x32, 0x56, 0xdf, 0xa8, 0x05,
+	0x95, 0x01, 0x11, 0x7d, 0x1e, 0x32, 0x19, 0xd2, 0xa8, 0x7e, 0xab, 0x65, 0xef, 0xde, 0xc6, 0xc5,
+	0x92, 0x53, 0x83, 0x6a, 0x3b, 0xee, 0x1d, 0x92, 0x04, 0x93, 0xaf, 0x31, 0x11, 0xd2, 0xf9, 0x6e,
+	0xc3, 0x7a, 0x56, 0x11, 0x8c, 0x46, 0x82, 0xa0, 0xe7, 0xb0, 0xc2, 0xe2, 0x5e, 0xe7, 0x94, 0x24,
+	0x0a, 0x5e, 0xd9, 0x7f, 0xe8, 0x16, 0x86, 0xd6, 0xf6, 0x6e, 0x6a, 0xef, 0xb6, 0xe3, 0xde, 0x59,
+	0xd8, 0x4f, 0x7b, 0x97, 0x99, 0x62, 0xa0, 0x17, 0x50, 0x26, 0xa9, 0x9e, 0xba, 0xbb, 0xb2, 0xff,
+	0xd8, 0x9d, 0xfd, 0xb9, 0xdc, 0x99, 0x59, 0xb0, 0xee, 0x71, 0x5e, 0x41, 0x2d, 0xad, 0x7e, 0xa2,
+	0x92, 0x18, 0x3d, 0xb4, 0x07, 0xa5, 0x73, 0x2a, 0x89, 0x11, 0xd9, 0x2a, 0xe2, 0xf4, 0x2f, 0xa4,
+	0x0e, 0xab, 0x33, 0xce, 0x37, 0x40, 0x0a, 0x3a, 0xd0, 0x00, 0x33, 0xcd, 0x35, 0x08, 0x37, 0xb3,
+	0x3f, 0x82, 0xcd, 0xb4, 0xda, 0xe6, 0x94, 0x51, 0xd1, 0x3d, 0xcb, 0x26, 0x78, 0x09, 0xab, 0xcc,
+	0x94, 0x8c, 0x43, 0x63, 0xd6, 0x21, 0x6b, 0x3a, 0x28, 0x5d, 0xfc, 0xd9, 0xb6, 0xf0, 0xb8, 0xc3,
+	0xf9, 0x61, 0xc3, 0x96, 0x1e, 0x2a, 0xe7, 0x9a, 0xc1, 0x9e, 0x5d, 0x07, 0x9c, 0x23, 0x6f, 0x36,
+	0x64, 0x15, 0x2a, 0xed, 0x30, 0x0a, 0xb2, 0xf4, 0xac, 0xc3, 0x9a, 0x5e, 0x6a, 0x27, 0xe7, 0x57,
+	0x19, 0x56, 0xde, 0x13, 0x21, 0xba, 0x01, 0x41, 0x87, 0x50, 0x33, 0x31, 0xea, 0x70, 0x7d, 0x7c,
+	0x5e, 0x9c, 0xb2, 0x1b, 0x27, 0x52, 0xe9, 0x5b, 0xb8, 0xca, 0x8a, 0x05, 0xf4, 0x01, 0xee, 0xe4,
+	0x30, 0x7d, 0x99, 0xf1, 0x77, 0xfe, 0x47, 0xd3, 0x27, 0x7d, 0x0b, 0xaf, 0xb3, 0xc9, 0x8c, 0x7f,
+	0x84, 0x0d, 0x11, 0x06, 0x51, 0x27, 0x7d, 0xf6, 0xb1, 0xde, 0x92, 0x02, 0x3e, 0x9a, 0x07, 0x9c,
+	0xca, 0xa5, 0x6f, 0xe1, 0x9a, 0x98, 0x8a, 0xea, 0x31, 0xdc, 0x15, 0xea, 0xa5, 0x32, 0xa8, 0xd1,
+	0x2c, 0x29, 0xea, 0xce, 0x22, 0xea, 0x64, 0x5c, 0x7d, 0x0b, 0x23, 0x31, 0x1b, 0xe2, 0xcf, 0x70,
+	0x4f, 0xe9, 0x66, 0x8f, 0x38, 0x56, 0x2e, 0x2b, 0xf8, 0x93, 0x45, 0xf0, 0xa9, 0x30, 0xfa, 0x16,
+	0xde, 0x14, 0x73, 0x32, 0xfa, 0x05, 0xea, 0x46, 0xbd, 0x70, 0x81, 0xd1, 0x5f, 0x56, 0x37, 0xec,
+	0x2d, 0xd6, 0x9f, 0x0e, 0xa6, 0x6f, 0xe1, 0x2d, 0x31, 0x3f, 0xb2, 0xaf, 0x61, 0x8d, 0x85, 0x51,
+	0x30, 0xb6, 0x5f, 0x51, 0xec, 0xed, 0xb9, 0x2f, 0x98, 0xa7, 0xcc, 0xb7, 0x70, 0x85, 0xe5, 0x4b,
+	0xf4, 0x16, 0xaa, 0x86, 0x62, 0x14, 0x57, 0x15, 0xa6, 0xb5, 0x18, 0x33, 0x16, 0x5b, 0x63, 0x85,
+	0xf5, 0x41, 0x19, 0x96, 0x44, 0x3c, 0x3c, 0xf0, 0x2f, 0xae, 0x9a, 0xf6, 0xe5, 0x55, 0xd3, 0xfe,
+	0x7b, 0xd5, 0xb4, 0x7f, 0x8e, 0x9a, 0xd6, 0xe5, 0xa8, 0x69, 0xfd, 0x1e, 0x35, 0xad, 0x63, 0x37,
+	0x08, 0xe5, 0x49, 0xdc, 0x73, 0xfb, 0x74, 0xe8, 0xe5, 0xf0, 0xe2, 0xe7, 0xc4, 0xff, 0x44, 0x6f,
+	0x59, 0x2d, 0x9f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x49, 0xf1, 0xd7, 0x3f, 0x06, 0x00,
+	0x00,
 }
 
 func (m *RemoteSignerError) Marshal() (dAtA []byte, err error) {

proto/privval/msgs.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.privval;
+package tendermint.privval;
 
 option go_package = "github.com/tendermint/tendermint/proto/privval";
 
@@ -17,30 +17,30 @@ message PubKeyRequest {}
 
 // PubKeyResponse is a response message containing the public key.
 message PubKeyResponse {
-  tendermint.proto.crypto.keys.PublicKey pub_key = 1;
-  RemoteSignerError                      error   = 2;
+  tendermint.crypto.keys.PublicKey pub_key = 1;
+  RemoteSignerError                error   = 2;
 }
 
 // SignVoteRequest is a request to sign a vote
 message SignVoteRequest {
-  tendermint.proto.types.Vote vote = 1;
+  tendermint.types.Vote vote = 1;
 }
 
 // SignedVoteResponse is a response containing a signed vote or an error
 message SignedVoteResponse {
-  tendermint.proto.types.Vote vote  = 1;
-  RemoteSignerError           error = 2;
+  tendermint.types.Vote vote  = 1;
+  RemoteSignerError     error = 2;
 }
 
 // SignProposalRequest is a request to sign a proposal
 message SignProposalRequest {
-  tendermint.proto.types.Proposal proposal = 1 [(gogoproto.nullable) = false];
+  tendermint.types.Proposal proposal = 1 [(gogoproto.nullable) = false];
 }
 
 // SignedProposalResponse is response containing a signed proposal or an error
 message SignedProposalResponse {
-  tendermint.proto.types.Proposal proposal = 1;
-  RemoteSignerError               error    = 2;
+  tendermint.types.Proposal proposal = 1;
+  RemoteSignerError         error    = 2;
 }
 
 // PingRequest is a request to confirm that the connection is alive.

proto/privval/types.pb.go

@@ -5,12 +5,8 @@ package privval
 
 import (
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	keys "github.com/tendermint/tendermint/proto/crypto/keys"
-	io "io"
 	math "math"
-	math_bits "math/bits"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -61,863 +57,27 @@ func (Errors) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_a9d74c406df3ad93, []int{0}
 }
 
-// FilePVKey stores the immutable part of PrivValidator.
-type FilePVKey struct {
-	Address  []byte          `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	PubKey   keys.PublicKey  `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key"`
-	PrivKey  keys.PrivateKey `protobuf:"bytes,3,opt,name=priv_key,json=privKey,proto3" json:"priv_key"`
-	FilePath string          `protobuf:"bytes,4,opt,name=file_path,json=filePath,proto3" json:"file_path,omitempty"`
-}
-
-func (m *FilePVKey) Reset()         { *m = FilePVKey{} }
-func (m *FilePVKey) String() string { return proto.CompactTextString(m) }
-func (*FilePVKey) ProtoMessage()    {}
-func (*FilePVKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a9d74c406df3ad93, []int{0}
-}
-func (m *FilePVKey) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *FilePVKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_FilePVKey.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *FilePVKey) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FilePVKey.Merge(m, src)
-}
-func (m *FilePVKey) XXX_Size() int {
-	return m.Size()
-}
-func (m *FilePVKey) XXX_DiscardUnknown() {
-	xxx_messageInfo_FilePVKey.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_FilePVKey proto.InternalMessageInfo
-
-func (m *FilePVKey) GetAddress() []byte {
-	if m != nil {
-		return m.Address
-	}
-	return nil
-}
-
-func (m *FilePVKey) GetPubKey() keys.PublicKey {
-	if m != nil {
-		return m.PubKey
-	}
-	return keys.PublicKey{}
-}
-
-func (m *FilePVKey) GetPrivKey() keys.PrivateKey {
-	if m != nil {
-		return m.PrivKey
-	}
-	return keys.PrivateKey{}
-}
-
-func (m *FilePVKey) GetFilePath() string {
-	if m != nil {
-		return m.FilePath
-	}
-	return ""
-}
-
-// FilePVLastSignState stores the mutable part of PrivValidator.
-type FilePVLastSignState struct {
-	Height    int64  `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
-	Round     int32  `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"`
-	Step      int32  `protobuf:"varint,3,opt,name=step,proto3" json:"step,omitempty"`
-	Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"`
-	SignBytes []byte `protobuf:"bytes,5,opt,name=sign_bytes,json=signBytes,proto3" json:"sign_bytes,omitempty"`
-	FilePath  string `protobuf:"bytes,6,opt,name=file_path,json=filePath,proto3" json:"file_path,omitempty"`
-}
-
-func (m *FilePVLastSignState) Reset()         { *m = FilePVLastSignState{} }
-func (m *FilePVLastSignState) String() string { return proto.CompactTextString(m) }
-func (*FilePVLastSignState) ProtoMessage()    {}
-func (*FilePVLastSignState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a9d74c406df3ad93, []int{1}
-}
-func (m *FilePVLastSignState) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *FilePVLastSignState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_FilePVLastSignState.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *FilePVLastSignState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FilePVLastSignState.Merge(m, src)
-}
-func (m *FilePVLastSignState) XXX_Size() int {
-	return m.Size()
-}
-func (m *FilePVLastSignState) XXX_DiscardUnknown() {
-	xxx_messageInfo_FilePVLastSignState.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_FilePVLastSignState proto.InternalMessageInfo
-
-func (m *FilePVLastSignState) GetHeight() int64 {
-	if m != nil {
-		return m.Height
-	}
-	return 0
-}
-
-func (m *FilePVLastSignState) GetRound() int32 {
-	if m != nil {
-		return m.Round
-	}
-	return 0
-}
-
-func (m *FilePVLastSignState) GetStep() int32 {
-	if m != nil {
-		return m.Step
-	}
-	return 0
-}
-
-func (m *FilePVLastSignState) GetSignature() []byte {
-	if m != nil {
-		return m.Signature
-	}
-	return nil
-}
-
-func (m *FilePVLastSignState) GetSignBytes() []byte {
-	if m != nil {
-		return m.SignBytes
-	}
-	return nil
-}
-
-func (m *FilePVLastSignState) GetFilePath() string {
-	if m != nil {
-		return m.FilePath
-	}
-	return ""
-}
-
 func init() {
-	proto.RegisterEnum("tendermint.proto.privval.Errors", Errors_name, Errors_value)
-	proto.RegisterType((*FilePVKey)(nil), "tendermint.proto.privval.FilePVKey")
-	proto.RegisterType((*FilePVLastSignState)(nil), "tendermint.proto.privval.FilePVLastSignState")
+	proto.RegisterEnum("tendermint.privval.Errors", Errors_name, Errors_value)
 }
 
 func init() { proto.RegisterFile("proto/privval/types.proto", fileDescriptor_a9d74c406df3ad93) }
 
 var fileDescriptor_a9d74c406df3ad93 = []byte{
-	// 493 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xcf, 0x6e, 0xd3, 0x4e,
-	0x18, 0xcc, 0x36, 0x89, 0xd3, 0xec, 0xaf, 0xfa, 0x29, 0xda, 0x56, 0xe0, 0x06, 0x62, 0xa2, 0x1e,
-	0x20, 0xe2, 0x60, 0x4b, 0xf0, 0x04, 0x24, 0xdd, 0x8a, 0x28, 0x60, 0x5b, 0x6b, 0x97, 0x22, 0x2e,
-	0x96, 0x1d, 0x2f, 0xf6, 0xaa, 0xa9, 0x6d, 0xad, 0xd7, 0x91, 0xfc, 0x16, 0x3c, 0x06, 0x57, 0xde,
-	0xa2, 0xc7, 0x5e, 0x90, 0x38, 0x21, 0x94, 0xbc, 0x08, 0xf2, 0x1f, 0xe2, 0x44, 0x1c, 0xb8, 0x7d,
-	0x33, 0xf3, 0x79, 0xe6, 0x1b, 0x79, 0xe1, 0x79, 0xc2, 0x63, 0x11, 0x6b, 0x09, 0x67, 0xeb, 0xb5,
-	0xbb, 0xd2, 0x44, 0x9e, 0xd0, 0x54, 0x2d, 0x39, 0x24, 0x0b, 0x1a, 0xf9, 0x94, 0xdf, 0xb1, 0x48,
-	0x54, 0x8c, 0x5a, 0x6f, 0x0d, 0x9f, 0x8b, 0x90, 0x71, 0xdf, 0x49, 0x5c, 0x2e, 0x72, 0xad, 0x32,
-	0x08, 0xe2, 0x20, 0x6e, 0xa6, 0x6a, 0x7f, 0x38, 0xaa, 0x98, 0x25, 0xcf, 0x13, 0x11, 0x6b, 0xb7,
-	0x34, 0x4f, 0xf7, 0x03, 0x2e, 0xbe, 0x03, 0xd8, 0xbf, 0x62, 0x2b, 0x6a, 0x7e, 0x58, 0xd0, 0x1c,
-	0xc9, 0xb0, 0xe7, 0xfa, 0x3e, 0xa7, 0x69, 0x2a, 0x83, 0x31, 0x98, 0x9c, 0x90, 0x3f, 0x10, 0x5d,
-	0xc1, 0x5e, 0x92, 0x79, 0xce, 0x2d, 0xcd, 0xe5, 0xa3, 0x31, 0x98, 0xfc, 0xf7, 0xea, 0x85, 0xfa,
-	0xd7, 0x69, 0x55, 0x86, 0x5a, 0x64, 0xa8, 0x66, 0xe6, 0xad, 0xd8, 0x72, 0x41, 0xf3, 0x69, 0xe7,
-	0xfe, 0xe7, 0xb3, 0x16, 0x91, 0x92, 0xcc, 0x2b, 0x12, 0xe6, 0xf0, 0xb8, 0x68, 0x50, 0x1a, 0xb5,
-	0x4b, 0xa3, 0xc9, 0x3f, 0x8c, 0x38, 0x5b, 0xbb, 0x82, 0x36, 0x4e, 0xbd, 0xe2, 0xfb, 0xc2, 0xea,
-	0x09, 0xec, 0x7f, 0x66, 0x2b, 0xea, 0x24, 0xae, 0x08, 0xe5, 0xce, 0x18, 0x4c, 0xfa, 0xe4, 0xb8,
-	0x20, 0x4c, 0x57, 0x84, 0x17, 0xdf, 0x00, 0x3c, 0xad, 0x7a, 0xbd, 0x73, 0x53, 0x61, 0xb1, 0x20,
-	0xb2, 0x84, 0x2b, 0x28, 0x7a, 0x04, 0xa5, 0x90, 0xb2, 0x20, 0x14, 0x65, 0xc1, 0x36, 0xa9, 0x11,
-	0x3a, 0x83, 0x5d, 0x1e, 0x67, 0x91, 0x5f, 0xb6, 0xeb, 0x92, 0x0a, 0x20, 0x04, 0x3b, 0xa9, 0xa0,
-	0x49, 0x79, 0x69, 0x97, 0x94, 0x33, 0x7a, 0x0a, 0xfb, 0x29, 0x0b, 0x22, 0x57, 0x64, 0x9c, 0x96,
-	0xb1, 0x27, 0xa4, 0x21, 0xd0, 0x08, 0xc2, 0x02, 0x38, 0x5e, 0x2e, 0x68, 0x2a, 0x77, 0x1b, 0x79,
-	0x5a, 0x10, 0x87, 0x37, 0x4b, 0x87, 0x37, 0xbf, 0xfc, 0x0a, 0xa0, 0x84, 0x39, 0x8f, 0x79, 0x8a,
-	0x10, 0xfc, 0x1f, 0x13, 0x62, 0x10, 0xcb, 0xb9, 0xd6, 0x17, 0xba, 0x71, 0xa3, 0x0f, 0x5a, 0x48,
-	0x81, 0xc3, 0x1d, 0x87, 0x3f, 0x9a, 0x78, 0x66, 0xe3, 0x4b, 0x87, 0x60, 0xcb, 0x34, 0x74, 0x0b,
-	0x0f, 0x00, 0x92, 0xe1, 0x59, 0xad, 0xeb, 0x86, 0x33, 0x33, 0x74, 0x1d, 0xcf, 0xec, 0xb9, 0xa1,
-	0x0f, 0x8e, 0xd0, 0x08, 0x9e, 0xd7, 0x4a, 0x43, 0x3b, 0xf6, 0xfc, 0x3d, 0x36, 0xae, 0xed, 0x41,
-	0x1b, 0x3d, 0x86, 0xa7, 0xb5, 0x4c, 0xf0, 0x9b, 0xcb, 0x9d, 0xd0, 0xd9, 0x73, 0xbc, 0x21, 0x73,
-	0x1b, 0xef, 0x94, 0xee, 0xf4, 0xed, 0xfd, 0x46, 0x01, 0x0f, 0x1b, 0x05, 0xfc, 0xda, 0x28, 0xe0,
-	0xcb, 0x56, 0x69, 0x3d, 0x6c, 0x95, 0xd6, 0x8f, 0xad, 0xd2, 0xfa, 0xa4, 0x06, 0x4c, 0x84, 0x99,
-	0xa7, 0x2e, 0xe3, 0x3b, 0xad, 0xf9, 0xb1, 0xfb, 0xe3, 0xc1, 0x6b, 0xf7, 0xa4, 0x12, 0xbe, 0xfe,
-	0x1d, 0x00, 0x00, 0xff, 0xff, 0x60, 0xba, 0xbc, 0x27, 0x05, 0x03, 0x00, 0x00,
-}
-
-func (m *FilePVKey) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *FilePVKey) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *FilePVKey) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.FilePath) > 0 {
-		i -= len(m.FilePath)
-		copy(dAtA[i:], m.FilePath)
-		i = encodeVarintTypes(dAtA, i, uint64(len(m.FilePath)))
-		i--
-		dAtA[i] = 0x22
-	}
-	{
-		size, err := m.PrivKey.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintTypes(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0x1a
-	{
-		size, err := m.PubKey.MarshalToSizedBuffer(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = encodeVarintTypes(dAtA, i, uint64(size))
-	}
-	i--
-	dAtA[i] = 0x12
-	if len(m.Address) > 0 {
-		i -= len(m.Address)
-		copy(dAtA[i:], m.Address)
-		i = encodeVarintTypes(dAtA, i, uint64(len(m.Address)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *FilePVLastSignState) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *FilePVLastSignState) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
+	// 232 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x28, 0xca, 0x2f,
+	0xc9, 0xd7, 0x2f, 0x28, 0xca, 0x2c, 0x2b, 0x4b, 0xcc, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6,
+	0x03, 0x8b, 0x09, 0x09, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x41,
+	0xe5, 0xb5, 0x56, 0x30, 0x72, 0xb1, 0xb9, 0x16, 0x15, 0xe5, 0x17, 0x15, 0x0b, 0x09, 0x71, 0xf1,
+	0xb9, 0x06, 0x05, 0xf9, 0x07, 0x05, 0xc7, 0x87, 0xfa, 0x79, 0xfb, 0xf9, 0x87, 0xfb, 0x09, 0x30,
+	0x08, 0xc9, 0x71, 0x49, 0xc1, 0xc5, 0x5c, 0x23, 0x02, 0x5c, 0x9d, 0x43, 0x5c, 0x5d, 0xe2, 0x83,
+	0x5c, 0x83, 0x03, 0xfc, 0xfd, 0x82, 0x5d, 0x05, 0x18, 0x85, 0x24, 0xb8, 0x44, 0xa0, 0xf2, 0x7e,
+	0xfe, 0xf1, 0xce, 0xfe, 0x7e, 0x7e, 0xae, 0xce, 0x21, 0x9e, 0xfe, 0x7e, 0x02, 0x4c, 0x42, 0xb2,
+	0x5c, 0x92, 0x50, 0x19, 0x84, 0x70, 0x7c, 0x88, 0xa7, 0xaf, 0xab, 0x7f, 0x68, 0x88, 0x00, 0xb3,
+	0x90, 0x38, 0x97, 0x30, 0x54, 0x3a, 0xc8, 0xd5, 0xd1, 0x05, 0x2e, 0xc1, 0x82, 0x64, 0x62, 0x78,
+	0x90, 0x67, 0x88, 0x2b, 0x5c, 0x86, 0xd5, 0xc9, 0xe3, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4,
+	0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f,
+	0xe5, 0x18, 0xa2, 0xf4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x11,
+	0x7e, 0x44, 0x66, 0xa2, 0x04, 0x4a, 0x12, 0x1b, 0x98, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff,
+	0x85, 0x3d, 0x1d, 0x57, 0x2c, 0x01, 0x00, 0x00,
 }
-
-func (m *FilePVLastSignState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.FilePath) > 0 {
-		i -= len(m.FilePath)
-		copy(dAtA[i:], m.FilePath)
-		i = encodeVarintTypes(dAtA, i, uint64(len(m.FilePath)))
-		i--
-		dAtA[i] = 0x32
-	}
-	if len(m.SignBytes) > 0 {
-		i -= len(m.SignBytes)
-		copy(dAtA[i:], m.SignBytes)
-		i = encodeVarintTypes(dAtA, i, uint64(len(m.SignBytes)))
-		i--
-		dAtA[i] = 0x2a
-	}
-	if len(m.Signature) > 0 {
-		i -= len(m.Signature)
-		copy(dAtA[i:], m.Signature)
-		i = encodeVarintTypes(dAtA, i, uint64(len(m.Signature)))
-		i--
-		dAtA[i] = 0x22
-	}
-	if m.Step != 0 {
-		i = encodeVarintTypes(dAtA, i, uint64(m.Step))
-		i--
-		dAtA[i] = 0x18
-	}
-	if m.Round != 0 {
-		i = encodeVarintTypes(dAtA, i, uint64(m.Round))
-		i--
-		dAtA[i] = 0x10
-	}
-	if m.Height != 0 {
-		i = encodeVarintTypes(dAtA, i, uint64(m.Height))
-		i--
-		dAtA[i] = 0x8
-	}
-	return len(dAtA) - i, nil
-}
-
-func encodeVarintTypes(dAtA []byte, offset int, v uint64) int {
-	offset -= sovTypes(v)
-	base := offset
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return base
-}
-func (m *FilePVKey) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Address)
-	if l > 0 {
-		n += 1 + l + sovTypes(uint64(l))
-	}
-	l = m.PubKey.Size()
-	n += 1 + l + sovTypes(uint64(l))
-	l = m.PrivKey.Size()
-	n += 1 + l + sovTypes(uint64(l))
-	l = len(m.FilePath)
-	if l > 0 {
-		n += 1 + l + sovTypes(uint64(l))
-	}
-	return n
-}
-
-func (m *FilePVLastSignState) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Height != 0 {
-		n += 1 + sovTypes(uint64(m.Height))
-	}
-	if m.Round != 0 {
-		n += 1 + sovTypes(uint64(m.Round))
-	}
-	if m.Step != 0 {
-		n += 1 + sovTypes(uint64(m.Step))
-	}
-	l = len(m.Signature)
-	if l > 0 {
-		n += 1 + l + sovTypes(uint64(l))
-	}
-	l = len(m.SignBytes)
-	if l > 0 {
-		n += 1 + l + sovTypes(uint64(l))
-	}
-	l = len(m.FilePath)
-	if l > 0 {
-		n += 1 + l + sovTypes(uint64(l))
-	}
-	return n
-}
-
-func sovTypes(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozTypes(x uint64) (n int) {
-	return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *FilePVKey) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTypes
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: FilePVKey: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: FilePVKey: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType)
-			}
-			var byteLen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				byteLen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if byteLen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + byteLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Address = append(m.Address[:0], dAtA[iNdEx:postIndex]...)
-			if m.Address == nil {
-				m.Address = []byte{}
-			}
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field PubKey", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field PrivKey", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.PrivKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field FilePath", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.FilePath = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTypes(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *FilePVLastSignState) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTypes
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: FilePVLastSignState: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: FilePVLastSignState: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
-			}
-			m.Height = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Height |= int64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Round", wireType)
-			}
-			m.Round = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Round |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 3:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Step", wireType)
-			}
-			m.Step = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Step |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Signature", wireType)
-			}
-			var byteLen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				byteLen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if byteLen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + byteLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Signature = append(m.Signature[:0], dAtA[iNdEx:postIndex]...)
-			if m.Signature == nil {
-				m.Signature = []byte{}
-			}
-			iNdEx = postIndex
-		case 5:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field SignBytes", wireType)
-			}
-			var byteLen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				byteLen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if byteLen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + byteLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.SignBytes = append(m.SignBytes[:0], dAtA[iNdEx:postIndex]...)
-			if m.SignBytes == nil {
-				m.SignBytes = []byte{}
-			}
-			iNdEx = postIndex
-		case 6:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field FilePath", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTypes
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.FilePath = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTypes(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthTypes
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipTypes(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	depth := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowTypes
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
-			}
-		case 1:
-			iNdEx += 8
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTypes
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if length < 0 {
-				return 0, ErrInvalidLengthTypes
-			}
-			iNdEx += length
-		case 3:
-			depth++
-		case 4:
-			if depth == 0 {
-				return 0, ErrUnexpectedEndOfGroupTypes
-			}
-			depth--
-		case 5:
-			iNdEx += 4
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
-		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthTypes
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
-	}
-	return 0, io.ErrUnexpectedEOF
-}
-
-var (
-	ErrInvalidLengthTypes        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowTypes          = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group")
-)

proto/privval/types.proto

@@ -1,31 +1,8 @@
 syntax = "proto3";
-package tendermint.proto.privval;
+package tendermint.privval;
 
 option go_package = "github.com/tendermint/tendermint/proto/privval";
 
-import "third_party/proto/gogoproto/gogo.proto";
-import "proto/crypto/keys/types.proto";
-
-// FilePVKey stores the immutable part of PrivValidator.
-message FilePVKey {
-  bytes                                   address  = 1;
-  tendermint.proto.crypto.keys.PublicKey  pub_key  = 2 [(gogoproto.nullable) = false];
-  tendermint.proto.crypto.keys.PrivateKey priv_key = 3 [(gogoproto.nullable) = false];
-
-  string file_path = 4;
-}
-
-// FilePVLastSignState stores the mutable part of PrivValidator.
-message FilePVLastSignState {
-  int64 height     = 1;
-  int32 round      = 2;
-  int32 step       = 3;
-  bytes signature  = 4;
-  bytes sign_bytes = 5;
-
-  string file_path = 6;
-}
-
 enum Errors {
   ERRORS_UNKNOWN             = 0;
   ERRORS_UNEXPECTED_RESPONSE = 1;

proto/state/types.pb.go

@@ -404,65 +404,65 @@ func (m *State) GetAppHash() []byte {
 }
 
 func init() {
-	proto.RegisterType((*ABCIResponses)(nil), "tendermint.proto.state.ABCIResponses")
-	proto.RegisterType((*ValidatorsInfo)(nil), "tendermint.proto.state.ValidatorsInfo")
-	proto.RegisterType((*ConsensusParamsInfo)(nil), "tendermint.proto.state.ConsensusParamsInfo")
-	proto.RegisterType((*Version)(nil), "tendermint.proto.state.Version")
-	proto.RegisterType((*State)(nil), "tendermint.proto.state.State")
+	proto.RegisterType((*ABCIResponses)(nil), "tendermint.state.ABCIResponses")
+	proto.RegisterType((*ValidatorsInfo)(nil), "tendermint.state.ValidatorsInfo")
+	proto.RegisterType((*ConsensusParamsInfo)(nil), "tendermint.state.ConsensusParamsInfo")
+	proto.RegisterType((*Version)(nil), "tendermint.state.Version")
+	proto.RegisterType((*State)(nil), "tendermint.state.State")
 }
 
 func init() { proto.RegisterFile("proto/state/types.proto", fileDescriptor_00e69fef8162ea9b) }
 
 var fileDescriptor_00e69fef8162ea9b = []byte{
-	// 754 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0xd3, 0x30,
-	0x18, 0x6d, 0xe8, 0xb6, 0xb6, 0xce, 0xba, 0x82, 0x27, 0x8d, 0xd0, 0x49, 0x6d, 0x55, 0xa6, 0xad,
-	0x20, 0x94, 0x4a, 0xe3, 0x01, 0x10, 0x69, 0x81, 0x05, 0x0d, 0x84, 0xb2, 0x69, 0x9a, 0xb8, 0x89,
-	0xdc, 0xc6, 0x4b, 0x22, 0xda, 0x24, 0x8a, 0xdd, 0xb2, 0x3d, 0x03, 0x37, 0x7b, 0x03, 0x5e, 0x67,
-	0x97, 0xbb, 0xe4, 0xaa, 0xa0, 0xee, 0x96, 0x87, 0x40, 0xb6, 0xf3, 0xe3, 0xfd, 0x69, 0xaa, 0xc4,
-	0x55, 0x1d, 0x9f, 0xef, 0x9c, 0xef, 0xd8, 0x3e, 0x9f, 0x0a, 0x9e, 0x46, 0x71, 0x48, 0xc3, 0x2e,
-	0xa1, 0x88, 0xe2, 0x2e, 0x3d, 0x8b, 0x30, 0xd1, 0xf9, 0x0e, 0xdc, 0xa0, 0x38, 0x70, 0x70, 0x3c,
-	0xf6, 0x03, 0x2a, 0x76, 0x74, 0x5e, 0x53, 0xdf, 0xa6, 0x9e, 0x1f, 0x3b, 0x76, 0x84, 0x62, 0x7a,
-	0xd6, 0x15, 0x64, 0x37, 0x74, 0xc3, 0x7c, 0x25, 0xaa, 0xeb, 0x1b, 0x68, 0x30, 0xf4, 0x85, 0xa2,
-	0xac, 0x5b, 0x4f, 0x1a, 0xde, 0x06, 0x36, 0x65, 0x60, 0x8a, 0x46, 0xbe, 0x83, 0x68, 0x18, 0x27,
-	0xa0, 0x26, 0x83, 0x11, 0x8a, 0xd1, 0xf8, 0x06, 0x6d, 0x8a, 0x63, 0xe2, 0x87, 0x41, 0xfa, 0x9b,
-	0x80, 0x4d, 0x37, 0x0c, 0xdd, 0x11, 0x16, 0x3e, 0x07, 0x93, 0x93, 0x2e, 0xf5, 0xc7, 0x98, 0x50,
-	0x34, 0x8e, 0x44, 0x41, 0xfb, 0xaf, 0x02, 0xaa, 0x6f, 0x8d, 0x9e, 0x69, 0x61, 0x12, 0x85, 0x01,
-	0xc1, 0x04, 0x9a, 0x40, 0x75, 0xf0, 0xc8, 0x9f, 0xe2, 0xd8, 0xa6, 0xa7, 0x44, 0x53, 0x5a, 0xc5,
-	0x8e, 0xba, 0xdb, 0xd1, 0xa5, 0xdb, 0x60, 0x07, 0xd3, 0x85, 0xf3, 0x94, 0xd6, 0x17, 0x8c, 0xc3,
-	0x53, 0x0b, 0x38, 0xe9, 0x92, 0xc0, 0x3e, 0xa8, 0xe0, 0xc0, 0xb1, 0x07, 0xa3, 0x70, 0xf8, 0x4d,
-	0x7b, 0xd4, 0x52, 0x3a, 0xea, 0xee, 0xce, 0x03, 0x42, 0xef, 0x02, 0xc7, 0x60, 0xe5, 0x56, 0x19,
-	0x27, 0x2b, 0xf8, 0x11, 0xa8, 0x03, 0xec, 0xfa, 0x41, 0xa2, 0x53, 0xe4, 0x3a, 0x2f, 0x1e, 0xd0,
-	0x31, 0x18, 0x43, 0x28, 0x81, 0x41, 0xb6, 0x6e, 0xff, 0x50, 0xc0, 0xda, 0x51, 0x7a, 0xb5, 0xc4,
-	0x0c, 0x4e, 0x42, 0x68, 0x82, 0x6a, 0x76, 0xd9, 0x36, 0xc1, 0x54, 0x53, 0x78, 0x83, 0x2d, 0xfd,
-	0xd6, 0xfb, 0x8b, 0x0e, 0x19, 0xfd, 0x00, 0x53, 0x6b, 0x75, 0x2a, 0x7d, 0x41, 0x1d, 0xac, 0x8f,
-	0x10, 0xa1, 0xb6, 0x87, 0x7d, 0xd7, 0xa3, 0xf6, 0xd0, 0x43, 0x81, 0x8b, 0x1d, 0x7e, 0xf2, 0xa2,
-	0xf5, 0x84, 0x41, 0x7b, 0x1c, 0xe9, 0x09, 0xa0, 0xfd, 0x53, 0x01, 0xeb, 0x3d, 0xe6, 0x36, 0x20,
-	0x13, 0xf2, 0x85, 0x3f, 0x2a, 0xb7, 0x74, 0x0c, 0x1e, 0x0f, 0xd3, 0x6d, 0x5b, 0x3c, 0x76, 0xe2,
-	0x6a, 0xe7, 0x3e, 0x57, 0x37, 0x64, 0x8c, 0xa5, 0x8b, 0x59, 0xb3, 0x60, 0xd5, 0x86, 0xd7, 0xb7,
-	0x17, 0x76, 0x18, 0x80, 0xd2, 0x91, 0x08, 0x14, 0xfc, 0x00, 0x2a, 0x99, 0x5a, 0xe2, 0xe6, 0xf9,
-	0x6d, 0x37, 0x69, 0xfc, 0x32, 0x3f, 0x89, 0x93, 0x9c, 0x0b, 0xeb, 0xa0, 0x4c, 0xc2, 0x13, 0xfa,
-	0x1d, 0xc5, 0x98, 0x37, 0xae, 0x58, 0xd9, 0x77, 0x7b, 0xb6, 0x02, 0x96, 0x0f, 0xd8, 0x98, 0xc1,
-	0x37, 0xa0, 0x94, 0x68, 0x25, 0xcd, 0x9a, 0xfa, 0xdd, 0x03, 0xa9, 0x27, 0x06, 0x93, 0x46, 0x29,
-	0x0b, 0x6e, 0x83, 0xf2, 0xd0, 0x43, 0x7e, 0x60, 0xfb, 0xe2, 0x7c, 0x15, 0x43, 0x9d, 0xcf, 0x9a,
-	0xa5, 0x1e, 0xdb, 0x33, 0xfb, 0x56, 0x89, 0x83, 0xa6, 0x03, 0x5f, 0x02, 0x7e, 0x6e, 0x91, 0xae,
-	0xe4, 0x62, 0x78, 0xc8, 0x8a, 0x56, 0x8d, 0x01, 0x3c, 0x38, 0xe2, 0x56, 0xe0, 0x31, 0xa8, 0x4a,
-	0xb5, 0xbe, 0xa3, 0x2d, 0xdd, 0x67, 0x4d, 0xbc, 0x0a, 0xe7, 0x9a, 0x7d, 0x63, 0x9d, 0x59, 0x9b,
-	0xcf, 0x9a, 0xea, 0x7e, 0x2a, 0x68, 0xf6, 0x2d, 0x35, 0x53, 0x37, 0x1d, 0xb8, 0x0f, 0x6a, 0x92,
-	0x32, 0x9b, 0x52, 0x6d, 0x99, 0x6b, 0xd7, 0x75, 0x31, 0xc2, 0x7a, 0x3a, 0xc2, 0xfa, 0x61, 0x3a,
-	0xc2, 0x46, 0x99, 0xc9, 0x9e, 0xff, 0x6e, 0x2a, 0x56, 0x35, 0xd3, 0x62, 0x28, 0xfc, 0x04, 0x6a,
-	0x01, 0x3e, 0xa5, 0x76, 0x96, 0x4e, 0xa2, 0xad, 0x2c, 0x90, 0xea, 0x35, 0x46, 0xce, 0xc7, 0x04,
-	0xf6, 0x01, 0x90, 0x94, 0x4a, 0x0b, 0x28, 0x49, 0x3c, 0x66, 0x8a, 0x1f, 0x51, 0x92, 0x2a, 0x2f,
-	0x62, 0x8a, 0x91, 0x25, 0x53, 0x3d, 0xd0, 0x90, 0xa3, 0x9c, 0xab, 0x66, 0xa9, 0xae, 0xf0, 0x47,
-	0xdc, 0xcc, 0x53, 0x9d, 0xb3, 0x93, 0x7c, 0xdf, 0x39, 0x69, 0xe0, 0xbf, 0x4c, 0xda, 0x67, 0xb0,
-	0x75, 0x6d, 0xd2, 0x6e, 0x74, 0xc9, 0x4c, 0xaa, 0xdc, 0x64, 0x4b, 0x1a, 0xbd, 0xeb, 0x42, 0xa9,
-	0xd3, 0x34, 0xa6, 0x31, 0x26, 0x93, 0x11, 0x25, 0xb6, 0x87, 0x88, 0xa7, 0xad, 0xb6, 0x94, 0xce,
-	0xaa, 0x88, 0xa9, 0x25, 0xf6, 0xf7, 0x10, 0xf1, 0xe0, 0x33, 0x50, 0x46, 0x51, 0x24, 0x4a, 0xaa,
-	0xbc, 0xa4, 0x84, 0xa2, 0x88, 0x41, 0xc6, 0xfb, 0x8b, 0x79, 0x43, 0xb9, 0x9c, 0x37, 0x94, 0x3f,
-	0xf3, 0x86, 0x72, 0x7e, 0xd5, 0x28, 0x5c, 0x5e, 0x35, 0x0a, 0xbf, 0xae, 0x1a, 0x85, 0xaf, 0xaf,
-	0x5c, 0x9f, 0x7a, 0x93, 0x81, 0x3e, 0x0c, 0xc7, 0xdd, 0xfc, 0xe8, 0xf2, 0x52, 0xfa, 0xa7, 0x1c,
-	0xac, 0xf0, 0x8f, 0xd7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x26, 0xbd, 0x31, 0x9b, 0x3f, 0x07,
-	0x00, 0x00,
+	// 755 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xd3, 0x4a,
+	0x18, 0x8d, 0x6f, 0xda, 0x26, 0x19, 0x37, 0x4d, 0xef, 0x54, 0xba, 0xd7, 0x4d, 0x85, 0x13, 0x22,
+	0x54, 0x02, 0x42, 0x8e, 0x54, 0x56, 0x6c, 0x90, 0xea, 0x04, 0xa8, 0x51, 0x85, 0x90, 0x5b, 0x75,
+	0xc1, 0xc6, 0x9a, 0xc4, 0x53, 0xdb, 0x22, 0xb1, 0x2d, 0xcf, 0x24, 0xb4, 0x0f, 0xc0, 0xbe, 0x5b,
+	0x5e, 0x85, 0x27, 0xe8, 0xb2, 0x4b, 0x56, 0x05, 0xa5, 0x5b, 0x1e, 0x02, 0xcd, 0x8c, 0x7f, 0x26,
+	0x29, 0x52, 0x8b, 0x58, 0x65, 0xfc, 0x9d, 0x39, 0x67, 0xce, 0x37, 0x73, 0x3e, 0x05, 0xfc, 0x1f,
+	0x27, 0x11, 0x8d, 0x7a, 0x84, 0x22, 0x8a, 0x7b, 0xf4, 0x3c, 0xc6, 0xc4, 0xe0, 0x15, 0xb8, 0x49,
+	0x71, 0xe8, 0xe2, 0x64, 0x12, 0x84, 0xd4, 0xe0, 0x68, 0x73, 0x97, 0xfa, 0x41, 0xe2, 0x3a, 0x31,
+	0x4a, 0xe8, 0x79, 0x4f, 0xd0, 0xbc, 0xc8, 0x8b, 0x8a, 0x95, 0x60, 0x36, 0xff, 0x13, 0x15, 0x34,
+	0x1c, 0x05, 0xb2, 0x62, 0x33, 0x3d, 0x8a, 0x97, 0x16, 0x80, 0x1d, 0x19, 0x98, 0xa1, 0x71, 0xe0,
+	0x22, 0x1a, 0x25, 0x29, 0xa8, 0xc9, 0x60, 0x8c, 0x12, 0x34, 0x59, 0xa2, 0xcd, 0x70, 0x42, 0x82,
+	0x28, 0xcc, 0x7e, 0x53, 0xb0, 0xe5, 0x45, 0x91, 0x37, 0xc6, 0xc2, 0xe7, 0x70, 0x7a, 0xda, 0xa3,
+	0xc1, 0x04, 0x13, 0x8a, 0x26, 0xb1, 0xd8, 0xd0, 0xf9, 0xa9, 0x80, 0xfa, 0xbe, 0xd9, 0xb7, 0x6c,
+	0x4c, 0xe2, 0x28, 0x24, 0x98, 0x40, 0x0b, 0xa8, 0x2e, 0x1e, 0x07, 0x33, 0x9c, 0x38, 0xf4, 0x8c,
+	0x68, 0x4a, 0xbb, 0xdc, 0x55, 0xf7, 0xba, 0x86, 0x74, 0x0f, 0xac, 0x25, 0x43, 0x38, 0xcf, 0x68,
+	0x03, 0xc1, 0x38, 0x3e, 0xb3, 0x81, 0x9b, 0x2d, 0x09, 0x1c, 0x80, 0x1a, 0x0e, 0x5d, 0x67, 0x38,
+	0x8e, 0x46, 0x1f, 0xb5, 0x7f, 0xda, 0x4a, 0x57, 0xdd, 0x7b, 0x7c, 0x87, 0xd0, 0xab, 0xd0, 0x35,
+	0xd9, 0x76, 0xbb, 0x8a, 0xd3, 0x15, 0x7c, 0x0b, 0xd4, 0x21, 0xf6, 0x82, 0x30, 0xd5, 0x29, 0x73,
+	0x9d, 0x27, 0x77, 0xe8, 0x98, 0x8c, 0x21, 0x94, 0xc0, 0x30, 0x5f, 0x77, 0x3e, 0x2b, 0x60, 0xe3,
+	0x24, 0xbb, 0x5a, 0x62, 0x85, 0xa7, 0x11, 0xec, 0x83, 0x7a, 0x7e, 0xd9, 0x0e, 0xc1, 0x54, 0x53,
+	0xf8, 0x01, 0xba, 0x7c, 0x80, 0xd0, 0xce, 0x89, 0x47, 0x98, 0xda, 0xeb, 0x33, 0xe9, 0x0b, 0x1a,
+	0x60, 0x6b, 0x8c, 0x08, 0x75, 0x7c, 0x1c, 0x78, 0x3e, 0x75, 0x46, 0x3e, 0x0a, 0x3d, 0xec, 0xf2,
+	0x9e, 0xcb, 0xf6, 0xbf, 0x0c, 0x3a, 0xe0, 0x48, 0x5f, 0x00, 0x9d, 0x2f, 0x0a, 0xd8, 0xea, 0x33,
+	0x9f, 0x21, 0x99, 0x92, 0xf7, 0xfc, 0x39, 0xb9, 0x19, 0x1b, 0x6c, 0x8e, 0xb2, 0xb2, 0x23, 0x9e,
+	0x39, 0xf5, 0xf3, 0xf0, 0xb6, 0x9f, 0x25, 0x01, 0x73, 0xe5, 0xf2, 0xba, 0x55, 0xb2, 0x1b, 0xa3,
+	0xc5, 0xf2, 0x1f, 0x7b, 0xf3, 0x41, 0xe5, 0x44, 0x84, 0x08, 0xee, 0x83, 0x5a, 0xae, 0x96, 0xfa,
+	0x78, 0x20, 0xfb, 0xc8, 0xc2, 0x96, 0x3b, 0x49, 0x3d, 0x14, 0x2c, 0xd8, 0x04, 0x55, 0x12, 0x9d,
+	0xd2, 0x4f, 0x28, 0xc1, 0xfc, 0xc8, 0x9a, 0x9d, 0x7f, 0x77, 0xbe, 0xae, 0x81, 0xd5, 0x23, 0x36,
+	0x54, 0xf0, 0x05, 0xa8, 0xa4, 0x5a, 0xe9, 0x31, 0xdb, 0xc6, 0xf2, 0xe0, 0x19, 0xa9, 0xa9, 0xf4,
+	0x88, 0x6c, 0x3f, 0xdc, 0x05, 0xd5, 0x91, 0x8f, 0x82, 0xd0, 0x09, 0x44, 0x4f, 0x35, 0x53, 0x9d,
+	0x5f, 0xb7, 0x2a, 0x7d, 0x56, 0xb3, 0x06, 0x76, 0x85, 0x83, 0x96, 0x0b, 0x9f, 0x02, 0xde, 0xab,
+	0x48, 0x51, 0x7a, 0x19, 0x3c, 0x4c, 0x65, 0xbb, 0xc1, 0x00, 0x1e, 0x10, 0x71, 0x13, 0xd0, 0x06,
+	0x75, 0x69, 0x6f, 0xe0, 0x6a, 0x2b, 0xb7, 0x4d, 0x89, 0x37, 0xe0, 0x2c, 0x6b, 0x60, 0x6e, 0x31,
+	0x53, 0xf3, 0xeb, 0x96, 0x7a, 0x98, 0x49, 0x59, 0x03, 0x5b, 0xcd, 0x75, 0x2d, 0x17, 0x1e, 0x82,
+	0x86, 0xa4, 0xc9, 0xe6, 0x50, 0x5b, 0xe5, 0xaa, 0x4d, 0x43, 0x0c, 0xa9, 0x91, 0x0d, 0xa9, 0x71,
+	0x9c, 0x0d, 0xa9, 0x59, 0x65, 0xb2, 0x17, 0xdf, 0x5b, 0x8a, 0x5d, 0xcf, 0xb5, 0x18, 0x0a, 0xdf,
+	0x80, 0x46, 0x88, 0xcf, 0xa8, 0x93, 0xa7, 0x90, 0x68, 0x6b, 0xf7, 0xca, 0xed, 0x06, 0xa3, 0x15,
+	0x23, 0x00, 0x5f, 0x02, 0x20, 0x69, 0x54, 0xee, 0xa5, 0x21, 0x31, 0x98, 0x11, 0xde, 0x96, 0x24,
+	0x52, 0xbd, 0x9f, 0x11, 0x46, 0x93, 0x8c, 0xf4, 0x81, 0x2e, 0xc7, 0xb4, 0xd0, 0xcb, 0x13, 0x5b,
+	0xe3, 0x8f, 0xb5, 0x53, 0x24, 0xb6, 0x60, 0xa7, 0xd9, 0xfd, 0xed, 0xfc, 0x80, 0xbf, 0x9c, 0x9f,
+	0x77, 0xe0, 0xd1, 0xc2, 0xfc, 0x2c, 0xe9, 0xe7, 0xf6, 0x54, 0x6e, 0xaf, 0x2d, 0x0d, 0xd4, 0xa2,
+	0x50, 0xe6, 0x31, 0x0b, 0x62, 0x82, 0xc9, 0x74, 0x4c, 0x89, 0xe3, 0x23, 0xe2, 0x6b, 0xeb, 0x6d,
+	0xa5, 0xbb, 0x2e, 0x82, 0x68, 0x8b, 0xfa, 0x01, 0x22, 0x3e, 0xdc, 0x06, 0x55, 0x14, 0xc7, 0x62,
+	0x4b, 0x9d, 0x6f, 0xa9, 0xa0, 0x38, 0x66, 0x90, 0xf9, 0xfa, 0x72, 0xae, 0x2b, 0x57, 0x73, 0x5d,
+	0xf9, 0x31, 0xd7, 0x95, 0x8b, 0x1b, 0xbd, 0x74, 0x75, 0xa3, 0x97, 0xbe, 0xdd, 0xe8, 0xa5, 0x0f,
+	0xcf, 0xbc, 0x80, 0xfa, 0xd3, 0xa1, 0x31, 0x8a, 0x26, 0xbd, 0xa2, 0x69, 0x79, 0x29, 0xfd, 0xdb,
+	0x0d, 0xd7, 0xf8, 0xc7, 0xf3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x85, 0xf0, 0x16, 0x03,
+	0x07, 0x00, 0x00,
 }
 
 func (m *ABCIResponses) Marshal() (dAtA []byte, err error) {

proto/state/types.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
-package tendermint.proto.state;
+package tendermint.state;
 
 option go_package = "github.com/tendermint/tendermint/proto/state";
 
 import "third_party/proto/gogoproto/gogo.proto";
-import "abci/types/types.proto";
+import "proto/abci/types.proto";
 import "proto/types/types.proto";
 import "proto/types/validator.proto";
 import "proto/types/params.proto";
@@ -22,19 +22,19 @@ message ABCIResponses {
 
 // ValidatorsInfo represents the latest validator set, or the last height it changed
 message ValidatorsInfo {
-  tendermint.proto.types.ValidatorSet validator_set       = 1;
-  int64                               last_height_changed = 2;
+  tendermint.types.ValidatorSet validator_set       = 1;
+  int64                         last_height_changed = 2;
 }
 
 // ConsensusParamsInfo represents the latest consensus params, or the last height it changed
 message ConsensusParamsInfo {
-  tendermint.proto.types.ConsensusParams consensus_params    = 1 [(gogoproto.nullable) = false];
-  int64                                  last_height_changed = 2;
+  tendermint.types.ConsensusParams consensus_params    = 1 [(gogoproto.nullable) = false];
+  int64                            last_height_changed = 2;
 }
 
 message Version {
-  tendermint.proto.version.Consensus consensus = 1 [(gogoproto.nullable) = false];
-  string                             software  = 2;
+  tendermint.version.Consensus consensus = 1 [(gogoproto.nullable) = false];
+  string                       software  = 2;
 }
 
 message State {
@@ -44,8 +44,8 @@ message State {
   string chain_id = 2 [(gogoproto.customname) = "ChainID"];
 
   // LastBlockHeight=0 at genesis (ie. block(H=0) does not exist)
-  int64                          last_block_height = 3;
-  tendermint.proto.types.BlockID last_block_id     = 4
+  int64                    last_block_height = 3;
+  tendermint.types.BlockID last_block_id     = 4
       [(gogoproto.nullable) = false, (gogoproto.customname) = "LastBlockID"];
   google.protobuf.Timestamp last_block_time = 5
       [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
@@ -56,15 +56,15 @@ message State {
   // Note that if s.LastBlockHeight causes a valset change,
   // we set s.LastHeightValidatorsChanged = s.LastBlockHeight + 1 + 1
   // Extra +1 due to nextValSet delay.
-  tendermint.proto.types.ValidatorSet next_validators                = 6;
-  tendermint.proto.types.ValidatorSet validators                     = 7;
-  tendermint.proto.types.ValidatorSet last_validators                = 8;
-  int64                               last_height_validators_changed = 9;
+  tendermint.types.ValidatorSet next_validators                = 6;
+  tendermint.types.ValidatorSet validators                     = 7;
+  tendermint.types.ValidatorSet last_validators                = 8;
+  int64                         last_height_validators_changed = 9;
 
   // Consensus parameters used for validating blocks.
   // Changes returned by EndBlock and updated after Commit.
-  tendermint.proto.types.ConsensusParams consensus_params                     = 10 [(gogoproto.nullable) = false];
-  int64                                  last_height_consensus_params_changed = 11;
+  tendermint.types.ConsensusParams consensus_params                     = 10 [(gogoproto.nullable) = false];
+  int64                            last_height_consensus_params_changed = 11;
 
   // Merkle root of the results from executing prev block
   bytes last_results_hash = 12;

proto/statesync/types.pb.go

@@ -382,42 +382,42 @@ func (m *ChunkResponse) GetMissing() bool {
 }
 
 func init() {
-	proto.RegisterType((*Message)(nil), "tendermint.proto.statesync.Message")
-	proto.RegisterType((*SnapshotsRequest)(nil), "tendermint.proto.statesync.SnapshotsRequest")
-	proto.RegisterType((*SnapshotsResponse)(nil), "tendermint.proto.statesync.SnapshotsResponse")
-	proto.RegisterType((*ChunkRequest)(nil), "tendermint.proto.statesync.ChunkRequest")
-	proto.RegisterType((*ChunkResponse)(nil), "tendermint.proto.statesync.ChunkResponse")
+	proto.RegisterType((*Message)(nil), "tendermint.statesync.Message")
+	proto.RegisterType((*SnapshotsRequest)(nil), "tendermint.statesync.SnapshotsRequest")
+	proto.RegisterType((*SnapshotsResponse)(nil), "tendermint.statesync.SnapshotsResponse")
+	proto.RegisterType((*ChunkRequest)(nil), "tendermint.statesync.ChunkRequest")
+	proto.RegisterType((*ChunkResponse)(nil), "tendermint.statesync.ChunkResponse")
 }
 
 func init() { proto.RegisterFile("proto/statesync/types.proto", fileDescriptor_bef273312884335b) }
 
 var fileDescriptor_bef273312884335b = []byte{
-	// 393 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcd, 0x6a, 0xdb, 0x40,
-	0x14, 0x85, 0x25, 0xff, 0x73, 0x6b, 0x15, 0x7b, 0x28, 0x45, 0xb8, 0x20, 0x8a, 0x56, 0x2e, 0xb4,
-	0x72, 0x69, 0xdf, 0xc0, 0xdd, 0x98, 0x42, 0x29, 0x4c, 0xb2, 0x4a, 0x20, 0x61, 0x2c, 0x4f, 0x24,
-	0x11, 0x34, 0x52, 0x74, 0x47, 0x10, 0x3f, 0x40, 0x56, 0xd9, 0xe4, 0xb1, 0xb2, 0xf4, 0x32, 0xcb,
-	0x60, 0xbf, 0x41, 0x9e, 0x20, 0x68, 0x24, 0xcb, 0x8a, 0x42, 0x82, 0x03, 0xd9, 0xcd, 0x39, 0xe8,
-	0x7e, 0x3a, 0xe7, 0x0e, 0x03, 0x5f, 0xe2, 0x24, 0x92, 0xd1, 0x04, 0x25, 0x93, 0x1c, 0x97, 0xc2,
-	0x9d, 0xc8, 0x65, 0xcc, 0xd1, 0x51, 0x2e, 0x19, 0x49, 0x2e, 0x16, 0x3c, 0x09, 0x03, 0x21, 0x73,
-	0xc7, 0x29, 0xbf, 0xb3, 0x1f, 0x1a, 0xd0, 0xfd, 0xc7, 0x11, 0x99, 0xc7, 0xc9, 0x31, 0x0c, 0x51,
-	0xb0, 0x18, 0xfd, 0x48, 0xe2, 0x69, 0xc2, 0x2f, 0x52, 0x8e, 0xd2, 0xd4, 0xbf, 0xea, 0xe3, 0x0f,
-	0xbf, 0xbe, 0x3b, 0x2f, 0x33, 0x9c, 0x83, 0xed, 0x10, 0xcd, 0x67, 0x66, 0x1a, 0x1d, 0x60, 0xcd,
-	0x23, 0x27, 0x40, 0xaa, 0x70, 0x8c, 0x23, 0x81, 0xdc, 0x6c, 0x28, 0xfa, 0x8f, 0x3d, 0xe9, 0xf9,
-	0xd0, 0x4c, 0xa3, 0x43, 0xac, 0x9b, 0xe4, 0x3f, 0x18, 0xae, 0x9f, 0x8a, 0xf3, 0x32, 0x78, 0x53,
-	0xa1, 0xc7, 0xaf, 0xa1, 0xff, 0x64, 0x03, 0xbb, 0xd0, 0x7d, 0xb7, 0xa2, 0x09, 0x85, 0x8f, 0x5b,
-	0x60, 0x11, 0xb6, 0xa5, 0x88, 0xdf, 0xf6, 0x20, 0x96, 0x41, 0x0d, 0xb7, 0x6a, 0x4c, 0xdb, 0xd0,
-	0xc4, 0x34, 0xb4, 0x09, 0x0c, 0xea, 0x3b, 0xb3, 0xaf, 0x75, 0x18, 0x3e, 0xab, 0x4a, 0x3e, 0x43,
-	0xc7, 0xe7, 0x81, 0xe7, 0xe7, 0xf7, 0xd0, 0xa2, 0x85, 0xca, 0xfc, 0xb3, 0x28, 0x09, 0x99, 0x54,
-	0x1b, 0x34, 0x68, 0xa1, 0x32, 0x5f, 0xfd, 0x11, 0x55, 0x7d, 0x83, 0x16, 0x8a, 0x10, 0x68, 0xf9,
-	0x0c, 0x7d, 0x55, 0xa1, 0x4f, 0xd5, 0x99, 0x8c, 0xa0, 0x17, 0x72, 0xc9, 0x16, 0x4c, 0x32, 0xb3,
-	0xad, 0xfc, 0x52, 0xdb, 0x87, 0xd0, 0xaf, 0x2e, 0xe7, 0xcd, 0x39, 0x3e, 0x41, 0x3b, 0x10, 0x0b,
-	0x7e, 0x59, 0xc4, 0xc8, 0x85, 0x7d, 0xa5, 0x83, 0xf1, 0x64, 0x43, 0xef, 0xc3, 0xcd, 0x5c, 0xd5,
-	0xb3, 0xa8, 0x97, 0x0b, 0x62, 0x42, 0x37, 0x0c, 0x10, 0x03, 0xe1, 0xa9, 0x7a, 0x3d, 0xba, 0x95,
-	0xd3, 0xbf, 0xb7, 0x6b, 0x4b, 0x5f, 0xad, 0x2d, 0xfd, 0x7e, 0x6d, 0xe9, 0x37, 0x1b, 0x4b, 0x5b,
-	0x6d, 0x2c, 0xed, 0x6e, 0x63, 0x69, 0x47, 0x3f, 0xbd, 0x40, 0xfa, 0xe9, 0xdc, 0x71, 0xa3, 0x70,
-	0xb2, 0xbb, 0xe6, 0xea, 0xb1, 0xf6, 0xd0, 0xe6, 0x1d, 0x65, 0xfc, 0x7e, 0x0c, 0x00, 0x00, 0xff,
-	0xff, 0x3c, 0x56, 0xfb, 0xc1, 0x82, 0x03, 0x00, 0x00,
+	// 389 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6a, 0xdb, 0x40,
+	0x18, 0x94, 0xfc, 0xcf, 0x57, 0xab, 0xd8, 0x8b, 0x29, 0xa2, 0x05, 0x51, 0x54, 0x68, 0x7b, 0x92,
+	0x4b, 0xfb, 0x06, 0xee, 0xc5, 0x2d, 0xc9, 0x65, 0x93, 0x40, 0xc8, 0x25, 0xac, 0xe5, 0x8d, 0x24,
+	0x82, 0x56, 0x8a, 0xbe, 0x15, 0xc4, 0x0f, 0x90, 0x53, 0x2e, 0x79, 0xac, 0x1c, 0x7d, 0x0c, 0x39,
+	0x05, 0xfb, 0x45, 0x82, 0x56, 0xb2, 0xac, 0x28, 0x26, 0x21, 0x90, 0xdb, 0x37, 0xc3, 0x68, 0x34,
+	0x33, 0x42, 0xf0, 0x25, 0x4e, 0x22, 0x19, 0x8d, 0x51, 0x32, 0xc9, 0x71, 0x21, 0xdc, 0xb1, 0x5c,
+	0xc4, 0x1c, 0x1d, 0xc5, 0x92, 0x91, 0xe4, 0x62, 0xce, 0x93, 0x30, 0x10, 0xd2, 0x29, 0x15, 0xf6,
+	0x7d, 0x03, 0xba, 0xfb, 0x1c, 0x91, 0x79, 0x9c, 0x1c, 0xc1, 0x10, 0x05, 0x8b, 0xd1, 0x8f, 0x24,
+	0x9e, 0x26, 0xfc, 0x22, 0xe5, 0x28, 0x4d, 0xfd, 0xab, 0xfe, 0xf3, 0xc3, 0xef, 0xef, 0xce, 0xae,
+	0xa7, 0x9d, 0x83, 0x8d, 0x9c, 0xe6, 0xea, 0xa9, 0x46, 0x07, 0x58, 0xe3, 0xc8, 0x31, 0x90, 0xaa,
+	0x2d, 0xc6, 0x91, 0x40, 0x6e, 0x36, 0x94, 0xef, 0x8f, 0x57, 0x7d, 0x73, 0xf9, 0x54, 0xa3, 0x43,
+	0xac, 0x93, 0xe4, 0x1f, 0x18, 0xae, 0x9f, 0x8a, 0xf3, 0x32, 0x6c, 0x53, 0x99, 0xda, 0xbb, 0x4d,
+	0xff, 0x66, 0xd2, 0x6d, 0xd0, 0xbe, 0x5b, 0xc1, 0x64, 0x0f, 0x3e, 0x6e, 0xac, 0x8a, 0x80, 0x2d,
+	0xe5, 0xf5, 0xed, 0x45, 0xaf, 0x32, 0x9c, 0xe1, 0x56, 0x89, 0x49, 0x1b, 0x9a, 0x98, 0x86, 0x36,
+	0x81, 0x41, 0x7d, 0x21, 0xfb, 0x5a, 0x87, 0xe1, 0xb3, 0x7a, 0xe4, 0x13, 0x74, 0x7c, 0x1e, 0x78,
+	0x7e, 0xbe, 0x77, 0x8b, 0x16, 0x28, 0xe3, 0xcf, 0xa2, 0x24, 0x64, 0x52, 0xed, 0x65, 0xd0, 0x02,
+	0x65, 0xbc, 0x7a, 0x23, 0xaa, 0xca, 0x06, 0x2d, 0x10, 0x21, 0xd0, 0xf2, 0x19, 0xfa, 0x2a, 0x7c,
+	0x9f, 0xaa, 0x9b, 0x7c, 0x86, 0x5e, 0xc8, 0x25, 0x9b, 0x33, 0xc9, 0xcc, 0xb6, 0xe2, 0x4b, 0x6c,
+	0x1f, 0x42, 0xbf, 0x3a, 0xcb, 0x9b, 0x73, 0x8c, 0xa0, 0x1d, 0x88, 0x39, 0xbf, 0x2c, 0x62, 0xe4,
+	0xc0, 0xbe, 0xd2, 0xc1, 0x78, 0xb2, 0xd0, 0xfb, 0xf8, 0x66, 0xac, 0xea, 0x59, 0xd4, 0xcb, 0x01,
+	0x31, 0xa1, 0x1b, 0x06, 0x88, 0x81, 0xf0, 0x54, 0xbd, 0x1e, 0xdd, 0xc0, 0xc9, 0xff, 0xdb, 0x95,
+	0xa5, 0x2f, 0x57, 0x96, 0xfe, 0xb0, 0xb2, 0xf4, 0x9b, 0xb5, 0xa5, 0x2d, 0xd7, 0x96, 0x76, 0xb7,
+	0xb6, 0xb4, 0x93, 0x5f, 0x5e, 0x20, 0xfd, 0x74, 0xe6, 0xb8, 0x51, 0x38, 0xde, 0x7e, 0xe0, 0xea,
+	0x59, 0xfb, 0x95, 0x66, 0x1d, 0x45, 0xfc, 0x79, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x0d, 0x38,
+	0x7f, 0x64, 0x03, 0x00, 0x00,
 }
 
 func (m *Message) Marshal() (dAtA []byte, err error) {

proto/statesync/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.statesync;
+package tendermint.statesync;
 
 option go_package = "github.com/tendermint/tendermint/proto/statesync";
 

proto/store/types.pb.go

@@ -75,24 +75,24 @@ func (m *BlockStoreState) GetHeight() int64 {
 }
 
 func init() {
-	proto.RegisterType((*BlockStoreState)(nil), "tendermint.proto.store.BlockStoreState")
+	proto.RegisterType((*BlockStoreState)(nil), "tendermint.store.BlockStoreState")
 }
 
 func init() { proto.RegisterFile("proto/store/types.proto", fileDescriptor_45a8553e38baf31c) }
 
 var fileDescriptor_45a8553e38baf31c = []byte{
-	// 164 bytes of a gzipped FileDescriptorProto
+	// 162 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x28, 0xca, 0x2f,
 	0xc9, 0xd7, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x03, 0x8b,
-	0x08, 0x89, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0x40, 0x44, 0xf4, 0xc0,
-	0x6a, 0x94, 0x6c, 0xb9, 0xf8, 0x9d, 0x72, 0xf2, 0x93, 0xb3, 0x83, 0x41, 0xbc, 0xe0, 0x92, 0xc4,
-	0x92, 0x54, 0x21, 0x21, 0x2e, 0x96, 0xa4, 0xc4, 0xe2, 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xe6,
-	0x20, 0x30, 0x5b, 0x48, 0x8c, 0x8b, 0x2d, 0x23, 0x35, 0x33, 0x3d, 0xa3, 0x44, 0x82, 0x09, 0x2c,
-	0x0a, 0xe5, 0x39, 0xb9, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72,
-	0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x4e,
-	0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xc2, 0x6e, 0x64, 0x26, 0x92,
-	0x53, 0x93, 0xd8, 0xc0, 0x1c, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xd0, 0xc2, 0xbe,
-	0xc0, 0x00, 0x00, 0x00,
+	0x08, 0x09, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x81, 0x65, 0x95,
+	0x6c, 0xb9, 0xf8, 0x9d, 0x72, 0xf2, 0x93, 0xb3, 0x83, 0x41, 0xbc, 0xe0, 0x92, 0xc4, 0x92, 0x54,
+	0x21, 0x21, 0x2e, 0x96, 0xa4, 0xc4, 0xe2, 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x30,
+	0x5b, 0x48, 0x8c, 0x8b, 0x2d, 0x23, 0x35, 0x33, 0x3d, 0xa3, 0x44, 0x82, 0x09, 0x2c, 0x0a, 0xe5,
+	0x39, 0xb9, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13,
+	0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x4e, 0x7a, 0x66,
+	0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xc2, 0x56, 0x64, 0x26, 0x92, 0x23, 0x93,
+	0xd8, 0xc0, 0x1c, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x79, 0x1a, 0xba, 0xba, 0x00,
+	0x00, 0x00,
 }
 
 func (m *BlockStoreState) Marshal() (dAtA []byte, err error) {

proto/store/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.store;
+package tendermint.store;
 
 option go_package = "github.com/tendermint/tendermint/proto/store";
 

proto/types/block.pb.go

@@ -92,31 +92,30 @@ func (m *Block) GetLastCommit() *Commit {
 }
 
 func init() {
-	proto.RegisterType((*Block)(nil), "tendermint.proto.types.Block")
+	proto.RegisterType((*Block)(nil), "tendermint.types.Block")
 }
 
 func init() { proto.RegisterFile("proto/types/block.proto", fileDescriptor_3aa007336dea920d) }
 
 var fileDescriptor_3aa007336dea920d = []byte{
-	// 273 bytes of a gzipped FileDescriptorProto
+	// 270 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x28, 0xca, 0x2f,
 	0xc9, 0xd7, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xca, 0xc9, 0x4f, 0xce, 0xd6, 0x03, 0x8b,
-	0x08, 0x89, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0x40, 0x44, 0xf4, 0xc0,
-	0x6a, 0xa4, 0xd4, 0x4a, 0x32, 0x32, 0x8b, 0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a, 0xf5, 0x21,
-	0x9a, 0xd3, 0xf3, 0xd3, 0xf3, 0x11, 0x2c, 0x88, 0x6a, 0x29, 0x14, 0x83, 0xc1, 0x24, 0x54, 0x42,
-	0x0a, 0x59, 0x22, 0xb5, 0x2c, 0x33, 0x25, 0x35, 0x2f, 0x39, 0x15, 0x22, 0xa7, 0xd4, 0xc6, 0xc4,
-	0xc5, 0xea, 0x04, 0x72, 0x84, 0x90, 0x0d, 0x17, 0x5b, 0x46, 0x6a, 0x62, 0x4a, 0x6a, 0x91, 0x04,
-	0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x9c, 0x1e, 0x76, 0xf7, 0xe8, 0x79, 0x80, 0x55, 0x39, 0xb1,
-	0x9c, 0xb8, 0x27, 0xcf, 0x10, 0x04, 0xd5, 0x23, 0x64, 0xc6, 0xc5, 0x92, 0x92, 0x58, 0x92, 0x28,
-	0xc1, 0x04, 0xd6, 0x2b, 0x83, 0x4b, 0xaf, 0x4b, 0x62, 0x49, 0x22, 0x54, 0x27, 0x58, 0xbd, 0x90,
-	0x1b, 0x17, 0x07, 0xcc, 0x45, 0x12, 0xcc, 0x60, 0xbd, 0x2a, 0xb8, 0xf4, 0xba, 0x42, 0xd5, 0x21,
-	0x99, 0x01, 0xd7, 0x2b, 0x64, 0xcf, 0xc5, 0x9d, 0x93, 0x58, 0x5c, 0x12, 0x9f, 0x9c, 0x9f, 0x9b,
-	0x9b, 0x59, 0x22, 0xc1, 0x82, 0xdf, 0x0b, 0xce, 0x60, 0x55, 0x41, 0x5c, 0x20, 0x2d, 0x10, 0xb6,
-	0x93, 0xdb, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1,
-	0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0xa4, 0x67, 0x96,
-	0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0xcc, 0x43, 0x66, 0x22, 0x85, 0x6f, 0x12,
-	0x1b, 0x98, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x42, 0x07, 0x4a, 0xe7, 0x01, 0x00,
-	0x00,
+	0x08, 0x09, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x81, 0x65, 0xa5,
+	0xd4, 0x4a, 0x32, 0x32, 0x8b, 0x52, 0xe2, 0x0b, 0x12, 0x8b, 0x4a, 0x2a, 0xf5, 0x21, 0xda, 0xd2,
+	0xf3, 0xd3, 0xf3, 0x11, 0x2c, 0x88, 0x4e, 0x29, 0x14, 0x23, 0xc1, 0x24, 0x54, 0x42, 0x0a, 0x59,
+	0x22, 0xb5, 0x2c, 0x33, 0x25, 0x35, 0x2f, 0x39, 0x15, 0x22, 0xa7, 0xf4, 0x8e, 0x91, 0x8b, 0xd5,
+	0x09, 0x64, 0xbd, 0x90, 0x19, 0x17, 0x5b, 0x46, 0x6a, 0x62, 0x4a, 0x6a, 0x91, 0x04, 0xa3, 0x02,
+	0xa3, 0x06, 0xb7, 0x91, 0x84, 0x1e, 0xba, 0x4b, 0xf4, 0x3c, 0xc0, 0xf2, 0x4e, 0x2c, 0x27, 0xee,
+	0xc9, 0x33, 0x04, 0x41, 0x55, 0x0b, 0x19, 0x70, 0xb1, 0xa4, 0x24, 0x96, 0x24, 0x4a, 0x30, 0x81,
+	0x75, 0x89, 0x61, 0xea, 0x72, 0x49, 0x2c, 0x49, 0x84, 0xea, 0x01, 0xab, 0x14, 0x72, 0xe0, 0xe2,
+	0x80, 0xb9, 0x42, 0x82, 0x19, 0xac, 0x4b, 0x0e, 0x53, 0x97, 0x2b, 0x54, 0x05, 0x92, 0x6e, 0xb8,
+	0x2e, 0x21, 0x4b, 0x2e, 0xee, 0x9c, 0xc4, 0xe2, 0x92, 0xf8, 0xe4, 0xfc, 0xdc, 0xdc, 0xcc, 0x12,
+	0x09, 0x16, 0x5c, 0x0e, 0x76, 0x06, 0xcb, 0x07, 0x71, 0x81, 0x14, 0x43, 0xd8, 0x4e, 0x6e, 0x27,
+	0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c,
+	0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x93, 0x9e, 0x59, 0x92, 0x51, 0x9a,
+	0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f, 0x30, 0x09, 0x99, 0x89, 0x14, 0x8e, 0x49, 0x6c, 0x60, 0x8e,
+	0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x84, 0x9a, 0x05, 0x41, 0xc9, 0x01, 0x00, 0x00,
 }
 
 func (m *Block) Marshal() (dAtA []byte, err error) {

proto/types/block.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.types;
+package tendermint.types;
 
 option go_package = "github.com/tendermint/tendermint/proto/types";
 
@@ -8,8 +8,8 @@ import "proto/types/types.proto";
 import "proto/types/evidence.proto";
 
 message Block {
-  Header                              header      = 1 [(gogoproto.nullable) = false];
-  Data                                data        = 2 [(gogoproto.nullable) = false];
-  tendermint.proto.types.EvidenceData evidence    = 3 [(gogoproto.nullable) = false];
-  Commit                              last_commit = 4;
+  Header                        header      = 1 [(gogoproto.nullable) = false];
+  Data                          data        = 2 [(gogoproto.nullable) = false];
+  tendermint.types.EvidenceData evidence    = 3 [(gogoproto.nullable) = false];
+  Commit                        last_commit = 4;
 }

proto/types/canonical.pb.go

@@ -133,7 +133,7 @@ func (m *CanonicalPartSetHeader) GetHash() []byte {
 }
 
 type CanonicalProposal struct {
-	Type      SignedMsgType     `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.proto.types.SignedMsgType" json:"type,omitempty"`
+	Type      SignedMsgType     `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"`
 	Height    int64             `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"`
 	Round     int64             `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"`
 	POLRound  int64             `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"`
@@ -225,7 +225,7 @@ func (m *CanonicalProposal) GetChainID() string {
 }
 
 type CanonicalVote struct {
-	Type      SignedMsgType     `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.proto.types.SignedMsgType" json:"type,omitempty"`
+	Type      SignedMsgType     `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"`
 	Height    int64             `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"`
 	Round     int64             `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"`
 	BlockID   *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"`
@@ -309,47 +309,47 @@ func (m *CanonicalVote) GetChainID() string {
 }
 
 func init() {
-	proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.proto.types.CanonicalBlockID")
-	proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.proto.types.CanonicalPartSetHeader")
-	proto.RegisterType((*CanonicalProposal)(nil), "tendermint.proto.types.CanonicalProposal")
-	proto.RegisterType((*CanonicalVote)(nil), "tendermint.proto.types.CanonicalVote")
+	proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.types.CanonicalBlockID")
+	proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.types.CanonicalPartSetHeader")
+	proto.RegisterType((*CanonicalProposal)(nil), "tendermint.types.CanonicalProposal")
+	proto.RegisterType((*CanonicalVote)(nil), "tendermint.types.CanonicalVote")
 }
 
 func init() { proto.RegisterFile("proto/types/canonical.proto", fileDescriptor_3f9b1d584b46f180) }
 
 var fileDescriptor_3f9b1d584b46f180 = []byte{
-	// 493 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0x6e, 0xba, 0x69, 0x9b, 0x4e, 0xbb, 0xb2, 0x0e, 0x52, 0x43, 0x85, 0xa4, 0x14, 0x5c, 0x22,
-	0xc8, 0x04, 0xd6, 0x93, 0xd7, 0xac, 0x88, 0x05, 0xc5, 0x32, 0xbb, 0x28, 0x78, 0x29, 0xd3, 0x64,
-	0x4c, 0x06, 0xd3, 0x4c, 0x48, 0xa6, 0x87, 0x9e, 0xfc, 0x0b, 0xfb, 0x6b, 0xfc, 0x0d, 0x7b, 0xdc,
-	0xa3, 0xa7, 0x2a, 0x29, 0xfe, 0x0f, 0x99, 0x99, 0xb6, 0xe9, 0x61, 0x8b, 0x07, 0xc5, 0x4b, 0x78,
-	0xef, 0x7b, 0xef, 0x7d, 0xef, 0xcb, 0xf7, 0x18, 0xf0, 0x24, 0x2f, 0xb8, 0xe0, 0xbe, 0x58, 0xe5,
-	0xb4, 0xf4, 0x43, 0x92, 0xf1, 0x8c, 0x85, 0x24, 0x45, 0x0a, 0x85, 0x03, 0x41, 0xb3, 0x88, 0x16,
-	0x0b, 0x96, 0x09, 0x8d, 0x20, 0xd5, 0x37, 0x3c, 0x17, 0x09, 0x2b, 0xa2, 0x59, 0x4e, 0x0a, 0xb1,
-	0xf2, 0x35, 0x41, 0xcc, 0x63, 0x5e, 0x47, 0xba, 0x7b, 0xf8, 0xf8, 0x90, 0x5c, 0x7d, 0xb7, 0x05,
-	0x37, 0xe6, 0x3c, 0x4e, 0xa9, 0x9e, 0x9d, 0x2f, 0x3f, 0xfb, 0x82, 0x2d, 0x68, 0x29, 0xc8, 0x22,
-	0xd7, 0x0d, 0xe3, 0xaf, 0xe0, 0xec, 0x72, 0x27, 0x26, 0x48, 0x79, 0xf8, 0x65, 0xf2, 0x0a, 0x42,
-	0x60, 0x26, 0xa4, 0x4c, 0x6c, 0x63, 0x64, 0x78, 0x7d, 0xac, 0x62, 0xf8, 0x11, 0xf4, 0xa5, 0x8a,
-	0x72, 0x96, 0x50, 0x12, 0xd1, 0xc2, 0x6e, 0x8e, 0x0c, 0xaf, 0x77, 0x81, 0xd0, 0xfd, 0xc2, 0xd1,
-	0x9e, 0x73, 0x4a, 0x0a, 0x71, 0x45, 0xc5, 0x1b, 0x35, 0x15, 0x98, 0xb7, 0x6b, 0xb7, 0x81, 0x7b,
-	0x8a, 0x49, 0x43, 0xe3, 0x00, 0x0c, 0xee, 0x6f, 0x86, 0x8f, 0x40, 0x4b, 0x70, 0x41, 0x52, 0xa5,
-	0xe3, 0x14, 0xeb, 0x64, 0x2f, 0xae, 0x59, 0x8b, 0x1b, 0xff, 0x6a, 0x82, 0x87, 0x35, 0x49, 0xc1,
-	0x73, 0x5e, 0x92, 0x14, 0xbe, 0x04, 0xa6, 0x14, 0xa3, 0xc6, 0x1f, 0x5c, 0x3c, 0x3d, 0x26, 0xf5,
-	0x8a, 0xc5, 0x19, 0x8d, 0xde, 0x95, 0xf1, 0xf5, 0x2a, 0xa7, 0x58, 0x8d, 0xc0, 0x01, 0x68, 0x27,
-	0x94, 0xc5, 0x89, 0x50, 0x6b, 0xce, 0xf0, 0x36, 0x93, 0x92, 0x0a, 0xbe, 0xcc, 0x22, 0xfb, 0x44,
-	0xc1, 0x3a, 0x81, 0xcf, 0x40, 0x37, 0xe7, 0xe9, 0x4c, 0x57, 0xcc, 0x91, 0xe1, 0x9d, 0x04, 0xfd,
-	0x6a, 0xed, 0x5a, 0xd3, 0xf7, 0x6f, 0xb1, 0xc4, 0xb0, 0x95, 0xf3, 0x54, 0x45, 0x70, 0x0a, 0xac,
-	0xb9, 0x74, 0x79, 0xc6, 0x22, 0xbb, 0xa5, 0x2c, 0xf4, 0xfe, 0x68, 0xe1, 0xf6, 0x2c, 0x41, 0xaf,
-	0x5a, 0xbb, 0x9d, 0x6d, 0x82, 0x3b, 0x8a, 0x66, 0x12, 0xc1, 0x00, 0x74, 0xf7, 0x37, 0xb5, 0xdb,
-	0x8a, 0x72, 0x88, 0xf4, 0xd5, 0xd1, 0xee, 0xea, 0xe8, 0x7a, 0xd7, 0x11, 0x58, 0xf2, 0x02, 0x37,
-	0x3f, 0x5c, 0x03, 0xd7, 0x63, 0xf0, 0x1c, 0x58, 0x61, 0x42, 0x58, 0x26, 0x55, 0x75, 0x46, 0x86,
-	0xd7, 0xd5, 0xbb, 0x2e, 0x25, 0x26, 0x77, 0xa9, 0xe2, 0x24, 0x1a, 0x7f, 0x6b, 0x82, 0xd3, 0xbd,
-	0xac, 0x0f, 0x5c, 0xd0, 0xff, 0xe7, 0xf1, 0xa1, 0x71, 0xe6, 0xbf, 0x37, 0xae, 0xf5, 0xf7, 0xc6,
-	0xb5, 0x8f, 0x1b, 0x17, 0xbc, 0xbe, 0xad, 0x1c, 0xe3, 0xae, 0x72, 0x8c, 0x9f, 0x95, 0x63, 0xdc,
-	0x6c, 0x9c, 0xc6, 0xdd, 0xc6, 0x69, 0x7c, 0xdf, 0x38, 0x8d, 0x4f, 0xcf, 0x63, 0x26, 0x92, 0xe5,
-	0x1c, 0x85, 0x7c, 0xe1, 0xd7, 0xff, 0x73, 0x18, 0x1e, 0x3c, 0xed, 0x79, 0x5b, 0x25, 0x2f, 0x7e,
-	0x07, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xd1, 0x62, 0xe9, 0x4d, 0x04, 0x00, 0x00,
+	// 489 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xcb, 0x6e, 0xd3, 0x40,
+	0x14, 0xcd, 0xa4, 0x4e, 0xe2, 0x4c, 0x52, 0x14, 0x46, 0xa8, 0x58, 0x41, 0xb2, 0x23, 0x2f, 0x2a,
+	0x23, 0x21, 0x5b, 0x6a, 0xff, 0xc0, 0x45, 0x88, 0x20, 0x10, 0x65, 0x5a, 0xb1, 0x60, 0x13, 0x4d,
+	0xec, 0xc1, 0x1e, 0xe1, 0x78, 0x2c, 0x7b, 0xb2, 0xc8, 0x5f, 0xf4, 0x3b, 0xf8, 0x92, 0x2e, 0xbb,
+	0x84, 0x4d, 0x40, 0xce, 0x8f, 0xa0, 0x99, 0x49, 0xe2, 0x88, 0xd7, 0x06, 0xd4, 0x8d, 0x75, 0x1f,
+	0xe7, 0x9e, 0x7b, 0x7c, 0xae, 0x06, 0x3e, 0x29, 0x4a, 0x2e, 0x78, 0x20, 0x56, 0x05, 0xad, 0x82,
+	0x88, 0xe4, 0x3c, 0x67, 0x11, 0xc9, 0x7c, 0x55, 0x45, 0x23, 0x41, 0xf3, 0x98, 0x96, 0x0b, 0x96,
+	0x0b, 0x5f, 0x21, 0xc6, 0xa7, 0x22, 0x65, 0x65, 0x3c, 0x2b, 0x48, 0x29, 0x56, 0x81, 0x1e, 0x4d,
+	0x78, 0xc2, 0x9b, 0x48, 0x4f, 0x8e, 0x1f, 0x1f, 0xd2, 0xaa, 0xef, 0xb6, 0xe1, 0x24, 0x9c, 0x27,
+	0x19, 0xd5, 0xb3, 0xf3, 0xe5, 0xc7, 0x40, 0xb0, 0x05, 0xad, 0x04, 0x59, 0x14, 0x1a, 0xe0, 0xae,
+	0xe0, 0xe8, 0x62, 0x27, 0x23, 0xcc, 0x78, 0xf4, 0x69, 0xfa, 0x1c, 0x21, 0x68, 0xa4, 0xa4, 0x4a,
+	0x2d, 0x30, 0x01, 0xde, 0x10, 0xab, 0x18, 0xbd, 0x83, 0x43, 0xa9, 0xa2, 0x9a, 0xa5, 0x94, 0xc4,
+	0xb4, 0xb4, 0xda, 0x13, 0xe0, 0x0d, 0xce, 0x3c, 0xff, 0x67, 0xc9, 0xfe, 0x9e, 0xed, 0x92, 0x94,
+	0xe2, 0x8a, 0x8a, 0x97, 0x0a, 0x1f, 0x1a, 0xb7, 0x6b, 0xa7, 0x85, 0x07, 0x8a, 0x43, 0x97, 0xdc,
+	0x10, 0x9e, 0xfc, 0x1e, 0x8c, 0x1e, 0xc1, 0x8e, 0xe0, 0x82, 0x64, 0x4a, 0xc1, 0x31, 0xd6, 0xc9,
+	0x5e, 0x56, 0xbb, 0x91, 0xe5, 0x7e, 0x6d, 0xc3, 0x87, 0x0d, 0x49, 0xc9, 0x0b, 0x5e, 0x91, 0x0c,
+	0x9d, 0x43, 0x43, 0x8a, 0x51, 0xe3, 0x0f, 0xce, 0x9c, 0x5f, 0x45, 0x5e, 0xb1, 0x24, 0xa7, 0xf1,
+	0x9b, 0x2a, 0xb9, 0x5e, 0x15, 0x14, 0x2b, 0x30, 0x3a, 0x81, 0xdd, 0x94, 0xb2, 0x24, 0x15, 0x6a,
+	0xc1, 0x08, 0x6f, 0x33, 0x29, 0xa6, 0xe4, 0xcb, 0x3c, 0xb6, 0x8e, 0x54, 0x59, 0x27, 0xe8, 0x29,
+	0xec, 0x17, 0x3c, 0x9b, 0xe9, 0x8e, 0x31, 0x01, 0xde, 0x51, 0x38, 0xac, 0xd7, 0x8e, 0x79, 0xf9,
+	0xf6, 0x35, 0x96, 0x35, 0x6c, 0x16, 0x3c, 0x53, 0x11, 0x7a, 0x05, 0xcd, 0xb9, 0x74, 0x76, 0xc6,
+	0x62, 0xab, 0xa3, 0x6c, 0x73, 0xff, 0x62, 0xdb, 0xf6, 0x08, 0xe1, 0xa0, 0x5e, 0x3b, 0xbd, 0x6d,
+	0x82, 0x7b, 0x8a, 0x60, 0x1a, 0xa3, 0x10, 0xf6, 0xf7, 0x17, 0xb4, 0xba, 0x8a, 0x6c, 0xec, 0xeb,
+	0x1b, 0xfb, 0xbb, 0x1b, 0xfb, 0xd7, 0x3b, 0x44, 0x68, 0x4a, 0xd7, 0x6f, 0xbe, 0x39, 0x00, 0x37,
+	0x63, 0xe8, 0x14, 0x9a, 0x51, 0x4a, 0x58, 0x2e, 0xf5, 0xf4, 0x26, 0xc0, 0xeb, 0xeb, 0x5d, 0x17,
+	0xb2, 0x26, 0x77, 0xa9, 0xe6, 0x34, 0x76, 0x3f, 0xb7, 0xe1, 0xf1, 0x5e, 0xd6, 0x7b, 0x2e, 0xe8,
+	0x7d, 0xf8, 0x7a, 0x68, 0x96, 0xf1, 0x3f, 0xcd, 0xea, 0xfc, 0xbb, 0x59, 0xdd, 0x3f, 0x9b, 0x15,
+	0xbe, 0xb8, 0xad, 0x6d, 0x70, 0x57, 0xdb, 0xe0, 0x7b, 0x6d, 0x83, 0x9b, 0x8d, 0xdd, 0xba, 0xdb,
+	0xd8, 0xad, 0x2f, 0x1b, 0xbb, 0xf5, 0xe1, 0x59, 0xc2, 0x44, 0xba, 0x9c, 0xfb, 0x11, 0x5f, 0x04,
+	0xcd, 0x9f, 0x1c, 0x86, 0x07, 0x8f, 0x77, 0xde, 0x55, 0xc9, 0xf9, 0x8f, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x6b, 0xbc, 0x84, 0x74, 0x29, 0x04, 0x00, 0x00,
 }
 
 func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) {

proto/types/canonical.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.types;
+package tendermint.types;
 
 option go_package = "github.com/tendermint/tendermint/proto/types";
 

proto/types/events.pb.go

@@ -83,25 +83,25 @@ func (m *EventDataRoundState) GetStep() string {
 }
 
 func init() {
-	proto.RegisterType((*EventDataRoundState)(nil), "tendermint.proto.types.EventDataRoundState")
+	proto.RegisterType((*EventDataRoundState)(nil), "tendermint.types.EventDataRoundState")
 }
 
 func init() { proto.RegisterFile("proto/types/events.proto", fileDescriptor_1bb9bdae76a076d6) }
 
 var fileDescriptor_1bb9bdae76a076d6 = []byte{
-	// 188 bytes of a gzipped FileDescriptorProto
+	// 186 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x28, 0xca, 0x2f,
 	0xc9, 0xd7, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x2d, 0x4b, 0xcd, 0x2b, 0x29, 0xd6, 0x03,
-	0x0b, 0x09, 0x89, 0x95, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0x40, 0x44, 0xf4,
-	0xc0, 0x8a, 0x94, 0xc2, 0xb9, 0x84, 0x5d, 0x41, 0xea, 0x5c, 0x12, 0x4b, 0x12, 0x83, 0xf2, 0x4b,
-	0xf3, 0x52, 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0xc4, 0xb8, 0xd8, 0x32, 0x52, 0x33, 0xd3, 0x33,
-	0x4a, 0x24, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xa0, 0x3c, 0x21, 0x11, 0x2e, 0xd6, 0x22, 0x90,
-	0x2a, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x08, 0x47, 0x48, 0x88, 0x8b, 0xa5, 0xb8, 0x24,
-	0xb5, 0x40, 0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0x72, 0x3b, 0xf1, 0x48, 0x8e,
-	0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58,
-	0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x9d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4,
-	0xfc, 0x5c, 0x7d, 0x84, 0xab, 0x90, 0x99, 0x48, 0xbe, 0x48, 0x62, 0x03, 0x73, 0x8c, 0x01, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x66, 0xcc, 0x41, 0x01, 0xdb, 0x00, 0x00, 0x00,
+	0x0b, 0x09, 0x09, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xe8, 0x81, 0xa5,
+	0x95, 0xc2, 0xb9, 0x84, 0x5d, 0x41, 0x2a, 0x5c, 0x12, 0x4b, 0x12, 0x83, 0xf2, 0x4b, 0xf3, 0x52,
+	0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0xc4, 0xb8, 0xd8, 0x32, 0x52, 0x33, 0xd3, 0x33, 0x4a, 0x24,
+	0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xa0, 0x3c, 0x21, 0x11, 0x2e, 0xd6, 0x22, 0x90, 0x2a, 0x09,
+	0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x08, 0x47, 0x48, 0x88, 0x8b, 0xa5, 0xb8, 0x24, 0xb5, 0x40,
+	0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0x72, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2,
+	0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1,
+	0xc6, 0x63, 0x39, 0x86, 0x28, 0x9d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c,
+	0x7d, 0x84, 0x7b, 0x90, 0x99, 0x48, 0xee, 0x4f, 0x62, 0x03, 0x73, 0x8c, 0x01, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0xee, 0x5d, 0x95, 0x24, 0xd5, 0x00, 0x00, 0x00,
 }
 
 func (m *EventDataRoundState) Marshal() (dAtA []byte, err error) {

proto/types/events.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.types;
+package tendermint.types;
 
 option go_package = "github.com/tendermint/tendermint/proto/types";
 

proto/types/evidence.pb.go

@@ -756,82 +756,81 @@ func (m *ProofOfLockChange) GetPubKey() *keys.PublicKey {
 }
 
 func init() {
-	proto.RegisterType((*DuplicateVoteEvidence)(nil), "tendermint.proto.types.DuplicateVoteEvidence")
-	proto.RegisterType((*PotentialAmnesiaEvidence)(nil), "tendermint.proto.types.PotentialAmnesiaEvidence")
-	proto.RegisterType((*AmnesiaEvidence)(nil), "tendermint.proto.types.AmnesiaEvidence")
-	proto.RegisterType((*MockEvidence)(nil), "tendermint.proto.types.MockEvidence")
-	proto.RegisterType((*MockRandomEvidence)(nil), "tendermint.proto.types.MockRandomEvidence")
-	proto.RegisterType((*ConflictingHeadersEvidence)(nil), "tendermint.proto.types.ConflictingHeadersEvidence")
-	proto.RegisterType((*LunaticValidatorEvidence)(nil), "tendermint.proto.types.LunaticValidatorEvidence")
-	proto.RegisterType((*PhantomValidatorEvidence)(nil), "tendermint.proto.types.PhantomValidatorEvidence")
-	proto.RegisterType((*Evidence)(nil), "tendermint.proto.types.Evidence")
-	proto.RegisterType((*EvidenceData)(nil), "tendermint.proto.types.EvidenceData")
-	proto.RegisterType((*ProofOfLockChange)(nil), "tendermint.proto.types.ProofOfLockChange")
+	proto.RegisterType((*DuplicateVoteEvidence)(nil), "tendermint.types.DuplicateVoteEvidence")
+	proto.RegisterType((*PotentialAmnesiaEvidence)(nil), "tendermint.types.PotentialAmnesiaEvidence")
+	proto.RegisterType((*AmnesiaEvidence)(nil), "tendermint.types.AmnesiaEvidence")
+	proto.RegisterType((*MockEvidence)(nil), "tendermint.types.MockEvidence")
+	proto.RegisterType((*MockRandomEvidence)(nil), "tendermint.types.MockRandomEvidence")
+	proto.RegisterType((*ConflictingHeadersEvidence)(nil), "tendermint.types.ConflictingHeadersEvidence")
+	proto.RegisterType((*LunaticValidatorEvidence)(nil), "tendermint.types.LunaticValidatorEvidence")
+	proto.RegisterType((*PhantomValidatorEvidence)(nil), "tendermint.types.PhantomValidatorEvidence")
+	proto.RegisterType((*Evidence)(nil), "tendermint.types.Evidence")
+	proto.RegisterType((*EvidenceData)(nil), "tendermint.types.EvidenceData")
+	proto.RegisterType((*ProofOfLockChange)(nil), "tendermint.types.ProofOfLockChange")
 }
 
 func init() { proto.RegisterFile("proto/types/evidence.proto", fileDescriptor_86495eef24aeacc0) }
 
 var fileDescriptor_86495eef24aeacc0 = []byte{
-	// 930 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcf, 0x8f, 0xdb, 0x44,
-	0x14, 0xb6, 0x37, 0xd9, 0x74, 0xfb, 0x36, 0x65, 0x8b, 0xd5, 0xd2, 0x28, 0xb4, 0xd9, 0xc5, 0x42,
-	0x74, 0x8b, 0xc0, 0xd9, 0xa6, 0x88, 0x1b, 0x12, 0x9b, 0xfe, 0x50, 0xaa, 0x2d, 0xa2, 0x9a, 0xad,
-	0x8a, 0xc4, 0x01, 0x6b, 0x62, 0x4f, 0xec, 0x51, 0x6c, 0x8f, 0x65, 0x4f, 0x82, 0x72, 0xe4, 0x06,
-	0xb7, 0x4a, 0xfc, 0x11, 0x9c, 0xb8, 0x72, 0xe6, 0x58, 0x89, 0x4b, 0xc5, 0x89, 0x13, 0xa0, 0xdd,
-	0x7f, 0x04, 0xcd, 0x8c, 0xed, 0xa4, 0x9b, 0x4c, 0x88, 0x38, 0x20, 0xf5, 0x12, 0x39, 0x6f, 0xde,
-	0xfb, 0xde, 0xf7, 0xc6, 0xdf, 0x7c, 0x1e, 0x68, 0xa7, 0x19, 0xe3, 0xac, 0xcb, 0x67, 0x29, 0xc9,
-	0xbb, 0x64, 0x4a, 0x7d, 0x92, 0x78, 0xc4, 0x91, 0x41, 0xeb, 0x1d, 0x4e, 0x12, 0x9f, 0x64, 0x31,
-	0x4d, 0xb8, 0x8a, 0x38, 0x32, 0xad, 0xfd, 0x01, 0x0f, 0x69, 0xe6, 0xbb, 0x29, 0xce, 0xf8, 0xac,
-	0xab, 0xea, 0x03, 0x16, 0xb0, 0xf9, 0x93, 0xca, 0x6e, 0xdf, 0x58, 0xc4, 0x96, 0xbf, 0xc5, 0xc2,
-	0x7e, 0xc0, 0x58, 0x10, 0x11, 0x55, 0x3b, 0x9c, 0x8c, 0xba, 0x9c, 0xc6, 0x24, 0xe7, 0x38, 0x4e,
-	0x8b, 0x84, 0x5b, 0xaa, 0xd2, 0xcb, 0x66, 0x29, 0x67, 0xdd, 0x31, 0x99, 0xbd, 0x56, 0x6f, 0x7f,
-	0x67, 0xc2, 0xf5, 0x07, 0x93, 0x34, 0xa2, 0x1e, 0xe6, 0xe4, 0x39, 0xe3, 0xe4, 0x61, 0x41, 0xdc,
-	0xba, 0x07, 0x8d, 0x29, 0xe3, 0xc4, 0xc5, 0x2d, 0xf3, 0xc0, 0x3c, 0xdc, 0xed, 0xdd, 0x74, 0x56,
-	0xcf, 0xe0, 0x88, 0x2a, 0xb4, 0x2d, 0x72, 0x8f, 0xab, 0xa2, 0x61, 0x6b, 0x6b, 0xd3, 0xa2, 0xbe,
-	0xfd, 0x93, 0x09, 0xad, 0xa7, 0x8c, 0x93, 0x84, 0x53, 0x1c, 0x1d, 0xc7, 0x09, 0xc9, 0x29, 0xfe,
-	0xff, 0x69, 0x58, 0xef, 0x41, 0x33, 0x24, 0x34, 0x08, 0xb9, 0x2b, 0xf7, 0xaf, 0x55, 0x3b, 0x30,
-	0x0f, 0x6b, 0x68, 0x57, 0xc5, 0x4e, 0x45, 0xc8, 0xfe, 0xd5, 0x84, 0xbd, 0x8b, 0x04, 0x13, 0x68,
-	0xa7, 0x25, 0x79, 0x17, 0xab, 0x45, 0xb7, 0x7c, 0xfd, 0x05, 0xe9, 0x23, 0x5d, 0x7f, 0xdd, 0xd8,
-	0xa8, 0x95, 0xea, 0x36, 0xe4, 0x33, 0xa8, 0xa7, 0x2c, 0xf2, 0x8a, 0xc9, 0xee, 0x68, 0x91, 0x33,
-	0xc6, 0x46, 0x5f, 0x8e, 0x9e, 0x30, 0x6f, 0x7c, 0x3f, 0xc4, 0x49, 0x40, 0x90, 0x2c, 0xb3, 0x7f,
-	0x36, 0xa1, 0xf9, 0x05, 0xf3, 0xc6, 0x15, 0xde, 0x6d, 0xd8, 0x2b, 0xd9, 0xba, 0x6a, 0x56, 0x49,
-	0xba, 0x86, 0xde, 0x2a, 0xc3, 0x03, 0x19, 0xb5, 0x1e, 0xc3, 0x95, 0x2a, 0x51, 0xa8, 0xac, 0x60,
-	0xd0, 0x76, 0x94, 0x04, 0x9d, 0x52, 0x82, 0xce, 0xb3, 0x52, 0x82, 0xfd, 0x9d, 0x97, 0x7f, 0xee,
-	0x1b, 0x2f, 0xfe, 0xda, 0x37, 0x51, 0xb3, 0x2c, 0x15, 0x8b, 0xd6, 0x1d, 0xb8, 0x5a, 0x41, 0x61,
-	0xdf, 0xcf, 0x48, 0x9e, 0xcb, 0xed, 0x6e, 0xa2, 0x8a, 0xcb, 0xb1, 0x0a, 0xdb, 0xbf, 0x9b, 0x60,
-	0x09, 0xbe, 0x08, 0x27, 0x3e, 0x8b, 0xdf, 0x10, 0xd6, 0xd6, 0x2d, 0x80, 0x0c, 0x27, 0xbe, 0x3b,
-	0x9c, 0x71, 0x92, 0xb7, 0xea, 0x32, 0xe9, 0xb2, 0x88, 0xf4, 0x45, 0xc0, 0xfe, 0xde, 0x84, 0xf6,
-	0x7d, 0x96, 0x8c, 0x22, 0xea, 0x71, 0x9a, 0x04, 0x03, 0x82, 0x7d, 0x92, 0xe5, 0xd5, 0x70, 0x9f,
-	0xc0, 0x56, 0x78, 0xb7, 0x90, 0xce, 0xfb, 0xba, 0x17, 0x7c, 0x4a, 0x83, 0x84, 0xf8, 0xaa, 0x14,
-	0x6d, 0x85, 0x77, 0x65, 0x55, 0xaf, 0x18, 0x6f, 0xd3, 0xaa, 0x9e, 0xfd, 0x8b, 0x09, 0xad, 0x27,
-	0x93, 0x04, 0x73, 0xea, 0x3d, 0xc7, 0x11, 0xf5, 0x31, 0x67, 0x59, 0x45, 0xe4, 0x53, 0x68, 0x84,
-	0x32, 0xb5, 0x20, 0xd3, 0xd1, 0xc1, 0x16, 0x80, 0x45, 0xb6, 0x75, 0x04, 0x75, 0x71, 0xa6, 0x36,
-	0x3a, 0x7d, 0x32, 0xd3, 0x3a, 0x82, 0x6b, 0x34, 0x99, 0x0a, 0x02, 0xae, 0xc2, 0x70, 0x47, 0x94,
-	0x44, 0xbe, 0xdc, 0xdf, 0xcb, 0xc8, 0x2a, 0xd6, 0x54, 0x9b, 0x47, 0x62, 0xc5, 0xfe, 0x51, 0xb8,
-	0x46, 0x88, 0x13, 0xce, 0xe2, 0x65, 0xe2, 0x25, 0x01, 0x73, 0x63, 0x02, 0x0f, 0xe1, 0x20, 0xc2,
-	0x39, 0x2f, 0xc4, 0xe4, 0x4e, 0x4b, 0x48, 0xf7, 0x5b, 0x9c, 0xbb, 0x34, 0x71, 0x73, 0xc2, 0xe5,
-	0x38, 0x35, 0xf4, 0xae, 0xc8, 0x53, 0xea, 0xaa, 0x1a, 0x7f, 0x85, 0xf3, 0xc7, 0xc9, 0x29, 0xe1,
-	0xf6, 0x6f, 0x0d, 0xd8, 0xa9, 0x58, 0x04, 0x70, 0xc3, 0x2f, 0xbd, 0xd5, 0x95, 0x86, 0x74, 0xc1,
-	0x17, 0x3e, 0xd6, 0x11, 0x5b, 0x69, 0xc9, 0x03, 0x03, 0x5d, 0xf7, 0x57, 0x7a, 0xf5, 0x14, 0x6e,
-	0x7a, 0x73, 0x39, 0x15, 0x3b, 0x98, 0xcf, 0xbb, 0xa9, 0xf7, 0xd0, 0xd3, 0x75, 0xd3, 0x4b, 0x71,
-	0x60, 0xa0, 0xb6, 0xa7, 0x17, 0x6a, 0x0a, 0xed, 0x48, 0x69, 0x67, 0x61, 0xc3, 0xaa, 0xae, 0xb5,
-	0xf5, 0xde, 0xa7, 0x53, 0xdd, 0xc0, 0x40, 0xad, 0x48, 0xa7, 0xc8, 0x74, 0xad, 0xdb, 0xd6, 0xff,
-	0x9b, 0xdb, 0x8a, 0x8e, 0x5a, 0xbf, 0x7d, 0x06, 0x57, 0x97, 0xfa, 0x6c, 0xcb, 0x3e, 0xb7, 0x75,
-	0x7d, 0x96, 0xe1, 0xf7, 0xf0, 0x05, 0x54, 0x31, 0x87, 0x12, 0xef, 0xaa, 0x9d, 0x6b, 0xfc, 0xcb,
-	0x1c, 0x1a, 0xd9, 0xcb, 0x39, 0x74, 0x47, 0xe2, 0x04, 0xae, 0xc4, 0xcc, 0x1b, 0xcf, 0x9b, 0x5c,
-	0x5a, 0xef, 0x14, 0x8b, 0x1f, 0x89, 0x81, 0x81, 0x9a, 0xf1, 0xe2, 0x47, 0xe3, 0x1b, 0xb8, 0x26,
-	0xc1, 0x32, 0xe9, 0xca, 0x73, 0xcc, 0x1d, 0x89, 0xf9, 0xe1, 0x3a, 0xcc, 0xd7, 0x8d, 0x7c, 0x60,
-	0x20, 0x2b, 0x5e, 0x8a, 0xf6, 0xb7, 0xa1, 0x96, 0x4f, 0x62, 0x7b, 0x04, 0xcd, 0x32, 0xf4, 0x00,
-	0x73, 0x6c, 0xf5, 0x61, 0x67, 0xe1, 0x04, 0xd5, 0x0e, 0x77, 0x7b, 0x07, 0xba, 0x56, 0x15, 0x54,
-	0x5d, 0xb8, 0x39, 0xaa, 0xea, 0x2c, 0x0b, 0xea, 0x21, 0xce, 0x43, 0x79, 0x26, 0x9a, 0x48, 0x3e,
-	0xdb, 0x3f, 0x98, 0xf0, 0xf6, 0xd2, 0x07, 0xd3, 0xea, 0x81, 0xbc, 0x19, 0xe4, 0x45, 0xab, 0x0d,
-	0x2e, 0x11, 0xb9, 0xf5, 0x39, 0x5c, 0x4a, 0x27, 0x43, 0x77, 0x4c, 0x66, 0xc5, 0xa1, 0x5b, 0x21,
-	0x12, 0x75, 0x17, 0x73, 0xc4, 0x5d, 0xcc, 0x79, 0x3a, 0x19, 0x46, 0xd4, 0x3b, 0x21, 0x33, 0xd4,
-	0x48, 0x27, 0xc3, 0x13, 0x32, 0xeb, 0x3f, 0x7a, 0x79, 0xd6, 0x31, 0x5f, 0x9d, 0x75, 0xcc, 0xbf,
-	0xcf, 0x3a, 0xe6, 0x8b, 0xf3, 0x8e, 0xf1, 0xea, 0xbc, 0x63, 0xfc, 0x71, 0xde, 0x31, 0xbe, 0xfe,
-	0x28, 0xa0, 0x3c, 0x9c, 0x0c, 0x1d, 0x8f, 0xc5, 0xdd, 0x39, 0xe8, 0xe2, 0xe3, 0xc2, 0x2d, 0x71,
-	0xd8, 0x90, 0x7f, 0xee, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xcb, 0x14, 0xa7, 0x97, 0x0a,
-	0x00, 0x00,
+	// 920 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x41, 0x6f, 0xdc, 0x44,
+	0x18, 0xb5, 0xb3, 0x9b, 0x6d, 0xfa, 0x75, 0x4b, 0x82, 0xd5, 0x52, 0x6b, 0xa1, 0x9b, 0xd4, 0x20,
+	0x5a, 0xaa, 0xe0, 0x6d, 0xc3, 0x01, 0x09, 0x71, 0xc9, 0xb6, 0xa9, 0xb6, 0x6a, 0x81, 0x6a, 0x82,
+	0x0a, 0xe2, 0x62, 0x66, 0xed, 0x59, 0x7b, 0xba, 0xb6, 0xc7, 0xb2, 0xc7, 0x41, 0x96, 0xe0, 0x27,
+	0x20, 0xf5, 0xde, 0x7f, 0x80, 0xc4, 0x8d, 0x1f, 0xd1, 0x63, 0xc5, 0x89, 0x13, 0xa0, 0xe4, 0x8f,
+	0xa0, 0x99, 0xb1, 0xbd, 0x9b, 0x78, 0xdd, 0xc0, 0x05, 0xa9, 0x97, 0x68, 0xf3, 0xcd, 0xf7, 0xbd,
+	0xf7, 0x66, 0xfc, 0xe6, 0xd9, 0x30, 0x48, 0x52, 0xc6, 0xd9, 0x88, 0x17, 0x09, 0xc9, 0x46, 0xe4,
+	0x88, 0x7a, 0x24, 0x76, 0x89, 0x2d, 0x8b, 0xc6, 0x16, 0x27, 0xb1, 0x47, 0xd2, 0x88, 0xc6, 0xdc,
+	0x96, 0x0d, 0x83, 0x0f, 0x79, 0x40, 0x53, 0xcf, 0x49, 0x70, 0xca, 0x8b, 0x91, 0x9a, 0xf4, 0x99,
+	0xcf, 0x16, 0xbf, 0xd4, 0xe4, 0xe0, 0xda, 0x32, 0xaa, 0xfc, 0x5b, 0x2e, 0x6c, 0xfb, 0x8c, 0xf9,
+	0x21, 0x51, 0xb3, 0xd3, 0x7c, 0x36, 0xe2, 0x34, 0x22, 0x19, 0xc7, 0x51, 0x52, 0x36, 0x5c, 0x57,
+	0x93, 0x6e, 0x5a, 0x24, 0x9c, 0x8d, 0xe6, 0xa4, 0x38, 0x35, 0x6f, 0xe5, 0x70, 0xf5, 0x7e, 0x9e,
+	0x84, 0xd4, 0xc5, 0x9c, 0x3c, 0x65, 0x9c, 0x1c, 0x94, 0x8a, 0x8d, 0x8f, 0xa1, 0x77, 0xc4, 0x38,
+	0x71, 0xb0, 0xa9, 0xef, 0xe8, 0xb7, 0x2e, 0xed, 0xbd, 0x63, 0x9f, 0x15, 0x6f, 0x8b, 0x7e, 0xb4,
+	0x2e, 0xba, 0xf6, 0xeb, 0xf6, 0xa9, 0xb9, 0x76, 0x7e, 0xfb, 0xd8, 0x7a, 0xa1, 0x83, 0xf9, 0x84,
+	0x71, 0x12, 0x73, 0x8a, 0xc3, 0xfd, 0x28, 0x26, 0x19, 0xc5, 0xff, 0x0f, 0xb5, 0x71, 0x03, 0xfa,
+	0x01, 0xa1, 0x7e, 0xc0, 0x1d, 0x79, 0x4c, 0x66, 0x67, 0x47, 0xbf, 0xd5, 0x41, 0x97, 0x54, 0xed,
+	0x50, 0x94, 0xac, 0xdf, 0x74, 0xd8, 0x3c, 0x2b, 0x2a, 0x80, 0x41, 0x52, 0x09, 0x76, 0xb0, 0x5a,
+	0x74, 0xaa, 0xe7, 0x5b, 0x0a, 0xbd, 0xdd, 0x64, 0x6e, 0xdb, 0x24, 0x32, 0x93, 0xb6, 0xed, 0x7f,
+	0x0a, 0xdd, 0x84, 0x85, 0x6e, 0xb9, 0x9b, 0xf7, 0x57, 0x60, 0xa6, 0x8c, 0xcd, 0xbe, 0x9a, 0x3d,
+	0x66, 0xee, 0xfc, 0x5e, 0x80, 0x63, 0x9f, 0x20, 0x39, 0x60, 0xfd, 0xaa, 0x43, 0xff, 0x0b, 0xe6,
+	0xce, 0x6b, 0xa4, 0x9b, 0xb0, 0x59, 0x29, 0x74, 0xd4, 0xfe, 0xa4, 0xd0, 0x0e, 0x7a, 0xab, 0x2a,
+	0x4f, 0x64, 0xd5, 0x78, 0x08, 0x97, 0xeb, 0x46, 0x61, 0xa0, 0x92, 0x7b, 0x60, 0x2b, 0x77, 0xd9,
+	0x95, 0xbb, 0xec, 0xaf, 0x2b, 0x77, 0x8d, 0x37, 0x5e, 0xfe, 0xb9, 0xad, 0x3d, 0xff, 0x6b, 0x5b,
+	0x47, 0xfd, 0x6a, 0x54, 0x2c, 0x1a, 0x1f, 0xc1, 0x56, 0x0d, 0x85, 0x3d, 0x2f, 0x25, 0x59, 0x26,
+	0x8f, 0xb8, 0x8f, 0x6a, 0x2d, 0xfb, 0xaa, 0x6c, 0xfd, 0xae, 0x83, 0x21, 0xf4, 0x22, 0x1c, 0x7b,
+	0x2c, 0x7a, 0x43, 0x54, 0x1b, 0xd7, 0x01, 0x52, 0x1c, 0x7b, 0xce, 0xb4, 0xe0, 0x24, 0x33, 0xbb,
+	0xb2, 0xe9, 0xa2, 0xa8, 0x8c, 0x45, 0xc1, 0xfa, 0x11, 0x06, 0xf7, 0x58, 0x3c, 0x0b, 0xa9, 0xcb,
+	0x69, 0xec, 0x4f, 0x08, 0xf6, 0x48, 0x9a, 0xd5, 0x7b, 0xb3, 0x61, 0x2d, 0xb8, 0x5b, 0xba, 0x65,
+	0xd8, 0x7c, 0xb2, 0x87, 0xd4, 0x8f, 0x89, 0xa7, 0x86, 0xd0, 0x5a, 0x70, 0x57, 0xf6, 0xef, 0x95,
+	0xfb, 0x3a, 0xbf, 0x7f, 0xcf, 0xfa, 0x45, 0x07, 0xf3, 0x71, 0x1e, 0x63, 0x4e, 0xdd, 0xa7, 0x38,
+	0xa4, 0x1e, 0xe6, 0x2c, 0xad, 0xc9, 0xef, 0x40, 0x2f, 0x90, 0xad, 0xa5, 0x00, 0xb3, 0x09, 0x58,
+	0x42, 0x95, 0x7d, 0xc6, 0x6d, 0xe8, 0x8a, 0x4b, 0x73, 0xce, 0xc5, 0x92, 0x3d, 0xc6, 0x1d, 0xb8,
+	0x42, 0xe3, 0x23, 0x41, 0xea, 0xa8, 0x69, 0x67, 0x46, 0x49, 0xe8, 0xc9, 0x63, 0xbc, 0x88, 0x8c,
+	0x72, 0x4d, 0x11, 0x3c, 0x10, 0x2b, 0xd6, 0xcf, 0x22, 0x04, 0x02, 0x1c, 0x73, 0x16, 0x35, 0xc5,
+	0x56, 0xd4, 0xfa, 0xbf, 0xa0, 0x3e, 0x80, 0x9d, 0x10, 0x67, 0xbc, 0x74, 0x8b, 0x73, 0x54, 0x81,
+	0x39, 0x3f, 0xe0, 0xcc, 0xa1, 0xb1, 0x93, 0x11, 0x2e, 0xb7, 0xd0, 0x41, 0xef, 0x8a, 0x3e, 0x65,
+	0x9f, 0x9a, 0xf2, 0x1b, 0x9c, 0x3d, 0x8c, 0x0f, 0x09, 0xb7, 0x5e, 0xf4, 0x60, 0xa3, 0xe6, 0xc7,
+	0x70, 0xcd, 0xab, 0x82, 0xd1, 0x91, 0xf9, 0x72, 0xe6, 0xb2, 0xdf, 0x6c, 0x4a, 0x5a, 0x99, 0xa4,
+	0x13, 0x0d, 0x5d, 0xf5, 0x56, 0x46, 0x6c, 0x02, 0xef, 0xb9, 0x0b, 0xab, 0x94, 0xa7, 0x96, 0x2d,
+	0x78, 0xd4, 0xa9, 0xef, 0x36, 0x79, 0xda, 0x0d, 0x36, 0xd1, 0xd0, 0xc0, 0x6d, 0xb7, 0xdf, 0x33,
+	0x18, 0x84, 0xca, 0x1d, 0x4b, 0x87, 0x54, 0xf3, 0x75, 0xda, 0x42, 0xac, 0xcd, 0x51, 0x13, 0x0d,
+	0x99, 0x61, 0x9b, 0xdb, 0x9e, 0xbd, 0x36, 0x30, 0xbb, 0xff, 0x35, 0x30, 0x05, 0x57, 0x6b, 0x64,
+	0x7e, 0x09, 0x5b, 0x0d, 0x86, 0x75, 0xc9, 0x70, 0xa3, 0xc9, 0xd0, 0x04, 0xde, 0xc4, 0x67, 0xf0,
+	0x84, 0x76, 0x65, 0xcc, 0x55, 0xe7, 0xd4, 0x6b, 0xd5, 0xde, 0x62, 0x66, 0xa9, 0xbd, 0xcd, 0xe8,
+	0x07, 0x70, 0x39, 0x62, 0xee, 0x7c, 0x01, 0x7f, 0xa1, 0xed, 0xb6, 0x2f, 0x67, 0xfb, 0x44, 0x43,
+	0xfd, 0x68, 0x39, 0xeb, 0xbf, 0x85, 0x2b, 0x12, 0x26, 0x95, 0x61, 0xba, 0x40, 0xdb, 0x90, 0x68,
+	0x1f, 0xac, 0x46, 0x3b, 0x9d, 0xbc, 0x13, 0x0d, 0x19, 0x51, 0xa3, 0x3a, 0x5e, 0x87, 0x4e, 0x96,
+	0x47, 0xd6, 0xf7, 0xd0, 0xaf, 0x4a, 0xf7, 0x31, 0xc7, 0xc6, 0xe7, 0xb0, 0xb1, 0x74, 0x23, 0x3a,
+	0x32, 0x78, 0x1b, 0x24, 0x35, 0x48, 0x57, 0x04, 0x2f, 0xaa, 0x27, 0x0c, 0x03, 0xba, 0x01, 0xce,
+	0x02, 0xe9, 0xf1, 0x3e, 0x92, 0xbf, 0xad, 0x9f, 0xe0, 0xed, 0xc6, 0xab, 0xcd, 0xd8, 0x05, 0xf9,
+	0xde, 0xce, 0x4a, 0x8e, 0xd7, 0xbe, 0xdc, 0x33, 0xe3, 0x33, 0xb8, 0x90, 0xe4, 0x53, 0x67, 0x4e,
+	0x8a, 0xf2, 0xf6, 0x9c, 0x7a, 0xfe, 0xea, 0x23, 0xc8, 0x16, 0x1f, 0x41, 0xf6, 0x93, 0x7c, 0x1a,
+	0x52, 0xf7, 0x11, 0x29, 0x50, 0x2f, 0xc9, 0xa7, 0x8f, 0x48, 0x31, 0x7e, 0xf0, 0xf2, 0x78, 0xa8,
+	0xbf, 0x3a, 0x1e, 0xea, 0x7f, 0x1f, 0x0f, 0xf5, 0xe7, 0x27, 0x43, 0xed, 0xd5, 0xc9, 0x50, 0xfb,
+	0xe3, 0x64, 0xa8, 0x7d, 0xb7, 0xeb, 0x53, 0x1e, 0xe4, 0x53, 0xdb, 0x65, 0xd1, 0x68, 0x01, 0xb7,
+	0xfc, 0x73, 0xe9, 0xf3, 0x6c, 0xda, 0x93, 0xff, 0x7c, 0xf2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xf6, 0x76, 0x34, 0xd7, 0x0a, 0x0a, 0x00, 0x00,
 }
 
 func (m *DuplicateVoteEvidence) Marshal() (dAtA []byte, err error) {

proto/types/evidence.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.types;
+package tendermint.types;
 
 option go_package = "github.com/tendermint/tendermint/proto/types";
 
@@ -79,6 +79,6 @@ message EvidenceData {
 }
 
 message ProofOfLockChange {
-  repeated Vote                          votes   = 1;
-  tendermint.proto.crypto.keys.PublicKey pub_key = 2;
+  repeated Vote                    votes   = 1;
+  tendermint.crypto.keys.PublicKey pub_key = 2;
 }

proto/types/params.pb.go

@@ -8,7 +8,6 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	golang_proto "github.com/golang/protobuf/proto"
 	_ "github.com/golang/protobuf/ptypes/duration"
 	io "io"
 	math "math"
@@ -18,7 +17,6 @@ import (
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
-var _ = golang_proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 var _ = time.Kitchen
@@ -343,57 +341,51 @@ func (m *HashedParams) GetBlockMaxGas() int64 {
 }
 
 func init() {
-	proto.RegisterType((*ConsensusParams)(nil), "tendermint.proto.types.ConsensusParams")
-	golang_proto.RegisterType((*ConsensusParams)(nil), "tendermint.proto.types.ConsensusParams")
-	proto.RegisterType((*BlockParams)(nil), "tendermint.proto.types.BlockParams")
-	golang_proto.RegisterType((*BlockParams)(nil), "tendermint.proto.types.BlockParams")
-	proto.RegisterType((*EvidenceParams)(nil), "tendermint.proto.types.EvidenceParams")
-	golang_proto.RegisterType((*EvidenceParams)(nil), "tendermint.proto.types.EvidenceParams")
-	proto.RegisterType((*ValidatorParams)(nil), "tendermint.proto.types.ValidatorParams")
-	golang_proto.RegisterType((*ValidatorParams)(nil), "tendermint.proto.types.ValidatorParams")
-	proto.RegisterType((*HashedParams)(nil), "tendermint.proto.types.HashedParams")
-	golang_proto.RegisterType((*HashedParams)(nil), "tendermint.proto.types.HashedParams")
+	proto.RegisterType((*ConsensusParams)(nil), "tendermint.types.ConsensusParams")
+	proto.RegisterType((*BlockParams)(nil), "tendermint.types.BlockParams")
+	proto.RegisterType((*EvidenceParams)(nil), "tendermint.types.EvidenceParams")
+	proto.RegisterType((*ValidatorParams)(nil), "tendermint.types.ValidatorParams")
+	proto.RegisterType((*HashedParams)(nil), "tendermint.types.HashedParams")
 }
 
 func init() { proto.RegisterFile("proto/types/params.proto", fileDescriptor_95a9f934fa6f056c) }
-func init() { golang_proto.RegisterFile("proto/types/params.proto", fileDescriptor_95a9f934fa6f056c) }
 
 var fileDescriptor_95a9f934fa6f056c = []byte{
-	// 540 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xbf, 0x6f, 0xd3, 0x40,
-	0x18, 0xcd, 0x91, 0x52, 0x92, 0x4b, 0xd3, 0x54, 0x37, 0x80, 0x29, 0x92, 0x13, 0x19, 0x29, 0x54,
-	0xa2, 0x72, 0x24, 0xd8, 0x58, 0x2a, 0x02, 0xa8, 0x45, 0x55, 0xa2, 0xca, 0xaa, 0x18, 0xba, 0x9c,
-	0xce, 0xf1, 0xd5, 0x39, 0x35, 0xe7, 0xb3, 0xee, 0x47, 0x95, 0xfc, 0x17, 0x8c, 0x8c, 0x1d, 0xf9,
-	0x13, 0x18, 0x19, 0x3b, 0x56, 0x62, 0x61, 0x02, 0x94, 0x2c, 0xf0, 0x5f, 0x20, 0x9f, 0x63, 0x9c,
-	0x54, 0x74, 0xbb, 0xfb, 0xbe, 0xf7, 0xbd, 0x7b, 0xef, 0x7b, 0x36, 0x74, 0x52, 0x29, 0xb4, 0xe8,
-	0xe9, 0x59, 0x4a, 0x55, 0x2f, 0x25, 0x92, 0x70, 0xe5, 0xdb, 0x12, 0x7a, 0xa8, 0x69, 0x12, 0x51,
-	0xc9, 0x59, 0xa2, 0xf3, 0x8a, 0x6f, 0x41, 0xbb, 0x5d, 0x3d, 0x66, 0x32, 0xc2, 0x29, 0x91, 0x7a,
-	0xd6, 0xcb, 0xa7, 0x63, 0x11, 0x8b, 0xf2, 0x94, 0xa3, 0x77, 0xdd, 0x58, 0x88, 0x78, 0x42, 0x73,
-	0x48, 0x68, 0xce, 0x7b, 0x91, 0x91, 0x44, 0x33, 0x91, 0xe4, 0x7d, 0xef, 0x0f, 0x80, 0xad, 0x37,
-	0x22, 0x51, 0x34, 0x51, 0x46, 0x9d, 0xd8, 0x97, 0xd1, 0x01, 0xbc, 0x1f, 0x4e, 0xc4, 0xe8, 0xc2,
-	0x01, 0x1d, 0xb0, 0xd7, 0x78, 0xf1, 0xd4, 0xff, 0xbf, 0x06, 0xbf, 0x9f, 0x81, 0xf2, 0x99, 0xfe,
-	0xc6, 0xf5, 0x8f, 0x76, 0x25, 0xc8, 0xe7, 0xd0, 0x11, 0xac, 0xd1, 0x4b, 0x16, 0xd1, 0x64, 0x44,
-	0x9d, 0x7b, 0x96, 0xa3, 0x7b, 0x17, 0xc7, 0xbb, 0x25, 0x6e, 0x8d, 0xe6, 0xdf, 0x34, 0x3a, 0x86,
-	0xf5, 0x4b, 0x32, 0x61, 0x11, 0xd1, 0x42, 0x3a, 0x55, 0x4b, 0xf5, 0xec, 0x2e, 0xaa, 0x0f, 0x05,
-	0x70, 0x8d, 0xab, 0x9c, 0xf7, 0x28, 0x6c, 0xac, 0x48, 0x46, 0x4f, 0x60, 0x9d, 0x93, 0x29, 0x0e,
-	0x67, 0x9a, 0x2a, 0x6b, 0xb5, 0x1a, 0xd4, 0x38, 0x99, 0xf6, 0xb3, 0x3b, 0x7a, 0x04, 0x1f, 0x64,
-	0xcd, 0x98, 0x28, 0xeb, 0xa0, 0x1a, 0x6c, 0x72, 0x32, 0x3d, 0x24, 0x0a, 0x75, 0xe0, 0x96, 0x66,
-	0x9c, 0x62, 0x26, 0x34, 0xc1, 0x5c, 0x59, 0x51, 0xd5, 0x00, 0x66, 0xb5, 0xf7, 0x42, 0x93, 0x81,
-	0xf2, 0xbe, 0x01, 0xb8, 0xbd, 0x6e, 0x0b, 0x3d, 0x87, 0x28, 0x63, 0x23, 0x31, 0xc5, 0x89, 0xe1,
-	0xd8, 0x6e, 0xa9, 0x78, 0xb3, 0xc5, 0xc9, 0xf4, 0x75, 0x4c, 0x87, 0x86, 0x5b, 0x71, 0x0a, 0x0d,
-	0xe0, 0x4e, 0x01, 0x2e, 0xc2, 0x5a, 0x6e, 0xf1, 0xb1, 0x9f, 0xa7, 0xe9, 0x17, 0x69, 0xfa, 0x6f,
-	0x97, 0x80, 0x7e, 0x2d, 0x33, 0xfb, 0xe9, 0x67, 0x1b, 0x04, 0xdb, 0x39, 0x5f, 0xd1, 0x29, 0x9c,
-	0x24, 0x86, 0x5b, 0xad, 0x4d, 0xeb, 0x64, 0x68, 0x38, 0xda, 0x87, 0x28, 0x95, 0x42, 0x9c, 0x63,
-	0x2d, 0x19, 0x99, 0xe0, 0x94, 0x4a, 0x26, 0x22, 0x67, 0xc3, 0x8a, 0xda, 0xb1, 0x9d, 0xd3, 0xac,
-	0x71, 0x62, 0xeb, 0xde, 0x01, 0x6c, 0xdd, 0x5a, 0x30, 0xf2, 0x60, 0x33, 0x35, 0x21, 0xbe, 0xa0,
-	0x33, 0x6c, 0x13, 0x70, 0x40, 0xa7, 0xba, 0x57, 0x0f, 0x1a, 0xa9, 0x09, 0x8f, 0xe9, 0xec, 0x34,
-	0x2b, 0xbd, 0xaa, 0x7d, 0xb9, 0x6a, 0x83, 0xdf, 0x57, 0x6d, 0xe0, 0x9d, 0xc1, 0xad, 0x23, 0xa2,
-	0xc6, 0x34, 0x5a, 0x4e, 0x77, 0x61, 0xcb, 0xee, 0x01, 0xdf, 0x0e, 0xa1, 0x69, 0xcb, 0x83, 0x22,
-	0x09, 0x0f, 0x36, 0x4b, 0x5c, 0x99, 0x47, 0xa3, 0x40, 0x1d, 0x12, 0xd5, 0x1f, 0x7e, 0x9e, 0xbb,
-	0xe0, 0x7a, 0xee, 0x82, 0x9b, 0xb9, 0x0b, 0x7e, 0xcd, 0x5d, 0xf0, 0x71, 0xe1, 0x56, 0xbe, 0x2e,
-	0x5c, 0x70, 0xb3, 0x70, 0x2b, 0xdf, 0x17, 0x6e, 0xe5, 0x6c, 0x3f, 0x66, 0x7a, 0x6c, 0x42, 0x7f,
-	0x24, 0x78, 0xaf, 0xfc, 0x7e, 0x56, 0x8f, 0x2b, 0xbf, 0x60, 0xb8, 0x69, 0x2f, 0x2f, 0xff, 0x06,
-	0x00, 0x00, 0xff, 0xff, 0x5d, 0x39, 0x60, 0xf5, 0x98, 0x03, 0x00, 0x00,
+	// 534 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xcd, 0x7c, 0xe9, 0x57, 0x92, 0x49, 0xd3, 0x44, 0xb3, 0xc1, 0x14, 0xe1, 0x04, 0x2f, 0xaa,
+	0x4a, 0x54, 0x8e, 0x04, 0x2b, 0xd8, 0x20, 0x0c, 0x55, 0xf9, 0x51, 0xaa, 0xca, 0xaa, 0x58, 0x74,
+	0x33, 0x1a, 0xc7, 0x53, 0x67, 0xd4, 0x8c, 0xc7, 0x9a, 0x9f, 0x2a, 0x79, 0x0b, 0x96, 0x2c, 0xbb,
+	0xe4, 0x11, 0x78, 0x84, 0x2e, 0x2b, 0xb1, 0x80, 0x15, 0xa0, 0x64, 0xc3, 0x63, 0x20, 0x8f, 0x63,
+	0x9c, 0xa4, 0xbb, 0x99, 0x7b, 0xce, 0xb9, 0x73, 0xee, 0x3d, 0x36, 0x74, 0x32, 0x29, 0xb4, 0x18,
+	0xe8, 0x59, 0x46, 0xd5, 0x20, 0x23, 0x92, 0x70, 0xe5, 0xdb, 0x12, 0xea, 0x6a, 0x9a, 0xc6, 0x54,
+	0x72, 0x96, 0x6a, 0xdf, 0xc2, 0x7b, 0xfb, 0x7a, 0xcc, 0x64, 0x8c, 0x33, 0x22, 0xf5, 0x6c, 0x50,
+	0xe8, 0x12, 0x91, 0x88, 0xea, 0x54, 0x28, 0xf7, 0xdc, 0x44, 0x88, 0x64, 0x42, 0x0b, 0x4a, 0x64,
+	0x2e, 0x06, 0xb1, 0x91, 0x44, 0x33, 0x91, 0x16, 0xb8, 0xf7, 0x1d, 0xc0, 0xce, 0x6b, 0x91, 0x2a,
+	0x9a, 0x2a, 0xa3, 0x4e, 0xed, 0x9b, 0xe8, 0x39, 0xfc, 0x3f, 0x9a, 0x88, 0xd1, 0xa5, 0x03, 0xfa,
+	0xe0, 0xa0, 0xf5, 0xf4, 0x91, 0xbf, 0xf9, 0xba, 0x1f, 0xe4, 0x70, 0xc1, 0x0e, 0xb6, 0x6e, 0x7e,
+	0xf6, 0x6a, 0x61, 0xa1, 0x40, 0x01, 0x6c, 0xd0, 0x2b, 0x16, 0xd3, 0x74, 0x44, 0x9d, 0xff, 0xac,
+	0xba, 0x7f, 0x57, 0x7d, 0xb4, 0x64, 0xac, 0x35, 0xf8, 0xa7, 0x43, 0x47, 0xb0, 0x79, 0x45, 0x26,
+	0x2c, 0x26, 0x5a, 0x48, 0xa7, 0x6e, 0x9b, 0x3c, 0xbe, 0xdb, 0xe4, 0x63, 0x49, 0x59, 0xeb, 0x52,
+	0x29, 0x3d, 0x0a, 0x5b, 0x2b, 0x36, 0xd1, 0x43, 0xd8, 0xe4, 0x64, 0x8a, 0xa3, 0x99, 0xa6, 0xca,
+	0x0e, 0x56, 0x0f, 0x1b, 0x9c, 0x4c, 0x83, 0xfc, 0x8e, 0xee, 0xc3, 0x7b, 0x39, 0x98, 0x10, 0x65,
+	0x5d, 0xd7, 0xc3, 0x6d, 0x4e, 0xa6, 0xc7, 0x44, 0xa1, 0x3e, 0xdc, 0xd1, 0x8c, 0x53, 0xcc, 0x84,
+	0x26, 0x98, 0x2b, 0x6b, 0xa7, 0x1e, 0xc2, 0xbc, 0xf6, 0x4e, 0x68, 0x32, 0x54, 0xde, 0x37, 0x00,
+	0x77, 0xd7, 0x07, 0x42, 0x4f, 0x20, 0xca, 0xbb, 0x91, 0x84, 0xe2, 0xd4, 0x70, 0x6c, 0x37, 0x53,
+	0xbe, 0xd9, 0xe1, 0x64, 0xfa, 0x2a, 0xa1, 0x27, 0x86, 0x5b, 0x73, 0x0a, 0x0d, 0x61, 0xb7, 0x24,
+	0x97, 0xd1, 0x2c, 0x37, 0xf7, 0xc0, 0x2f, 0xb2, 0xf3, 0xcb, 0xec, 0xfc, 0x37, 0x4b, 0x42, 0xd0,
+	0xc8, 0x87, 0xfd, 0xfc, 0xab, 0x07, 0xc2, 0xdd, 0xa2, 0x5f, 0x89, 0x94, 0x93, 0xa4, 0x86, 0x5b,
+	0xaf, 0x6d, 0x3b, 0xc9, 0x89, 0xe1, 0xe8, 0x10, 0xa2, 0x4c, 0x0a, 0x71, 0x81, 0xb5, 0x64, 0x64,
+	0x82, 0x33, 0x2a, 0x99, 0x88, 0x9d, 0x2d, 0x6b, 0xaa, 0x6b, 0x91, 0xb3, 0x1c, 0x38, 0xb5, 0x75,
+	0xef, 0x25, 0xec, 0x6c, 0x2c, 0x18, 0x79, 0xb0, 0x9d, 0x99, 0x08, 0x5f, 0xd2, 0x19, 0xb6, 0x09,
+	0x38, 0xa0, 0x5f, 0x3f, 0x68, 0x86, 0xad, 0xcc, 0x44, 0x1f, 0xe8, 0xec, 0x2c, 0x2f, 0xbd, 0x68,
+	0x7c, 0xbd, 0xee, 0x81, 0x3f, 0xd7, 0x3d, 0xe0, 0x9d, 0xc3, 0x9d, 0xb7, 0x44, 0x8d, 0x69, 0xbc,
+	0x54, 0xef, 0xc3, 0x8e, 0xdd, 0x03, 0xde, 0x0c, 0xa1, 0x6d, 0xcb, 0xc3, 0x32, 0x09, 0x0f, 0xb6,
+	0x2b, 0x5e, 0x95, 0x47, 0xab, 0x64, 0x1d, 0x13, 0x15, 0xbc, 0xff, 0x32, 0x77, 0xc1, 0xcd, 0xdc,
+	0x05, 0xb7, 0x73, 0x17, 0xfc, 0x9e, 0xbb, 0xe0, 0xd3, 0xc2, 0xad, 0xdd, 0x2e, 0xdc, 0xda, 0x8f,
+	0x85, 0x5b, 0x3b, 0x3f, 0x4c, 0x98, 0x1e, 0x9b, 0xc8, 0x1f, 0x09, 0x3e, 0xa8, 0xbe, 0x9a, 0xd5,
+	0xe3, 0xca, 0x6f, 0x16, 0x6d, 0xdb, 0xcb, 0xb3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x5b,
+	0x98, 0x09, 0x7c, 0x03, 0x00, 0x00,
 }
 
 func (this *ConsensusParams) Equal(that interface{}) bool {

proto/types/params.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.types;
+package tendermint.types;
 
 option go_package = "github.com/tendermint/tendermint/proto/types";
 
@@ -7,10 +7,6 @@ import "third_party/proto/gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 
 option (gogoproto.equal_all) = true;
-option (gogoproto.marshaler_all)        = true;
-option (gogoproto.unmarshaler_all)      = true;
-option (gogoproto.sizer_all)            = true;
-option (gogoproto.goproto_registration) = true;
 
 // ConsensusParams contains consensus critical parameters that determine the
 // validity of blocks.

proto/types/types.pb.go

@@ -476,7 +476,7 @@ func (m *Data) GetHash() []byte {
 // Vote represents a prevote, precommit, or commit vote from validators for
 // consensus.
 type Vote struct {
-	Type             SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.proto.types.SignedMsgType" json:"type,omitempty"`
+	Type             SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"`
 	Height           int64         `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
 	Round            int32         `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"`
 	BlockID          BlockID       `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"`
@@ -662,7 +662,7 @@ func (m *Commit) GetBitArray() *bits.BitArray {
 
 // CommitSig is a part of the Vote included in a Commit.
 type CommitSig struct {
-	BlockIdFlag      BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.proto.types.BlockIDFlag" json:"block_id_flag,omitempty"`
+	BlockIdFlag      BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"`
 	ValidatorAddress []byte      `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"`
 	Timestamp        time.Time   `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
 	Signature        []byte      `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"`
@@ -730,7 +730,7 @@ func (m *CommitSig) GetSignature() []byte {
 }
 
 type Proposal struct {
-	Type      SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.proto.types.SignedMsgType" json:"type,omitempty"`
+	Type      SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"`
 	Height    int64         `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
 	Round     int32         `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"`
 	PolRound  int32         `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"`
@@ -1003,109 +1003,108 @@ func (m *TxProof) GetProof() *merkle.Proof {
 }
 
 func init() {
-	proto.RegisterEnum("tendermint.proto.types.BlockIDFlag", BlockIDFlag_name, BlockIDFlag_value)
-	proto.RegisterEnum("tendermint.proto.types.SignedMsgType", SignedMsgType_name, SignedMsgType_value)
-	proto.RegisterType((*PartSetHeader)(nil), "tendermint.proto.types.PartSetHeader")
-	proto.RegisterType((*Part)(nil), "tendermint.proto.types.Part")
-	proto.RegisterType((*BlockID)(nil), "tendermint.proto.types.BlockID")
-	proto.RegisterType((*Header)(nil), "tendermint.proto.types.Header")
-	proto.RegisterType((*Data)(nil), "tendermint.proto.types.Data")
-	proto.RegisterType((*Vote)(nil), "tendermint.proto.types.Vote")
-	proto.RegisterType((*Commit)(nil), "tendermint.proto.types.Commit")
-	proto.RegisterType((*CommitSig)(nil), "tendermint.proto.types.CommitSig")
-	proto.RegisterType((*Proposal)(nil), "tendermint.proto.types.Proposal")
-	proto.RegisterType((*SignedHeader)(nil), "tendermint.proto.types.SignedHeader")
-	proto.RegisterType((*BlockMeta)(nil), "tendermint.proto.types.BlockMeta")
-	proto.RegisterType((*TxProof)(nil), "tendermint.proto.types.TxProof")
+	proto.RegisterEnum("tendermint.types.BlockIDFlag", BlockIDFlag_name, BlockIDFlag_value)
+	proto.RegisterEnum("tendermint.types.SignedMsgType", SignedMsgType_name, SignedMsgType_value)
+	proto.RegisterType((*PartSetHeader)(nil), "tendermint.types.PartSetHeader")
+	proto.RegisterType((*Part)(nil), "tendermint.types.Part")
+	proto.RegisterType((*BlockID)(nil), "tendermint.types.BlockID")
+	proto.RegisterType((*Header)(nil), "tendermint.types.Header")
+	proto.RegisterType((*Data)(nil), "tendermint.types.Data")
+	proto.RegisterType((*Vote)(nil), "tendermint.types.Vote")
+	proto.RegisterType((*Commit)(nil), "tendermint.types.Commit")
+	proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig")
+	proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal")
+	proto.RegisterType((*SignedHeader)(nil), "tendermint.types.SignedHeader")
+	proto.RegisterType((*BlockMeta)(nil), "tendermint.types.BlockMeta")
+	proto.RegisterType((*TxProof)(nil), "tendermint.types.TxProof")
 }
 
 func init() { proto.RegisterFile("proto/types/types.proto", fileDescriptor_ff06f8095857fb18) }
 
 var fileDescriptor_ff06f8095857fb18 = []byte{
-	// 1317 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x41, 0x6f, 0x1b, 0xc5,
-	0x17, 0xcf, 0xda, 0xeb, 0xd8, 0x7e, 0xb6, 0x13, 0x67, 0x95, 0x7f, 0xeb, 0xbf, 0x03, 0x8e, 0xeb,
-	0xd0, 0x92, 0x96, 0xca, 0x46, 0x41, 0x42, 0x54, 0x70, 0xb1, 0x93, 0x34, 0xb5, 0x9a, 0x38, 0xd6,
-	0xda, 0x14, 0xc1, 0x65, 0xb5, 0xf6, 0x4e, 0xed, 0x55, 0xd7, 0x3b, 0xab, 0xdd, 0x71, 0x48, 0x7a,
-	0xe0, 0x8c, 0x72, 0xea, 0x17, 0xc8, 0xa9, 0x20, 0xf1, 0x2d, 0xe0, 0xd8, 0x13, 0xea, 0x91, 0x53,
-	0x41, 0xc9, 0x37, 0x40, 0x7c, 0x00, 0x34, 0x6f, 0x66, 0xd7, 0x76, 0x93, 0x40, 0xa0, 0x15, 0x97,
-	0x64, 0xe6, 0xbd, 0xdf, 0x7b, 0x33, 0xef, 0x37, 0xbf, 0x99, 0xb7, 0x86, 0xeb, 0x9e, 0x4f, 0x19,
-	0xad, 0xb1, 0x23, 0x8f, 0x04, 0xe2, 0x6f, 0x15, 0x2d, 0xda, 0x35, 0x46, 0x5c, 0x8b, 0xf8, 0x23,
-	0xdb, 0x65, 0xc2, 0x52, 0x45, 0x6f, 0xf1, 0x16, 0x1b, 0xda, 0xbe, 0x65, 0x78, 0xa6, 0xcf, 0x8e,
-	0x6a, 0x22, 0x78, 0x40, 0x07, 0x74, 0x32, 0x12, 0xe8, 0xe2, 0xea, 0x80, 0xd2, 0x81, 0x43, 0x04,
-	0xa4, 0x37, 0x7e, 0x5c, 0x63, 0xf6, 0x88, 0x04, 0xcc, 0x1c, 0x79, 0x12, 0xb0, 0x22, 0x42, 0x1c,
-	0xbb, 0x17, 0xd4, 0x7a, 0x36, 0x9b, 0x59, 0xbd, 0xb8, 0x2a, 0x9c, 0x7d, 0xff, 0xc8, 0x63, 0xb4,
-	0x36, 0x22, 0xfe, 0x13, 0x87, 0xcc, 0x00, 0x64, 0xf4, 0x01, 0xf1, 0x03, 0x9b, 0xba, 0xe1, 0x7f,
-	0xe1, 0xac, 0xdc, 0x83, 0x5c, 0xdb, 0xf4, 0x59, 0x87, 0xb0, 0x07, 0xc4, 0xb4, 0x88, 0xaf, 0x2d,
-	0x43, 0x82, 0x51, 0x66, 0x3a, 0x05, 0xa5, 0xac, 0xac, 0xe7, 0x74, 0x31, 0xd1, 0x34, 0x50, 0x87,
-	0x66, 0x30, 0x2c, 0xc4, 0xca, 0xca, 0x7a, 0x56, 0xc7, 0x71, 0x65, 0x0c, 0x2a, 0x0f, 0xe5, 0x11,
-	0xb6, 0x6b, 0x91, 0xc3, 0x30, 0x02, 0x27, 0xdc, 0xda, 0x3b, 0x62, 0x24, 0x90, 0x21, 0x62, 0xa2,
-	0xd5, 0x21, 0xe1, 0xf9, 0x94, 0x3e, 0x2e, 0xc4, 0xcb, 0xca, 0x7a, 0x66, 0xe3, 0x66, 0xf5, 0x1c,
-	0x75, 0xa2, 0x8e, 0xaa, 0xa8, 0xa3, 0xda, 0xe6, 0xe0, 0x86, 0xfa, 0xe2, 0xd5, 0xea, 0x9c, 0x2e,
-	0x22, 0x2b, 0x23, 0x48, 0x36, 0x1c, 0xda, 0x7f, 0xd2, 0xdc, 0x8a, 0x76, 0xa5, 0x4c, 0x76, 0xa5,
-	0xb5, 0x20, 0xcb, 0x09, 0x0f, 0x8c, 0x21, 0xd6, 0x83, 0xcb, 0x5f, 0xb8, 0x90, 0xa0, 0x68, 0xa6,
-	0x78, 0xb9, 0x50, 0x06, 0x13, 0x08, 0x53, 0xe5, 0x77, 0x15, 0xe6, 0x25, 0x35, 0x9b, 0x90, 0x94,
-	0xe4, 0xe1, 0x8a, 0x99, 0x8d, 0xb5, 0xf3, 0x59, 0x43, 0x76, 0x37, 0xa9, 0x1b, 0x10, 0x37, 0x18,
-	0x07, 0x32, 0x67, 0x18, 0xa9, 0xdd, 0x82, 0x54, 0x7f, 0x68, 0xda, 0xae, 0x61, 0x5b, 0xb8, 0xb7,
-	0x74, 0x23, 0x73, 0xfa, 0x6a, 0x35, 0xb9, 0xc9, 0x6d, 0xcd, 0x2d, 0x3d, 0x89, 0xce, 0xa6, 0xa5,
-	0x5d, 0x83, 0xf9, 0x21, 0xb1, 0x07, 0x43, 0x86, 0x54, 0xc5, 0x75, 0x39, 0xd3, 0x3e, 0x01, 0x95,
-	0xcb, 0xa3, 0xa0, 0xe2, 0x0e, 0x8a, 0x55, 0xa1, 0x9d, 0x6a, 0xa8, 0x9d, 0x6a, 0x37, 0xd4, 0x4e,
-	0x23, 0xc5, 0x17, 0x7e, 0xf6, 0xeb, 0xaa, 0xa2, 0x63, 0x84, 0xd6, 0x84, 0x9c, 0x63, 0x06, 0xcc,
-	0xe8, 0x71, 0xf6, 0xf8, 0xf2, 0x09, 0x4c, 0xb1, 0x7a, 0x19, 0x35, 0x92, 0xe5, 0x90, 0x14, 0x1e,
-	0x2b, 0x4c, 0x96, 0xb6, 0x0e, 0x79, 0x4c, 0xd5, 0xa7, 0xa3, 0x91, 0xcd, 0x0c, 0x3c, 0x84, 0x79,
-	0x3c, 0x84, 0x05, 0x6e, 0xdf, 0x44, 0xf3, 0x03, 0x7e, 0x1c, 0x2b, 0x90, 0xb6, 0x4c, 0x66, 0x0a,
-	0x48, 0x12, 0x21, 0x29, 0x6e, 0x40, 0xe7, 0xfb, 0xb0, 0x78, 0x60, 0x3a, 0xb6, 0x65, 0x32, 0xea,
-	0x07, 0x02, 0x92, 0x12, 0x59, 0x26, 0x66, 0x04, 0x7e, 0x08, 0xcb, 0x2e, 0x39, 0x64, 0xc6, 0xeb,
-	0xe8, 0x34, 0xa2, 0x35, 0xee, 0x7b, 0x34, 0x1b, 0x71, 0x13, 0x16, 0xfa, 0xe1, 0x11, 0x08, 0x2c,
-	0x20, 0x36, 0x17, 0x59, 0x11, 0xf6, 0x7f, 0x48, 0x99, 0x9e, 0x27, 0x00, 0x19, 0x04, 0x24, 0x4d,
-	0xcf, 0x43, 0xd7, 0x1d, 0x58, 0xc2, 0x1a, 0x7d, 0x12, 0x8c, 0x1d, 0x26, 0x93, 0x64, 0x11, 0xb3,
-	0xc8, 0x1d, 0xba, 0xb0, 0x23, 0x76, 0x0d, 0x72, 0xe4, 0xc0, 0xb6, 0x88, 0xdb, 0x27, 0x02, 0x97,
-	0x43, 0x5c, 0x36, 0x34, 0x22, 0xe8, 0x36, 0xe4, 0x3d, 0x9f, 0x7a, 0x34, 0x20, 0xbe, 0x61, 0x5a,
-	0x96, 0x4f, 0x82, 0xa0, 0xb0, 0x20, 0xf2, 0x85, 0xf6, 0xba, 0x30, 0x57, 0xee, 0x82, 0xba, 0x65,
-	0x32, 0x53, 0xcb, 0x43, 0x9c, 0x1d, 0x06, 0x05, 0xa5, 0x1c, 0x5f, 0xcf, 0xea, 0x7c, 0x78, 0xe1,
-	0x45, 0xfc, 0x23, 0x06, 0xea, 0x23, 0xca, 0x88, 0x76, 0x0f, 0x54, 0x7e, 0x74, 0xa8, 0xce, 0x85,
-	0xcb, 0x35, 0xdf, 0xb1, 0x07, 0x2e, 0xb1, 0xf6, 0x82, 0x41, 0xf7, 0xc8, 0x23, 0x3a, 0x86, 0x4c,
-	0xc9, 0x2d, 0x36, 0x23, 0xb7, 0x65, 0x48, 0xf8, 0x74, 0xec, 0x5a, 0xa8, 0xc2, 0x84, 0x2e, 0x26,
-	0xda, 0x43, 0x48, 0x45, 0x2a, 0x52, 0xaf, 0xa6, 0xa2, 0x45, 0xae, 0x22, 0xae, 0x74, 0x69, 0xd0,
-	0x93, 0x3d, 0x29, 0xa6, 0x06, 0xa4, 0xa3, 0x07, 0x4f, 0x6a, 0xf2, 0x6a, 0xb2, 0x9e, 0x84, 0x69,
-	0x1f, 0xc0, 0x52, 0xa4, 0x8d, 0x88, 0x5c, 0xa1, 0xc8, 0x7c, 0xe4, 0x90, 0xec, 0xce, 0xc8, 0xce,
-	0x10, 0x4f, 0x57, 0x12, 0xab, 0x9b, 0xc8, 0xae, 0x89, 0x6f, 0xd8, 0x3b, 0x90, 0x0e, 0xec, 0x81,
-	0x6b, 0xb2, 0xb1, 0x4f, 0xa4, 0x32, 0x27, 0x86, 0xca, 0xf3, 0x18, 0xcc, 0x0b, 0xa5, 0x4f, 0xb1,
-	0xa7, 0x5c, 0xcc, 0x5e, 0xec, 0x32, 0xf6, 0xe2, 0x6f, 0xca, 0xde, 0x0e, 0x40, 0xb4, 0xa5, 0xa0,
-	0xa0, 0x96, 0xe3, 0xeb, 0x99, 0x8d, 0x1b, 0x97, 0xa5, 0x13, 0xdb, 0xed, 0xd8, 0x03, 0x79, 0xa9,
-	0xa7, 0x42, 0x23, 0x65, 0x25, 0xa6, 0x1e, 0xd3, 0x3a, 0xa4, 0x7b, 0x36, 0x33, 0x4c, 0xdf, 0x37,
-	0x8f, 0x90, 0xce, 0xcc, 0xc6, 0x7b, 0xe7, 0x73, 0xf3, 0xbe, 0x54, 0xe5, 0x7d, 0xa9, 0xda, 0xb0,
-	0x59, 0x9d, 0x63, 0xf5, 0x54, 0x4f, 0x8e, 0x2a, 0x67, 0x0a, 0xa4, 0xa3, 0x65, 0xb5, 0x1d, 0xc8,
-	0x85, 0xa5, 0x1b, 0x8f, 0x1d, 0x73, 0x20, 0xa5, 0xba, 0xf6, 0x37, 0xf5, 0xdf, 0x77, 0xcc, 0x81,
-	0x9e, 0x91, 0x25, 0xf3, 0xc9, 0xc5, 0x07, 0x1e, 0xbb, 0xe4, 0xc0, 0x67, 0x14, 0x16, 0xff, 0x77,
-	0x0a, 0x9b, 0xd1, 0x82, 0xfa, 0xba, 0x16, 0x7e, 0x8c, 0x41, 0xaa, 0x8d, 0x97, 0xd8, 0x74, 0xfe,
-	0xbb, 0x6b, 0xb8, 0x02, 0x69, 0x8f, 0x3a, 0x86, 0xf0, 0xa8, 0xe8, 0x49, 0x79, 0xd4, 0xd1, 0xcf,
-	0xa9, 0x2c, 0xf1, 0x56, 0xef, 0xe8, 0xfc, 0x5b, 0x60, 0x30, 0xf9, 0x3a, 0x83, 0xdf, 0x40, 0x56,
-	0x10, 0x22, 0x9b, 0xed, 0xc7, 0x9c, 0x09, 0xec, 0xe0, 0xa2, 0xd7, 0x96, 0x2e, 0xdb, 0xbc, 0xc0,
-	0xeb, 0x12, 0xcd, 0xe3, 0x44, 0x57, 0x92, 0x9d, 0xbf, 0xf4, 0xd7, 0x77, 0x41, 0x97, 0xe8, 0xca,
-	0xcf, 0x0a, 0xa4, 0xb1, 0xec, 0x3d, 0xc2, 0xcc, 0x19, 0xf2, 0x94, 0x37, 0x25, 0xef, 0x5d, 0x00,
-	0x91, 0x2c, 0xb0, 0x9f, 0x12, 0x79, 0xb0, 0x69, 0xb4, 0x74, 0xec, 0xa7, 0x44, 0xfb, 0x2c, 0xaa,
-	0x34, 0x7e, 0x95, 0x4a, 0xe5, 0xd5, 0x0d, 0xeb, 0xbd, 0x0e, 0x49, 0x77, 0x3c, 0x32, 0x78, 0x9b,
-	0x50, 0x85, 0x64, 0xdc, 0xf1, 0xa8, 0x7b, 0x18, 0x54, 0xbe, 0x86, 0x64, 0xf7, 0x10, 0xbf, 0x9f,
-	0xb8, 0x4e, 0x7c, 0x4a, 0x65, 0x9f, 0x16, 0x1f, 0x4b, 0x29, 0x6e, 0xc0, 0xb6, 0xa4, 0x81, 0xca,
-	0x1b, 0x72, 0xd8, 0x51, 0xf8, 0x58, 0xfb, 0x14, 0x12, 0xed, 0x7f, 0xfc, 0x99, 0xa6, 0x8b, 0x98,
-	0x3b, 0x3f, 0x29, 0x90, 0x99, 0xba, 0xb7, 0x5a, 0x11, 0xae, 0x35, 0x76, 0xf7, 0x37, 0x1f, 0x6e,
-	0x19, 0xcd, 0x2d, 0xe3, 0xfe, 0x6e, 0x7d, 0xc7, 0xf8, 0xbc, 0xf5, 0xb0, 0xb5, 0xff, 0x45, 0x2b,
-	0x3f, 0xa7, 0xd5, 0x60, 0x19, 0x7d, 0x91, 0xab, 0xde, 0xe8, 0x6c, 0xb7, 0xba, 0x79, 0xa5, 0xf8,
-	0xbf, 0xe3, 0x93, 0xf2, 0xd2, 0x54, 0x9a, 0x7a, 0x2f, 0x20, 0x2e, 0x3b, 0x1f, 0xb0, 0xb9, 0xbf,
-	0xb7, 0xd7, 0xec, 0xe6, 0x63, 0xe7, 0x02, 0xe4, 0xd3, 0x7c, 0x1b, 0x96, 0x66, 0x03, 0x5a, 0xcd,
-	0xdd, 0x7c, 0xbc, 0xa8, 0x1d, 0x9f, 0x94, 0x17, 0xa6, 0xd0, 0x2d, 0xdb, 0x29, 0xa6, 0xbe, 0x7d,
-	0x5e, 0x9a, 0xfb, 0xe1, 0xbb, 0x92, 0x72, 0xe7, 0x7b, 0x05, 0x72, 0x33, 0xd7, 0x53, 0x5b, 0x81,
-	0xeb, 0x9d, 0xe6, 0x4e, 0x6b, 0x7b, 0xcb, 0xd8, 0xeb, 0xec, 0x18, 0xdd, 0x2f, 0xdb, 0xdb, 0x53,
-	0x55, 0xdc, 0x80, 0x6c, 0x5b, 0xdf, 0x7e, 0xb4, 0xdf, 0xdd, 0x46, 0x4f, 0x5e, 0x29, 0x2e, 0x1e,
-	0x9f, 0x94, 0x33, 0x6d, 0x9f, 0x1c, 0x50, 0x46, 0x30, 0xfe, 0x26, 0x2c, 0xb4, 0xf5, 0x6d, 0xb1,
-	0x59, 0x01, 0x8a, 0x15, 0x97, 0x8e, 0x4f, 0xca, 0xb9, 0xb6, 0x4f, 0x84, 0x02, 0x11, 0xb6, 0x06,
-	0xb9, 0xb6, 0xbe, 0xdf, 0xde, 0xef, 0xd4, 0x77, 0x05, 0x2a, 0x5e, 0xcc, 0x1f, 0x9f, 0x94, 0xb3,
-	0xe1, 0xdb, 0xc2, 0x41, 0x93, 0x7d, 0x36, 0xee, 0xbf, 0x38, 0x2d, 0x29, 0x2f, 0x4f, 0x4b, 0xca,
-	0x6f, 0xa7, 0x25, 0xe5, 0xd9, 0x59, 0x69, 0xee, 0xe5, 0x59, 0x69, 0xee, 0x97, 0xb3, 0xd2, 0xdc,
-	0x57, 0x77, 0x07, 0x36, 0x1b, 0x8e, 0x7b, 0xd5, 0x3e, 0x1d, 0xd5, 0x26, 0x87, 0x37, 0x3d, 0x9c,
-	0xfa, 0x35, 0xd3, 0x9b, 0xc7, 0xc9, 0x47, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x21, 0xb8, 0xcf,
-	0x26, 0xe3, 0x0c, 0x00, 0x00,
+	// 1312 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1a, 0x47,
+	0x14, 0xf7, 0xc2, 0x62, 0xe0, 0x01, 0x36, 0x5e, 0xb9, 0x09, 0xc1, 0x0d, 0xa6, 0x44, 0x49, 0x9d,
+	0x34, 0x82, 0xc8, 0x51, 0xab, 0x56, 0x51, 0x0f, 0x60, 0x93, 0x04, 0xc5, 0xc6, 0x68, 0xa1, 0xa9,
+	0xda, 0xcb, 0x6a, 0x61, 0x27, 0xb0, 0xca, 0xb2, 0xb3, 0xdd, 0x1d, 0x2c, 0x3b, 0x9f, 0xa0, 0xf2,
+	0x29, 0xfd, 0x00, 0x3e, 0xb5, 0x95, 0x7a, 0xef, 0x17, 0xa8, 0x7a, 0xca, 0x31, 0xc7, 0x5e, 0x9a,
+	0x56, 0x8e, 0x54, 0xf5, 0x63, 0x54, 0xf3, 0x66, 0x16, 0x16, 0xff, 0xe9, 0x9f, 0x28, 0xea, 0xc5,
+	0x9e, 0x79, 0xef, 0xf7, 0xde, 0xcc, 0xfb, 0xcd, 0x6f, 0xe6, 0x2d, 0x70, 0xd9, 0xf3, 0x29, 0xa3,
+	0x35, 0x76, 0xe8, 0x91, 0x40, 0xfc, 0xad, 0xa2, 0x45, 0xcb, 0x33, 0xe2, 0x5a, 0xc4, 0x1f, 0xdb,
+	0x2e, 0xab, 0xa2, 0xbd, 0x78, 0x83, 0x8d, 0x6c, 0xdf, 0x32, 0x3c, 0xd3, 0x67, 0x87, 0x35, 0x11,
+	0x36, 0xa4, 0x43, 0x3a, 0x1b, 0x89, 0xc8, 0xe2, 0xfa, 0x90, 0xd2, 0xa1, 0x43, 0x04, 0xa4, 0x3f,
+	0x79, 0x52, 0x63, 0xf6, 0x98, 0x04, 0xcc, 0x1c, 0x7b, 0x12, 0xb0, 0x26, 0x42, 0x1c, 0xbb, 0x1f,
+	0xd4, 0xfa, 0x36, 0x9b, 0x5b, 0xb7, 0xb8, 0x2e, 0x9c, 0x03, 0xff, 0xd0, 0x63, 0xb4, 0x36, 0x26,
+	0xfe, 0x53, 0x87, 0xcc, 0x01, 0x64, 0xf4, 0x3e, 0xf1, 0x03, 0x9b, 0xba, 0xe1, 0x7f, 0xe1, 0xac,
+	0x7c, 0x02, 0xb9, 0x8e, 0xe9, 0xb3, 0x2e, 0x61, 0x0f, 0x89, 0x69, 0x11, 0x5f, 0x5b, 0x85, 0x04,
+	0xa3, 0xcc, 0x74, 0x0a, 0x4a, 0x59, 0xd9, 0xc8, 0xe9, 0x62, 0xa2, 0x69, 0xa0, 0x8e, 0xcc, 0x60,
+	0x54, 0x88, 0x95, 0x95, 0x8d, 0xac, 0x8e, 0xe3, 0x0a, 0x05, 0x95, 0x87, 0xf2, 0x08, 0xdb, 0xb5,
+	0xc8, 0x41, 0x18, 0x81, 0x13, 0x6e, 0xed, 0x1f, 0x32, 0x12, 0xc8, 0x10, 0x31, 0xd1, 0xee, 0x41,
+	0xc2, 0xf3, 0x29, 0x7d, 0x52, 0x88, 0x97, 0x95, 0x8d, 0xcc, 0xe6, 0x7a, 0x35, 0x42, 0x9a, 0xa8,
+	0xa0, 0x2a, 0x2a, 0xa8, 0x76, 0x38, 0xac, 0xa1, 0xbe, 0x78, 0xb5, 0xbe, 0xa0, 0x8b, 0x98, 0xca,
+	0x10, 0x92, 0x0d, 0x87, 0x0e, 0x9e, 0xb6, 0xb6, 0xa7, 0xfb, 0x51, 0x66, 0xfb, 0xd1, 0x1e, 0x42,
+	0x96, 0x53, 0x1d, 0x18, 0x23, 0xac, 0x04, 0x17, 0x3e, 0xb5, 0x84, 0xa0, 0x65, 0xae, 0x60, 0xb9,
+	0x44, 0x06, 0x43, 0x85, 0xa9, 0xf2, 0x87, 0x0a, 0x8b, 0x92, 0x8e, 0x4f, 0x21, 0x29, 0x09, 0xc3,
+	0xb5, 0x32, 0x9b, 0x57, 0xa3, 0xf9, 0x42, 0x2e, 0xb7, 0xa8, 0x1b, 0x10, 0x37, 0x98, 0x04, 0x32,
+	0x5b, 0x18, 0xa3, 0xdd, 0x80, 0xd4, 0x60, 0x64, 0xda, 0xae, 0x61, 0x5b, 0xb8, 0x9f, 0x74, 0x23,
+	0x73, 0xf2, 0x6a, 0x3d, 0xb9, 0xc5, 0x6d, 0xad, 0x6d, 0x3d, 0x89, 0xce, 0x96, 0xa5, 0x5d, 0x82,
+	0xc5, 0x11, 0xb1, 0x87, 0x23, 0x86, 0xc4, 0xc4, 0x75, 0x39, 0xd3, 0x3e, 0x06, 0x95, 0x8b, 0xa1,
+	0xa0, 0xe2, 0xda, 0xc5, 0xaa, 0x50, 0x4a, 0x35, 0x54, 0x4a, 0xb5, 0x17, 0x2a, 0xa5, 0x91, 0xe2,
+	0x0b, 0x3f, 0xff, 0x6d, 0x5d, 0xd1, 0x31, 0x42, 0xdb, 0x82, 0x9c, 0x63, 0x06, 0xcc, 0xe8, 0x73,
+	0xc6, 0xf8, 0xf2, 0x09, 0x4c, 0x71, 0xe5, 0x2c, 0x1d, 0x92, 0xd3, 0x90, 0x08, 0x1e, 0x25, 0x4c,
+	0x96, 0xb6, 0x01, 0x79, 0x4c, 0x32, 0xa0, 0xe3, 0xb1, 0xcd, 0x0c, 0xa4, 0x7c, 0x11, 0x29, 0x5f,
+	0xe2, 0xf6, 0x2d, 0x34, 0x3f, 0xe4, 0xe4, 0xaf, 0x41, 0xda, 0x32, 0x99, 0x29, 0x20, 0x49, 0x84,
+	0xa4, 0xb8, 0x01, 0x9d, 0xef, 0xc3, 0xf2, 0xbe, 0xe9, 0xd8, 0x96, 0xc9, 0xa8, 0x1f, 0x08, 0x48,
+	0x4a, 0x64, 0x99, 0x99, 0x11, 0x78, 0x07, 0x56, 0x5d, 0x72, 0xc0, 0x8c, 0xd3, 0xe8, 0x34, 0xa2,
+	0x35, 0xee, 0x7b, 0x3c, 0x1f, 0x71, 0x1d, 0x96, 0x06, 0x21, 0xf9, 0x02, 0x0b, 0x88, 0xcd, 0x4d,
+	0xad, 0x08, 0xbb, 0x02, 0x29, 0xd3, 0xf3, 0x04, 0x20, 0x83, 0x80, 0xa4, 0xe9, 0x79, 0xe8, 0xba,
+	0x05, 0x2b, 0x58, 0xa3, 0x4f, 0x82, 0x89, 0xc3, 0x64, 0x92, 0x2c, 0x62, 0x96, 0xb9, 0x43, 0x17,
+	0x76, 0xc4, 0x5e, 0x83, 0x1c, 0xd9, 0xb7, 0x2d, 0xe2, 0x0e, 0x88, 0xc0, 0xe5, 0x10, 0x97, 0x0d,
+	0x8d, 0x08, 0xba, 0x09, 0x79, 0xcf, 0xa7, 0x1e, 0x0d, 0x88, 0x6f, 0x98, 0x96, 0xe5, 0x93, 0x20,
+	0x28, 0x2c, 0x89, 0x7c, 0xa1, 0xbd, 0x2e, 0xcc, 0x95, 0xdb, 0xa0, 0x6e, 0x9b, 0xcc, 0xd4, 0xf2,
+	0x10, 0x67, 0x07, 0x41, 0x41, 0x29, 0xc7, 0x37, 0xb2, 0x3a, 0x1f, 0x9e, 0x7b, 0xe1, 0xfe, 0x8c,
+	0x81, 0xfa, 0x98, 0x32, 0xa2, 0xdd, 0x05, 0x95, 0x1f, 0x1d, 0x2a, 0x72, 0xe9, 0x3c, 0x85, 0x77,
+	0xed, 0xa1, 0x4b, 0xac, 0xdd, 0x60, 0xd8, 0x3b, 0xf4, 0x88, 0x8e, 0xe0, 0x88, 0xc4, 0x62, 0x73,
+	0x12, 0x5b, 0x85, 0x84, 0x4f, 0x27, 0xae, 0x85, 0xca, 0x4b, 0xe8, 0x62, 0xa2, 0x35, 0x21, 0x35,
+	0x55, 0x8e, 0xfa, 0x4f, 0xca, 0x59, 0xe6, 0xca, 0xe1, 0xba, 0x96, 0x06, 0x3d, 0xd9, 0x97, 0x02,
+	0x6a, 0x40, 0x7a, 0xfa, 0x98, 0x49, 0x05, 0xfe, 0x3b, 0x11, 0xcf, 0xc2, 0xb4, 0x0f, 0x60, 0x65,
+	0xaa, 0x87, 0x29, 0xa1, 0x42, 0x85, 0xf9, 0xa9, 0x43, 0x32, 0x3a, 0x27, 0x35, 0x43, 0x3c, 0x4b,
+	0x49, 0xac, 0x6b, 0x26, 0xb5, 0x16, 0xbe, 0x4f, 0xef, 0x42, 0x3a, 0xb0, 0x87, 0xae, 0xc9, 0x26,
+	0x3e, 0x91, 0x6a, 0x9c, 0x19, 0x2a, 0xdf, 0xc4, 0x60, 0x51, 0xa8, 0x3b, 0xc2, 0x9b, 0x72, 0x3e,
+	0x6f, 0xb1, 0x8b, 0x78, 0x8b, 0xbf, 0x39, 0x6f, 0x75, 0x80, 0xe9, 0x66, 0x82, 0x82, 0x5a, 0x8e,
+	0x6f, 0x64, 0x36, 0xd7, 0xce, 0x26, 0x12, 0x5b, 0xec, 0xda, 0x43, 0x79, 0x79, 0x23, 0x41, 0x53,
+	0x05, 0x25, 0x22, 0x4f, 0xe4, 0x3d, 0x48, 0xf7, 0x6d, 0x66, 0x98, 0xbe, 0x6f, 0x1e, 0x22, 0x85,
+	0x99, 0xcd, 0x52, 0x34, 0x2b, 0xef, 0x30, 0x55, 0xde, 0x61, 0xaa, 0x0d, 0x9b, 0xd5, 0x39, 0x4a,
+	0x4f, 0xf5, 0xe5, 0xa8, 0xf2, 0xab, 0x02, 0xe9, 0xe9, 0x82, 0x5a, 0x1d, 0x72, 0x61, 0xa1, 0xc6,
+	0x13, 0xc7, 0x1c, 0x4a, 0x31, 0x5e, 0xbd, 0xb0, 0xda, 0xfb, 0x8e, 0x39, 0xd4, 0x33, 0xb2, 0x40,
+	0x3e, 0x39, 0xff, 0x60, 0x63, 0x17, 0x1c, 0xec, 0x9c, 0x92, 0xe2, 0x6f, 0xa6, 0xa4, 0xb9, 0x33,
+	0x57, 0x4f, 0x9f, 0xf9, 0x8f, 0x31, 0x48, 0x75, 0xf0, 0x82, 0x9a, 0xce, 0xff, 0x71, 0xc5, 0xd6,
+	0x20, 0xed, 0x51, 0xc7, 0x10, 0x1e, 0x15, 0x3d, 0x29, 0x8f, 0x3a, 0xfa, 0x19, 0x1d, 0x25, 0xde,
+	0xd2, 0xfd, 0x5b, 0x7c, 0x0b, 0xac, 0x25, 0x4f, 0xb3, 0xe6, 0x43, 0x56, 0x50, 0x21, 0x1b, 0xe6,
+	0x1d, 0xce, 0x01, 0xf6, 0x5f, 0xd1, 0x2f, 0x0b, 0x67, 0xb7, 0x2d, 0x90, 0xba, 0xc4, 0xf1, 0x08,
+	0xd1, 0x5f, 0x64, 0xc7, 0x2e, 0x5c, 0xa4, 0x73, 0x5d, 0xe2, 0x2a, 0x3f, 0x2b, 0x90, 0xc6, 0x52,
+	0x77, 0x09, 0x33, 0xe7, 0xa8, 0x52, 0xde, 0x9c, 0xaa, 0xab, 0x00, 0x22, 0x4d, 0x60, 0x3f, 0x23,
+	0xf2, 0x00, 0xd3, 0x68, 0xe9, 0xda, 0xcf, 0x88, 0xf6, 0xd1, 0xb4, 0xae, 0xf8, 0xdf, 0xd7, 0x25,
+	0xaf, 0x62, 0x58, 0xdd, 0x65, 0x48, 0xba, 0x93, 0xb1, 0xc1, 0x9f, 0x77, 0x55, 0x88, 0xc2, 0x9d,
+	0x8c, 0x7b, 0x07, 0x41, 0xe5, 0x2b, 0x48, 0xf6, 0x0e, 0xf0, 0x2b, 0x87, 0x2b, 0xc1, 0xa7, 0x54,
+	0xf6, 0x57, 0xf1, 0x49, 0x93, 0xe2, 0x06, 0x6c, 0x27, 0x1a, 0xa8, 0xbc, 0x91, 0x86, 0x9d, 0x80,
+	0x8f, 0xb5, 0x0f, 0x21, 0xd1, 0xf9, 0x0f, 0x9f, 0x51, 0xba, 0x40, 0xdf, 0xfa, 0x49, 0x81, 0x4c,
+	0xe4, 0x36, 0x6a, 0x45, 0xb8, 0xd4, 0xd8, 0xd9, 0xdb, 0x7a, 0xb4, 0x6d, 0xb4, 0xb6, 0x8d, 0xfb,
+	0x3b, 0xf5, 0x07, 0xc6, 0x67, 0xed, 0x47, 0xed, 0xbd, 0xcf, 0xdb, 0xf9, 0x05, 0xad, 0x06, 0xab,
+	0xe8, 0x9b, 0xba, 0xea, 0x8d, 0x6e, 0xb3, 0xdd, 0xcb, 0x2b, 0xc5, 0x77, 0x8e, 0x8e, 0xcb, 0x2b,
+	0x91, 0x34, 0xf5, 0x7e, 0x40, 0x5c, 0x76, 0x36, 0x60, 0x6b, 0x6f, 0x77, 0xb7, 0xd5, 0xcb, 0xc7,
+	0xce, 0x04, 0xc8, 0x87, 0xf5, 0x26, 0xac, 0xcc, 0x07, 0xb4, 0x5b, 0x3b, 0xf9, 0x78, 0x51, 0x3b,
+	0x3a, 0x2e, 0x2f, 0x45, 0xd0, 0x6d, 0xdb, 0x29, 0xa6, 0xbe, 0xfe, 0xb6, 0xb4, 0xf0, 0xc3, 0x77,
+	0x25, 0xe5, 0xd6, 0xf7, 0x0a, 0xe4, 0xe6, 0xae, 0x9e, 0xb6, 0x06, 0x97, 0xbb, 0xad, 0x07, 0xed,
+	0xe6, 0xb6, 0xb1, 0xdb, 0x7d, 0x60, 0xf4, 0xbe, 0xe8, 0x34, 0x23, 0x55, 0xbc, 0x07, 0xd9, 0x8e,
+	0xde, 0x7c, 0xbc, 0xd7, 0x6b, 0xa2, 0x27, 0xaf, 0x14, 0x97, 0x8f, 0x8e, 0xcb, 0x99, 0x8e, 0x4f,
+	0xf6, 0x29, 0x23, 0x18, 0x7f, 0x1d, 0x96, 0x3a, 0x7a, 0x53, 0x6c, 0x56, 0x80, 0x62, 0xc5, 0x95,
+	0xa3, 0xe3, 0x72, 0xae, 0xe3, 0x13, 0xa1, 0x37, 0x84, 0x5d, 0x83, 0x5c, 0x47, 0xdf, 0xeb, 0xec,
+	0x75, 0xeb, 0x3b, 0x02, 0x55, 0x2e, 0xe6, 0x8f, 0x8e, 0xcb, 0xd9, 0xf0, 0xc5, 0xe0, 0xa0, 0xd9,
+	0x3e, 0x1b, 0xf7, 0x5f, 0x9c, 0x94, 0x94, 0x97, 0x27, 0x25, 0xe5, 0xf7, 0x93, 0x92, 0xf2, 0xfc,
+	0x75, 0x69, 0xe1, 0xe5, 0xeb, 0xd2, 0xc2, 0x2f, 0xaf, 0x4b, 0x0b, 0x5f, 0xde, 0x1e, 0xda, 0x6c,
+	0x34, 0xe9, 0x57, 0x07, 0x74, 0x5c, 0x9b, 0x1d, 0x5b, 0x74, 0x18, 0xf9, 0x85, 0xd1, 0x5f, 0xc4,
+	0xc9, 0xdd, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x84, 0xdd, 0x04, 0x77, 0x0c, 0x00, 0x00,
 }
 
 func (m *PartSetHeader) Marshal() (dAtA []byte, err error) {

proto/types/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.types;
+package tendermint.types;
 
 option go_package = "github.com/tendermint/tendermint/proto/types";
 
@@ -27,11 +27,11 @@ enum SignedMsgType {
 
   SIGNED_MSG_TYPE_UNKNOWN = 0;
   // Votes
-  PREVOTE_TYPE            = 1 [(gogoproto.enumvalue_customname) = "PrevoteType"];
-  PRECOMMIT_TYPE          = 2 [(gogoproto.enumvalue_customname) = "PrecommitType"];
+  PREVOTE_TYPE   = 1 [(gogoproto.enumvalue_customname) = "PrevoteType"];
+  PRECOMMIT_TYPE = 2 [(gogoproto.enumvalue_customname) = "PrecommitType"];
 
   // Proposals
-  PROPOSAL_TYPE           = 32 [(gogoproto.enumvalue_customname) = "ProposalType"];
+  PROPOSAL_TYPE = 32 [(gogoproto.enumvalue_customname) = "ProposalType"];
 }
 
 // PartsetHeader
@@ -41,9 +41,9 @@ message PartSetHeader {
 }
 
 message Part {
-  uint32                               index = 1;
-  bytes                                bytes = 2;
-  tendermint.proto.crypto.merkle.Proof proof = 3 [(gogoproto.nullable) = false];
+  uint32                         index = 1;
+  bytes                          bytes = 2;
+  tendermint.crypto.merkle.Proof proof = 3 [(gogoproto.nullable) = false];
 }
 
 // BlockID
@@ -57,10 +57,10 @@ message BlockID {
 // Header defines the structure of a Tendermint block header.
 message Header {
   // basic block info
-  tendermint.proto.version.Consensus version  = 1 [(gogoproto.nullable) = false];
-  string                             chain_id = 2 [(gogoproto.customname) = "ChainID"];
-  int64                              height   = 3;
-  google.protobuf.Timestamp          time     = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+  tendermint.version.Consensus version  = 1 [(gogoproto.nullable) = false];
+  string                       chain_id = 2 [(gogoproto.customname) = "ChainID"];
+  int64                        height   = 3;
+  google.protobuf.Timestamp    time     = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
 
   // prev block info
   BlockID last_block_id = 5 [(gogoproto.nullable) = false];
@@ -108,12 +108,12 @@ message Vote {
 
 // Commit contains the evidence that a block was committed by a set of validators.
 message Commit {
-  int64                               height     = 1;
-  int32                               round      = 2;
-  BlockID                             block_id   = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"];
-  repeated CommitSig                  signatures = 4 [(gogoproto.nullable) = false];
-  bytes                               hash       = 5;
-  tendermint.proto.libs.bits.BitArray bit_array  = 6;
+  int64                         height     = 1;
+  int32                         round      = 2;
+  BlockID                       block_id   = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"];
+  repeated CommitSig            signatures = 4 [(gogoproto.nullable) = false];
+  bytes                         hash       = 5;
+  tendermint.libs.bits.BitArray bit_array  = 6;
 }
 
 // CommitSig is a part of the Vote included in a Commit.
@@ -150,7 +150,7 @@ message BlockMeta {
 
 // TxProof represents a Merkle proof of the presence of a transaction in the Merkle tree.
 message TxProof {
-  bytes                                root_hash = 1;
-  bytes                                data      = 2;
-  tendermint.proto.crypto.merkle.Proof Proof     = 3;
+  bytes                          root_hash = 1;
+  bytes                          data      = 2;
+  tendermint.crypto.merkle.Proof Proof     = 3;
 }

proto/types/validator.pb.go

@@ -7,7 +7,6 @@ import (
 	fmt "fmt"
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	golang_proto "github.com/golang/protobuf/proto"
 	keys "github.com/tendermint/tendermint/proto/crypto/keys"
 	io "io"
 	math "math"
@@ -16,7 +15,6 @@ import (
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
-var _ = golang_proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
@@ -207,45 +205,39 @@ func (m *SimpleValidator) GetVotingPower() int64 {
 }
 
 func init() {
-	proto.RegisterType((*ValidatorSet)(nil), "tendermint.proto.types.ValidatorSet")
-	golang_proto.RegisterType((*ValidatorSet)(nil), "tendermint.proto.types.ValidatorSet")
-	proto.RegisterType((*Validator)(nil), "tendermint.proto.types.Validator")
-	golang_proto.RegisterType((*Validator)(nil), "tendermint.proto.types.Validator")
-	proto.RegisterType((*SimpleValidator)(nil), "tendermint.proto.types.SimpleValidator")
-	golang_proto.RegisterType((*SimpleValidator)(nil), "tendermint.proto.types.SimpleValidator")
+	proto.RegisterType((*ValidatorSet)(nil), "tendermint.types.ValidatorSet")
+	proto.RegisterType((*Validator)(nil), "tendermint.types.Validator")
+	proto.RegisterType((*SimpleValidator)(nil), "tendermint.types.SimpleValidator")
 }
 
 func init() { proto.RegisterFile("proto/types/validator.proto", fileDescriptor_2e7c6b38c20e5406) }
-func init() {
-	golang_proto.RegisterFile("proto/types/validator.proto", fileDescriptor_2e7c6b38c20e5406)
-}
 
 var fileDescriptor_2e7c6b38c20e5406 = []byte{
-	// 383 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x6b, 0xe2, 0x40,
-	0x18, 0xc6, 0x33, 0x2a, 0xba, 0x3b, 0x0a, 0xbb, 0x3b, 0x87, 0x25, 0xb8, 0x6c, 0x56, 0x3d, 0xec,
-	0x0a, 0x2b, 0x09, 0xb4, 0xe7, 0x42, 0xeb, 0xa1, 0x87, 0x7a, 0x91, 0x08, 0x1e, 0x7a, 0x09, 0x89,
-	0x19, 0xe2, 0x60, 0x74, 0x86, 0xc9, 0x24, 0x65, 0xbe, 0x45, 0xbf, 0x50, 0x4b, 0x8f, 0x1e, 0x3d,
-	0xf6, 0x54, 0x8a, 0xf9, 0x22, 0xc5, 0x8c, 0x49, 0x04, 0x2d, 0xb4, 0xb7, 0x79, 0x9f, 0xe7, 0xfd,
-	0xf3, 0x7b, 0x5f, 0x06, 0xfe, 0x62, 0x9c, 0x0a, 0x6a, 0x09, 0xc9, 0x70, 0x64, 0x25, 0x6e, 0x48,
-	0x7c, 0x57, 0x50, 0x6e, 0x66, 0x2a, 0xfa, 0x29, 0xf0, 0xca, 0xc7, 0x7c, 0x49, 0x56, 0x42, 0x29,
-	0x66, 0x96, 0xd7, 0xfe, 0x2b, 0xe6, 0x84, 0xfb, 0x0e, 0x73, 0xb9, 0x90, 0x96, 0x6a, 0x10, 0xd0,
-	0x80, 0x96, 0x2f, 0x95, 0xdd, 0xfe, 0xad, 0x94, 0x19, 0x97, 0x4c, 0x50, 0x6b, 0x81, 0x65, 0xa4,
-	0x06, 0x29, 0xbb, 0xf7, 0x08, 0x60, 0x6b, 0x9a, 0x8f, 0x9c, 0x60, 0x81, 0xae, 0x20, 0x2c, 0x10,
-	0x22, 0x1d, 0x74, 0xaa, 0xfd, 0xe6, 0x59, 0xd7, 0x3c, 0x0d, 0x61, 0x16, 0x95, 0xf6, 0x41, 0x11,
-	0xba, 0x80, 0x5f, 0x18, 0xa7, 0x8c, 0x46, 0x98, 0xeb, 0x95, 0x0e, 0xf8, 0x58, 0x83, 0xa2, 0x04,
-	0x0d, 0x20, 0x12, 0x54, 0xb8, 0xa1, 0x93, 0x50, 0x41, 0x56, 0x81, 0xc3, 0xe8, 0x1d, 0xe6, 0x7a,
-	0xb5, 0x03, 0xfa, 0x55, 0xfb, 0x7b, 0xe6, 0x4c, 0x33, 0x63, 0xbc, 0xd3, 0x7b, 0x0f, 0x00, 0x7e,
-	0x2d, 0xba, 0x20, 0x1d, 0x36, 0x5c, 0xdf, 0xe7, 0x38, 0xda, 0xa1, 0x83, 0x7e, 0xcb, 0xce, 0x43,
-	0x74, 0x0d, 0x1b, 0x2c, 0xf6, 0x9c, 0x05, 0x96, 0x7b, 0xa6, 0x7f, 0xc7, 0x4c, 0xea, 0x48, 0xe6,
-	0xee, 0x48, 0xe6, 0x38, 0xf6, 0x42, 0x32, 0x1b, 0x61, 0x39, 0xac, 0xad, 0x5f, 0xfe, 0x68, 0x76,
-	0x9d, 0xc5, 0xde, 0x08, 0x4b, 0xd4, 0x85, 0xad, 0x13, 0x5c, 0xcd, 0xa4, 0x44, 0x42, 0xff, 0xe1,
-	0x8f, 0x7c, 0x19, 0x87, 0x71, 0x42, 0x39, 0x11, 0x52, 0xaf, 0x29, 0xfe, 0xdc, 0x18, 0xef, 0xf5,
-	0x5e, 0x02, 0xbf, 0x4d, 0xc8, 0x92, 0x85, 0xb8, 0x5c, 0xe2, 0xb2, 0x44, 0x05, 0x9f, 0x42, 0x7d,
-	0x17, 0xb2, 0x72, 0x04, 0x39, 0xbc, 0x59, 0x6f, 0x0d, 0xb0, 0xd9, 0x1a, 0xe0, 0x75, 0x6b, 0x80,
-	0xfb, 0xd4, 0xd0, 0x9e, 0x52, 0x03, 0x6c, 0x52, 0x43, 0x7b, 0x4e, 0x0d, 0xed, 0x76, 0x10, 0x10,
-	0x31, 0x8f, 0x3d, 0x73, 0x46, 0x97, 0x56, 0x39, 0xfb, 0xf0, 0x79, 0xf0, 0x67, 0xbd, 0x7a, 0x16,
-	0x9c, 0xbf, 0x05, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x74, 0x56, 0xec, 0xc9, 0x02, 0x00, 0x00,
+	// 376 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x6a, 0xea, 0x40,
+	0x1c, 0xc5, 0x33, 0x2a, 0x7a, 0xef, 0x28, 0x5c, 0xef, 0xac, 0x82, 0xd2, 0x54, 0x5d, 0x14, 0xa1,
+	0x92, 0x40, 0xbb, 0x28, 0xb4, 0x9b, 0xe2, 0xa2, 0x1b, 0x37, 0x12, 0xc1, 0x45, 0x37, 0x21, 0x31,
+	0x43, 0x1c, 0x8c, 0xce, 0x30, 0x99, 0x58, 0xe6, 0x2d, 0xfa, 0x2c, 0xdd, 0xf4, 0x15, 0x5c, 0xba,
+	0xec, 0xaa, 0x14, 0x7d, 0x91, 0x62, 0xc6, 0x7c, 0xd0, 0x0f, 0xda, 0xdd, 0xcc, 0x39, 0xff, 0x93,
+	0xf3, 0xcb, 0x9f, 0x81, 0x6d, 0xc6, 0xa9, 0xa0, 0x96, 0x90, 0x0c, 0x47, 0xd6, 0xda, 0x0d, 0x89,
+	0xef, 0x0a, 0xca, 0xcd, 0x44, 0x45, 0x4d, 0x81, 0x57, 0x3e, 0xe6, 0x4b, 0xb2, 0x12, 0x66, 0x32,
+	0xd1, 0x3a, 0x13, 0x73, 0xc2, 0x7d, 0x87, 0xb9, 0x5c, 0x48, 0x4b, 0x45, 0x03, 0x1a, 0xd0, 0xfc,
+	0xa4, 0x92, 0xad, 0x13, 0xa5, 0xcc, 0xb8, 0x64, 0x82, 0x5a, 0x0b, 0x2c, 0x23, 0x55, 0xa1, 0xec,
+	0xde, 0x13, 0x80, 0x8d, 0x69, 0x5a, 0x36, 0xc1, 0x02, 0xdd, 0x40, 0x98, 0x95, 0x47, 0x3a, 0xe8,
+	0x94, 0xfb, 0xf5, 0x8b, 0xb6, 0xf9, 0xb1, 0xde, 0xcc, 0x32, 0x76, 0x61, 0x1c, 0x5d, 0xc1, 0x3f,
+	0x8c, 0x53, 0x46, 0x23, 0xcc, 0xf5, 0x52, 0x07, 0xfc, 0x14, 0xcd, 0x86, 0xd1, 0x00, 0x22, 0x41,
+	0x85, 0x1b, 0x3a, 0x6b, 0x2a, 0xc8, 0x2a, 0x70, 0x18, 0x7d, 0xc0, 0x5c, 0x2f, 0x77, 0x40, 0xbf,
+	0x6c, 0x37, 0x13, 0x67, 0x9a, 0x18, 0xe3, 0x83, 0xde, 0x7b, 0x06, 0xf0, 0x6f, 0xf6, 0x15, 0xa4,
+	0xc3, 0x9a, 0xeb, 0xfb, 0x1c, 0x47, 0x07, 0x5c, 0xd0, 0x6f, 0xd8, 0xe9, 0x15, 0xdd, 0xc2, 0x1a,
+	0x8b, 0x3d, 0x67, 0x81, 0xe5, 0x91, 0xa6, 0x5b, 0xa4, 0x51, 0x2b, 0x31, 0x0f, 0x2b, 0x31, 0xc7,
+	0xb1, 0x17, 0x92, 0xd9, 0x08, 0xcb, 0x61, 0x65, 0xf3, 0x7a, 0xaa, 0xd9, 0x55, 0x16, 0x7b, 0x23,
+	0x2c, 0x51, 0x17, 0x36, 0xbe, 0x20, 0xaa, 0xaf, 0x73, 0x18, 0x74, 0x0e, 0xff, 0xa7, 0xbf, 0xe1,
+	0x30, 0x4e, 0x28, 0x27, 0x42, 0xea, 0x15, 0x45, 0x9e, 0x1a, 0xe3, 0xa3, 0xde, 0x63, 0xf0, 0xdf,
+	0x84, 0x2c, 0x59, 0x88, 0x73, 0xfc, 0xeb, 0x1c, 0x12, 0xfc, 0x12, 0xf2, 0x5b, 0xbc, 0xd2, 0x27,
+	0xbc, 0xe1, 0xdd, 0x66, 0x67, 0x80, 0xed, 0xce, 0x00, 0x6f, 0x3b, 0x03, 0x3c, 0xee, 0x0d, 0x6d,
+	0xbb, 0x37, 0xb4, 0x97, 0xbd, 0xa1, 0xdd, 0x0f, 0x02, 0x22, 0xe6, 0xb1, 0x67, 0xce, 0xe8, 0xd2,
+	0xca, 0x1b, 0x8b, 0xc7, 0xc2, 0x8b, 0xf4, 0xaa, 0xc9, 0xe5, 0xf2, 0x3d, 0x00, 0x00, 0xff, 0xff,
+	0x1d, 0x26, 0xc3, 0xf5, 0xa7, 0x02, 0x00, 0x00,
 }
 
 func (m *ValidatorSet) Marshal() (dAtA []byte, err error) {

proto/types/validator.proto

@@ -1,16 +1,11 @@
 syntax = "proto3";
-package tendermint.proto.types;
+package tendermint.types;
 
 option go_package = "github.com/tendermint/tendermint/proto/types";
 
 import "third_party/proto/gogoproto/gogo.proto";
 import "proto/crypto/keys/types.proto";
 
-option (gogoproto.marshaler_all)        = true;
-option (gogoproto.unmarshaler_all)      = true;
-option (gogoproto.sizer_all)            = true;
-option (gogoproto.goproto_registration) = true;
-
 message ValidatorSet {
   repeated Validator validators         = 1;
   Validator          proposer           = 2;
@@ -18,13 +13,13 @@ message ValidatorSet {
 }
 
 message Validator {
-  bytes                                  address           = 1;
-  tendermint.proto.crypto.keys.PublicKey pub_key           = 2 [(gogoproto.nullable) = false];
-  int64                                  voting_power      = 3;
-  int64                                  proposer_priority = 4;
+  bytes                            address           = 1;
+  tendermint.crypto.keys.PublicKey pub_key           = 2 [(gogoproto.nullable) = false];
+  int64                            voting_power      = 3;
+  int64                            proposer_priority = 4;
 }
 
 message SimpleValidator {
-  tendermint.proto.crypto.keys.PublicKey pub_key      = 1;
-  int64                                  voting_power = 2;
+  tendermint.crypto.keys.PublicKey pub_key      = 1;
+  int64                            voting_power = 2;
 }

proto/version/version.pb.go

@@ -134,28 +134,28 @@ func (m *Consensus) GetApp() uint64 {
 }
 
 func init() {
-	proto.RegisterType((*App)(nil), "tendermint.proto.version.App")
-	proto.RegisterType((*Consensus)(nil), "tendermint.proto.version.Consensus")
+	proto.RegisterType((*App)(nil), "tendermint.version.App")
+	proto.RegisterType((*Consensus)(nil), "tendermint.version.Consensus")
 }
 
 func init() { proto.RegisterFile("proto/version/version.proto", fileDescriptor_14aa2353622f11e1) }
 
 var fileDescriptor_14aa2353622f11e1 = []byte{
-	// 224 bytes of a gzipped FileDescriptorProto
+	// 222 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x28, 0xca, 0x2f,
-	0xc9, 0xd7, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x60, 0x51, 0x21, 0x89,
-	0x92, 0xd4, 0xbc, 0x94, 0xd4, 0xa2, 0xdc, 0xcc, 0xbc, 0x12, 0x88, 0x88, 0x1e, 0x54, 0x5e, 0x4a,
-	0xad, 0x24, 0x23, 0xb3, 0x28, 0x25, 0xbe, 0x20, 0xb1, 0xa8, 0xa4, 0x52, 0x1f, 0x62, 0x44, 0x7a,
-	0x7e, 0x7a, 0x3e, 0x82, 0x05, 0x51, 0xaf, 0x64, 0xcb, 0xc5, 0xec, 0x58, 0x50, 0x20, 0x24, 0xc5,
-	0xc5, 0x01, 0xe6, 0x27, 0xe7, 0xe7, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0xc1, 0xf9, 0x20,
-	0xb9, 0xe2, 0xfc, 0xb4, 0x92, 0xf2, 0xc4, 0xa2, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xce, 0x20,
-	0x38, 0x5f, 0xc9, 0x92, 0x8b, 0xd3, 0x39, 0x3f, 0xaf, 0x38, 0x35, 0xaf, 0xb8, 0xb4, 0x58, 0x48,
-	0x84, 0x8b, 0x35, 0x29, 0x27, 0x3f, 0x39, 0x1b, 0x6a, 0x02, 0x84, 0x23, 0x24, 0xc0, 0xc5, 0x9c,
-	0x58, 0x50, 0x00, 0xd6, 0xc9, 0x12, 0x04, 0x62, 0x5a, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4,
-	0x71, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c,
-	0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x7a, 0xe9, 0x99, 0x25, 0x19,
-	0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0x0f, 0x22, 0x33, 0x51, 0xc2, 0x24, 0x89, 0x0d,
-	0xcc, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x05, 0x3a, 0xdb, 0xd4, 0x2b, 0x01, 0x00, 0x00,
+	0xc9, 0xd7, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x60, 0x51, 0x21, 0xa1,
+	0x92, 0xd4, 0xbc, 0x94, 0xd4, 0xa2, 0xdc, 0xcc, 0xbc, 0x12, 0x3d, 0xa8, 0x8c, 0x94, 0x5a, 0x49,
+	0x46, 0x66, 0x51, 0x4a, 0x7c, 0x41, 0x62, 0x51, 0x49, 0xa5, 0x3e, 0x44, 0x73, 0x7a, 0x7e, 0x7a,
+	0x3e, 0x82, 0x05, 0xd1, 0xab, 0x64, 0xcb, 0xc5, 0xec, 0x58, 0x50, 0x20, 0x24, 0xc5, 0xc5, 0x01,
+	0xe6, 0x27, 0xe7, 0xe7, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0xc1, 0xf9, 0x20, 0xb9, 0xe2,
+	0xfc, 0xb4, 0x92, 0xf2, 0xc4, 0xa2, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x38, 0x5f,
+	0xc9, 0x92, 0x8b, 0xd3, 0x39, 0x3f, 0xaf, 0x38, 0x35, 0xaf, 0xb8, 0xb4, 0x58, 0x48, 0x84, 0x8b,
+	0x35, 0x29, 0x27, 0x3f, 0x39, 0x1b, 0x6a, 0x02, 0x84, 0x23, 0x24, 0xc0, 0xc5, 0x9c, 0x58, 0x50,
+	0x00, 0xd6, 0xc9, 0x12, 0x04, 0x62, 0x5a, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x71, 0xe2,
+	0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70,
+	0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x7a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49,
+	0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x08, 0xaf, 0x21, 0x33, 0x51, 0x42, 0x23, 0x89, 0x0d, 0xcc, 0x35,
+	0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x42, 0x26, 0x61, 0x25, 0x01, 0x00, 0x00,
 }
 
 func (this *Consensus) Equal(that interface{}) bool {

proto/version/version.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tendermint.proto.version;
+package tendermint.version;
 
 option go_package = "github.com/tendermint/tendermint/proto/version";
 
@@ -17,7 +17,7 @@ message App {
 // including all blockchain data structures and the rules of the application's
 // state transition machine.
 message Consensus {
-  option (gogoproto.equal)    = true;
+  option (gogoproto.equal) = true;
 
   uint64 block = 1;
   uint64 app   = 2;

rpc/grpc/types.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: rpc/grpc/types.proto
+// source: proto/rpc/types.proto
 
 package coregrpc
 
@@ -34,7 +34,7 @@ func (m *RequestPing) Reset()         { *m = RequestPing{} }
 func (m *RequestPing) String() string { return proto.CompactTextString(m) }
 func (*RequestPing) ProtoMessage()    {}
 func (*RequestPing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15f63baabf91876a, []int{0}
+	return fileDescriptor_f35ca15370f9307c, []int{0}
 }
 func (m *RequestPing) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -71,7 +71,7 @@ func (m *RequestBroadcastTx) Reset()         { *m = RequestBroadcastTx{} }
 func (m *RequestBroadcastTx) String() string { return proto.CompactTextString(m) }
 func (*RequestBroadcastTx) ProtoMessage()    {}
 func (*RequestBroadcastTx) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15f63baabf91876a, []int{1}
+	return fileDescriptor_f35ca15370f9307c, []int{1}
 }
 func (m *RequestBroadcastTx) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -114,7 +114,7 @@ func (m *ResponsePing) Reset()         { *m = ResponsePing{} }
 func (m *ResponsePing) String() string { return proto.CompactTextString(m) }
 func (*ResponsePing) ProtoMessage()    {}
 func (*ResponsePing) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15f63baabf91876a, []int{2}
+	return fileDescriptor_f35ca15370f9307c, []int{2}
 }
 func (m *ResponsePing) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -152,7 +152,7 @@ func (m *ResponseBroadcastTx) Reset()         { *m = ResponseBroadcastTx{} }
 func (m *ResponseBroadcastTx) String() string { return proto.CompactTextString(m) }
 func (*ResponseBroadcastTx) ProtoMessage()    {}
 func (*ResponseBroadcastTx) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15f63baabf91876a, []int{3}
+	return fileDescriptor_f35ca15370f9307c, []int{3}
 }
 func (m *ResponseBroadcastTx) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -202,30 +202,31 @@ func init() {
 	proto.RegisterType((*ResponseBroadcastTx)(nil), "tendermint.rpc.grpc.ResponseBroadcastTx")
 }
 
-func init() { proto.RegisterFile("rpc/grpc/types.proto", fileDescriptor_15f63baabf91876a) }
-
-var fileDescriptor_15f63baabf91876a = []byte{
-	// 317 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x29, 0x2a, 0x48, 0xd6,
-	0x4f, 0x07, 0x11, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2,
-	0x25, 0xa9, 0x79, 0x29, 0xa9, 0x45, 0xb9, 0x99, 0x79, 0x25, 0x7a, 0x45, 0x05, 0xc9, 0x7a, 0x20,
-	0x05, 0x52, 0x62, 0x89, 0x49, 0xc9, 0x99, 0x10, 0x65, 0xc8, 0x8a, 0x95, 0x78, 0xb9, 0xb8, 0x83,
-	0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x02, 0x32, 0xf3, 0xd2, 0x95, 0x54, 0xb8, 0x84, 0xa0, 0x5c,
-	0xa7, 0xa2, 0xfc, 0xc4, 0x94, 0xe4, 0xc4, 0xe2, 0x92, 0x90, 0x0a, 0x21, 0x3e, 0x2e, 0xa6, 0x92,
-	0x0a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x9e, 0x20, 0xa6, 0x92, 0x0a, 0x25, 0x3e, 0x2e, 0x9e, 0xa0,
-	0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0xb0, 0xae, 0x85, 0x8c, 0x5c, 0xc2, 0x30, 0x01, 0x64,
-	0x7d, 0x8e, 0x5c, 0x1c, 0xc9, 0x19, 0xa9, 0xc9, 0xd9, 0xf1, 0x50, 0xdd, 0xdc, 0x46, 0x6a, 0x7a,
-	0x48, 0x8e, 0x03, 0x39, 0x49, 0x0f, 0xe2, 0x18, 0x98, 0x6e, 0x67, 0x90, 0xf2, 0x90, 0x8a, 0x20,
-	0xf6, 0x64, 0x08, 0x43, 0xc8, 0x9d, 0x8b, 0x2b, 0x25, 0x35, 0x27, 0xb3, 0x2c, 0xb5, 0x08, 0x64,
-	0x08, 0x13, 0xd8, 0x10, 0x0d, 0x02, 0x86, 0xb8, 0x40, 0x34, 0x84, 0x54, 0x04, 0x71, 0xa6, 0xc0,
-	0x98, 0x46, 0x7b, 0x19, 0xb9, 0x78, 0xe0, 0x6e, 0x73, 0x0c, 0xf0, 0x14, 0xf2, 0xe6, 0x62, 0x01,
-	0x39, 0x5e, 0x48, 0x41, 0x0f, 0x4b, 0x78, 0xe9, 0x21, 0x05, 0x8a, 0x94, 0x22, 0x0e, 0x15, 0x88,
-	0x10, 0x10, 0x4a, 0xe0, 0xe2, 0x46, 0xf6, 0xb8, 0x3a, 0x3e, 0x33, 0x91, 0x14, 0x4a, 0x69, 0xe0,
-	0x35, 0x1a, 0x49, 0xa5, 0x93, 0xcf, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78,
-	0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44,
-	0x19, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x4c, 0x43, 0x66,
-	0xc2, 0x92, 0x89, 0x75, 0x72, 0x7e, 0x51, 0x2a, 0x88, 0x91, 0xc4, 0x06, 0x8e, 0x7d, 0x63, 0x40,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x5d, 0xfe, 0x6b, 0x42, 0x02, 0x00, 0x00,
+func init() { proto.RegisterFile("proto/rpc/types.proto", fileDescriptor_f35ca15370f9307c) }
+
+var fileDescriptor_f35ca15370f9307c = []byte{
+	// 321 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x28, 0xca, 0x2f,
+	0xc9, 0xd7, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x03, 0xf3, 0x85, 0x84,
+	0x4b, 0x52, 0xf3, 0x52, 0x52, 0x8b, 0x72, 0x33, 0xf3, 0x4a, 0xf4, 0x8a, 0x0a, 0x92, 0xf5, 0xd2,
+	0x8b, 0x0a, 0x92, 0xa5, 0xc4, 0x20, 0x6a, 0x13, 0x93, 0x92, 0x33, 0x91, 0x15, 0x2b, 0xf1, 0x72,
+	0x71, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x04, 0x64, 0xe6, 0xa5, 0x2b, 0xa9, 0x70, 0x09,
+	0x41, 0xb9, 0x4e, 0x45, 0xf9, 0x89, 0x29, 0xc9, 0x89, 0xc5, 0x25, 0x21, 0x15, 0x42, 0x7c, 0x5c,
+	0x4c, 0x25, 0x15, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x4c, 0x25, 0x15, 0x4a, 0x7c, 0x5c,
+	0x3c, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x60, 0x5d, 0x0b, 0x19, 0xb9, 0x84, 0x61,
+	0x02, 0xc8, 0xfa, 0x1c, 0xb9, 0x38, 0x92, 0x33, 0x52, 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9, 0x8d,
+	0xd4, 0xf4, 0x90, 0x1c, 0x07, 0x72, 0x8c, 0x1e, 0xc4, 0x31, 0x30, 0xdd, 0xce, 0x20, 0xe5, 0x21,
+	0x15, 0x41, 0xec, 0xc9, 0x10, 0x86, 0x90, 0x3b, 0x17, 0x57, 0x4a, 0x6a, 0x4e, 0x66, 0x59, 0x6a,
+	0x11, 0xc8, 0x10, 0x26, 0xb0, 0x21, 0x1a, 0x04, 0x0c, 0x71, 0x81, 0x68, 0x08, 0xa9, 0x08, 0xe2,
+	0x4c, 0x81, 0x31, 0x8d, 0xf6, 0x32, 0x72, 0xf1, 0xc0, 0xdd, 0xe6, 0x18, 0xe0, 0x29, 0xe4, 0xcd,
+	0xc5, 0x02, 0x72, 0xbc, 0x90, 0x82, 0x1e, 0x96, 0xf0, 0xd2, 0x43, 0x0a, 0x14, 0x29, 0x45, 0x1c,
+	0x2a, 0x10, 0x21, 0x20, 0x94, 0xc0, 0xc5, 0x8d, 0xec, 0x71, 0x75, 0x7c, 0x66, 0x22, 0x29, 0x94,
+	0xd2, 0xc0, 0x6b, 0x34, 0x92, 0x4a, 0x27, 0x9f, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63,
+	0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96,
+	0x63, 0x88, 0x32, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0x98,
+	0x86, 0xcc, 0x04, 0xa5, 0x10, 0x90, 0xc1, 0xd6, 0xc9, 0xf9, 0x45, 0xa9, 0x20, 0x46, 0x12, 0x1b,
+	0x38, 0xf6, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x0b, 0x3a, 0xe3, 0x43, 0x02, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -341,7 +342,7 @@ var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "rpc/grpc/types.proto",
+	Metadata: "proto/rpc/types.proto",
 }
 
 func (m *RequestPing) Marshal() (dAtA []byte, err error) {

scripts/protocgen.sh

@@ -2,10 +2,19 @@
 
 set -eo pipefail
 
-proto_dirs=$(find . -path ./third_party -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
+proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
 for dir in $proto_dirs; do
   protoc \
   -I. \
-  --gogofaster_out=Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,plugins=grpc,paths=source_relative:. \
+  --gogofaster_out=\
+Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\
+Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,\
+plugins=grpc,paths=source_relative:. \
   $(find "${dir}" -maxdepth 1 -name '*.proto')
 done
+
+cp -r proto/abci/types.pb.go ./abci/types
+rm -rf proto/abci/types.pb.go
+
+cp -r proto/rpc/types.pb.go ./rpc/grpc
+rm -rf proto/rpc/types.pb.go