diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 6a70bb979..306741951 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -61,7 +61,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{0} + return fileDescriptor_types_8ef1cec46591baa0, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -483,7 +483,7 @@ func (m *RequestEcho) Reset() { *m = RequestEcho{} } func (m *RequestEcho) String() string { return proto.CompactTextString(m) } func (*RequestEcho) ProtoMessage() {} func (*RequestEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{1} + return fileDescriptor_types_8ef1cec46591baa0, []int{1} } func (m *RequestEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -529,7 +529,7 @@ func (m *RequestFlush) Reset() { *m = RequestFlush{} } func (m *RequestFlush) String() string { return proto.CompactTextString(m) } func (*RequestFlush) ProtoMessage() {} func (*RequestFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{2} + return fileDescriptor_types_8ef1cec46591baa0, []int{2} } func (m *RequestFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -571,7 +571,7 @@ func (m *RequestInfo) Reset() { *m = RequestInfo{} } func (m *RequestInfo) String() string { return proto.CompactTextString(m) } func (*RequestInfo) ProtoMessage() {} func (*RequestInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{3} + return fileDescriptor_types_8ef1cec46591baa0, []int{3} } func (m *RequestInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -634,7 +634,7 @@ func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } func (*RequestSetOption) ProtoMessage() {} func (*RequestSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{4} + return fileDescriptor_types_8ef1cec46591baa0, []int{4} } func (m *RequestSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -692,7 +692,7 @@ func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{5} + return fileDescriptor_types_8ef1cec46591baa0, []int{5} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -759,7 +759,7 @@ func (m *RequestInitChain) GetAppStateBytes() []byte { type RequestQuery struct { Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` - Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` + Height int64 `protobuf:"zigzag64,3,opt,name=height,proto3" json:"height,omitempty"` Prove bool `protobuf:"varint,4,opt,name=prove,proto3" json:"prove,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -770,7 +770,7 @@ func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} func (*RequestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{6} + return fileDescriptor_types_8ef1cec46591baa0, []int{6} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -842,7 +842,7 @@ func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} func (*RequestBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{7} + return fileDescriptor_types_8ef1cec46591baa0, []int{7} } func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -910,7 +910,7 @@ func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } func (*RequestCheckTx) ProtoMessage() {} func (*RequestCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{8} + return fileDescriptor_types_8ef1cec46591baa0, []int{8} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -957,7 +957,7 @@ func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } func (*RequestDeliverTx) ProtoMessage() {} func (*RequestDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{9} + return fileDescriptor_types_8ef1cec46591baa0, []int{9} } func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -994,7 +994,7 @@ func (m *RequestDeliverTx) GetTx() []byte { } type RequestEndBlock struct { - Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + Height int64 `protobuf:"zigzag64,1,opt,name=height,proto3" json:"height,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1004,7 +1004,7 @@ func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} func (*RequestEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{10} + return fileDescriptor_types_8ef1cec46591baa0, []int{10} } func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1050,7 +1050,7 @@ func (m *RequestCommit) Reset() { *m = RequestCommit{} } func (m *RequestCommit) String() string { return proto.CompactTextString(m) } func (*RequestCommit) ProtoMessage() {} func (*RequestCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{11} + return fileDescriptor_types_8ef1cec46591baa0, []int{11} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1103,7 +1103,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{12} + return fileDescriptor_types_8ef1cec46591baa0, []int{12} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1556,7 +1556,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{13} + return fileDescriptor_types_8ef1cec46591baa0, []int{13} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1603,7 +1603,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{14} + return fileDescriptor_types_8ef1cec46591baa0, []int{14} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1649,7 +1649,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{15} + return fileDescriptor_types_8ef1cec46591baa0, []int{15} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1682,7 +1682,7 @@ type ResponseInfo struct { Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` AppVersion uint64 `protobuf:"varint,3,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty"` - LastBlockHeight int64 `protobuf:"varint,4,opt,name=last_block_height,json=lastBlockHeight,proto3" json:"last_block_height,omitempty"` + LastBlockHeight int64 `protobuf:"zigzag64,4,opt,name=last_block_height,json=lastBlockHeight,proto3" json:"last_block_height,omitempty"` LastBlockAppHash []byte `protobuf:"bytes,5,opt,name=last_block_app_hash,json=lastBlockAppHash,proto3" json:"last_block_app_hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1693,7 +1693,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{16} + return fileDescriptor_types_8ef1cec46591baa0, []int{16} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1772,7 +1772,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{17} + return fileDescriptor_types_8ef1cec46591baa0, []int{17} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1834,7 +1834,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{18} + return fileDescriptor_types_8ef1cec46591baa0, []int{18} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1882,11 +1882,11 @@ type ResponseQuery struct { // bytes data = 2; // use "value" instead. Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` - Index int64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"` + Index int64 `protobuf:"zigzag64,5,opt,name=index,proto3" json:"index,omitempty"` Key []byte `protobuf:"bytes,6,opt,name=key,proto3" json:"key,omitempty"` Value []byte `protobuf:"bytes,7,opt,name=value,proto3" json:"value,omitempty"` Proof *merkle.Proof `protobuf:"bytes,8,opt,name=proof" json:"proof,omitempty"` - Height int64 `protobuf:"varint,9,opt,name=height,proto3" json:"height,omitempty"` + Height int64 `protobuf:"zigzag64,9,opt,name=height,proto3" json:"height,omitempty"` Codespace string `protobuf:"bytes,10,opt,name=codespace,proto3" json:"codespace,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1897,7 +1897,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{19} + return fileDescriptor_types_8ef1cec46591baa0, []int{19} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2000,7 +2000,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{20} + return fileDescriptor_types_8ef1cec46591baa0, []int{20} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2041,8 +2041,8 @@ type ResponseCheckTx struct { Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` - GasWanted int64 `protobuf:"varint,5,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` - GasUsed int64 `protobuf:"varint,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` + GasWanted int64 `protobuf:"zigzag64,5,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` + GasUsed int64 `protobuf:"zigzag64,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` Tags []common.KVPair `protobuf:"bytes,7,rep,name=tags" json:"tags,omitempty"` Codespace string `protobuf:"bytes,8,opt,name=codespace,proto3" json:"codespace,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -2054,7 +2054,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{21} + return fileDescriptor_types_8ef1cec46591baa0, []int{21} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2144,8 +2144,8 @@ type ResponseDeliverTx struct { Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` - GasWanted int64 `protobuf:"varint,5,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` - GasUsed int64 `protobuf:"varint,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` + GasWanted int64 `protobuf:"zigzag64,5,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` + GasUsed int64 `protobuf:"zigzag64,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` Tags []common.KVPair `protobuf:"bytes,7,rep,name=tags" json:"tags,omitempty"` Codespace string `protobuf:"bytes,8,opt,name=codespace,proto3" json:"codespace,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -2157,7 +2157,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{22} + return fileDescriptor_types_8ef1cec46591baa0, []int{22} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2255,7 +2255,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{23} + return fileDescriptor_types_8ef1cec46591baa0, []int{23} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2317,7 +2317,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{24} + return fileDescriptor_types_8ef1cec46591baa0, []int{24} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2367,7 +2367,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{25} + return fileDescriptor_types_8ef1cec46591baa0, []int{25} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2413,9 +2413,9 @@ func (m *ConsensusParams) GetEvidenceParams() *EvidenceParams { // BlockSize contains limits on the block size. type BlockSize struct { // Note: must be greater than 0 - MaxBytes int64 `protobuf:"varint,1,opt,name=max_bytes,json=maxBytes,proto3" json:"max_bytes,omitempty"` + MaxBytes int64 `protobuf:"zigzag64,1,opt,name=max_bytes,json=maxBytes,proto3" json:"max_bytes,omitempty"` // Note: must be greater or equal to -1 - MaxGas int64 `protobuf:"varint,2,opt,name=max_gas,json=maxGas,proto3" json:"max_gas,omitempty"` + MaxGas int64 `protobuf:"zigzag64,2,opt,name=max_gas,json=maxGas,proto3" json:"max_gas,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2425,7 +2425,7 @@ func (m *BlockSize) Reset() { *m = BlockSize{} } func (m *BlockSize) String() string { return proto.CompactTextString(m) } func (*BlockSize) ProtoMessage() {} func (*BlockSize) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{26} + return fileDescriptor_types_8ef1cec46591baa0, []int{26} } func (m *BlockSize) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2471,7 +2471,7 @@ func (m *BlockSize) GetMaxGas() int64 { // EvidenceParams contains limits on the evidence. type EvidenceParams struct { // Note: must be greater than 0 - MaxAge int64 `protobuf:"varint,1,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` + MaxAge int64 `protobuf:"zigzag64,1,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2481,7 +2481,7 @@ func (m *EvidenceParams) Reset() { *m = EvidenceParams{} } func (m *EvidenceParams) String() string { return proto.CompactTextString(m) } func (*EvidenceParams) ProtoMessage() {} func (*EvidenceParams) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{27} + return fileDescriptor_types_8ef1cec46591baa0, []int{27} } func (m *EvidenceParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2518,7 +2518,7 @@ func (m *EvidenceParams) GetMaxAge() int64 { } type LastCommitInfo struct { - Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` + Round int32 `protobuf:"zigzag32,1,opt,name=round,proto3" json:"round,omitempty"` Votes []VoteInfo `protobuf:"bytes,2,rep,name=votes" json:"votes"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -2529,7 +2529,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{28} + return fileDescriptor_types_8ef1cec46591baa0, []int{28} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2576,10 +2576,10 @@ type Header struct { // basic block info Version Version `protobuf:"bytes,1,opt,name=version" json:"version"` ChainID string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` + Height int64 `protobuf:"zigzag64,3,opt,name=height,proto3" json:"height,omitempty"` Time time.Time `protobuf:"bytes,4,opt,name=time,stdtime" json:"time"` - NumTxs int64 `protobuf:"varint,5,opt,name=num_txs,json=numTxs,proto3" json:"num_txs,omitempty"` - TotalTxs int64 `protobuf:"varint,6,opt,name=total_txs,json=totalTxs,proto3" json:"total_txs,omitempty"` + NumTxs int64 `protobuf:"zigzag64,5,opt,name=num_txs,json=numTxs,proto3" json:"num_txs,omitempty"` + TotalTxs int64 `protobuf:"zigzag64,6,opt,name=total_txs,json=totalTxs,proto3" json:"total_txs,omitempty"` // prev block info LastBlockId BlockID `protobuf:"bytes,7,opt,name=last_block_id,json=lastBlockId" json:"last_block_id"` // hashes of block data @@ -2603,7 +2603,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{29} + return fileDescriptor_types_8ef1cec46591baa0, []int{29} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2756,7 +2756,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{30} + return fileDescriptor_types_8ef1cec46591baa0, []int{30} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2811,7 +2811,7 @@ func (m *BlockID) Reset() { *m = BlockID{} } func (m *BlockID) String() string { return proto.CompactTextString(m) } func (*BlockID) ProtoMessage() {} func (*BlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{31} + return fileDescriptor_types_8ef1cec46591baa0, []int{31} } func (m *BlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2855,7 +2855,7 @@ func (m *BlockID) GetPartsHeader() PartSetHeader { } type PartSetHeader struct { - Total int32 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"` + Total int32 `protobuf:"zigzag32,1,opt,name=total,proto3" json:"total,omitempty"` Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -2866,7 +2866,7 @@ func (m *PartSetHeader) Reset() { *m = PartSetHeader{} } func (m *PartSetHeader) String() string { return proto.CompactTextString(m) } func (*PartSetHeader) ProtoMessage() {} func (*PartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{32} + return fileDescriptor_types_8ef1cec46591baa0, []int{32} } func (m *PartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2913,7 +2913,7 @@ func (m *PartSetHeader) GetHash() []byte { type Validator struct { Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // PubKey pub_key = 2 [(gogoproto.nullable)=false]; - Power int64 `protobuf:"varint,3,opt,name=power,proto3" json:"power,omitempty"` + Power int64 `protobuf:"zigzag64,3,opt,name=power,proto3" json:"power,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2923,7 +2923,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{33} + return fileDescriptor_types_8ef1cec46591baa0, []int{33} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2969,7 +2969,7 @@ func (m *Validator) GetPower() int64 { // ValidatorUpdate type ValidatorUpdate struct { PubKey PubKey `protobuf:"bytes,1,opt,name=pub_key,json=pubKey" json:"pub_key"` - Power int64 `protobuf:"varint,2,opt,name=power,proto3" json:"power,omitempty"` + Power int64 `protobuf:"zigzag64,2,opt,name=power,proto3" json:"power,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2979,7 +2979,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{34} + return fileDescriptor_types_8ef1cec46591baa0, []int{34} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3035,7 +3035,7 @@ func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{35} + return fileDescriptor_types_8ef1cec46591baa0, []int{35} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3090,7 +3090,7 @@ func (m *PubKey) Reset() { *m = PubKey{} } func (m *PubKey) String() string { return proto.CompactTextString(m) } func (*PubKey) ProtoMessage() {} func (*PubKey) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{36} + return fileDescriptor_types_8ef1cec46591baa0, []int{36} } func (m *PubKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3136,9 +3136,9 @@ func (m *PubKey) GetData() []byte { type Evidence struct { Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` Validator Validator `protobuf:"bytes,2,opt,name=validator" json:"validator"` - Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` + Height int64 `protobuf:"zigzag64,3,opt,name=height,proto3" json:"height,omitempty"` Time time.Time `protobuf:"bytes,4,opt,name=time,stdtime" json:"time"` - TotalVotingPower int64 `protobuf:"varint,5,opt,name=total_voting_power,json=totalVotingPower,proto3" json:"total_voting_power,omitempty"` + TotalVotingPower int64 `protobuf:"zigzag64,5,opt,name=total_voting_power,json=totalVotingPower,proto3" json:"total_voting_power,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -3148,7 +3148,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_types_4449c1011851ea19, []int{37} + return fileDescriptor_types_8ef1cec46591baa0, []int{37} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5933,7 +5933,7 @@ func (m *RequestQuery) MarshalTo(dAtA []byte) (int, error) { if m.Height != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Height)<<1)^uint64((m.Height>>63)))) } if m.Prove { dAtA[i] = 0x20 @@ -6078,7 +6078,7 @@ func (m *RequestEndBlock) MarshalTo(dAtA []byte) (int, error) { if m.Height != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Height)<<1)^uint64((m.Height>>63)))) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -6413,7 +6413,7 @@ func (m *ResponseInfo) MarshalTo(dAtA []byte) (int, error) { if m.LastBlockHeight != 0 { dAtA[i] = 0x20 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.LastBlockHeight)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.LastBlockHeight)<<1)^uint64((m.LastBlockHeight>>63)))) } if len(m.LastBlockAppHash) > 0 { dAtA[i] = 0x2a @@ -6543,7 +6543,7 @@ func (m *ResponseQuery) MarshalTo(dAtA []byte) (int, error) { if m.Index != 0 { dAtA[i] = 0x28 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Index)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Index)<<1)^uint64((m.Index>>63)))) } if len(m.Key) > 0 { dAtA[i] = 0x32 @@ -6570,7 +6570,7 @@ func (m *ResponseQuery) MarshalTo(dAtA []byte) (int, error) { if m.Height != 0 { dAtA[i] = 0x48 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Height)<<1)^uint64((m.Height>>63)))) } if len(m.Codespace) > 0 { dAtA[i] = 0x52 @@ -6658,12 +6658,12 @@ func (m *ResponseCheckTx) MarshalTo(dAtA []byte) (int, error) { if m.GasWanted != 0 { dAtA[i] = 0x28 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.GasWanted)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.GasWanted)<<1)^uint64((m.GasWanted>>63)))) } if m.GasUsed != 0 { dAtA[i] = 0x30 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.GasUsed)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.GasUsed)<<1)^uint64((m.GasUsed>>63)))) } if len(m.Tags) > 0 { for _, msg := range m.Tags { @@ -6730,12 +6730,12 @@ func (m *ResponseDeliverTx) MarshalTo(dAtA []byte) (int, error) { if m.GasWanted != 0 { dAtA[i] = 0x28 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.GasWanted)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.GasWanted)<<1)^uint64((m.GasWanted>>63)))) } if m.GasUsed != 0 { dAtA[i] = 0x30 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.GasUsed)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.GasUsed)<<1)^uint64((m.GasUsed>>63)))) } if len(m.Tags) > 0 { for _, msg := range m.Tags { @@ -6902,12 +6902,12 @@ func (m *BlockSize) MarshalTo(dAtA []byte) (int, error) { if m.MaxBytes != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.MaxBytes)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.MaxBytes)<<1)^uint64((m.MaxBytes>>63)))) } if m.MaxGas != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.MaxGas)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.MaxGas)<<1)^uint64((m.MaxGas>>63)))) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -6933,7 +6933,7 @@ func (m *EvidenceParams) MarshalTo(dAtA []byte) (int, error) { if m.MaxAge != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.MaxAge)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.MaxAge)<<1)^uint64((m.MaxAge>>63)))) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -6959,7 +6959,7 @@ func (m *LastCommitInfo) MarshalTo(dAtA []byte) (int, error) { if m.Round != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Round)) + i = encodeVarintTypes(dAtA, i, uint64((uint32(m.Round)<<1)^uint32((m.Round>>31)))) } if len(m.Votes) > 0 { for _, msg := range m.Votes { @@ -7011,7 +7011,7 @@ func (m *Header) MarshalTo(dAtA []byte) (int, error) { if m.Height != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Height)<<1)^uint64((m.Height>>63)))) } dAtA[i] = 0x22 i++ @@ -7024,12 +7024,12 @@ func (m *Header) MarshalTo(dAtA []byte) (int, error) { if m.NumTxs != 0 { dAtA[i] = 0x28 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NumTxs)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.NumTxs)<<1)^uint64((m.NumTxs>>63)))) } if m.TotalTxs != 0 { dAtA[i] = 0x30 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.TotalTxs)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.TotalTxs)<<1)^uint64((m.TotalTxs>>63)))) } dAtA[i] = 0x3a i++ @@ -7185,7 +7185,7 @@ func (m *PartSetHeader) MarshalTo(dAtA []byte) (int, error) { if m.Total != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Total)) + i = encodeVarintTypes(dAtA, i, uint64((uint32(m.Total)<<1)^uint32((m.Total>>31)))) } if len(m.Hash) > 0 { dAtA[i] = 0x12 @@ -7223,7 +7223,7 @@ func (m *Validator) MarshalTo(dAtA []byte) (int, error) { if m.Power != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Power)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Power)<<1)^uint64((m.Power>>63)))) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -7257,7 +7257,7 @@ func (m *ValidatorUpdate) MarshalTo(dAtA []byte) (int, error) { if m.Power != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Power)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Power)<<1)^uint64((m.Power>>63)))) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -7369,7 +7369,7 @@ func (m *Evidence) MarshalTo(dAtA []byte) (int, error) { if m.Height != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Height)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.Height)<<1)^uint64((m.Height>>63)))) } dAtA[i] = 0x22 i++ @@ -7382,7 +7382,7 @@ func (m *Evidence) MarshalTo(dAtA []byte) (int, error) { if m.TotalVotingPower != 0 { dAtA[i] = 0x28 i++ - i = encodeVarintTypes(dAtA, i, uint64(m.TotalVotingPower)) + i = encodeVarintTypes(dAtA, i, uint64((uint64(m.TotalVotingPower)<<1)^uint64((m.TotalVotingPower>>63)))) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -8503,7 +8503,7 @@ func (m *RequestQuery) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sozTypes(uint64(m.Height)) } if m.Prove { n += 2 @@ -8567,7 +8567,7 @@ func (m *RequestEndBlock) Size() (n int) { var l int _ = l if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sozTypes(uint64(m.Height)) } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -8754,7 +8754,7 @@ func (m *ResponseInfo) Size() (n int) { n += 1 + sovTypes(uint64(m.AppVersion)) } if m.LastBlockHeight != 0 { - n += 1 + sovTypes(uint64(m.LastBlockHeight)) + n += 1 + sozTypes(uint64(m.LastBlockHeight)) } l = len(m.LastBlockAppHash) if l > 0 { @@ -8820,7 +8820,7 @@ func (m *ResponseQuery) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } if m.Index != 0 { - n += 1 + sovTypes(uint64(m.Index)) + n += 1 + sozTypes(uint64(m.Index)) } l = len(m.Key) if l > 0 { @@ -8835,7 +8835,7 @@ func (m *ResponseQuery) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sozTypes(uint64(m.Height)) } l = len(m.Codespace) if l > 0 { @@ -8881,10 +8881,10 @@ func (m *ResponseCheckTx) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } if m.GasWanted != 0 { - n += 1 + sovTypes(uint64(m.GasWanted)) + n += 1 + sozTypes(uint64(m.GasWanted)) } if m.GasUsed != 0 { - n += 1 + sovTypes(uint64(m.GasUsed)) + n += 1 + sozTypes(uint64(m.GasUsed)) } if len(m.Tags) > 0 { for _, e := range m.Tags { @@ -8921,10 +8921,10 @@ func (m *ResponseDeliverTx) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } if m.GasWanted != 0 { - n += 1 + sovTypes(uint64(m.GasWanted)) + n += 1 + sozTypes(uint64(m.GasWanted)) } if m.GasUsed != 0 { - n += 1 + sovTypes(uint64(m.GasUsed)) + n += 1 + sozTypes(uint64(m.GasUsed)) } if len(m.Tags) > 0 { for _, e := range m.Tags { @@ -9001,10 +9001,10 @@ func (m *BlockSize) Size() (n int) { var l int _ = l if m.MaxBytes != 0 { - n += 1 + sovTypes(uint64(m.MaxBytes)) + n += 1 + sozTypes(uint64(m.MaxBytes)) } if m.MaxGas != 0 { - n += 1 + sovTypes(uint64(m.MaxGas)) + n += 1 + sozTypes(uint64(m.MaxGas)) } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -9016,7 +9016,7 @@ func (m *EvidenceParams) Size() (n int) { var l int _ = l if m.MaxAge != 0 { - n += 1 + sovTypes(uint64(m.MaxAge)) + n += 1 + sozTypes(uint64(m.MaxAge)) } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -9028,7 +9028,7 @@ func (m *LastCommitInfo) Size() (n int) { var l int _ = l if m.Round != 0 { - n += 1 + sovTypes(uint64(m.Round)) + n += 1 + sozTypes(uint64(m.Round)) } if len(m.Votes) > 0 { for _, e := range m.Votes { @@ -9052,15 +9052,15 @@ func (m *Header) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sozTypes(uint64(m.Height)) } l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) if m.NumTxs != 0 { - n += 1 + sovTypes(uint64(m.NumTxs)) + n += 1 + sozTypes(uint64(m.NumTxs)) } if m.TotalTxs != 0 { - n += 1 + sovTypes(uint64(m.TotalTxs)) + n += 1 + sozTypes(uint64(m.TotalTxs)) } l = m.LastBlockId.Size() n += 1 + l + sovTypes(uint64(l)) @@ -9140,7 +9140,7 @@ func (m *PartSetHeader) Size() (n int) { var l int _ = l if m.Total != 0 { - n += 1 + sovTypes(uint64(m.Total)) + n += 1 + sozTypes(uint64(m.Total)) } l = len(m.Hash) if l > 0 { @@ -9160,7 +9160,7 @@ func (m *Validator) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } if m.Power != 0 { - n += 1 + sovTypes(uint64(m.Power)) + n += 1 + sozTypes(uint64(m.Power)) } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -9174,7 +9174,7 @@ func (m *ValidatorUpdate) Size() (n int) { l = m.PubKey.Size() n += 1 + l + sovTypes(uint64(l)) if m.Power != 0 { - n += 1 + sovTypes(uint64(m.Power)) + n += 1 + sozTypes(uint64(m.Power)) } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -9223,12 +9223,12 @@ func (m *Evidence) Size() (n int) { l = m.Validator.Size() n += 1 + l + sovTypes(uint64(l)) if m.Height != 0 { - n += 1 + sovTypes(uint64(m.Height)) + n += 1 + sozTypes(uint64(m.Height)) } l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) if m.TotalVotingPower != 0 { - n += 1 + sovTypes(uint64(m.TotalVotingPower)) + n += 1 + sozTypes(uint64(m.TotalVotingPower)) } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) @@ -10308,7 +10308,7 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - m.Height = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -10318,11 +10318,13 @@ func (m *RequestQuery) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Height = int64(v) case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Prove", wireType) @@ -10735,7 +10737,7 @@ func (m *RequestEndBlock) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - m.Height = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -10745,11 +10747,13 @@ func (m *RequestEndBlock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Height = int64(v) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -11579,7 +11583,7 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field LastBlockHeight", wireType) } - m.LastBlockHeight = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11589,11 +11593,13 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.LastBlockHeight |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.LastBlockHeight = int64(v) case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastBlockAppHash", wireType) @@ -12000,7 +12006,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) } - m.Index = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12010,11 +12016,13 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Index |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Index = int64(v) case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) @@ -12114,7 +12122,7 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - m.Height = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12124,11 +12132,13 @@ func (m *ResponseQuery) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Height = int64(v) case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Codespace", wireType) @@ -12403,7 +12413,7 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field GasWanted", wireType) } - m.GasWanted = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12413,16 +12423,18 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GasWanted |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.GasWanted = int64(v) case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field GasUsed", wireType) } - m.GasUsed = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12432,11 +12444,13 @@ func (m *ResponseCheckTx) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GasUsed |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.GasUsed = int64(v) case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Tags", wireType) @@ -12660,7 +12674,7 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field GasWanted", wireType) } - m.GasWanted = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12670,16 +12684,18 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GasWanted |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.GasWanted = int64(v) case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field GasUsed", wireType) } - m.GasUsed = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12689,11 +12705,13 @@ func (m *ResponseDeliverTx) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GasUsed |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.GasUsed = int64(v) case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Tags", wireType) @@ -13154,7 +13172,7 @@ func (m *BlockSize) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MaxBytes", wireType) } - m.MaxBytes = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13164,16 +13182,18 @@ func (m *BlockSize) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxBytes |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.MaxBytes = int64(v) case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MaxGas", wireType) } - m.MaxGas = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13183,11 +13203,13 @@ func (m *BlockSize) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxGas |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.MaxGas = int64(v) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -13243,7 +13265,7 @@ func (m *EvidenceParams) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MaxAge", wireType) } - m.MaxAge = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13253,11 +13275,13 @@ func (m *EvidenceParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MaxAge |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.MaxAge = int64(v) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -13313,7 +13337,7 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Round", wireType) } - m.Round = 0 + var v int32 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13323,11 +13347,13 @@ func (m *LastCommitInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Round |= (int32(b) & 0x7F) << shift + v |= (int32(b) & 0x7F) << shift if b < 0x80 { break } } + v = int32((uint32(v) >> 1) ^ uint32(((v&1)<<31)>>31)) + m.Round = v case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Votes", wireType) @@ -13473,7 +13499,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - m.Height = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13483,11 +13509,13 @@ func (m *Header) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Height = int64(v) case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) @@ -13522,7 +13550,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NumTxs", wireType) } - m.NumTxs = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13532,16 +13560,18 @@ func (m *Header) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.NumTxs |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.NumTxs = int64(v) case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field TotalTxs", wireType) } - m.TotalTxs = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13551,11 +13581,13 @@ func (m *Header) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.TotalTxs |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.TotalTxs = int64(v) case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastBlockId", wireType) @@ -14121,7 +14153,7 @@ func (m *PartSetHeader) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Total", wireType) } - m.Total = 0 + var v int32 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -14131,11 +14163,13 @@ func (m *PartSetHeader) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Total |= (int32(b) & 0x7F) << shift + v |= (int32(b) & 0x7F) << shift if b < 0x80 { break } } + v = int32((uint32(v) >> 1) ^ uint32(((v&1)<<31)>>31)) + m.Total = v case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) @@ -14253,7 +14287,7 @@ func (m *Validator) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Power", wireType) } - m.Power = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -14263,11 +14297,13 @@ func (m *Validator) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Power |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Power = int64(v) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -14353,7 +14389,7 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Power", wireType) } - m.Power = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -14363,11 +14399,13 @@ func (m *ValidatorUpdate) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Power |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Power = int64(v) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -14694,7 +14732,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - m.Height = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -14704,11 +14742,13 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.Height = int64(v) case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) @@ -14743,7 +14783,7 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field TotalVotingPower", wireType) } - m.TotalVotingPower = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -14753,11 +14793,13 @@ func (m *Evidence) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.TotalVotingPower |= (int64(b) & 0x7F) << shift + v |= (uint64(b) & 0x7F) << shift if b < 0x80 { break } } + v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) + m.TotalVotingPower = int64(v) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -14885,15 +14927,15 @@ var ( ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow") ) -func init() { proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_4449c1011851ea19) } +func init() { proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_8ef1cec46591baa0) } func init() { - golang_proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_4449c1011851ea19) + golang_proto.RegisterFile("abci/types/types.proto", fileDescriptor_types_8ef1cec46591baa0) } -var fileDescriptor_types_4449c1011851ea19 = []byte{ - // 2177 bytes of a gzipped FileDescriptorProto +var fileDescriptor_types_8ef1cec46591baa0 = []byte{ + // 2176 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcd, 0x93, 0x1b, 0x47, - 0x15, 0xdf, 0xd1, 0x6a, 0x25, 0xcd, 0xd3, 0xea, 0x23, 0xed, 0xb5, 0x2d, 0x8b, 0xb0, 0xeb, 0x1a, + 0x15, 0xdf, 0xd1, 0x6a, 0x25, 0xcd, 0xd3, 0xea, 0xc3, 0xed, 0x8d, 0x2d, 0x8b, 0xb0, 0xeb, 0x1a, 0x43, 0xe2, 0x25, 0x8e, 0x36, 0x6c, 0x08, 0xb5, 0x8e, 0x43, 0xaa, 0x56, 0xb6, 0x61, 0xb7, 0x12, 0x60, 0x19, 0xdb, 0xcb, 0x85, 0xaa, 0xa9, 0x96, 0xa6, 0x2d, 0x4d, 0x59, 0x9a, 0x99, 0xcc, 0xb4, 0x36, 0x5a, 0x1f, 0x73, 0xce, 0x21, 0x07, 0xfe, 0x08, 0xfe, 0x84, 0x1c, 0x39, 0x51, 0x39, 0x72, @@ -14908,7 +14950,7 @@ var fileDescriptor_types_4449c1011851ea19 = []byte{ 0x9b, 0x31, 0xf5, 0x27, 0x95, 0xad, 0xdf, 0x55, 0xa1, 0x6e, 0xb3, 0x4f, 0x16, 0x2c, 0xe6, 0xe4, 0x36, 0x54, 0xd9, 0x78, 0x1a, 0xf4, 0x2a, 0x37, 0x8d, 0xdb, 0xcd, 0x7d, 0x32, 0x90, 0x9b, 0x28, 0xee, 0xc3, 0xf1, 0x34, 0x38, 0x5a, 0xb3, 0x51, 0x82, 0xbc, 0x05, 0x1b, 0x4f, 0x67, 0x8b, 0x78, - 0xda, 0x5b, 0x47, 0xd1, 0x2b, 0x79, 0xd1, 0x1f, 0x0b, 0xd6, 0xd1, 0x9a, 0x2d, 0x65, 0xc4, 0xb2, + 0xda, 0x5b, 0x47, 0xd1, 0xab, 0x79, 0xd1, 0x1f, 0x0b, 0xd6, 0xd1, 0x9a, 0x2d, 0x65, 0xc4, 0xb2, 0x9e, 0xff, 0x34, 0xe8, 0x55, 0xcb, 0x96, 0x3d, 0xf6, 0x9f, 0xe2, 0xb2, 0x42, 0x82, 0x1c, 0x00, 0xc4, 0x8c, 0x3b, 0x41, 0xc8, 0xbd, 0xc0, 0xef, 0x6d, 0xa0, 0xfc, 0xf5, 0xbc, 0xfc, 0x23, 0xc6, 0x7f, 0x8e, 0xec, 0xa3, 0x35, 0xdb, 0x8c, 0xf5, 0x44, 0x68, 0x7a, 0xbe, 0xc7, 0x9d, 0xf1, 0x94, @@ -14916,117 +14958,116 @@ var fileDescriptor_types_4449c1011851ea19 = []byte{ 0x55, 0x3e, 0x59, 0xb0, 0xe8, 0xbc, 0x57, 0x2f, 0xbb, 0xca, 0x2f, 0x04, 0x4b, 0x5c, 0x05, 0x65, 0xc8, 0x3d, 0x68, 0x8e, 0xd8, 0xc4, 0xf3, 0x9d, 0xd1, 0x2c, 0x18, 0x3f, 0xeb, 0x35, 0x50, 0xa5, 0x97, 0x57, 0x19, 0x0a, 0x81, 0xa1, 0xe0, 0x1f, 0xad, 0xd9, 0x30, 0x4a, 0x66, 0x64, 0x1f, 0x1a, - 0xe3, 0x29, 0x1b, 0x3f, 0x73, 0xf8, 0xb2, 0x67, 0xa2, 0xe6, 0xd5, 0xbc, 0xe6, 0x7d, 0xc1, 0x7d, - 0xbc, 0x3c, 0x5a, 0xb3, 0xeb, 0x63, 0x39, 0x24, 0xef, 0x81, 0xc9, 0x7c, 0x57, 0x6d, 0xd7, 0x44, - 0xa5, 0x6b, 0x85, 0xef, 0xe2, 0xbb, 0x7a, 0xb3, 0x06, 0x53, 0x63, 0x32, 0x80, 0x9a, 0x70, 0x14, - 0x8f, 0xf7, 0x36, 0x51, 0x67, 0xab, 0xb0, 0x11, 0xf2, 0x8e, 0xd6, 0x6c, 0x25, 0x25, 0xcc, 0xe7, - 0xb2, 0x99, 0x77, 0xc6, 0x22, 0x71, 0xb8, 0x2b, 0x65, 0xe6, 0x7b, 0x20, 0xf9, 0x78, 0x3c, 0xd3, - 0xd5, 0x93, 0x61, 0x1d, 0x36, 0xce, 0xe8, 0x6c, 0xc1, 0xac, 0x37, 0xa1, 0x99, 0xf1, 0x14, 0xd2, - 0x83, 0xfa, 0x9c, 0xc5, 0x31, 0x9d, 0xb0, 0x9e, 0x71, 0xd3, 0xb8, 0x6d, 0xda, 0x7a, 0x6a, 0xb5, - 0x61, 0x33, 0xeb, 0x27, 0xd6, 0x3c, 0x51, 0x14, 0xbe, 0x20, 0x14, 0xcf, 0x58, 0x14, 0x0b, 0x07, - 0x50, 0x8a, 0x6a, 0x4a, 0x6e, 0x41, 0x0b, 0xed, 0xe0, 0x68, 0xbe, 0xf0, 0xd3, 0xaa, 0xbd, 0x89, - 0xc4, 0x53, 0x25, 0xb4, 0x03, 0xcd, 0x70, 0x3f, 0x4c, 0x44, 0xd6, 0x51, 0x04, 0xc2, 0xfd, 0x50, - 0x09, 0x58, 0xef, 0x43, 0xb7, 0xe8, 0x4a, 0xa4, 0x0b, 0xeb, 0xcf, 0xd8, 0xb9, 0xda, 0x4f, 0x0c, - 0xc9, 0x96, 0xba, 0x16, 0xee, 0x61, 0xda, 0xea, 0x8e, 0x5f, 0x54, 0x12, 0xe5, 0xc4, 0x9b, 0xc8, - 0x01, 0x54, 0x45, 0x2c, 0xa3, 0x76, 0x73, 0xbf, 0x3f, 0x90, 0x81, 0x3e, 0xd0, 0x81, 0x3e, 0x78, - 0xac, 0x03, 0x7d, 0xd8, 0xf8, 0xea, 0xc5, 0xce, 0xda, 0x17, 0x7f, 0xdc, 0x31, 0x6c, 0xd4, 0x20, - 0x37, 0x84, 0x43, 0x50, 0xcf, 0x77, 0x3c, 0x57, 0xed, 0x53, 0xc7, 0xf9, 0xb1, 0x4b, 0x0e, 0xa1, - 0x3b, 0x0e, 0xfc, 0x98, 0xf9, 0xf1, 0x22, 0x76, 0x42, 0x1a, 0xd1, 0x79, 0xac, 0x62, 0x4d, 0x7f, - 0xfe, 0xfb, 0x9a, 0x7d, 0x82, 0x5c, 0xbb, 0x33, 0xce, 0x13, 0xc8, 0x07, 0x00, 0x67, 0x74, 0xe6, - 0xb9, 0x94, 0x07, 0x51, 0xdc, 0xab, 0xde, 0x5c, 0xcf, 0x28, 0x9f, 0x6a, 0xc6, 0x93, 0xd0, 0xa5, - 0x9c, 0x0d, 0xab, 0xe2, 0x64, 0x76, 0x46, 0x9e, 0xbc, 0x01, 0x1d, 0x1a, 0x86, 0x4e, 0xcc, 0x29, - 0x67, 0xce, 0xe8, 0x9c, 0xb3, 0x18, 0xe3, 0x71, 0xd3, 0x6e, 0xd1, 0x30, 0x7c, 0x24, 0xa8, 0x43, - 0x41, 0xb4, 0xdc, 0xe4, 0x6b, 0x62, 0xa8, 0x10, 0x02, 0x55, 0x97, 0x72, 0x8a, 0xd6, 0xd8, 0xb4, - 0x71, 0x2c, 0x68, 0x21, 0xe5, 0x53, 0x75, 0x47, 0x1c, 0x93, 0x6b, 0x50, 0x9b, 0x32, 0x6f, 0x32, - 0xe5, 0x78, 0xad, 0x75, 0x5b, 0xcd, 0x84, 0xe1, 0xc3, 0x28, 0x38, 0x63, 0x98, 0x2d, 0x1a, 0xb6, - 0x9c, 0x58, 0x7f, 0x35, 0xe0, 0xb5, 0x4b, 0xe1, 0x25, 0xd6, 0x9d, 0xd2, 0x78, 0xaa, 0xf7, 0x12, - 0x63, 0xf2, 0x96, 0x58, 0x97, 0xba, 0x2c, 0x52, 0x59, 0xac, 0xa5, 0x6e, 0x7c, 0x84, 0x44, 0x75, - 0x51, 0x25, 0x42, 0x1e, 0x42, 0x77, 0x46, 0x63, 0xee, 0xc8, 0x28, 0x70, 0x30, 0x4b, 0xad, 0xe7, - 0x22, 0xf3, 0x63, 0xaa, 0xa3, 0x45, 0x38, 0xa7, 0x52, 0x6f, 0xcf, 0x72, 0x54, 0x72, 0x04, 0x5b, - 0xa3, 0xf3, 0xe7, 0xd4, 0xe7, 0x9e, 0xcf, 0x9c, 0x4b, 0x36, 0xef, 0xa8, 0xa5, 0x1e, 0x9e, 0x79, - 0x2e, 0xf3, 0xc7, 0xda, 0xd8, 0x57, 0x12, 0x95, 0xe4, 0x63, 0xc4, 0xd6, 0x4d, 0x68, 0xe7, 0x73, - 0x01, 0x69, 0x43, 0x85, 0x2f, 0xd5, 0x0d, 0x2b, 0x7c, 0x69, 0x59, 0x89, 0x07, 0x26, 0x01, 0x79, - 0x49, 0x66, 0x17, 0x3a, 0x85, 0xe4, 0x90, 0x31, 0xb7, 0x91, 0x35, 0xb7, 0xd5, 0x81, 0x56, 0x2e, - 0x27, 0x58, 0x9f, 0x6f, 0x40, 0xc3, 0x66, 0x71, 0x28, 0x9c, 0x89, 0x1c, 0x80, 0xc9, 0x96, 0x63, - 0x26, 0xd3, 0xb1, 0x51, 0x48, 0x76, 0x52, 0xe6, 0xa1, 0xe6, 0x8b, 0xb4, 0x90, 0x08, 0x93, 0xdd, - 0x1c, 0x94, 0x5c, 0x29, 0x2a, 0x65, 0xb1, 0xe4, 0x4e, 0x1e, 0x4b, 0xb6, 0x0a, 0xb2, 0x05, 0x30, - 0xd9, 0xcd, 0x81, 0x49, 0x71, 0xe1, 0x1c, 0x9a, 0xdc, 0x2d, 0x41, 0x93, 0xe2, 0xf1, 0x57, 0xc0, - 0xc9, 0xdd, 0x12, 0x38, 0xe9, 0x5d, 0xda, 0xab, 0x14, 0x4f, 0xee, 0xe4, 0xf1, 0xa4, 0x78, 0x9d, - 0x02, 0xa0, 0x7c, 0x50, 0x06, 0x28, 0x37, 0x0a, 0x3a, 0x2b, 0x11, 0xe5, 0xdd, 0x4b, 0x88, 0x72, - 0xad, 0xa0, 0x5a, 0x02, 0x29, 0x77, 0x73, 0xb9, 0x1e, 0x4a, 0xef, 0x56, 0x9e, 0xec, 0xc9, 0x0f, - 0x2f, 0xa3, 0xd1, 0xf5, 0xe2, 0xa7, 0x2d, 0x83, 0xa3, 0xbd, 0x02, 0x1c, 0x5d, 0x2d, 0x9e, 0xb2, - 0x80, 0x47, 0x29, 0xaa, 0xec, 0x8a, 0xb8, 0x2f, 0x78, 0x9a, 0xc8, 0x11, 0x2c, 0x8a, 0x82, 0x48, - 0x25, 0x6c, 0x39, 0xb1, 0x6e, 0x8b, 0x4c, 0x94, 0xfa, 0xd7, 0x4b, 0x10, 0x08, 0x9d, 0x3e, 0xe3, - 0x5d, 0xd6, 0x97, 0x46, 0xaa, 0x8b, 0x11, 0x9d, 0xcd, 0x62, 0xa6, 0xca, 0x62, 0x19, 0x60, 0xaa, - 0xe4, 0x81, 0x69, 0x07, 0x9a, 0x22, 0x57, 0x16, 0x30, 0x87, 0x86, 0x1a, 0x73, 0xc8, 0xf7, 0xe0, - 0x35, 0xcc, 0x33, 0x12, 0xbe, 0x54, 0x20, 0x56, 0x31, 0x10, 0x3b, 0x82, 0x21, 0x2d, 0x26, 0x13, - 0xe0, 0xdb, 0x70, 0x25, 0x23, 0x2b, 0xd6, 0xc5, 0x1c, 0x27, 0x93, 0x6f, 0x37, 0x91, 0x3e, 0x0c, - 0xc3, 0x23, 0x1a, 0x4f, 0xad, 0x9f, 0xa6, 0x06, 0x4a, 0xf1, 0x8c, 0x40, 0x75, 0x1c, 0xb8, 0xf2, - 0xde, 0x2d, 0x1b, 0xc7, 0x02, 0xe3, 0x66, 0xc1, 0x04, 0x0f, 0x67, 0xda, 0x62, 0x28, 0xa4, 0x92, - 0x50, 0x32, 0x65, 0xcc, 0x58, 0xbf, 0x36, 0xd2, 0xf5, 0x52, 0x88, 0x2b, 0x43, 0x23, 0xe3, 0xbf, - 0x41, 0xa3, 0xca, 0xab, 0xa1, 0x91, 0x75, 0x61, 0xa4, 0x9f, 0x2c, 0xc1, 0x99, 0x6f, 0x76, 0x45, - 0xe1, 0x3d, 0x9e, 0xef, 0xb2, 0x25, 0x9a, 0x74, 0xdd, 0x96, 0x13, 0x5d, 0x02, 0xd4, 0xd0, 0xcc, - 0xf9, 0x12, 0xa0, 0x8e, 0x34, 0x39, 0x21, 0xb7, 0x10, 0x9f, 0x82, 0xa7, 0x2a, 0x54, 0x5b, 0x03, - 0x55, 0x4d, 0x9f, 0x08, 0xa2, 0x2d, 0x79, 0x99, 0x6c, 0x6b, 0xe6, 0xc0, 0xed, 0x75, 0x30, 0xc5, - 0x41, 0xe3, 0x90, 0x8e, 0x19, 0x46, 0x9e, 0x69, 0xa7, 0x04, 0xeb, 0x04, 0xc8, 0xe5, 0x88, 0x27, - 0xef, 0x43, 0x95, 0xd3, 0x89, 0xb0, 0xb7, 0x30, 0x59, 0x7b, 0x20, 0x1b, 0x80, 0xc1, 0x47, 0xa7, - 0x27, 0xd4, 0x8b, 0x86, 0xd7, 0x84, 0xa9, 0xfe, 0xfe, 0x62, 0xa7, 0x2d, 0x64, 0xee, 0x04, 0x73, - 0x8f, 0xb3, 0x79, 0xc8, 0xcf, 0x6d, 0xd4, 0xb1, 0xfe, 0x61, 0x08, 0x24, 0xc8, 0x65, 0x82, 0x52, - 0xc3, 0x69, 0x77, 0xaf, 0x64, 0x40, 0xfb, 0xeb, 0x19, 0xf3, 0xdb, 0x00, 0x13, 0x1a, 0x3b, 0x9f, - 0x52, 0x9f, 0x33, 0x57, 0x59, 0xd4, 0x9c, 0xd0, 0xf8, 0x97, 0x48, 0x10, 0x15, 0x8e, 0x60, 0x2f, - 0x62, 0xe6, 0xa2, 0x69, 0xd7, 0xed, 0xfa, 0x84, 0xc6, 0x4f, 0x62, 0xe6, 0x26, 0xf7, 0xaa, 0xbf, - 0xfa, 0xbd, 0xf2, 0x76, 0x6c, 0x14, 0xed, 0xf8, 0xcf, 0x8c, 0x0f, 0xa7, 0x20, 0xf9, 0xff, 0x7f, - 0xef, 0xbf, 0x19, 0xa2, 0x36, 0xc8, 0xa7, 0x61, 0x72, 0x0c, 0xaf, 0x25, 0x71, 0xe4, 0x2c, 0x30, - 0xbe, 0xb4, 0x2f, 0xbd, 0x3c, 0xfc, 0xba, 0x67, 0x79, 0x72, 0x4c, 0x7e, 0x06, 0xd7, 0x0b, 0x59, - 0x20, 0x59, 0xb0, 0xf2, 0xd2, 0x64, 0x70, 0x35, 0x9f, 0x0c, 0xf4, 0x7a, 0xda, 0x12, 0xeb, 0xdf, - 0xc0, 0xb3, 0xbf, 0x23, 0x0a, 0xa5, 0x2c, 0x78, 0x94, 0x7d, 0x4b, 0xeb, 0x33, 0x03, 0x3a, 0x85, - 0xc3, 0x90, 0x3d, 0x00, 0x99, 0x5a, 0x63, 0xef, 0xb9, 0x2e, 0xda, 0xbb, 0xea, 0xe0, 0x68, 0xb2, - 0x47, 0xde, 0x73, 0x66, 0x9b, 0x23, 0x3d, 0x24, 0x1f, 0x42, 0x87, 0xa9, 0xd2, 0x4d, 0xe7, 0xbe, - 0x4a, 0x0e, 0xc5, 0x74, 0x61, 0xa7, 0x6e, 0xdb, 0x66, 0xb9, 0xb9, 0x75, 0x08, 0x66, 0xb2, 0x2e, - 0xf9, 0x16, 0x98, 0x73, 0xba, 0x54, 0x05, 0xb5, 0x2c, 0xc5, 0x1a, 0x73, 0xba, 0xc4, 0x5a, 0x9a, - 0x5c, 0x87, 0xba, 0x60, 0x4e, 0xa8, 0xdc, 0x61, 0xdd, 0xae, 0xcd, 0xe9, 0xf2, 0x27, 0x34, 0xb6, - 0x76, 0xa1, 0x9d, 0xdf, 0x44, 0x8b, 0x6a, 0x70, 0x93, 0xa2, 0x87, 0x13, 0x66, 0x3d, 0x82, 0x76, - 0xbe, 0x66, 0x15, 0x79, 0x2c, 0x0a, 0x16, 0xbe, 0x8b, 0x82, 0x1b, 0xb6, 0x9c, 0x88, 0xb6, 0xf7, - 0x2c, 0x90, 0x9f, 0x2e, 0x5b, 0xa4, 0x9e, 0x06, 0x9c, 0x65, 0x2a, 0x5d, 0x29, 0x63, 0x7d, 0xb6, - 0x01, 0x35, 0x59, 0x40, 0x93, 0x41, 0xbe, 0x3d, 0x13, 0xdf, 0x4d, 0x69, 0x4a, 0xaa, 0x52, 0x4c, - 0xb0, 0xf1, 0x8d, 0x62, 0x8f, 0x33, 0x6c, 0x5e, 0xbc, 0xd8, 0xa9, 0x23, 0xae, 0x1c, 0x3f, 0x48, - 0x1b, 0x9e, 0x55, 0xfd, 0x80, 0xee, 0xae, 0xaa, 0xaf, 0xdc, 0x5d, 0x5d, 0x87, 0xba, 0xbf, 0x98, - 0x3b, 0x7c, 0x19, 0xab, 0xf8, 0xac, 0xf9, 0x8b, 0xf9, 0xe3, 0x65, 0x2c, 0xbe, 0x01, 0x0f, 0x38, - 0x9d, 0x21, 0x4b, 0x46, 0x67, 0x03, 0x09, 0x82, 0x79, 0x00, 0xad, 0x0c, 0xfc, 0x7a, 0xae, 0x2a, - 0xe3, 0xda, 0x59, 0x0f, 0x39, 0x7e, 0xa0, 0x6e, 0xd9, 0x4c, 0xe0, 0xf8, 0xd8, 0x25, 0xb7, 0xf3, - 0xcd, 0x04, 0xa2, 0x76, 0x03, 0x9d, 0x31, 0xd3, 0x2f, 0x08, 0xcc, 0x16, 0x07, 0x10, 0xee, 0x29, - 0x45, 0x4c, 0x14, 0x69, 0x08, 0x02, 0x32, 0xdf, 0x84, 0x4e, 0x0a, 0x7c, 0x52, 0x04, 0xe4, 0x2a, - 0x29, 0x19, 0x05, 0xdf, 0x81, 0x2d, 0x9f, 0x2d, 0xb9, 0x53, 0x94, 0x6e, 0xa2, 0x34, 0x11, 0xbc, - 0xd3, 0xbc, 0xc6, 0x77, 0xa1, 0x9d, 0x06, 0x30, 0xca, 0x6e, 0xca, 0x96, 0x2e, 0xa1, 0xa2, 0xd8, - 0x0d, 0x68, 0x24, 0x65, 0x47, 0x0b, 0x05, 0xea, 0x54, 0x56, 0x1b, 0x49, 0x21, 0x13, 0xb1, 0x78, - 0x31, 0xe3, 0x6a, 0x91, 0x36, 0xca, 0x60, 0x21, 0x63, 0x4b, 0x3a, 0xca, 0xde, 0x82, 0x56, 0x12, - 0x37, 0x28, 0xd7, 0x41, 0xb9, 0x4d, 0x4d, 0x44, 0xa1, 0x5d, 0xe8, 0x86, 0x51, 0x10, 0x06, 0x31, - 0x8b, 0x1c, 0xea, 0xba, 0x11, 0x8b, 0xe3, 0x5e, 0x57, 0xae, 0xa7, 0xe9, 0x87, 0x92, 0x6c, 0x7d, - 0x1f, 0xea, 0xba, 0x9e, 0xda, 0x82, 0x0d, 0xb4, 0x3a, 0xba, 0x60, 0xd5, 0x96, 0x13, 0x91, 0xb9, - 0x0f, 0xc3, 0x50, 0xbd, 0x0a, 0x88, 0xa1, 0xf5, 0x2b, 0xa8, 0xab, 0x0f, 0x56, 0xda, 0x2b, 0xfe, - 0x08, 0x36, 0x43, 0x1a, 0x89, 0x6b, 0x64, 0x3b, 0x46, 0x5d, 0xb1, 0x9f, 0xd0, 0x88, 0x3f, 0x62, - 0x3c, 0xd7, 0x38, 0x36, 0x51, 0x5e, 0x92, 0xac, 0xbb, 0xd0, 0xca, 0xc9, 0x88, 0x63, 0xa1, 0x1f, - 0xe9, 0x48, 0xc3, 0x49, 0xb2, 0x73, 0x25, 0xdd, 0xd9, 0xba, 0x07, 0x66, 0xf2, 0x6d, 0x44, 0x61, - 0xa9, 0xaf, 0x6e, 0x28, 0x73, 0xcb, 0x29, 0x36, 0xc3, 0xc1, 0xa7, 0x2c, 0x52, 0x31, 0x21, 0x27, - 0xd6, 0x13, 0xe8, 0x14, 0x52, 0x36, 0xb9, 0x03, 0xf5, 0x70, 0x31, 0x72, 0xf4, 0x23, 0x46, 0xda, - 0xf6, 0x9e, 0x2c, 0x46, 0x1f, 0xb1, 0x73, 0xdd, 0xf6, 0x86, 0x38, 0x4b, 0x97, 0xad, 0x64, 0x97, - 0x9d, 0x41, 0x43, 0x47, 0x3f, 0xf9, 0x01, 0x98, 0x89, 0x5b, 0x15, 0x72, 0x64, 0xb2, 0xb5, 0x5a, - 0x34, 0x15, 0x14, 0xde, 0x11, 0x7b, 0x13, 0x9f, 0xb9, 0x4e, 0x1a, 0x42, 0xb8, 0x47, 0xc3, 0xee, - 0x48, 0xc6, 0xc7, 0x3a, 0x5e, 0xac, 0x77, 0xa0, 0x26, 0xcf, 0x26, 0xec, 0x23, 0x56, 0xd6, 0xb5, - 0xb6, 0x18, 0x97, 0x26, 0xf3, 0x3f, 0x18, 0xd0, 0xd0, 0x59, 0xb0, 0x54, 0x29, 0x77, 0xe8, 0xca, - 0xd7, 0x3d, 0xf4, 0xff, 0x3e, 0xf1, 0xdc, 0x01, 0x22, 0xf3, 0xcb, 0x59, 0xc0, 0x3d, 0x7f, 0xe2, - 0x48, 0x5b, 0xcb, 0x1c, 0xd4, 0x45, 0xce, 0x29, 0x32, 0x4e, 0x04, 0x7d, 0xff, 0xf3, 0x0d, 0xe8, - 0x1c, 0x0e, 0xef, 0x1f, 0x1f, 0x86, 0xe1, 0xcc, 0x1b, 0x53, 0xac, 0xdf, 0xf7, 0xa0, 0x8a, 0x2d, - 0x4c, 0xc9, 0x13, 0x6c, 0xbf, 0xac, 0x97, 0x26, 0xfb, 0xb0, 0x81, 0x9d, 0x0c, 0x29, 0x7b, 0x89, - 0xed, 0x97, 0xb6, 0xd4, 0x62, 0x13, 0xd9, 0xeb, 0x5c, 0x7e, 0x90, 0xed, 0x97, 0xf5, 0xd5, 0xe4, - 0x43, 0x30, 0xd3, 0x16, 0x63, 0xd5, 0xb3, 0x6c, 0x7f, 0x65, 0x87, 0x2d, 0xf4, 0xd3, 0x72, 0x6c, - 0xd5, 0xeb, 0x62, 0x7f, 0x65, 0x2b, 0x4a, 0x0e, 0xa0, 0xae, 0x8b, 0xd8, 0xf2, 0x87, 0xd3, 0xfe, - 0x8a, 0xee, 0x57, 0x98, 0x47, 0x76, 0x0d, 0x65, 0xaf, 0xbb, 0xfd, 0xd2, 0x16, 0x9d, 0xbc, 0x07, - 0x35, 0x55, 0x59, 0x94, 0x3e, 0x9e, 0xf6, 0xcb, 0x7b, 0x58, 0x71, 0xc9, 0xb4, 0x6f, 0x5a, 0xf5, - 0x02, 0xdd, 0x5f, 0xf9, 0x96, 0x40, 0x0e, 0x01, 0x32, 0xc5, 0xff, 0xca, 0xa7, 0xe5, 0xfe, 0xea, - 0x37, 0x02, 0x72, 0x0f, 0x1a, 0xe9, 0xbb, 0x4f, 0xf9, 0x63, 0x71, 0x7f, 0x55, 0xdb, 0x3e, 0x7c, - 0xfd, 0x5f, 0x7f, 0xde, 0x36, 0x7e, 0x73, 0xb1, 0x6d, 0x7c, 0x79, 0xb1, 0x6d, 0x7c, 0x75, 0xb1, - 0x6d, 0xfc, 0xfe, 0x62, 0xdb, 0xf8, 0xd3, 0xc5, 0xb6, 0xf1, 0xdb, 0xbf, 0x6c, 0x1b, 0xa3, 0x1a, - 0xba, 0xff, 0xbb, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x7c, 0xbd, 0x95, 0x1c, 0x19, 0x00, - 0x00, + 0xe3, 0x29, 0x1b, 0x3f, 0x73, 0xf8, 0xb2, 0x67, 0xa2, 0xe6, 0x6b, 0x79, 0xcd, 0xfb, 0x82, 0xfb, + 0x78, 0x79, 0xb4, 0x66, 0xd7, 0xc7, 0x72, 0x48, 0xde, 0x03, 0x93, 0xf9, 0xae, 0xda, 0xae, 0x89, + 0x4a, 0xd7, 0x0a, 0xdf, 0xc5, 0x77, 0xf5, 0x66, 0x0d, 0xa6, 0xc6, 0x64, 0x00, 0x35, 0xe1, 0x28, + 0x1e, 0xef, 0x6d, 0xa2, 0xce, 0x56, 0x61, 0x23, 0xe4, 0x1d, 0xad, 0xd9, 0x4a, 0x4a, 0x98, 0xcf, + 0x65, 0x33, 0xef, 0x8c, 0x45, 0xe2, 0x70, 0x57, 0xcb, 0xcc, 0xf7, 0x40, 0xf2, 0xf1, 0x78, 0xa6, + 0xab, 0x27, 0xc3, 0x3a, 0x6c, 0x9c, 0xd1, 0xd9, 0x82, 0x59, 0x6f, 0x42, 0x33, 0xe3, 0x29, 0xa4, + 0x07, 0xf5, 0x39, 0x8b, 0x63, 0x3a, 0x61, 0x3d, 0xe3, 0xa6, 0x71, 0xdb, 0xb4, 0xf5, 0xd4, 0x6a, + 0xc3, 0x66, 0xd6, 0x4f, 0xac, 0x79, 0xa2, 0x28, 0x7c, 0x41, 0x28, 0x9e, 0xb1, 0x28, 0x16, 0x0e, + 0xa0, 0x14, 0xd5, 0x94, 0xdc, 0x82, 0x16, 0xda, 0xc1, 0xd1, 0x7c, 0xe1, 0xa7, 0x55, 0x7b, 0x13, + 0x89, 0xa7, 0x4a, 0x68, 0x07, 0x9a, 0xe1, 0x7e, 0x98, 0x88, 0xac, 0xa3, 0x08, 0x84, 0xfb, 0xa1, + 0x12, 0xb0, 0xde, 0x87, 0x6e, 0xd1, 0x95, 0x48, 0x17, 0xd6, 0x9f, 0xb1, 0x73, 0xb5, 0x9f, 0x18, + 0x92, 0x2d, 0x75, 0x2d, 0xdc, 0xc3, 0xb4, 0xd5, 0x1d, 0xbf, 0xa8, 0x24, 0xca, 0x89, 0x37, 0x91, + 0x03, 0xa8, 0x8a, 0x58, 0x46, 0xed, 0xe6, 0x7e, 0x7f, 0x20, 0x03, 0x7d, 0xa0, 0x03, 0x7d, 0xf0, + 0x58, 0x07, 0xfa, 0xb0, 0xf1, 0xd5, 0x8b, 0x9d, 0xb5, 0x2f, 0xfe, 0xb8, 0x63, 0xd8, 0xa8, 0x41, + 0x6e, 0x08, 0x87, 0xa0, 0x9e, 0xef, 0x78, 0xae, 0xda, 0xa7, 0x8e, 0xf3, 0x63, 0x97, 0x1c, 0x42, + 0x77, 0x1c, 0xf8, 0x31, 0xf3, 0xe3, 0x45, 0xec, 0x84, 0x34, 0xa2, 0xf3, 0x58, 0xc5, 0x9a, 0xfe, + 0xfc, 0xf7, 0x35, 0xfb, 0x04, 0xb9, 0x76, 0x67, 0x9c, 0x27, 0x90, 0x0f, 0x00, 0xce, 0xe8, 0xcc, + 0x73, 0x29, 0x0f, 0xa2, 0xb8, 0x57, 0xbd, 0xb9, 0x9e, 0x51, 0x3e, 0xd5, 0x8c, 0x27, 0xa1, 0x4b, + 0x39, 0x1b, 0x56, 0xc5, 0xc9, 0xec, 0x8c, 0x3c, 0x79, 0x03, 0x3a, 0x34, 0x0c, 0x9d, 0x98, 0x53, + 0xce, 0x9c, 0xd1, 0x39, 0x67, 0x31, 0xc6, 0xe3, 0xa6, 0xdd, 0xa2, 0x61, 0xf8, 0x48, 0x50, 0x87, + 0x82, 0x68, 0xb9, 0xc9, 0xd7, 0xc4, 0x50, 0x21, 0x04, 0xaa, 0x2e, 0xe5, 0x14, 0xad, 0xb1, 0x69, + 0xe3, 0x58, 0xd0, 0x42, 0xca, 0xa7, 0xea, 0x8e, 0x38, 0x26, 0xd7, 0xa0, 0x36, 0x65, 0xde, 0x64, + 0xca, 0xf1, 0x5a, 0xc4, 0x56, 0x33, 0x61, 0xf8, 0x30, 0x0a, 0xce, 0x18, 0x66, 0x8b, 0x86, 0x2d, + 0x27, 0xd6, 0x5f, 0x0d, 0xb8, 0x72, 0x29, 0xbc, 0xc4, 0xba, 0x53, 0x1a, 0x4f, 0xf5, 0x5e, 0x62, + 0x4c, 0xde, 0x12, 0xeb, 0x52, 0x97, 0x45, 0x2a, 0x8b, 0xb5, 0xd4, 0x8d, 0x8f, 0x90, 0xa8, 0x2e, + 0xaa, 0x44, 0xc8, 0x43, 0xe8, 0xce, 0x68, 0xcc, 0x1d, 0x19, 0x05, 0x0e, 0x66, 0xa9, 0xf5, 0x5c, + 0x64, 0x7e, 0x4c, 0x75, 0xb4, 0x08, 0xe7, 0x54, 0xea, 0xed, 0x59, 0x8e, 0x4a, 0x8e, 0x60, 0x6b, + 0x74, 0xfe, 0x9c, 0xfa, 0xdc, 0xf3, 0x99, 0x73, 0xc9, 0xe6, 0x1d, 0xb5, 0xd4, 0xc3, 0x33, 0xcf, + 0x65, 0xfe, 0x58, 0x1b, 0xfb, 0x6a, 0xa2, 0x92, 0x7c, 0x8c, 0xd8, 0xba, 0x09, 0xed, 0x7c, 0x2e, + 0x20, 0x6d, 0xa8, 0xf0, 0xa5, 0xba, 0x61, 0x85, 0x2f, 0x2d, 0x2b, 0xf1, 0xc0, 0x24, 0x20, 0x2f, + 0xc9, 0xec, 0x42, 0xa7, 0x90, 0x1c, 0x32, 0xe6, 0x36, 0xb2, 0xe6, 0xb6, 0x3a, 0xd0, 0xca, 0xe5, + 0x04, 0xeb, 0xf3, 0x0d, 0x68, 0xd8, 0x2c, 0x0e, 0x85, 0x33, 0x91, 0x03, 0x30, 0xd9, 0x72, 0xcc, + 0x64, 0x3a, 0x36, 0x0a, 0xc9, 0x4e, 0xca, 0x3c, 0xd4, 0x7c, 0x91, 0x16, 0x12, 0x61, 0xb2, 0x9b, + 0x83, 0x92, 0xab, 0x45, 0xa5, 0x2c, 0x96, 0xdc, 0xc9, 0x63, 0xc9, 0x56, 0x41, 0xb6, 0x00, 0x26, + 0xbb, 0x39, 0x30, 0x29, 0x2e, 0x9c, 0x43, 0x93, 0xbb, 0x25, 0x68, 0x52, 0x3c, 0xfe, 0x0a, 0x38, + 0xb9, 0x5b, 0x02, 0x27, 0xbd, 0x4b, 0x7b, 0x95, 0xe2, 0xc9, 0x9d, 0x3c, 0x9e, 0x14, 0xaf, 0x53, + 0x00, 0x94, 0x0f, 0xca, 0x00, 0xe5, 0x46, 0x41, 0x67, 0x25, 0xa2, 0xbc, 0x7b, 0x09, 0x51, 0xae, + 0x15, 0x54, 0x4b, 0x20, 0xe5, 0x6e, 0x2e, 0xd7, 0x43, 0xe9, 0xdd, 0xca, 0x93, 0x3d, 0xf9, 0xe1, + 0x65, 0x34, 0xba, 0x5e, 0xfc, 0xb4, 0x65, 0x70, 0xb4, 0x57, 0x80, 0xa3, 0xd7, 0x8a, 0xa7, 0x2c, + 0xe0, 0x51, 0x8a, 0x2a, 0xbb, 0x22, 0xee, 0x0b, 0x9e, 0x26, 0x72, 0x04, 0x8b, 0xa2, 0x20, 0x52, + 0x09, 0x5b, 0x4e, 0xac, 0xdb, 0x22, 0x13, 0xa5, 0xfe, 0xf5, 0x12, 0x04, 0x42, 0xa7, 0xcf, 0x78, + 0x97, 0xf5, 0xa5, 0x91, 0xea, 0x62, 0x44, 0x67, 0xb3, 0x98, 0xa9, 0xb2, 0x58, 0x06, 0x98, 0x2a, + 0x79, 0x60, 0xda, 0x81, 0xa6, 0xc8, 0x95, 0x05, 0xcc, 0xa1, 0xa1, 0xc6, 0x1c, 0xf2, 0x3d, 0xb8, + 0x82, 0x79, 0x46, 0xc2, 0x97, 0x0a, 0xc4, 0x2a, 0x06, 0x62, 0x47, 0x30, 0xa4, 0xc5, 0x64, 0x02, + 0x7c, 0x1b, 0xae, 0x66, 0x64, 0xc5, 0xba, 0x98, 0xe3, 0x64, 0xf2, 0xed, 0x26, 0xd2, 0x87, 0x61, + 0x78, 0x44, 0xe3, 0xa9, 0xf5, 0xd3, 0xd4, 0x40, 0x29, 0x9e, 0x11, 0xa8, 0x8e, 0x03, 0x57, 0xde, + 0xbb, 0x65, 0xe3, 0x58, 0x60, 0xdc, 0x2c, 0x98, 0xe0, 0xe1, 0x4c, 0x5b, 0x0c, 0x85, 0x54, 0x12, + 0x4a, 0xa6, 0x8c, 0x19, 0xeb, 0xd7, 0x46, 0xba, 0x5e, 0x0a, 0x71, 0x65, 0x68, 0x64, 0xfc, 0x37, + 0x68, 0x54, 0x79, 0x35, 0x34, 0xb2, 0x2e, 0x8c, 0xf4, 0x93, 0x25, 0x38, 0xf3, 0xcd, 0xae, 0x28, + 0xbc, 0xc7, 0xf3, 0x5d, 0xb6, 0x44, 0x93, 0x12, 0x5b, 0x4e, 0x74, 0x09, 0x50, 0x43, 0x33, 0xe7, + 0x4b, 0x80, 0x3a, 0xd2, 0xe4, 0x84, 0xdc, 0x42, 0x7c, 0x0a, 0x9e, 0xaa, 0x50, 0x6d, 0x0d, 0x54, + 0x35, 0x7d, 0x22, 0x88, 0xb6, 0xe4, 0x65, 0xb2, 0xad, 0x99, 0x03, 0xb7, 0xd7, 0xc1, 0x14, 0x07, + 0x8d, 0x43, 0x3a, 0x66, 0x18, 0x79, 0xa6, 0x9d, 0x12, 0xac, 0x13, 0x20, 0x97, 0x23, 0x9e, 0xbc, + 0x0f, 0x55, 0x4e, 0x27, 0xc2, 0xde, 0xc2, 0x64, 0xed, 0x81, 0x6c, 0x00, 0x06, 0x1f, 0x9d, 0x9e, + 0x50, 0x2f, 0x1a, 0x5e, 0x13, 0xa6, 0xfa, 0xfb, 0x8b, 0x9d, 0xb6, 0x90, 0xb9, 0x13, 0xcc, 0x3d, + 0xce, 0xe6, 0x21, 0x3f, 0xb7, 0x51, 0xc7, 0xfa, 0x87, 0x21, 0x90, 0x20, 0x97, 0x09, 0x4a, 0x0d, + 0xa7, 0xdd, 0xbd, 0x92, 0x01, 0xed, 0xaf, 0x67, 0xcc, 0x6f, 0x03, 0x4c, 0x68, 0xec, 0x7c, 0x4a, + 0x7d, 0xce, 0x5c, 0x65, 0x51, 0x73, 0x42, 0xe3, 0x5f, 0x22, 0x41, 0x54, 0x38, 0x82, 0xbd, 0x88, + 0x99, 0x8b, 0xa6, 0x25, 0x76, 0x7d, 0x42, 0xe3, 0x27, 0x31, 0x73, 0x93, 0x7b, 0xd5, 0x5f, 0xfd, + 0x5e, 0x79, 0x3b, 0x36, 0x8a, 0x76, 0xfc, 0x67, 0xc6, 0x87, 0x53, 0x90, 0xfc, 0xff, 0xbf, 0xf7, + 0xdf, 0x0c, 0x51, 0x1b, 0xe4, 0xd3, 0x30, 0x39, 0x86, 0x2b, 0x49, 0x1c, 0x39, 0x0b, 0x8c, 0x2f, + 0xed, 0x4b, 0x2f, 0x0f, 0xbf, 0xee, 0x59, 0x9e, 0x1c, 0x93, 0x9f, 0xc1, 0xf5, 0x42, 0x16, 0x48, + 0x16, 0xac, 0xbc, 0x34, 0x19, 0xbc, 0x96, 0x4f, 0x06, 0x7a, 0x3d, 0x6d, 0x89, 0xf5, 0x6f, 0xe0, + 0xd9, 0xdf, 0x11, 0x85, 0x52, 0x16, 0x3c, 0xca, 0xbe, 0xa5, 0xf5, 0x99, 0x01, 0x9d, 0xc2, 0x61, + 0xc8, 0x1e, 0x80, 0x4c, 0xad, 0xb1, 0xf7, 0x5c, 0x17, 0xed, 0x5d, 0x75, 0x70, 0x34, 0xd9, 0x23, + 0xef, 0x39, 0xb3, 0xcd, 0x91, 0x1e, 0x92, 0x0f, 0xa1, 0xc3, 0x54, 0xe9, 0xa6, 0x73, 0x5f, 0x25, + 0x87, 0x62, 0xba, 0xb0, 0x53, 0xb7, 0x6d, 0xb3, 0xdc, 0xdc, 0x3a, 0x04, 0x33, 0x59, 0x97, 0x7c, + 0x0b, 0xcc, 0x39, 0x5d, 0xaa, 0x82, 0x5a, 0x96, 0x62, 0x8d, 0x39, 0x5d, 0x62, 0x2d, 0x4d, 0xae, + 0x43, 0x5d, 0x30, 0x27, 0x54, 0xee, 0x40, 0xec, 0xda, 0x9c, 0x2e, 0x7f, 0x42, 0x63, 0x6b, 0x17, + 0xda, 0xf9, 0x4d, 0xb4, 0xa8, 0x06, 0x37, 0x29, 0x7a, 0x38, 0x61, 0xd6, 0x23, 0x68, 0xe7, 0x6b, + 0x56, 0x91, 0xc7, 0xa2, 0x60, 0xe1, 0xbb, 0x28, 0x78, 0xc5, 0x96, 0x13, 0xd1, 0xf6, 0x9e, 0x05, + 0xf2, 0xd3, 0x65, 0x8b, 0xd4, 0xd3, 0x80, 0xb3, 0x4c, 0xa5, 0x2b, 0x65, 0xac, 0xcf, 0x36, 0xa0, + 0x26, 0x0b, 0x68, 0x32, 0xc8, 0xb7, 0x67, 0xe2, 0xbb, 0x29, 0x4d, 0x49, 0x55, 0x8a, 0x09, 0x36, + 0xbe, 0x51, 0xec, 0x71, 0x86, 0xcd, 0x8b, 0x17, 0x3b, 0x75, 0xc4, 0x95, 0xe3, 0x07, 0x69, 0xc3, + 0xb3, 0xaa, 0x1f, 0xd0, 0xdd, 0x55, 0xf5, 0x95, 0xbb, 0xab, 0xeb, 0x50, 0xf7, 0x17, 0x73, 0x87, + 0x2f, 0x63, 0x15, 0x9f, 0x35, 0x7f, 0x31, 0x7f, 0xbc, 0x8c, 0xc5, 0x37, 0xe0, 0x01, 0xa7, 0x33, + 0x64, 0xc9, 0xe8, 0x6c, 0x20, 0x41, 0x30, 0x0f, 0xa0, 0x95, 0x81, 0x5f, 0xcf, 0x55, 0x65, 0x5c, + 0x3b, 0xeb, 0x21, 0xc7, 0x0f, 0xd4, 0x2d, 0x9b, 0x09, 0x1c, 0x1f, 0xbb, 0xe4, 0x76, 0xbe, 0x99, + 0x40, 0xd4, 0x6e, 0xa0, 0x33, 0x66, 0xfa, 0x05, 0x81, 0xd9, 0xe2, 0x00, 0xc2, 0x3d, 0xa5, 0x88, + 0x89, 0x22, 0x0d, 0x41, 0x40, 0xe6, 0x9b, 0xd0, 0x49, 0x81, 0x4f, 0x8a, 0x80, 0x5c, 0x25, 0x25, + 0xa3, 0xe0, 0x3b, 0xb0, 0xe5, 0xb3, 0x25, 0x77, 0x8a, 0xd2, 0x4d, 0x94, 0x26, 0x82, 0x77, 0x9a, + 0xd7, 0xf8, 0x2e, 0xb4, 0xd3, 0x00, 0x46, 0xd9, 0x4d, 0xd9, 0xd2, 0x25, 0x54, 0x14, 0xbb, 0x01, + 0x8d, 0xa4, 0xec, 0x68, 0xa1, 0x40, 0x9d, 0xca, 0x6a, 0x23, 0x29, 0x64, 0x22, 0x16, 0x2f, 0x66, + 0x5c, 0x2d, 0xd2, 0x46, 0x19, 0x2c, 0x64, 0x6c, 0x49, 0x47, 0xd9, 0x5b, 0xd0, 0x4a, 0xe2, 0x06, + 0xe5, 0x3a, 0x28, 0xb7, 0xa9, 0x89, 0x28, 0xb4, 0x0b, 0xdd, 0x30, 0x0a, 0xc2, 0x20, 0x66, 0x91, + 0x43, 0x5d, 0x37, 0x62, 0x71, 0xdc, 0xeb, 0xca, 0xf5, 0x34, 0xfd, 0x50, 0x92, 0xad, 0xef, 0x43, + 0x5d, 0xd7, 0x53, 0x5b, 0xb0, 0x81, 0x56, 0x47, 0x17, 0xac, 0xda, 0x72, 0x22, 0x32, 0xf7, 0x61, + 0x18, 0xaa, 0x57, 0x01, 0x31, 0xb4, 0x7e, 0x05, 0x75, 0xf5, 0xc1, 0x4a, 0x7b, 0xc5, 0x1f, 0xc1, + 0x66, 0x48, 0x23, 0x71, 0x8d, 0x6c, 0xc7, 0xa8, 0x2b, 0xf6, 0x13, 0x1a, 0xf1, 0x47, 0x8c, 0xe7, + 0x1a, 0xc7, 0x26, 0xca, 0x4b, 0x92, 0x75, 0x17, 0x5a, 0x39, 0x19, 0x71, 0x2c, 0xf4, 0x23, 0x1d, + 0x69, 0x38, 0x49, 0x76, 0xae, 0xa4, 0x3b, 0x5b, 0xf7, 0xc0, 0x4c, 0xbe, 0x8d, 0x28, 0x2c, 0xf5, + 0xd5, 0x0d, 0x65, 0x6e, 0x39, 0xc5, 0x66, 0x38, 0xf8, 0x94, 0x45, 0x2a, 0x26, 0xe4, 0xc4, 0x7a, + 0x02, 0x9d, 0x42, 0xca, 0x26, 0x77, 0xa0, 0x1e, 0x2e, 0x46, 0x8e, 0x7e, 0xc4, 0x48, 0xdb, 0xde, + 0x93, 0xc5, 0xe8, 0x23, 0x76, 0xae, 0xdb, 0xde, 0x10, 0x67, 0xe9, 0xb2, 0x95, 0xec, 0xb2, 0x33, + 0x68, 0xe8, 0xe8, 0x27, 0x3f, 0x00, 0x33, 0x71, 0xab, 0x42, 0x8e, 0x4c, 0xb6, 0x56, 0x8b, 0xa6, + 0x82, 0xc2, 0x3b, 0x62, 0x6f, 0xe2, 0x33, 0xd7, 0x49, 0x43, 0x08, 0xf7, 0x68, 0xd8, 0x1d, 0xc9, + 0xf8, 0x58, 0xc7, 0x8b, 0xf5, 0x0e, 0xd4, 0xe4, 0xd9, 0x84, 0x7d, 0xc4, 0xca, 0xba, 0xd6, 0x16, + 0xe3, 0xd2, 0x64, 0xfe, 0x07, 0x03, 0x1a, 0x3a, 0x0b, 0x96, 0x2a, 0xe5, 0x0e, 0x5d, 0xf9, 0xba, + 0x87, 0xfe, 0xdf, 0x27, 0x9e, 0x3b, 0x40, 0x64, 0x7e, 0x39, 0x0b, 0xb8, 0xe7, 0x4f, 0x1c, 0x69, + 0x6b, 0x99, 0x83, 0xba, 0xc8, 0x39, 0x45, 0xc6, 0x89, 0xa0, 0xef, 0x7f, 0xbe, 0x01, 0x9d, 0xc3, + 0xe1, 0xfd, 0xe3, 0xc3, 0x30, 0x9c, 0x79, 0x63, 0x8a, 0xf5, 0xfb, 0x1e, 0x54, 0xb1, 0x85, 0x29, + 0x79, 0x82, 0xed, 0x97, 0xf5, 0xd2, 0x64, 0x1f, 0x36, 0xb0, 0x93, 0x21, 0x65, 0x2f, 0xb1, 0xfd, + 0xd2, 0x96, 0x5a, 0x6c, 0x22, 0x7b, 0x9d, 0xcb, 0x0f, 0xb2, 0xfd, 0xb2, 0xbe, 0x9a, 0x7c, 0x08, + 0x66, 0xda, 0x62, 0xac, 0x7a, 0x96, 0xed, 0xaf, 0xec, 0xb0, 0x85, 0x7e, 0x5a, 0x8e, 0xad, 0x7a, + 0x5d, 0xec, 0xaf, 0x6c, 0x45, 0xc9, 0x01, 0xd4, 0x75, 0x11, 0x5b, 0xfe, 0x70, 0xda, 0x5f, 0xd1, + 0xfd, 0x0a, 0xf3, 0xc8, 0xae, 0xa1, 0xec, 0x75, 0xb7, 0x5f, 0xda, 0xa2, 0x93, 0xf7, 0xa0, 0xa6, + 0x2a, 0x8b, 0xd2, 0xc7, 0xd3, 0x7e, 0x79, 0x0f, 0x2b, 0x2e, 0x99, 0xf6, 0x4d, 0xab, 0x5e, 0xa0, + 0xfb, 0x2b, 0xdf, 0x12, 0xc8, 0x21, 0x40, 0xa6, 0xf8, 0x5f, 0xf9, 0xb4, 0xdc, 0x5f, 0xfd, 0x46, + 0x40, 0xee, 0x41, 0x23, 0x7d, 0xf7, 0x29, 0x7f, 0x2c, 0xee, 0xaf, 0x6a, 0xdb, 0x87, 0xaf, 0xff, + 0xeb, 0xcf, 0xdb, 0xc6, 0x6f, 0x2e, 0xb6, 0x8d, 0x2f, 0x2f, 0xb6, 0x8d, 0xaf, 0x2e, 0xb6, 0x8d, + 0xdf, 0x5f, 0x6c, 0x1b, 0x7f, 0xba, 0xd8, 0x36, 0x7e, 0xfb, 0x97, 0x6d, 0x63, 0x54, 0x43, 0xf7, + 0x7f, 0xf7, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x34, 0x22, 0xb5, 0xe7, 0x1c, 0x19, 0x00, 0x00, } diff --git a/abci/types/types.proto b/abci/types/types.proto index ffa321836..d3b78866d 100644 --- a/abci/types/types.proto +++ b/abci/types/types.proto @@ -70,7 +70,7 @@ message RequestInitChain { message RequestQuery { bytes data = 1; string path = 2; - int64 height = 3; + sint64 height = 3; bool prove = 4; } @@ -91,7 +91,7 @@ message RequestDeliverTx { } message RequestEndBlock { - int64 height = 1; + sint64 height = 1; } message RequestCommit { @@ -135,7 +135,7 @@ message ResponseInfo { string version = 2; uint64 app_version = 3; - int64 last_block_height = 4; + sint64 last_block_height = 4; bytes last_block_app_hash = 5; } @@ -157,11 +157,11 @@ message ResponseQuery { // bytes data = 2; // use "value" instead. string log = 3; // nondeterministic string info = 4; // nondeterministic - int64 index = 5; + sint64 index = 5; bytes key = 6; bytes value = 7; merkle.Proof proof = 8; - int64 height = 9; + sint64 height = 9; string codespace = 10; } @@ -174,8 +174,8 @@ message ResponseCheckTx { bytes data = 2; string log = 3; // nondeterministic string info = 4; // nondeterministic - int64 gas_wanted = 5; - int64 gas_used = 6; + sint64 gas_wanted = 5; + sint64 gas_used = 6; repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; string codespace = 8; } @@ -185,8 +185,8 @@ message ResponseDeliverTx { bytes data = 2; string log = 3; // nondeterministic string info = 4; // nondeterministic - int64 gas_wanted = 5; - int64 gas_used = 6; + sint64 gas_wanted = 5; + sint64 gas_used = 6; repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; string codespace = 8; } @@ -215,19 +215,19 @@ message ConsensusParams { // BlockSize contains limits on the block size. message BlockSize { // Note: must be greater than 0 - int64 max_bytes = 1; + sint64 max_bytes = 1; // Note: must be greater or equal to -1 - int64 max_gas = 2; + sint64 max_gas = 2; } // EvidenceParams contains limits on the evidence. message EvidenceParams { // Note: must be greater than 0 - int64 max_age = 1; + sint64 max_age = 1; } message LastCommitInfo { - int32 round = 1; + sint32 round = 1; repeated VoteInfo votes = 2 [(gogoproto.nullable)=false]; } @@ -238,10 +238,10 @@ message Header { // basic block info Version version = 1 [(gogoproto.nullable)=false]; string chain_id = 2 [(gogoproto.customname)="ChainID"]; - int64 height = 3; + sint64 height = 3; google.protobuf.Timestamp time = 4 [(gogoproto.nullable)=false, (gogoproto.stdtime)=true]; - int64 num_txs = 5; - int64 total_txs = 6; + sint64 num_txs = 5; + sint64 total_txs = 6; // prev block info BlockID last_block_id = 7 [(gogoproto.nullable)=false]; @@ -274,7 +274,7 @@ message BlockID { } message PartSetHeader { - int32 total = 1; + sint32 total = 1; bytes hash = 2; } @@ -282,13 +282,13 @@ message PartSetHeader { message Validator { bytes address = 1; //PubKey pub_key = 2 [(gogoproto.nullable)=false]; - int64 power = 3; + sint64 power = 3; } // ValidatorUpdate message ValidatorUpdate { PubKey pub_key = 1 [(gogoproto.nullable)=false]; - int64 power = 2; + sint64 power = 2; } // VoteInfo @@ -305,9 +305,9 @@ message PubKey { message Evidence { string type = 1; Validator validator = 2 [(gogoproto.nullable)=false]; - int64 height = 3; + sint64 height = 3; google.protobuf.Timestamp time = 4 [(gogoproto.nullable)=false, (gogoproto.stdtime)=true]; - int64 total_voting_power = 5; + sint64 total_voting_power = 5; } //---------------------------------------- diff --git a/types/protobuf_test.go b/types/protobuf_test.go index f39d04b07..462fcefc6 100644 --- a/types/protobuf_test.go +++ b/types/protobuf_test.go @@ -79,7 +79,7 @@ func TestABCIConsensusParams(t *testing.T) { assert.Equal(t, *cp, cp2) } -func _TestABCIbeader(t *testing.T) { +func TestABCIHeader(t *testing.T) { // build a full header var height int64 = 5 var numTxs int64 = 3 @@ -126,7 +126,6 @@ func _TestABCIbeader(t *testing.T) { // assert the encodings match assert.EqualValues(t, headerBz, pbHeaderBz) - } func TestABCIEvidence(t *testing.T) {