From 6933af1ead0ddf4a8c7516690e3674c6cdfa7bd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 14:36:33 +0200 Subject: [PATCH 1/7] build(deps): Bump github.com/celestiaorg/nmt from 0.18.1 to 0.19.0 (#1073) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/celestiaorg/nmt](https://github.com/celestiaorg/nmt) from 0.18.1 to 0.19.0.
Release notes

Sourced from github.com/celestiaorg/nmt's releases.

v0.19.0

What's Changed

Full Changelog: https://github.com/celestiaorg/nmt/compare/v0.18.1...v0.19.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/celestiaorg/nmt&package-manager=go_modules&previous-version=0.18.1&new-version=0.19.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e69c1e2b7a..96abcba119 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.0 github.com/btcsuite/btcd/btcec/v2 v2.2.1 github.com/btcsuite/btcd/btcutil v1.1.2 - github.com/celestiaorg/nmt v0.18.1 + github.com/celestiaorg/nmt v0.19.0 github.com/cometbft/cometbft-db v0.7.0 github.com/go-git/go-git/v5 v5.5.1 github.com/vektra/mockery/v2 v2.14.0 diff --git a/go.sum b/go.sum index 2fe6b7568c..3dcbd28026 100644 --- a/go.sum +++ b/go.sum @@ -150,8 +150,8 @@ github.com/bufbuild/protocompile v0.1.0/go.mod h1:ix/MMMdsT3fzxfw91dvbfzKW3fRRnu github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/celestiaorg/nmt v0.18.1 h1:zU3apzW4y0fs0ilQA74XnEYW8FvRv0CUK2LXK66L3rA= -github.com/celestiaorg/nmt v0.18.1/go.mod h1:0l8q6UYRju1xNrxtvV6NwPdW3lfsN6KuZ0htRnModdc= +github.com/celestiaorg/nmt v0.19.0 h1:9VXFeI/gt+q8h5HeCE0RjXJhOxsFzxJUjHrkvF9CMYE= +github.com/celestiaorg/nmt v0.19.0/go.mod h1:Oz15Ub6YPez9uJV0heoU4WpFctxazuIhKyUtaYNio7E= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= From 4132340224a9b0cf87ddc9962d4341f24c964d2d Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 20 Sep 2023 13:30:55 +0200 Subject: [PATCH 2/7] feat!: deduplicate consensus params #9287 (#1082) Cherry pick of https://github.com/tendermint/tendermint/pull/9287 --- abci/types/types.pb.go | 1061 ++++++----------------- consensus/replay.go | 8 +- consensus/replay_test.go | 4 +- consensus/state.go | 5 +- evidence/mocks/block_store.go | 2 +- evidence/pool_test.go | 13 +- light/rpc/client.go | 4 +- proto/tendermint/abci/types.proto | 40 +- proto/tendermint/blockchain/types.pb.go | 52 +- proto/tendermint/consensus/types.pb.go | 114 +-- proto/tendermint/consensus/wal.pb.go | 72 +- proto/tendermint/crypto/keys.pb.go | 12 +- proto/tendermint/crypto/proof.pb.go | 47 +- proto/tendermint/libs/bits/types.pb.go | 12 +- proto/tendermint/mempool/types.pb.go | 11 +- proto/tendermint/p2p/conn.pb.go | 54 +- proto/tendermint/p2p/pex.pb.go | 11 +- proto/tendermint/p2p/types.pb.go | 59 +- proto/tendermint/privval/types.pb.go | 101 +-- proto/tendermint/rpc/grpc/types.pb.go | 45 +- proto/tendermint/state/types.pb.go | 110 +-- proto/tendermint/statesync/types.pb.go | 52 +- proto/tendermint/store/types.pb.go | 12 +- proto/tendermint/types/block.pb.go | 10 +- proto/tendermint/types/canonical.pb.go | 64 +- proto/tendermint/types/events.pb.go | 11 +- proto/tendermint/types/evidence.pb.go | 68 +- proto/tendermint/types/params.pb.go | 275 +++--- proto/tendermint/types/params.proto | 17 +- proto/tendermint/types/validator.pb.go | 50 +- proto/tendermint/version/types.pb.go | 10 +- proxy/mocks/app_conn_consensus.go | 2 +- proxy/mocks/app_conn_mempool.go | 2 +- proxy/mocks/client_creator.go | 2 +- rpc/core/types/responses.go | 6 +- rpc/grpc/types.pb.go | 45 +- state/execution.go | 8 +- state/execution_test.go | 5 +- state/export_test.go | 3 +- state/helpers_test.go | 8 +- state/mocks/evidence_pool.go | 2 +- state/mocks/store.go | 20 +- state/rollback.go | 2 +- state/rollback_test.go | 4 +- state/state.go | 9 +- state/state_test.go | 7 +- state/store.go | 21 +- state/store_test.go | 8 +- state/txindex/mocks/tx_indexer.go | 2 +- state/validation.go | 5 +- statesync/mocks/state_provider.go | 2 +- test/e2e/runner/setup.go | 2 +- test/maverick/consensus/replay.go | 8 +- test/maverick/consensus/state.go | 5 +- types/genesis.go | 17 +- types/params.go | 126 ++- types/params_test.go | 126 +-- types/protobuf.go | 28 - types/protobuf_test.go | 8 - 59 files changed, 1205 insertions(+), 1684 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index c2b7e90e17..ad936d96d9 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -6,12 +6,12 @@ package types import ( context "context" fmt "fmt" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + types1 "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -539,6 +539,7 @@ type RequestInfo struct { Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` BlockVersion uint64 `protobuf:"varint,2,opt,name=block_version,json=blockVersion,proto3" json:"block_version,omitempty"` P2PVersion uint64 `protobuf:"varint,3,opt,name=p2p_version,json=p2pVersion,proto3" json:"p2p_version,omitempty"` + AbciVersion string `protobuf:"bytes,4,opt,name=abci_version,json=abciVersion,proto3" json:"abci_version,omitempty"` } func (m *RequestInfo) Reset() { *m = RequestInfo{} } @@ -595,13 +596,20 @@ func (m *RequestInfo) GetP2PVersion() uint64 { return 0 } +func (m *RequestInfo) GetAbciVersion() string { + if m != nil { + return m.AbciVersion + } + return "" +} + type RequestInitChain struct { - Time time.Time `protobuf:"bytes,1,opt,name=time,proto3,stdtime" json:"time"` - ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - ConsensusParams *ConsensusParams `protobuf:"bytes,3,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` - Validators []ValidatorUpdate `protobuf:"bytes,4,rep,name=validators,proto3" json:"validators"` - AppStateBytes []byte `protobuf:"bytes,5,opt,name=app_state_bytes,json=appStateBytes,proto3" json:"app_state_bytes,omitempty"` - InitialHeight int64 `protobuf:"varint,6,opt,name=initial_height,json=initialHeight,proto3" json:"initial_height,omitempty"` + Time time.Time `protobuf:"bytes,1,opt,name=time,proto3,stdtime" json:"time"` + ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + ConsensusParams *types1.ConsensusParams `protobuf:"bytes,3,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` + Validators []ValidatorUpdate `protobuf:"bytes,4,rep,name=validators,proto3" json:"validators"` + AppStateBytes []byte `protobuf:"bytes,5,opt,name=app_state_bytes,json=appStateBytes,proto3" json:"app_state_bytes,omitempty"` + InitialHeight int64 `protobuf:"varint,6,opt,name=initial_height,json=initialHeight,proto3" json:"initial_height,omitempty"` } func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } @@ -651,7 +659,7 @@ func (m *RequestInitChain) GetChainId() string { return "" } -func (m *RequestInitChain) GetConsensusParams() *ConsensusParams { +func (m *RequestInitChain) GetConsensusParams() *types1.ConsensusParams { if m != nil { return m.ConsensusParams } @@ -1892,9 +1900,9 @@ func (m *ResponseInfo) GetLastBlockAppHash() []byte { } type ResponseInitChain struct { - ConsensusParams *ConsensusParams `protobuf:"bytes,1,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` - Validators []ValidatorUpdate `protobuf:"bytes,2,rep,name=validators,proto3" json:"validators"` - AppHash []byte `protobuf:"bytes,3,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + ConsensusParams *types1.ConsensusParams `protobuf:"bytes,1,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` + Validators []ValidatorUpdate `protobuf:"bytes,2,rep,name=validators,proto3" json:"validators"` + AppHash []byte `protobuf:"bytes,3,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` } func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } @@ -1930,7 +1938,7 @@ func (m *ResponseInitChain) XXX_DiscardUnknown() { var xxx_messageInfo_ResponseInitChain proto.InternalMessageInfo -func (m *ResponseInitChain) GetConsensusParams() *ConsensusParams { +func (m *ResponseInitChain) GetConsensusParams() *types1.ConsensusParams { if m != nil { return m.ConsensusParams } @@ -2331,9 +2339,9 @@ func (m *ResponseDeliverTx) GetCodespace() string { } type ResponseEndBlock struct { - ValidatorUpdates []ValidatorUpdate `protobuf:"bytes,1,rep,name=validator_updates,json=validatorUpdates,proto3" json:"validator_updates"` - ConsensusParamUpdates *ConsensusParams `protobuf:"bytes,2,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` - Events []Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events,omitempty"` + ValidatorUpdates []ValidatorUpdate `protobuf:"bytes,1,rep,name=validator_updates,json=validatorUpdates,proto3" json:"validator_updates"` + ConsensusParamUpdates *types1.ConsensusParams `protobuf:"bytes,2,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` + Events []Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events,omitempty"` } func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } @@ -2376,7 +2384,7 @@ func (m *ResponseEndBlock) GetValidatorUpdates() []ValidatorUpdate { return nil } -func (m *ResponseEndBlock) GetConsensusParamUpdates() *ConsensusParams { +func (m *ResponseEndBlock) GetConsensusParamUpdates() *types1.ConsensusParams { if m != nil { return m.ConsensusParamUpdates } @@ -2726,131 +2734,6 @@ func (m *ResponseProcessProposal) GetStatus() ResponseProcessProposal_ProposalSt return ResponseProcessProposal_UNKNOWN } -// ConsensusParams contains all consensus-relevant parameters -// that can be adjusted by the abci app -type ConsensusParams struct { - Block *BlockParams `protobuf:"bytes,1,opt,name=block,proto3" json:"block,omitempty"` - Evidence *types1.EvidenceParams `protobuf:"bytes,2,opt,name=evidence,proto3" json:"evidence,omitempty"` - Validator *types1.ValidatorParams `protobuf:"bytes,3,opt,name=validator,proto3" json:"validator,omitempty"` - Version *types1.VersionParams `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` -} - -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_252557cfdd89a31a, []int{35} -} -func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ConsensusParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ConsensusParams.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 *ConsensusParams) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConsensusParams.Merge(m, src) -} -func (m *ConsensusParams) XXX_Size() int { - return m.Size() -} -func (m *ConsensusParams) XXX_DiscardUnknown() { - xxx_messageInfo_ConsensusParams.DiscardUnknown(m) -} - -var xxx_messageInfo_ConsensusParams proto.InternalMessageInfo - -func (m *ConsensusParams) GetBlock() *BlockParams { - if m != nil { - return m.Block - } - return nil -} - -func (m *ConsensusParams) GetEvidence() *types1.EvidenceParams { - if m != nil { - return m.Evidence - } - return nil -} - -func (m *ConsensusParams) GetValidator() *types1.ValidatorParams { - if m != nil { - return m.Validator - } - return nil -} - -func (m *ConsensusParams) GetVersion() *types1.VersionParams { - if m != nil { - return m.Version - } - return nil -} - -// BlockParams contains limits on the block size. -type BlockParams struct { - // Note: must be greater than 0 - MaxBytes int64 `protobuf:"varint,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"` -} - -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_252557cfdd89a31a, []int{36} -} -func (m *BlockParams) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *BlockParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_BlockParams.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 *BlockParams) XXX_Merge(src proto.Message) { - xxx_messageInfo_BlockParams.Merge(m, src) -} -func (m *BlockParams) XXX_Size() int { - return m.Size() -} -func (m *BlockParams) XXX_DiscardUnknown() { - xxx_messageInfo_BlockParams.DiscardUnknown(m) -} - -var xxx_messageInfo_BlockParams proto.InternalMessageInfo - -func (m *BlockParams) GetMaxBytes() int64 { - if m != nil { - return m.MaxBytes - } - return 0 -} - -func (m *BlockParams) GetMaxGas() int64 { - if m != nil { - return m.MaxGas - } - return 0 -} - type CommitInfo struct { Round int32 `protobuf:"varint,1,opt,name=round,proto3" json:"round,omitempty"` Votes []VoteInfo `protobuf:"bytes,2,rep,name=votes,proto3" json:"votes"` @@ -2860,7 +2743,7 @@ func (m *CommitInfo) Reset() { *m = CommitInfo{} } func (m *CommitInfo) String() string { return proto.CompactTextString(m) } func (*CommitInfo) ProtoMessage() {} func (*CommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{37} + return fileDescriptor_252557cfdd89a31a, []int{35} } func (m *CommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2915,7 +2798,7 @@ func (m *ExtendedCommitInfo) Reset() { *m = ExtendedCommitInfo{} } func (m *ExtendedCommitInfo) String() string { return proto.CompactTextString(m) } func (*ExtendedCommitInfo) ProtoMessage() {} func (*ExtendedCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{38} + return fileDescriptor_252557cfdd89a31a, []int{36} } func (m *ExtendedCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2970,7 +2853,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_252557cfdd89a31a, []int{39} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3024,7 +2907,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_252557cfdd89a31a, []int{40} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3088,7 +2971,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_252557cfdd89a31a, []int{41} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3156,7 +3039,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_252557cfdd89a31a, []int{42} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3209,7 +3092,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_252557cfdd89a31a, []int{43} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3262,7 +3145,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_252557cfdd89a31a, []int{44} + return fileDescriptor_252557cfdd89a31a, []int{42} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3315,7 +3198,7 @@ func (m *ExtendedVoteInfo) Reset() { *m = ExtendedVoteInfo{} } func (m *ExtendedVoteInfo) String() string { return proto.CompactTextString(m) } func (*ExtendedVoteInfo) ProtoMessage() {} func (*ExtendedVoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{45} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *ExtendedVoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3383,7 +3266,7 @@ func (m *Misbehavior) Reset() { *m = Misbehavior{} } func (m *Misbehavior) String() string { return proto.CompactTextString(m) } func (*Misbehavior) ProtoMessage() {} func (*Misbehavior) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{46} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *Misbehavior) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3459,7 +3342,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_252557cfdd89a31a, []int{47} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3564,8 +3447,6 @@ func init() { proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.ResponseApplySnapshotChunk") proto.RegisterType((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") proto.RegisterType((*ResponseProcessProposal)(nil), "tendermint.abci.ResponseProcessProposal") - proto.RegisterType((*ConsensusParams)(nil), "tendermint.abci.ConsensusParams") - proto.RegisterType((*BlockParams)(nil), "tendermint.abci.BlockParams") proto.RegisterType((*CommitInfo)(nil), "tendermint.abci.CommitInfo") proto.RegisterType((*ExtendedCommitInfo)(nil), "tendermint.abci.ExtendedCommitInfo") proto.RegisterType((*Event)(nil), "tendermint.abci.Event") @@ -3582,201 +3463,196 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3099 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xc5, - 0x15, 0xd7, 0xf7, 0xc7, 0xd3, 0xa7, 0x7b, 0xcd, 0xae, 0x56, 0x2c, 0xb6, 0x99, 0x2d, 0x60, 0x77, - 0x01, 0x2f, 0x31, 0x59, 0x3e, 0x0a, 0x08, 0x58, 0x5a, 0x2d, 0x32, 0x36, 0xb6, 0x33, 0x96, 0x97, - 0x90, 0x8f, 0x1d, 0x5a, 0x9a, 0xb6, 0x34, 0xac, 0x34, 0x33, 0xcc, 0x8c, 0x8c, 0xcc, 0x31, 0x54, - 0xaa, 0x52, 0xe4, 0xc2, 0x91, 0x0b, 0x87, 0x1c, 0xf2, 0x3f, 0xe4, 0x94, 0x4b, 0x2e, 0x54, 0xe5, - 0xc2, 0x21, 0x87, 0x1c, 0x52, 0x24, 0x05, 0xb7, 0xfc, 0x03, 0x39, 0xe4, 0x40, 0xaa, 0x3f, 0xe6, - 0x4b, 0xd2, 0x58, 0x32, 0xa4, 0x52, 0x95, 0xca, 0x6d, 0xfa, 0xcd, 0x7b, 0x6f, 0xba, 0x5f, 0x77, - 0xff, 0xfa, 0xfd, 0xde, 0x34, 0x3c, 0xea, 0x10, 0x5d, 0x25, 0xd6, 0x48, 0xd3, 0x9d, 0xdb, 0xb8, - 0xdb, 0xd3, 0x6e, 0x3b, 0x67, 0x26, 0xb1, 0x37, 0x4d, 0xcb, 0x70, 0x0c, 0x54, 0xf1, 0x5f, 0x6e, - 0xd2, 0x97, 0xf5, 0xc7, 0x02, 0xda, 0x3d, 0xeb, 0xcc, 0x74, 0x8c, 0xdb, 0xa6, 0x65, 0x18, 0x27, - 0x5c, 0xbf, 0x7e, 0x2d, 0xf0, 0x9a, 0xf9, 0x09, 0x7a, 0x0b, 0xbd, 0x15, 0xc6, 0x0f, 0xc9, 0x99, - 0xfb, 0xf6, 0xb1, 0x19, 0x5b, 0x13, 0x5b, 0x78, 0xe4, 0xbe, 0x5e, 0xef, 0x1b, 0x46, 0x7f, 0x48, - 0x6e, 0xb3, 0x56, 0x77, 0x7c, 0x72, 0xdb, 0xd1, 0x46, 0xc4, 0x76, 0xf0, 0xc8, 0x14, 0x0a, 0xab, - 0x7d, 0xa3, 0x6f, 0xb0, 0xc7, 0xdb, 0xf4, 0x89, 0x4b, 0xa5, 0x6f, 0x73, 0x90, 0x95, 0xc9, 0x07, - 0x63, 0x62, 0x3b, 0x68, 0x0b, 0x52, 0xa4, 0x37, 0x30, 0x6a, 0xf1, 0x8d, 0xf8, 0x8d, 0xc2, 0xd6, - 0xb5, 0xcd, 0xa9, 0xc1, 0x6d, 0x0a, 0xbd, 0x56, 0x6f, 0x60, 0xb4, 0x63, 0x32, 0xd3, 0x45, 0x77, - 0x20, 0x7d, 0x32, 0x1c, 0xdb, 0x83, 0x5a, 0x82, 0x19, 0x3d, 0x16, 0x65, 0x74, 0x8f, 0x2a, 0xb5, - 0x63, 0x32, 0xd7, 0xa6, 0x9f, 0xd2, 0xf4, 0x13, 0xa3, 0x96, 0x3c, 0xff, 0x53, 0x3b, 0xfa, 0x09, - 0xfb, 0x14, 0xd5, 0x45, 0x0d, 0x00, 0x4d, 0xd7, 0x1c, 0xa5, 0x37, 0xc0, 0x9a, 0x5e, 0x4b, 0x33, - 0xcb, 0xc7, 0xa3, 0x2d, 0x35, 0xa7, 0x49, 0x15, 0xdb, 0x31, 0x39, 0xaf, 0xb9, 0x0d, 0xda, 0xdd, - 0x0f, 0xc6, 0xc4, 0x3a, 0xab, 0x65, 0xce, 0xef, 0xee, 0x8f, 0xa9, 0x12, 0xed, 0x2e, 0xd3, 0x46, - 0x2d, 0x28, 0x74, 0x49, 0x5f, 0xd3, 0x95, 0xee, 0xd0, 0xe8, 0x3d, 0xac, 0x65, 0x99, 0xb1, 0x14, - 0x65, 0xdc, 0xa0, 0xaa, 0x0d, 0xaa, 0xd9, 0x8e, 0xc9, 0xd0, 0xf5, 0x5a, 0xe8, 0x55, 0xc8, 0xf5, - 0x06, 0xa4, 0xf7, 0x50, 0x71, 0x26, 0xb5, 0x1c, 0xf3, 0xb1, 0x1e, 0xe5, 0xa3, 0x49, 0xf5, 0x3a, - 0x93, 0x76, 0x4c, 0xce, 0xf6, 0xf8, 0x23, 0x1d, 0xbf, 0x4a, 0x86, 0xda, 0x29, 0xb1, 0xa8, 0x7d, - 0xfe, 0xfc, 0xf1, 0xdf, 0xe5, 0x9a, 0xcc, 0x43, 0x5e, 0x75, 0x1b, 0xe8, 0x75, 0xc8, 0x13, 0x5d, - 0x15, 0xc3, 0x00, 0xe6, 0x62, 0x23, 0x72, 0x9e, 0x75, 0xd5, 0x1d, 0x44, 0x8e, 0x88, 0x67, 0xf4, - 0x12, 0x64, 0x7a, 0xc6, 0x68, 0xa4, 0x39, 0xb5, 0x02, 0xb3, 0x5e, 0x8b, 0x1c, 0x00, 0xd3, 0x6a, - 0xc7, 0x64, 0xa1, 0x8f, 0xf6, 0xa1, 0x3c, 0xd4, 0x6c, 0x47, 0xb1, 0x75, 0x6c, 0xda, 0x03, 0xc3, - 0xb1, 0x6b, 0x45, 0xe6, 0xe1, 0x89, 0x28, 0x0f, 0x7b, 0x9a, 0xed, 0x1c, 0xb9, 0xca, 0xed, 0x98, - 0x5c, 0x1a, 0x06, 0x05, 0xd4, 0x9f, 0x71, 0x72, 0x42, 0x2c, 0xcf, 0x61, 0xad, 0x74, 0xbe, 0xbf, - 0x03, 0xaa, 0xed, 0xda, 0x53, 0x7f, 0x46, 0x50, 0x80, 0x7e, 0x06, 0x97, 0x86, 0x06, 0x56, 0x3d, - 0x77, 0x4a, 0x6f, 0x30, 0xd6, 0x1f, 0xd6, 0xca, 0xcc, 0xe9, 0xcd, 0xc8, 0x4e, 0x1a, 0x58, 0x75, - 0x5d, 0x34, 0xa9, 0x41, 0x3b, 0x26, 0xaf, 0x0c, 0xa7, 0x85, 0xe8, 0x01, 0xac, 0x62, 0xd3, 0x1c, - 0x9e, 0x4d, 0x7b, 0xaf, 0x30, 0xef, 0xb7, 0xa2, 0xbc, 0x6f, 0x53, 0x9b, 0x69, 0xf7, 0x08, 0xcf, - 0x48, 0x51, 0x07, 0xaa, 0xa6, 0x45, 0x4c, 0x6c, 0x11, 0xc5, 0xb4, 0x0c, 0xd3, 0xb0, 0xf1, 0xb0, - 0x56, 0x65, 0xbe, 0x9f, 0x8a, 0xf2, 0x7d, 0xc8, 0xf5, 0x0f, 0x85, 0x7a, 0x3b, 0x26, 0x57, 0xcc, - 0xb0, 0x88, 0x7b, 0x35, 0x7a, 0xc4, 0xb6, 0x7d, 0xaf, 0x2b, 0x8b, 0xbc, 0x32, 0xfd, 0xb0, 0xd7, - 0x90, 0xa8, 0x91, 0x85, 0xf4, 0x29, 0x1e, 0x8e, 0xc9, 0x5b, 0xa9, 0x5c, 0xaa, 0x9a, 0x96, 0x9e, - 0x82, 0x42, 0x00, 0x58, 0x50, 0x0d, 0xb2, 0x23, 0x62, 0xdb, 0xb8, 0x4f, 0x18, 0x0e, 0xe5, 0x65, - 0xb7, 0x29, 0x95, 0xa1, 0x18, 0x04, 0x13, 0x69, 0xe4, 0x19, 0x52, 0x98, 0xa0, 0x86, 0xa7, 0xc4, - 0xb2, 0x35, 0x43, 0x77, 0x0d, 0x45, 0x13, 0x5d, 0x87, 0x12, 0x5b, 0xf0, 0x8a, 0xfb, 0x9e, 0x62, - 0x55, 0x4a, 0x2e, 0x32, 0xe1, 0x7d, 0xa1, 0xb4, 0x0e, 0x05, 0x73, 0xcb, 0xf4, 0x54, 0x92, 0x4c, - 0x05, 0xcc, 0x2d, 0x53, 0x28, 0x48, 0x7f, 0x4a, 0x40, 0x75, 0x1a, 0x5c, 0xd0, 0x4b, 0x90, 0xa2, - 0x38, 0x2b, 0x20, 0xb3, 0xbe, 0xc9, 0x41, 0x78, 0xd3, 0x05, 0xe1, 0xcd, 0x8e, 0x0b, 0xc2, 0x8d, - 0xdc, 0x17, 0x5f, 0xad, 0xc7, 0x3e, 0xfd, 0xdb, 0x7a, 0x5c, 0x66, 0x16, 0xe8, 0x2a, 0xc5, 0x02, - 0xac, 0xe9, 0x8a, 0xa6, 0xb2, 0xfe, 0xe4, 0xe9, 0x46, 0xc7, 0x9a, 0xbe, 0xa3, 0xa2, 0x5d, 0xa8, - 0xf6, 0x0c, 0xdd, 0x26, 0xba, 0x3d, 0xb6, 0x15, 0x0e, 0xf2, 0x02, 0x28, 0x67, 0xf7, 0x6a, 0xd3, - 0x55, 0x3c, 0x64, 0x7a, 0x72, 0xa5, 0x17, 0x16, 0xa0, 0x7b, 0x00, 0xa7, 0x78, 0xa8, 0xa9, 0xd8, - 0x31, 0x2c, 0xbb, 0x96, 0xda, 0x48, 0xce, 0x75, 0x73, 0xdf, 0x55, 0x39, 0x36, 0x55, 0xec, 0x90, - 0x46, 0x8a, 0xf6, 0x56, 0x0e, 0x58, 0xa2, 0x27, 0xa1, 0x82, 0x4d, 0x53, 0xb1, 0x1d, 0xec, 0x10, - 0xa5, 0x7b, 0xe6, 0x10, 0x9b, 0x41, 0x70, 0x51, 0x2e, 0x61, 0xd3, 0x3c, 0xa2, 0xd2, 0x06, 0x15, - 0xa2, 0x27, 0xa0, 0x4c, 0xe1, 0x56, 0xc3, 0x43, 0x65, 0x40, 0xb4, 0xfe, 0xc0, 0x61, 0x50, 0x9b, - 0x94, 0x4b, 0x42, 0xda, 0x66, 0x42, 0x49, 0xf5, 0x26, 0x93, 0x41, 0x2d, 0x42, 0x90, 0x52, 0xb1, - 0x83, 0x59, 0x20, 0x8b, 0x32, 0x7b, 0xa6, 0x32, 0x13, 0x3b, 0x03, 0x11, 0x1e, 0xf6, 0x8c, 0x2e, - 0x43, 0x46, 0xb8, 0x4d, 0x32, 0xb7, 0xa2, 0x85, 0x56, 0x21, 0x6d, 0x5a, 0xc6, 0x29, 0xa9, 0xa5, - 0x36, 0xe2, 0x37, 0x72, 0x32, 0x6f, 0x48, 0x1f, 0x27, 0x60, 0x65, 0x06, 0x94, 0xa9, 0xdf, 0x01, - 0xb6, 0x07, 0xee, 0xb7, 0xe8, 0x33, 0x7a, 0x81, 0xfa, 0xc5, 0x2a, 0xb1, 0xc4, 0x41, 0x56, 0x0b, - 0x86, 0x88, 0x1f, 0xd2, 0x6d, 0xf6, 0x5e, 0x84, 0x46, 0x68, 0xd3, 0xb9, 0x1a, 0x62, 0xdb, 0x51, - 0x38, 0xc8, 0x29, 0x81, 0x43, 0xed, 0xd1, 0x39, 0x73, 0x45, 0x75, 0xe8, 0x62, 0x15, 0x4e, 0xca, - 0xd4, 0xd4, 0x97, 0xa2, 0x63, 0x58, 0xed, 0x9e, 0x7d, 0x84, 0x75, 0x47, 0xd3, 0x89, 0x32, 0x33, - 0x6b, 0xb3, 0xa7, 0xe4, 0xdb, 0x9a, 0xdd, 0x25, 0x03, 0x7c, 0xaa, 0x19, 0x6e, 0xb7, 0x2e, 0x79, - 0xf6, 0xde, 0x8c, 0xda, 0x92, 0x0c, 0xe5, 0xf0, 0xa9, 0x82, 0xca, 0x90, 0x70, 0x26, 0x62, 0xfc, - 0x09, 0x67, 0x82, 0x9e, 0x83, 0x14, 0x1d, 0x23, 0x1b, 0x7b, 0x79, 0xce, 0x87, 0x84, 0x5d, 0xe7, - 0xcc, 0x24, 0x32, 0xd3, 0x94, 0x24, 0x6f, 0x33, 0x78, 0x27, 0xcd, 0xb4, 0x57, 0xe9, 0x26, 0x54, - 0xa6, 0x8e, 0x92, 0xc0, 0xf4, 0xc5, 0x83, 0xd3, 0x27, 0x55, 0xa0, 0x14, 0x3a, 0x37, 0xa4, 0xcb, - 0xb0, 0x3a, 0xef, 0x18, 0x90, 0x06, 0x9e, 0x3c, 0x04, 0xe7, 0xe8, 0x0e, 0xe4, 0xbc, 0x73, 0x80, - 0x6f, 0xc6, 0xab, 0x33, 0xa3, 0x70, 0x95, 0x65, 0x4f, 0x95, 0xee, 0x42, 0xba, 0xaa, 0xd9, 0x72, - 0x48, 0xb0, 0x8e, 0x67, 0xb1, 0x69, 0xb6, 0xb1, 0x3d, 0x90, 0xde, 0x83, 0x5a, 0x14, 0xc6, 0x4f, - 0x0d, 0x23, 0xe5, 0xad, 0xc2, 0xcb, 0x90, 0x39, 0x31, 0xac, 0x11, 0x76, 0x98, 0xb3, 0x92, 0x2c, - 0x5a, 0x74, 0x75, 0x72, 0xbc, 0x4f, 0x32, 0x31, 0x6f, 0x48, 0x0a, 0x5c, 0x8d, 0xc4, 0x79, 0x6a, - 0xa2, 0xe9, 0x2a, 0xe1, 0xf1, 0x2c, 0xc9, 0xbc, 0xe1, 0x3b, 0xe2, 0x9d, 0xe5, 0x0d, 0xfa, 0x59, - 0x9b, 0x8d, 0x95, 0xf9, 0xcf, 0xcb, 0xa2, 0x25, 0x7d, 0x96, 0x84, 0xcb, 0xf3, 0xd1, 0x1e, 0x6d, - 0x40, 0x71, 0x84, 0x27, 0x8a, 0x33, 0x11, 0x7b, 0x99, 0x4f, 0x07, 0x8c, 0xf0, 0xa4, 0x33, 0xe1, - 0x1b, 0xb9, 0x0a, 0x49, 0x67, 0x62, 0xd7, 0x12, 0x1b, 0xc9, 0x1b, 0x45, 0x99, 0x3e, 0xa2, 0x63, - 0x58, 0x19, 0x1a, 0x3d, 0x3c, 0x54, 0x02, 0x2b, 0x5e, 0x2c, 0xf6, 0xeb, 0x33, 0xc1, 0x6e, 0x4d, - 0x98, 0x44, 0x9d, 0x59, 0xf4, 0x15, 0xe6, 0x63, 0xcf, 0x5b, 0xf9, 0xe8, 0x2e, 0x14, 0x46, 0xfe, - 0x42, 0xbe, 0xc0, 0x62, 0x0f, 0x9a, 0x05, 0xa6, 0x24, 0x1d, 0x02, 0x06, 0x17, 0xa1, 0x33, 0x17, - 0x46, 0xe8, 0xe7, 0x60, 0x55, 0x27, 0x13, 0x27, 0xb0, 0x11, 0xf9, 0x3a, 0xc9, 0xb2, 0xd0, 0x23, - 0xfa, 0xce, 0xdf, 0x64, 0x74, 0xc9, 0xa0, 0x9b, 0xec, 0xbc, 0x34, 0x0d, 0x9b, 0x58, 0x0a, 0x56, - 0x55, 0x8b, 0xd8, 0x36, 0xcb, 0xf3, 0x8a, 0xec, 0x10, 0x64, 0xf2, 0x6d, 0x2e, 0x96, 0x7e, 0x1d, - 0x9c, 0x9a, 0xd0, 0xf9, 0xe8, 0x06, 0x3e, 0xee, 0x07, 0xfe, 0x08, 0x56, 0x85, 0xbd, 0x1a, 0x8a, - 0x7d, 0x62, 0x59, 0xa0, 0x41, 0xae, 0x79, 0x74, 0xd8, 0x93, 0xdf, 0x2d, 0xec, 0x2e, 0x96, 0xa6, - 0x02, 0x58, 0xfa, 0x3f, 0x36, 0x15, 0x7f, 0xce, 0x43, 0x4e, 0x26, 0xb6, 0x49, 0x0f, 0x4e, 0xd4, - 0x80, 0x3c, 0x99, 0xf4, 0x88, 0xe9, 0xb8, 0x79, 0xc4, 0xfc, 0x3c, 0x9f, 0x6b, 0xb7, 0x5c, 0x4d, - 0x9a, 0x64, 0x7b, 0x66, 0xe8, 0x79, 0xc1, 0xa3, 0xa2, 0x29, 0x91, 0x30, 0x0f, 0x12, 0xa9, 0x17, - 0x5c, 0x22, 0x95, 0x8c, 0xcc, 0xab, 0xb9, 0xd5, 0x14, 0x93, 0x7a, 0x5e, 0x30, 0xa9, 0xd4, 0x82, - 0x8f, 0x85, 0xa8, 0x54, 0x33, 0x44, 0xa5, 0x32, 0x0b, 0x86, 0x19, 0xc1, 0xa5, 0x5e, 0x70, 0xb9, - 0x54, 0x76, 0x41, 0x8f, 0xa7, 0xc8, 0xd4, 0xbd, 0x30, 0x99, 0xca, 0x45, 0x00, 0x88, 0x6b, 0x1d, - 0xc9, 0xa6, 0x5e, 0x0b, 0xb0, 0xa9, 0x7c, 0x24, 0x95, 0xe1, 0x4e, 0xe6, 0xd0, 0xa9, 0x66, 0x88, - 0x4e, 0xc1, 0x82, 0x18, 0x44, 0xf0, 0xa9, 0x37, 0x82, 0x7c, 0xaa, 0x10, 0x49, 0xc9, 0xc4, 0x7c, - 0xcf, 0x23, 0x54, 0x2f, 0x7b, 0x84, 0xaa, 0x18, 0xc9, 0x08, 0xc5, 0x18, 0xa6, 0x19, 0xd5, 0xc1, - 0x0c, 0xa3, 0xe2, 0x0c, 0xe8, 0xc9, 0x48, 0x17, 0x0b, 0x28, 0xd5, 0xc1, 0x0c, 0xa5, 0x2a, 0x2f, - 0x70, 0xb8, 0x80, 0x53, 0xfd, 0x7c, 0x3e, 0xa7, 0x8a, 0x66, 0x3d, 0xa2, 0x9b, 0xcb, 0x91, 0x2a, - 0x25, 0x82, 0x54, 0x71, 0xe2, 0xf3, 0x74, 0xa4, 0xfb, 0xa5, 0x59, 0xd5, 0xf1, 0x1c, 0x56, 0xc5, - 0xf9, 0xcf, 0x8d, 0x48, 0xe7, 0x4b, 0xd0, 0xaa, 0xe3, 0x39, 0xb4, 0x0a, 0x2d, 0x74, 0x7b, 0x11, - 0x5e, 0x95, 0xae, 0x66, 0xa4, 0x9b, 0x34, 0xf5, 0x9d, 0xc2, 0x29, 0x9a, 0x3f, 0x10, 0xcb, 0x32, - 0x2c, 0x41, 0x91, 0x78, 0x43, 0xba, 0x41, 0x93, 0x71, 0x1f, 0x93, 0xce, 0xe1, 0x60, 0x2c, 0x4f, - 0x0b, 0xe0, 0x90, 0xf4, 0xfb, 0xb8, 0x6f, 0xcb, 0x72, 0xd8, 0x60, 0x22, 0x9f, 0x17, 0x89, 0x7c, - 0x80, 0x9a, 0x25, 0xc2, 0xd4, 0x6c, 0x1d, 0x0a, 0x34, 0xff, 0x9a, 0x62, 0x5d, 0xd8, 0x74, 0x59, - 0x17, 0xba, 0x05, 0x2b, 0xec, 0xc4, 0xe3, 0x04, 0x4e, 0x1c, 0x2b, 0x29, 0x76, 0xac, 0x54, 0xe8, - 0x0b, 0xbe, 0xa1, 0xf8, 0xf9, 0xf2, 0x2c, 0x5c, 0x0a, 0xe8, 0x7a, 0x79, 0x1d, 0xa7, 0x29, 0x55, - 0x4f, 0x7b, 0x5b, 0x24, 0x78, 0x7f, 0x8c, 0xfb, 0x11, 0xf2, 0x19, 0xdd, 0x3c, 0xf2, 0x15, 0xff, - 0xcf, 0x90, 0xaf, 0xc4, 0x77, 0x26, 0x5f, 0xc1, 0x34, 0x35, 0x19, 0x4e, 0x53, 0xff, 0x19, 0xf7, - 0xa7, 0xc4, 0xa3, 0x52, 0x3d, 0x43, 0x25, 0x22, 0x71, 0x64, 0xcf, 0x34, 0xa7, 0x18, 0x1a, 0x7d, - 0x91, 0x1e, 0xd2, 0x47, 0xaa, 0xe5, 0x9d, 0x1b, 0x79, 0x71, 0x2c, 0x78, 0x39, 0x27, 0x3f, 0xb7, - 0x45, 0xce, 0x59, 0x85, 0xe4, 0x43, 0xc2, 0x2b, 0x66, 0x45, 0x99, 0x3e, 0x52, 0x3d, 0xb6, 0xd2, - 0xc4, 0xf9, 0xcb, 0x1b, 0xe8, 0x25, 0xc8, 0xb3, 0x5a, 0xa7, 0x62, 0x98, 0xb6, 0x40, 0xf5, 0x50, - 0x6a, 0xc2, 0x4b, 0x9a, 0x9b, 0x87, 0x54, 0xe7, 0xc0, 0xb4, 0xe5, 0x9c, 0x29, 0x9e, 0x02, 0x09, - 0x43, 0x3e, 0x94, 0x30, 0x5c, 0x83, 0x3c, 0xed, 0xbd, 0x6d, 0xe2, 0x1e, 0x61, 0x08, 0x9d, 0x97, - 0x7d, 0x81, 0xf4, 0x00, 0xd0, 0xec, 0x19, 0x81, 0xda, 0x90, 0x21, 0xa7, 0x44, 0x77, 0x78, 0x02, - 0x55, 0xd8, 0xba, 0x3c, 0x9b, 0x99, 0xd2, 0xd7, 0x8d, 0x1a, 0x0d, 0xf2, 0x3f, 0xbe, 0x5a, 0xaf, - 0x72, 0xed, 0x67, 0x8c, 0x91, 0xe6, 0x90, 0x91, 0xe9, 0x9c, 0xc9, 0xc2, 0x5e, 0xfa, 0x6b, 0x82, - 0xf2, 0x97, 0xd0, 0xf9, 0x31, 0x37, 0xb6, 0xee, 0x8a, 0x4f, 0x04, 0xa8, 0xeb, 0x72, 0xf1, 0x5e, - 0x03, 0xe8, 0x63, 0x5b, 0xf9, 0x10, 0xeb, 0x0e, 0x51, 0x45, 0xd0, 0x03, 0x12, 0x54, 0x87, 0x1c, - 0x6d, 0x8d, 0x6d, 0xa2, 0x0a, 0x16, 0xed, 0xb5, 0x03, 0xe3, 0xcc, 0x7e, 0xbf, 0x71, 0x86, 0xa3, - 0x9c, 0x9b, 0x8a, 0x72, 0x80, 0x5b, 0xe4, 0x83, 0xdc, 0x82, 0xf6, 0xcd, 0xb4, 0x34, 0xc3, 0xd2, - 0x9c, 0x33, 0x36, 0x35, 0x49, 0xd9, 0x6b, 0xa3, 0xeb, 0x50, 0x1a, 0x91, 0x91, 0x69, 0x18, 0x43, - 0x85, 0xa3, 0x4d, 0x81, 0x99, 0x16, 0x85, 0xb0, 0xc5, 0x40, 0xe7, 0x57, 0x09, 0x7f, 0xfb, 0xf9, - 0x1c, 0xf2, 0xff, 0x2e, 0xc0, 0xd2, 0x6f, 0x58, 0x5d, 0x29, 0x9c, 0x21, 0xa0, 0x23, 0x58, 0xf1, - 0xb6, 0xbf, 0x32, 0x66, 0xb0, 0xe0, 0x2e, 0xe8, 0x65, 0xf1, 0xa3, 0x7a, 0x1a, 0x16, 0xdb, 0xe8, - 0x27, 0x70, 0x65, 0x0a, 0xda, 0x3c, 0xd7, 0x89, 0x25, 0x11, 0xee, 0x91, 0x30, 0xc2, 0xb9, 0x9e, - 0xfd, 0x58, 0x25, 0xbf, 0xe7, 0xa6, 0xdb, 0x81, 0x72, 0x38, 0xdf, 0x99, 0x3b, 0xfb, 0xd7, 0xa1, - 0x64, 0x11, 0x07, 0x6b, 0xba, 0x12, 0x2a, 0x06, 0x15, 0xb9, 0x50, 0x94, 0x98, 0x0e, 0xe1, 0x91, - 0xb9, 0x79, 0x0f, 0x7a, 0x11, 0xf2, 0x7e, 0xca, 0xc4, 0x83, 0x7a, 0x4e, 0xb1, 0xc0, 0xd7, 0x95, - 0xfe, 0x10, 0xf7, 0x5d, 0x86, 0xcb, 0x0f, 0x2d, 0xc8, 0x58, 0xc4, 0x1e, 0x0f, 0x79, 0x41, 0xa0, - 0xbc, 0xf5, 0xec, 0x72, 0x19, 0x13, 0x95, 0x8e, 0x87, 0x8e, 0x2c, 0x8c, 0xa5, 0x07, 0x90, 0xe1, - 0x12, 0x54, 0x80, 0xec, 0xf1, 0xfe, 0xee, 0xfe, 0xc1, 0x3b, 0xfb, 0xd5, 0x18, 0x02, 0xc8, 0x6c, - 0x37, 0x9b, 0xad, 0xc3, 0x4e, 0x35, 0x8e, 0xf2, 0x90, 0xde, 0x6e, 0x1c, 0xc8, 0x9d, 0x6a, 0x82, - 0x8a, 0xe5, 0xd6, 0x5b, 0xad, 0x66, 0xa7, 0x9a, 0x44, 0x2b, 0x50, 0xe2, 0xcf, 0xca, 0xbd, 0x03, - 0xf9, 0xed, 0xed, 0x4e, 0x35, 0x15, 0x10, 0x1d, 0xb5, 0xf6, 0xef, 0xb6, 0xe4, 0x6a, 0x5a, 0xfa, - 0x01, 0x5c, 0x8d, 0xcc, 0xb1, 0xfc, 0xda, 0x42, 0x3c, 0x50, 0x5b, 0x90, 0x3e, 0x4b, 0x40, 0x3d, - 0x3a, 0x71, 0x42, 0x6f, 0x4d, 0x0d, 0x7c, 0xeb, 0x02, 0x59, 0xd7, 0xd4, 0xe8, 0xd1, 0x13, 0x50, - 0xb6, 0xc8, 0x09, 0x71, 0x7a, 0x03, 0x9e, 0xc8, 0xf1, 0x13, 0xb3, 0x24, 0x97, 0x84, 0x94, 0x19, - 0xd9, 0x5c, 0xed, 0x7d, 0xd2, 0x73, 0x14, 0x0e, 0x45, 0x7c, 0xd1, 0xe5, 0xa9, 0x1a, 0x95, 0x1e, - 0x71, 0xa1, 0xf4, 0xde, 0x85, 0x62, 0x99, 0x87, 0xb4, 0xdc, 0xea, 0xc8, 0xef, 0x56, 0x93, 0x08, - 0x41, 0x99, 0x3d, 0x2a, 0x47, 0xfb, 0xdb, 0x87, 0x47, 0xed, 0x03, 0x1a, 0xcb, 0x4b, 0x50, 0x71, - 0x63, 0xe9, 0x0a, 0xd3, 0xd2, 0xd3, 0x70, 0x25, 0x22, 0xeb, 0x9b, 0xe5, 0xf0, 0xd2, 0x6f, 0xe3, - 0x41, 0xed, 0x30, 0xe3, 0x3f, 0x80, 0x8c, 0xed, 0x60, 0x67, 0x6c, 0x8b, 0x20, 0xbe, 0xb8, 0x6c, - 0x1a, 0xb8, 0xe9, 0x3e, 0x1c, 0x31, 0x73, 0x59, 0xb8, 0x91, 0xee, 0x40, 0x39, 0xfc, 0x26, 0x3a, - 0x06, 0xfe, 0x22, 0x4a, 0x48, 0xdf, 0xc6, 0xa1, 0x32, 0xb5, 0xe3, 0xd1, 0x16, 0xa4, 0x39, 0xbb, - 0x89, 0xfa, 0x2b, 0xc8, 0x00, 0x4b, 0xc0, 0x03, 0x57, 0x45, 0xaf, 0x42, 0x8e, 0x9c, 0x6a, 0x2a, - 0xd1, 0x7b, 0x64, 0x1e, 0xb2, 0xf0, 0x72, 0x6a, 0x4b, 0x68, 0x08, 0x53, 0xcf, 0x02, 0xbd, 0x0e, - 0x79, 0x0f, 0xba, 0x04, 0x1b, 0x7e, 0x7c, 0xd6, 0xdc, 0x03, 0x3d, 0x61, 0xef, 0xdb, 0xa0, 0x97, - 0xfd, 0x74, 0x33, 0x35, 0xcb, 0xa9, 0x84, 0x39, 0x57, 0x10, 0xc6, 0xae, 0xbe, 0xd4, 0x84, 0x42, - 0x60, 0x3c, 0xe8, 0x51, 0xc8, 0x8f, 0x70, 0xb8, 0x44, 0x96, 0x1b, 0x61, 0x51, 0x20, 0xbb, 0x02, - 0x59, 0xfa, 0xb2, 0x8f, 0x39, 0x7c, 0x26, 0xe5, 0xcc, 0x08, 0x4f, 0xde, 0xc4, 0xb6, 0xf4, 0x2e, - 0x40, 0xa0, 0xa8, 0xbb, 0x0a, 0x69, 0xcb, 0x18, 0xeb, 0x2a, 0xb3, 0x4f, 0xcb, 0xbc, 0x81, 0xee, - 0x40, 0xfa, 0xd4, 0xe0, 0xc8, 0x3b, 0x1f, 0x7f, 0xee, 0x1b, 0x0e, 0x09, 0x54, 0x70, 0xb8, 0xb6, - 0xa4, 0x01, 0x9a, 0x2d, 0xac, 0x45, 0x7c, 0xe2, 0xb5, 0xf0, 0x27, 0x1e, 0x8f, 0x2c, 0xd1, 0xcd, - 0xff, 0xd4, 0x47, 0x90, 0x66, 0xa0, 0x4d, 0x01, 0x98, 0x15, 0x87, 0x45, 0x46, 0x4f, 0x9f, 0xd1, - 0x2f, 0x00, 0xb0, 0xe3, 0x58, 0x5a, 0x77, 0xec, 0x7f, 0x60, 0x7d, 0x3e, 0xe8, 0x6f, 0xbb, 0x7a, - 0x8d, 0x6b, 0x02, 0xfd, 0x57, 0x7d, 0xd3, 0xc0, 0x09, 0x10, 0x70, 0x28, 0xed, 0x43, 0x39, 0x6c, - 0xeb, 0x26, 0xa1, 0xbc, 0x0f, 0xe1, 0x24, 0x94, 0x53, 0x0a, 0x91, 0x84, 0x7a, 0x29, 0x6c, 0x92, - 0xff, 0x07, 0x60, 0x0d, 0xe9, 0x93, 0x38, 0xe4, 0x3a, 0x13, 0x01, 0x07, 0x11, 0x35, 0x68, 0xdf, - 0x34, 0x11, 0xac, 0xb8, 0xf2, 0xa2, 0x76, 0xd2, 0x2b, 0x95, 0xbf, 0xe1, 0x01, 0x5e, 0x6a, 0xd9, - 0x92, 0x81, 0xfb, 0xcb, 0x40, 0x80, 0xfc, 0x2b, 0x90, 0xf7, 0x16, 0x2f, 0xa5, 0x46, 0x6e, 0x79, - 0x2a, 0x2e, 0x12, 0x7b, 0xde, 0x64, 0x7f, 0x34, 0x8c, 0x0f, 0x45, 0x4d, 0x37, 0x29, 0xf3, 0x86, - 0xa4, 0x42, 0x65, 0xea, 0xb8, 0x47, 0xaf, 0x40, 0xd6, 0x1c, 0x77, 0x15, 0x37, 0x3c, 0x53, 0x7b, - 0xd4, 0xcd, 0xba, 0xc7, 0xdd, 0xa1, 0xd6, 0xdb, 0x25, 0x67, 0x6e, 0x67, 0xcc, 0x71, 0x77, 0x97, - 0x47, 0x91, 0x7f, 0x25, 0x11, 0xfc, 0xca, 0x29, 0xe4, 0xdc, 0x45, 0x81, 0x7e, 0x14, 0xdc, 0x8e, - 0xee, 0x7f, 0xae, 0xc8, 0x14, 0x44, 0xb8, 0x0f, 0xec, 0xc6, 0x5b, 0xb0, 0x62, 0x6b, 0x7d, 0xdd, - 0x2d, 0x5d, 0x72, 0x30, 0x49, 0xb0, 0xd9, 0xa9, 0xf0, 0x17, 0x7b, 0x2e, 0x33, 0x93, 0x7e, 0x17, - 0x87, 0xea, 0xf4, 0xaa, 0xfc, 0x6f, 0x76, 0x80, 0x9e, 0x2d, 0x74, 0xf5, 0x2b, 0x84, 0x76, 0xc2, - 0xa3, 0xa4, 0x45, 0xb9, 0x44, 0xa5, 0x2d, 0x57, 0x28, 0x7d, 0x9c, 0x80, 0x42, 0xa0, 0x30, 0x8a, - 0x7e, 0x18, 0xd8, 0x22, 0xe5, 0x39, 0x69, 0x54, 0x40, 0xd7, 0xff, 0x87, 0x12, 0x1e, 0x58, 0xe2, - 0xe2, 0x03, 0x8b, 0xfa, 0x17, 0xe6, 0xd6, 0x59, 0x53, 0x17, 0xae, 0xb3, 0x3e, 0x03, 0xc8, 0x31, - 0x1c, 0x3c, 0x54, 0x4e, 0x0d, 0x47, 0xd3, 0xfb, 0x0a, 0x5f, 0x1a, 0x3c, 0x6f, 0xae, 0xb2, 0x37, - 0xf7, 0xd9, 0x8b, 0x43, 0xb6, 0x4a, 0x7e, 0x19, 0x87, 0x9c, 0x97, 0x01, 0x5d, 0xf4, 0x97, 0xc8, - 0x65, 0xc8, 0x88, 0x43, 0x9e, 0xff, 0x13, 0x11, 0xad, 0xb9, 0x05, 0xe5, 0x3a, 0xe4, 0x46, 0xc4, - 0xc1, 0x2c, 0x0d, 0xe4, 0x6c, 0xde, 0x6b, 0xdf, 0x7a, 0x19, 0x0a, 0x81, 0xbf, 0x53, 0x14, 0x27, - 0xf6, 0x5b, 0xef, 0x54, 0x63, 0xf5, 0xec, 0x27, 0x9f, 0x6f, 0x24, 0xf7, 0xc9, 0x87, 0x74, 0x87, - 0xc9, 0xad, 0x66, 0xbb, 0xd5, 0xdc, 0xad, 0xc6, 0xeb, 0x85, 0x4f, 0x3e, 0xdf, 0xc8, 0xca, 0x84, - 0xd5, 0x00, 0x6f, 0xed, 0x42, 0x65, 0x6a, 0x62, 0xc2, 0xc7, 0x24, 0x82, 0xf2, 0xdd, 0xe3, 0xc3, - 0xbd, 0x9d, 0xe6, 0x76, 0xa7, 0xa5, 0xdc, 0x3f, 0xe8, 0xb4, 0xaa, 0x71, 0x74, 0x05, 0x2e, 0xed, - 0xed, 0xbc, 0xd9, 0xee, 0x28, 0xcd, 0xbd, 0x9d, 0xd6, 0x7e, 0x47, 0xd9, 0xee, 0x74, 0xb6, 0x9b, - 0xbb, 0xd5, 0xc4, 0xd6, 0xbf, 0x00, 0x2a, 0xdb, 0x8d, 0xe6, 0x0e, 0x4d, 0x73, 0xb4, 0x1e, 0x66, - 0xd5, 0x96, 0x26, 0xa4, 0x58, 0x3d, 0xe5, 0xdc, 0xab, 0x34, 0xf5, 0xf3, 0x0b, 0xc4, 0xe8, 0x1e, - 0xa4, 0x59, 0xa9, 0x05, 0x9d, 0x7f, 0xb7, 0xa6, 0xbe, 0xa0, 0x62, 0x4c, 0x3b, 0xc3, 0xb6, 0xd3, - 0xb9, 0x97, 0x6d, 0xea, 0xe7, 0x17, 0x90, 0x91, 0x0c, 0x79, 0x9f, 0xab, 0x2d, 0xbe, 0x7c, 0x52, - 0x5f, 0x02, 0x1d, 0xd1, 0x1e, 0x64, 0x5d, 0x7a, 0xbd, 0xe8, 0x3a, 0x4c, 0x7d, 0x61, 0x85, 0x97, - 0x86, 0x8b, 0x97, 0x41, 0xce, 0xbf, 0xdb, 0x53, 0x5f, 0x50, 0xae, 0x46, 0x3b, 0x90, 0x11, 0x04, - 0x64, 0xc1, 0x15, 0x97, 0xfa, 0xa2, 0x8a, 0x2d, 0x0d, 0x9a, 0x5f, 0x5f, 0x5a, 0x7c, 0x63, 0xa9, - 0xbe, 0x44, 0x25, 0x1e, 0x1d, 0x03, 0x04, 0x8a, 0x1e, 0x4b, 0x5c, 0x45, 0xaa, 0x2f, 0x53, 0x61, - 0x47, 0x07, 0x90, 0xf3, 0x38, 0xe8, 0xc2, 0x8b, 0x41, 0xf5, 0xc5, 0xa5, 0x6e, 0xf4, 0x00, 0x4a, - 0x61, 0xf2, 0xb5, 0xdc, 0x75, 0x9f, 0xfa, 0x92, 0x35, 0x6c, 0xea, 0x3f, 0xcc, 0xc4, 0x96, 0xbb, - 0xfe, 0x53, 0x5f, 0xb2, 0xa4, 0x8d, 0xde, 0x87, 0x95, 0x59, 0xa6, 0xb4, 0xfc, 0x6d, 0xa0, 0xfa, - 0x05, 0x8a, 0xdc, 0x68, 0x04, 0x68, 0x0e, 0xc3, 0xba, 0xc0, 0xe5, 0xa0, 0xfa, 0x45, 0x6a, 0xde, - 0x48, 0x85, 0xca, 0x34, 0x6d, 0x59, 0xf6, 0xb2, 0x50, 0x7d, 0xe9, 0xfa, 0x37, 0xff, 0x4a, 0x98, - 0xee, 0x2c, 0x7b, 0x79, 0xa8, 0xbe, 0x74, 0x39, 0xbc, 0xd1, 0xfa, 0xe2, 0xeb, 0xb5, 0xf8, 0x97, - 0x5f, 0xaf, 0xc5, 0xff, 0xfe, 0xf5, 0x5a, 0xfc, 0xd3, 0x6f, 0xd6, 0x62, 0x5f, 0x7e, 0xb3, 0x16, - 0xfb, 0xcb, 0x37, 0x6b, 0xb1, 0x9f, 0x3e, 0xdd, 0xd7, 0x9c, 0xc1, 0xb8, 0xbb, 0xd9, 0x33, 0x46, - 0xb7, 0x83, 0x37, 0x28, 0xe7, 0xdd, 0xea, 0xec, 0x66, 0xd8, 0x19, 0xf9, 0xfc, 0xbf, 0x03, 0x00, - 0x00, 0xff, 0xff, 0xb9, 0x27, 0xe5, 0x82, 0xf5, 0x29, 0x00, 0x00, + // 3010 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x3b, 0x73, 0x23, 0xc7, + 0xf1, 0xc7, 0xfb, 0xd1, 0x78, 0x72, 0x8e, 0xa2, 0x70, 0xd0, 0x89, 0xa4, 0xf6, 0x4a, 0xd2, 0xdd, + 0x49, 0x22, 0xf5, 0xa7, 0xfe, 0xa7, 0x47, 0xc9, 0xb2, 0x05, 0xe0, 0x70, 0x06, 0x45, 0x8a, 0xa4, + 0x97, 0xe0, 0xa9, 0xe4, 0xc7, 0xad, 0x16, 0xd8, 0x21, 0xb1, 0x3a, 0x60, 0x77, 0xb5, 0x3b, 0xa0, + 0x40, 0x85, 0x56, 0xb9, 0xca, 0xa5, 0x72, 0xa0, 0x50, 0x89, 0x02, 0x07, 0xfe, 0x0e, 0x8e, 0x1c, + 0x39, 0x50, 0xe0, 0x40, 0x81, 0x03, 0x07, 0x2e, 0xd9, 0x25, 0x65, 0xfe, 0x02, 0x0e, 0x1c, 0xd8, + 0x35, 0x8f, 0x7d, 0x01, 0x58, 0x02, 0x94, 0x5c, 0xae, 0x72, 0x39, 0x9b, 0xe9, 0xed, 0xee, 0x99, + 0xe9, 0x99, 0xe9, 0xee, 0x5f, 0xef, 0xc0, 0x13, 0x04, 0x1b, 0x1a, 0xb6, 0x47, 0xba, 0x41, 0xb6, + 0xd5, 0x5e, 0x5f, 0xdf, 0x26, 0x17, 0x16, 0x76, 0xb6, 0x2c, 0xdb, 0x24, 0x26, 0xaa, 0xf8, 0x1f, + 0xb7, 0xe8, 0xc7, 0xfa, 0x93, 0x01, 0xee, 0xbe, 0x7d, 0x61, 0x11, 0x73, 0xdb, 0xb2, 0x4d, 0xf3, + 0x94, 0xf3, 0xd7, 0x6f, 0x04, 0x3e, 0x33, 0x3d, 0x41, 0x6d, 0xa1, 0xaf, 0x42, 0xf8, 0x11, 0xbe, + 0x70, 0xbf, 0x3e, 0x39, 0x23, 0x6b, 0xa9, 0xb6, 0x3a, 0x72, 0x3f, 0x6f, 0x9c, 0x99, 0xe6, 0xd9, + 0x10, 0x6f, 0xb3, 0x5e, 0x6f, 0x7c, 0xba, 0x4d, 0xf4, 0x11, 0x76, 0x88, 0x3a, 0xb2, 0x04, 0xc3, + 0xea, 0x99, 0x79, 0x66, 0xb2, 0xe6, 0x36, 0x6d, 0x71, 0xaa, 0xf4, 0xcf, 0x1c, 0x64, 0x65, 0xfc, + 0xc1, 0x18, 0x3b, 0x04, 0xed, 0x40, 0x0a, 0xf7, 0x07, 0x66, 0x2d, 0xbe, 0x19, 0xbf, 0x55, 0xd8, + 0xb9, 0xb1, 0x35, 0xb5, 0xb8, 0x2d, 0xc1, 0xd7, 0xee, 0x0f, 0xcc, 0x4e, 0x4c, 0x66, 0xbc, 0xe8, + 0x2e, 0xa4, 0x4f, 0x87, 0x63, 0x67, 0x50, 0x4b, 0x30, 0xa1, 0x27, 0xa3, 0x84, 0xee, 0x53, 0xa6, + 0x4e, 0x4c, 0xe6, 0xdc, 0x74, 0x28, 0xdd, 0x38, 0x35, 0x6b, 0xc9, 0xcb, 0x87, 0xda, 0x35, 0x4e, + 0xd9, 0x50, 0x94, 0x17, 0x35, 0x01, 0x74, 0x43, 0x27, 0x4a, 0x7f, 0xa0, 0xea, 0x46, 0x2d, 0xcd, + 0x24, 0x9f, 0x8a, 0x96, 0xd4, 0x49, 0x8b, 0x32, 0x76, 0x62, 0x72, 0x5e, 0x77, 0x3b, 0x74, 0xba, + 0x1f, 0x8c, 0xb1, 0x7d, 0x51, 0xcb, 0x5c, 0x3e, 0xdd, 0x1f, 0x51, 0x26, 0x3a, 0x5d, 0xc6, 0x8d, + 0xda, 0x50, 0xe8, 0xe1, 0x33, 0xdd, 0x50, 0x7a, 0x43, 0xb3, 0xff, 0xa8, 0x96, 0x65, 0xc2, 0x52, + 0x94, 0x70, 0x93, 0xb2, 0x36, 0x29, 0x67, 0x27, 0x26, 0x43, 0xcf, 0xeb, 0xa1, 0xef, 0x41, 0xae, + 0x3f, 0xc0, 0xfd, 0x47, 0x0a, 0x99, 0xd4, 0x72, 0x4c, 0xc7, 0x46, 0x94, 0x8e, 0x16, 0xe5, 0xeb, + 0x4e, 0x3a, 0x31, 0x39, 0xdb, 0xe7, 0x4d, 0xba, 0x7e, 0x0d, 0x0f, 0xf5, 0x73, 0x6c, 0x53, 0xf9, + 0xfc, 0xe5, 0xeb, 0xbf, 0xc7, 0x39, 0x99, 0x86, 0xbc, 0xe6, 0x76, 0xd0, 0x0f, 0x20, 0x8f, 0x0d, + 0x4d, 0x2c, 0x03, 0x98, 0x8a, 0xcd, 0xc8, 0x7d, 0x36, 0x34, 0x77, 0x11, 0x39, 0x2c, 0xda, 0xe8, + 0x55, 0xc8, 0xf4, 0xcd, 0xd1, 0x48, 0x27, 0xb5, 0x02, 0x93, 0x5e, 0x8f, 0x5c, 0x00, 0xe3, 0xea, + 0xc4, 0x64, 0xc1, 0x8f, 0x0e, 0xa0, 0x3c, 0xd4, 0x1d, 0xa2, 0x38, 0x86, 0x6a, 0x39, 0x03, 0x93, + 0x38, 0xb5, 0x22, 0xd3, 0xf0, 0x74, 0x94, 0x86, 0x7d, 0xdd, 0x21, 0xc7, 0x2e, 0x73, 0x27, 0x26, + 0x97, 0x86, 0x41, 0x02, 0xd5, 0x67, 0x9e, 0x9e, 0x62, 0xdb, 0x53, 0x58, 0x2b, 0x5d, 0xae, 0xef, + 0x90, 0x72, 0xbb, 0xf2, 0x54, 0x9f, 0x19, 0x24, 0xa0, 0x9f, 0xc0, 0xb5, 0xa1, 0xa9, 0x6a, 0x9e, + 0x3a, 0xa5, 0x3f, 0x18, 0x1b, 0x8f, 0x6a, 0x65, 0xa6, 0xf4, 0x76, 0xe4, 0x24, 0x4d, 0x55, 0x73, + 0x55, 0xb4, 0xa8, 0x40, 0x27, 0x26, 0xaf, 0x0c, 0xa7, 0x89, 0xe8, 0x21, 0xac, 0xaa, 0x96, 0x35, + 0xbc, 0x98, 0xd6, 0x5e, 0x61, 0xda, 0xef, 0x44, 0x69, 0x6f, 0x50, 0x99, 0x69, 0xf5, 0x48, 0x9d, + 0xa1, 0xa2, 0x2e, 0x54, 0x2d, 0x1b, 0x5b, 0xaa, 0x8d, 0x15, 0xcb, 0x36, 0x2d, 0xd3, 0x51, 0x87, + 0xb5, 0x2a, 0xd3, 0xfd, 0x6c, 0x94, 0xee, 0x23, 0xce, 0x7f, 0x24, 0xd8, 0x3b, 0x31, 0xb9, 0x62, + 0x85, 0x49, 0x5c, 0xab, 0xd9, 0xc7, 0x8e, 0xe3, 0x6b, 0x5d, 0x59, 0xa4, 0x95, 0xf1, 0x87, 0xb5, + 0x86, 0x48, 0xcd, 0x2c, 0xa4, 0xcf, 0xd5, 0xe1, 0x18, 0xbf, 0x95, 0xca, 0xa5, 0xaa, 0x69, 0xe9, + 0x59, 0x28, 0x04, 0x1c, 0x0b, 0xaa, 0x41, 0x76, 0x84, 0x1d, 0x47, 0x3d, 0xc3, 0xcc, 0x0f, 0xe5, + 0x65, 0xb7, 0x2b, 0x95, 0xa1, 0x18, 0x74, 0x26, 0xd2, 0xa7, 0x71, 0x4f, 0x92, 0xfa, 0x09, 0x2a, + 0x79, 0x8e, 0x6d, 0x47, 0x37, 0x0d, 0x57, 0x52, 0x74, 0xd1, 0x4d, 0x28, 0xb1, 0x13, 0xaf, 0xb8, + 0xdf, 0xa9, 0xb3, 0x4a, 0xc9, 0x45, 0x46, 0x7c, 0x20, 0x98, 0x36, 0xa0, 0x60, 0xed, 0x58, 0x1e, + 0x4b, 0x92, 0xb1, 0x80, 0xb5, 0x63, 0xb9, 0x0c, 0x4f, 0x41, 0x91, 0xae, 0xd4, 0xe3, 0x48, 0xb1, + 0x41, 0x0a, 0x94, 0x26, 0x58, 0xa4, 0x3f, 0x24, 0xa0, 0x3a, 0xed, 0x80, 0xd0, 0xab, 0x90, 0xa2, + 0xbe, 0x58, 0xb8, 0xd5, 0xfa, 0x16, 0x77, 0xd4, 0x5b, 0xae, 0xa3, 0xde, 0xea, 0xba, 0x8e, 0xba, + 0x99, 0xfb, 0xe2, 0xab, 0x8d, 0xd8, 0xa7, 0x7f, 0xd9, 0x88, 0xcb, 0x4c, 0x02, 0x5d, 0xa7, 0xfe, + 0x42, 0xd5, 0x0d, 0x45, 0xd7, 0xd8, 0x94, 0xf3, 0xd4, 0x19, 0xa8, 0xba, 0xb1, 0xab, 0xa1, 0x7d, + 0xa8, 0xf6, 0x4d, 0xc3, 0xc1, 0x86, 0x33, 0x76, 0x14, 0x1e, 0x08, 0x84, 0x33, 0x0d, 0xb9, 0x04, + 0x1e, 0x5e, 0x5a, 0x2e, 0xe7, 0x11, 0x63, 0x94, 0x2b, 0xfd, 0x30, 0x01, 0xdd, 0x07, 0x38, 0x57, + 0x87, 0xba, 0xa6, 0x12, 0xd3, 0x76, 0x6a, 0xa9, 0xcd, 0xe4, 0x5c, 0xbf, 0xf0, 0xc0, 0x65, 0x39, + 0xb1, 0x34, 0x95, 0xe0, 0x66, 0x8a, 0x4e, 0x57, 0x0e, 0x48, 0xa2, 0x67, 0xa0, 0xa2, 0x5a, 0x96, + 0xe2, 0x10, 0x95, 0x60, 0xa5, 0x77, 0x41, 0xb0, 0xc3, 0xfc, 0x74, 0x51, 0x2e, 0xa9, 0x96, 0x75, + 0x4c, 0xa9, 0x4d, 0x4a, 0x44, 0x4f, 0x43, 0x99, 0xfa, 0x64, 0x5d, 0x1d, 0x2a, 0x03, 0xac, 0x9f, + 0x0d, 0x08, 0xf3, 0xc7, 0x49, 0xb9, 0x24, 0xa8, 0x1d, 0x46, 0x94, 0x34, 0x6f, 0xc7, 0x99, 0x3f, + 0x46, 0x08, 0x52, 0x9a, 0x4a, 0x54, 0x66, 0xc9, 0xa2, 0xcc, 0xda, 0x94, 0x66, 0xa9, 0x64, 0x20, + 0xec, 0xc3, 0xda, 0x68, 0x0d, 0x32, 0x42, 0x6d, 0x92, 0xa9, 0x15, 0x3d, 0xb4, 0x0a, 0x69, 0xcb, + 0x36, 0xcf, 0x31, 0xdb, 0xba, 0x9c, 0xcc, 0x3b, 0xd2, 0xc7, 0x09, 0x58, 0x99, 0xf1, 0xdc, 0x54, + 0xef, 0x40, 0x75, 0x06, 0xee, 0x58, 0xb4, 0x8d, 0x5e, 0xa6, 0x7a, 0x55, 0x0d, 0xdb, 0x22, 0xda, + 0xd5, 0x66, 0x4d, 0xdd, 0x61, 0xdf, 0x85, 0x69, 0x04, 0x37, 0xda, 0x83, 0xea, 0x50, 0x75, 0x88, + 0xc2, 0x3d, 0xa1, 0x12, 0x88, 0x7c, 0x4f, 0xcc, 0x18, 0x99, 0xfb, 0x4d, 0x7a, 0xa0, 0x85, 0x92, + 0x32, 0x15, 0xf5, 0xa9, 0xe8, 0x04, 0x56, 0x7b, 0x17, 0x1f, 0xa9, 0x06, 0xd1, 0x0d, 0xac, 0xcc, + 0xec, 0xda, 0x6c, 0x28, 0x7d, 0x5b, 0x77, 0x7a, 0x78, 0xa0, 0x9e, 0xeb, 0xa6, 0x3b, 0xad, 0x6b, + 0x9e, 0xbc, 0xb7, 0xa3, 0x8e, 0x24, 0x43, 0x39, 0x1c, 0x7a, 0x50, 0x19, 0x12, 0x64, 0x22, 0xd6, + 0x9f, 0x20, 0x13, 0xf4, 0x22, 0xa4, 0xe8, 0x1a, 0xd9, 0xda, 0xcb, 0x73, 0x06, 0x12, 0x72, 0xdd, + 0x0b, 0x0b, 0xcb, 0x8c, 0x53, 0x92, 0xbc, 0xdb, 0xe0, 0x85, 0xa3, 0x69, 0xad, 0xd2, 0x6d, 0xa8, + 0x4c, 0xc5, 0x9b, 0xc0, 0xf6, 0xc5, 0x83, 0xdb, 0x27, 0x55, 0xa0, 0x14, 0x0a, 0x2e, 0xd2, 0x1a, + 0xac, 0xce, 0x8b, 0x15, 0xd2, 0xc0, 0xa3, 0x87, 0x7c, 0x3e, 0xba, 0x0b, 0x39, 0x2f, 0x58, 0xf0, + 0xdb, 0x78, 0x7d, 0x66, 0x15, 0x2e, 0xb3, 0xec, 0xb1, 0xd2, 0x6b, 0x48, 0x4f, 0x35, 0x3b, 0x0e, + 0x09, 0x36, 0xf1, 0xac, 0x6a, 0x59, 0x1d, 0xd5, 0x19, 0x48, 0xef, 0x41, 0x2d, 0x2a, 0x10, 0x4c, + 0x2d, 0x23, 0xe5, 0x9d, 0xc2, 0x35, 0xc8, 0x9c, 0x9a, 0xf6, 0x48, 0x25, 0x4c, 0x59, 0x49, 0x16, + 0x3d, 0x7a, 0x3a, 0x79, 0x50, 0x48, 0x32, 0x32, 0xef, 0x48, 0x0a, 0x5c, 0x8f, 0x0c, 0x06, 0x54, + 0x44, 0x37, 0x34, 0xcc, 0xed, 0x59, 0x92, 0x79, 0xc7, 0x57, 0xc4, 0x27, 0xcb, 0x3b, 0x74, 0x58, + 0x87, 0xad, 0x95, 0xe9, 0xcf, 0xcb, 0xa2, 0x27, 0x7d, 0x96, 0x84, 0xb5, 0xf9, 0x21, 0x01, 0x6d, + 0x42, 0x71, 0xa4, 0x4e, 0x14, 0x32, 0x11, 0x77, 0x99, 0x6f, 0x07, 0x8c, 0xd4, 0x49, 0x77, 0xc2, + 0x2f, 0x72, 0x15, 0x92, 0x64, 0xe2, 0xd4, 0x12, 0x9b, 0xc9, 0x5b, 0x45, 0x99, 0x36, 0xd1, 0x09, + 0xac, 0x0c, 0xcd, 0xbe, 0x3a, 0x54, 0x02, 0x27, 0x5e, 0x1c, 0xf6, 0x9b, 0x33, 0xc6, 0x6e, 0x4f, + 0x18, 0x45, 0x9b, 0x39, 0xf4, 0x15, 0xa6, 0x63, 0xdf, 0x3b, 0xf9, 0xe8, 0x1e, 0x14, 0x46, 0xfe, + 0x41, 0xbe, 0xc2, 0x61, 0x0f, 0x8a, 0x05, 0xb6, 0x24, 0x1d, 0x72, 0x0c, 0xae, 0x8b, 0xce, 0x5c, + 0xd9, 0x45, 0xbf, 0x08, 0xab, 0x06, 0x9e, 0x90, 0xc0, 0x45, 0xe4, 0xe7, 0x24, 0xcb, 0x4c, 0x8f, + 0xe8, 0x37, 0xff, 0x92, 0xd1, 0x23, 0x83, 0x6e, 0xb3, 0xa0, 0x6a, 0x99, 0x0e, 0xb6, 0x15, 0x55, + 0xd3, 0x6c, 0xec, 0x38, 0x2c, 0x19, 0x2c, 0xb2, 0x48, 0xc9, 0xe8, 0x0d, 0x4e, 0x96, 0x7e, 0x19, + 0xdc, 0x9a, 0x50, 0x10, 0x75, 0x0d, 0x1f, 0xf7, 0x0d, 0x7f, 0x0c, 0xab, 0x42, 0x5e, 0x0b, 0xd9, + 0x3e, 0xb1, 0xac, 0xa3, 0x41, 0xae, 0x78, 0xb4, 0xd9, 0x93, 0xdf, 0xce, 0xec, 0xae, 0x2f, 0x4d, + 0x05, 0x7c, 0xe9, 0x7f, 0xd9, 0x56, 0xfc, 0x31, 0x0f, 0x39, 0x19, 0x3b, 0x16, 0x0d, 0x9c, 0xa8, + 0x09, 0x79, 0x3c, 0xe9, 0x63, 0x8b, 0xb8, 0xb9, 0xc6, 0x7c, 0x30, 0xc0, 0xb9, 0xdb, 0x2e, 0x27, + 0xcd, 0xc4, 0x3d, 0x31, 0xf4, 0x92, 0x00, 0x5b, 0xd1, 0xb8, 0x49, 0x88, 0x07, 0xd1, 0xd6, 0xcb, + 0x2e, 0xda, 0x4a, 0x46, 0x26, 0xdf, 0x5c, 0x6a, 0x0a, 0x6e, 0xbd, 0x24, 0xe0, 0x56, 0x6a, 0xc1, + 0x60, 0x21, 0xbc, 0xd5, 0x0a, 0xe1, 0xad, 0xcc, 0x82, 0x65, 0x46, 0x00, 0xae, 0x97, 0x5d, 0xc0, + 0x95, 0x5d, 0x30, 0xe3, 0x29, 0xc4, 0x75, 0x3f, 0x8c, 0xb8, 0x72, 0x11, 0x0e, 0xc4, 0x95, 0x8e, + 0x84, 0x5c, 0x6f, 0x04, 0x20, 0x57, 0x3e, 0x12, 0xef, 0x70, 0x25, 0x73, 0x30, 0x57, 0x2b, 0x84, + 0xb9, 0x60, 0x81, 0x0d, 0x22, 0x40, 0xd7, 0x9b, 0x41, 0xd0, 0x55, 0x88, 0xc4, 0x6d, 0x62, 0xbf, + 0xe7, 0xa1, 0xae, 0xd7, 0x3c, 0xd4, 0x55, 0x8c, 0x84, 0x8d, 0x62, 0x0d, 0xd3, 0xb0, 0xeb, 0x70, + 0x06, 0x76, 0x71, 0x98, 0xf4, 0x4c, 0xa4, 0x8a, 0x05, 0xb8, 0xeb, 0x70, 0x06, 0x77, 0x95, 0x17, + 0x28, 0x5c, 0x00, 0xbc, 0x7e, 0x3a, 0x1f, 0x78, 0x45, 0x43, 0x23, 0x31, 0xcd, 0xe5, 0x90, 0x97, + 0x12, 0x81, 0xbc, 0x38, 0x3a, 0x7a, 0x2e, 0x52, 0xfd, 0xd2, 0xd0, 0xeb, 0x64, 0x0e, 0xf4, 0xe2, + 0x20, 0xe9, 0x56, 0xa4, 0xf2, 0x25, 0xb0, 0xd7, 0xc9, 0x1c, 0xec, 0x85, 0x16, 0xaa, 0xbd, 0x0a, + 0xf8, 0x4a, 0x57, 0x33, 0xd2, 0x6d, 0x9a, 0xfa, 0x4e, 0xf9, 0x29, 0x9a, 0x3f, 0x60, 0xdb, 0x36, + 0x6d, 0x01, 0xa3, 0x78, 0x47, 0xba, 0x45, 0x93, 0x71, 0xdf, 0x27, 0x5d, 0x02, 0xd4, 0x58, 0x9e, + 0x16, 0xf0, 0x43, 0xd2, 0x6f, 0xe3, 0xbe, 0x2c, 0xcb, 0x61, 0x83, 0x89, 0x7c, 0x5e, 0x24, 0xf2, + 0x01, 0xf8, 0x96, 0x08, 0xc3, 0xb7, 0x0d, 0x28, 0xd0, 0xfc, 0x6b, 0x0a, 0x99, 0xa9, 0x96, 0x87, + 0xcc, 0xee, 0xc0, 0x0a, 0x8b, 0x78, 0x1c, 0xe4, 0x89, 0xb0, 0x92, 0x62, 0x61, 0xa5, 0x42, 0x3f, + 0xf0, 0x0b, 0xc5, 0xe3, 0xcb, 0x0b, 0x70, 0x2d, 0xc0, 0xeb, 0xe5, 0x75, 0x1c, 0xa6, 0x54, 0x3d, + 0xee, 0x86, 0x48, 0xf0, 0x7e, 0x1f, 0xf7, 0x2d, 0xe4, 0x43, 0xba, 0x79, 0xe8, 0x2b, 0xfe, 0x6f, + 0x42, 0x5f, 0x89, 0x6f, 0x8d, 0xbe, 0x82, 0x79, 0x6a, 0x32, 0x9c, 0xa7, 0xfe, 0x3d, 0xee, 0xef, + 0x89, 0x87, 0xa5, 0xfa, 0xa6, 0x86, 0x45, 0xe6, 0xc8, 0xda, 0x34, 0xa9, 0x18, 0x9a, 0x67, 0x22, + 0x3f, 0xa4, 0x4d, 0xca, 0xe5, 0x05, 0x8e, 0xbc, 0x88, 0x0b, 0x5e, 0xd2, 0xc9, 0x03, 0xb7, 0x48, + 0x3a, 0xab, 0x90, 0x7c, 0x84, 0x79, 0x5d, 0xad, 0x28, 0xd3, 0x26, 0xe5, 0x63, 0x47, 0x4d, 0x04, + 0x60, 0xde, 0x41, 0xaf, 0x42, 0x9e, 0x55, 0x44, 0x15, 0xd3, 0x72, 0x84, 0x5b, 0x0f, 0xe5, 0x26, + 0xbc, 0xf0, 0xb9, 0x75, 0x44, 0x79, 0x0e, 0x2d, 0x47, 0xce, 0x59, 0xa2, 0x15, 0xc8, 0x18, 0xf2, + 0xa1, 0x8c, 0xe1, 0x06, 0xe4, 0xe9, 0xec, 0x1d, 0x4b, 0xed, 0x63, 0xe6, 0xa2, 0xf3, 0xb2, 0x4f, + 0x90, 0x1e, 0x02, 0x9a, 0x0d, 0x12, 0xa8, 0x03, 0x19, 0x7c, 0x8e, 0x0d, 0xc2, 0x33, 0xa8, 0xc2, + 0xce, 0xda, 0x6c, 0x6a, 0x4a, 0x3f, 0x37, 0x6b, 0xd4, 0xc8, 0x7f, 0xfb, 0x6a, 0xa3, 0xca, 0xb9, + 0x9f, 0x37, 0x47, 0x3a, 0xc1, 0x23, 0x8b, 0x5c, 0xc8, 0x42, 0x5e, 0xfa, 0x73, 0x82, 0x02, 0x98, + 0x50, 0x00, 0x99, 0x6b, 0x5b, 0xf7, 0xc8, 0x27, 0x02, 0xd8, 0x75, 0x39, 0x7b, 0xaf, 0x03, 0x9c, + 0xa9, 0x8e, 0xf2, 0xa1, 0x6a, 0x10, 0xac, 0x09, 0xa3, 0x07, 0x28, 0xa8, 0x0e, 0x39, 0xda, 0x1b, + 0x3b, 0x58, 0x13, 0x30, 0xda, 0xeb, 0x07, 0xd6, 0x99, 0xfd, 0x6e, 0xeb, 0x0c, 0x5b, 0x39, 0x37, + 0x65, 0xe5, 0x00, 0xb8, 0xc8, 0x07, 0xc1, 0x05, 0x9d, 0x9b, 0x65, 0xeb, 0xa6, 0xad, 0x93, 0x0b, + 0xb6, 0x35, 0x49, 0xd9, 0xeb, 0xa3, 0x9b, 0x50, 0x1a, 0xe1, 0x91, 0x65, 0x9a, 0x43, 0x85, 0xbb, + 0x9b, 0x02, 0x13, 0x2d, 0x0a, 0x62, 0x9b, 0x79, 0x9d, 0x5f, 0x24, 0xfc, 0xfb, 0xe7, 0x83, 0xc8, + 0xff, 0x39, 0x03, 0x4b, 0xbf, 0x62, 0x95, 0xa5, 0x70, 0x8a, 0x80, 0x8e, 0x61, 0xc5, 0xbb, 0xfe, + 0xca, 0x98, 0xb9, 0x05, 0xf7, 0x40, 0x2f, 0xeb, 0x3f, 0xaa, 0xe7, 0x61, 0xb2, 0x83, 0xde, 0x85, + 0xc7, 0xa7, 0x7c, 0x9b, 0xa7, 0x3a, 0xb1, 0xac, 0x8b, 0x7b, 0x2c, 0xec, 0xe2, 0x5c, 0xd5, 0xbe, + 0xb1, 0x92, 0xdf, 0xf1, 0xd6, 0xed, 0x42, 0x39, 0x9c, 0xf1, 0xcc, 0xdd, 0xfe, 0x9b, 0x50, 0xb2, + 0x31, 0x51, 0x75, 0x43, 0x09, 0x95, 0x83, 0x8a, 0x9c, 0x28, 0x8a, 0x4c, 0x47, 0xf0, 0xd8, 0xdc, + 0xcc, 0x07, 0xbd, 0x02, 0x79, 0x3f, 0x69, 0xe2, 0x56, 0xbd, 0xa4, 0x5c, 0xe0, 0xf3, 0x4a, 0xbf, + 0x8b, 0xfb, 0x2a, 0xc3, 0x05, 0x88, 0x36, 0x64, 0x6c, 0xec, 0x8c, 0x87, 0xbc, 0x24, 0x50, 0xde, + 0x79, 0x61, 0xb9, 0x9c, 0x89, 0x52, 0xc7, 0x43, 0x22, 0x0b, 0x61, 0xe9, 0x21, 0x64, 0x38, 0x05, + 0x15, 0x20, 0x7b, 0x72, 0xb0, 0x77, 0x70, 0xf8, 0xce, 0x41, 0x35, 0x86, 0x00, 0x32, 0x8d, 0x56, + 0xab, 0x7d, 0xd4, 0xad, 0xc6, 0x51, 0x1e, 0xd2, 0x8d, 0xe6, 0xa1, 0xdc, 0xad, 0x26, 0x28, 0x59, + 0x6e, 0xbf, 0xd5, 0x6e, 0x75, 0xab, 0x49, 0xb4, 0x02, 0x25, 0xde, 0x56, 0xee, 0x1f, 0xca, 0x6f, + 0x37, 0xba, 0xd5, 0x54, 0x80, 0x74, 0xdc, 0x3e, 0xb8, 0xd7, 0x96, 0xab, 0x69, 0xe9, 0xff, 0xe0, + 0x7a, 0x64, 0x96, 0xe5, 0x57, 0x17, 0xe2, 0x81, 0xea, 0x82, 0xf4, 0x59, 0x02, 0xea, 0xd1, 0xa9, + 0x13, 0x7a, 0x6b, 0x6a, 0xe1, 0x3b, 0x57, 0xc8, 0xbb, 0xa6, 0x56, 0x8f, 0x9e, 0x86, 0xb2, 0x8d, + 0x4f, 0x31, 0xe9, 0x0f, 0x78, 0x2a, 0xc7, 0x43, 0x66, 0x49, 0x2e, 0x09, 0x2a, 0x13, 0x72, 0x38, + 0xdb, 0xfb, 0xb8, 0x4f, 0x14, 0xee, 0x8b, 0xf8, 0xa1, 0xcb, 0x53, 0x36, 0x4a, 0x3d, 0xe6, 0x44, + 0xe9, 0xbd, 0x2b, 0xd9, 0x32, 0x0f, 0x69, 0xb9, 0xdd, 0x95, 0xdf, 0xad, 0x26, 0x11, 0x82, 0x32, + 0x6b, 0x2a, 0xc7, 0x07, 0x8d, 0xa3, 0xe3, 0xce, 0x21, 0xb5, 0xe5, 0x35, 0xa8, 0xb8, 0xb6, 0x74, + 0x89, 0x69, 0xe9, 0x39, 0x78, 0x3c, 0x22, 0xef, 0x9b, 0x45, 0xf1, 0xd2, 0xaf, 0xe3, 0x41, 0xee, + 0x30, 0xe6, 0x3f, 0x84, 0x8c, 0x43, 0x54, 0x32, 0x76, 0x84, 0x11, 0x5f, 0x59, 0x36, 0x11, 0xdc, + 0x72, 0x1b, 0xc7, 0x4c, 0x5c, 0x16, 0x6a, 0xa4, 0xbb, 0x50, 0x0e, 0x7f, 0x89, 0xb6, 0x81, 0x7f, + 0x88, 0x12, 0xd2, 0xbb, 0x00, 0x81, 0x7a, 0xe4, 0x2a, 0xa4, 0x6d, 0x73, 0x6c, 0x68, 0x6c, 0x52, + 0x69, 0x99, 0x77, 0xd0, 0x5d, 0x48, 0x9f, 0x9b, 0xdc, 0x67, 0xcc, 0xbf, 0x38, 0x0f, 0x4c, 0x82, + 0x03, 0xc5, 0x07, 0xce, 0x2d, 0xe9, 0x80, 0x66, 0x6b, 0x42, 0x11, 0x43, 0xbc, 0x11, 0x1e, 0xe2, + 0xa9, 0xc8, 0xea, 0xd2, 0xfc, 0xa1, 0x3e, 0x82, 0x34, 0xf3, 0x36, 0xd4, 0x73, 0xb0, 0xba, 0xa6, + 0x48, 0x46, 0x69, 0x1b, 0xfd, 0x0c, 0x40, 0x25, 0xc4, 0xd6, 0x7b, 0x63, 0x7f, 0x80, 0x8d, 0xf9, + 0xde, 0xaa, 0xe1, 0xf2, 0x35, 0x6f, 0x08, 0xb7, 0xb5, 0xea, 0x8b, 0x06, 0x5c, 0x57, 0x40, 0xa1, + 0x74, 0x00, 0xe5, 0xb0, 0xac, 0x9b, 0x3e, 0xf1, 0x39, 0x84, 0xd3, 0x27, 0x9e, 0x0d, 0x8b, 0xf4, + 0xc9, 0x4b, 0xbe, 0x92, 0xbc, 0x84, 0xcd, 0x3a, 0xd2, 0x27, 0x71, 0xc8, 0x75, 0x27, 0xe2, 0x1c, + 0x47, 0x94, 0x4f, 0x7d, 0xd1, 0x44, 0xb0, 0x58, 0xc8, 0xeb, 0xb1, 0x49, 0xaf, 0xca, 0xfb, 0xa6, + 0x77, 0x53, 0x53, 0xcb, 0xa2, 0x5d, 0xb7, 0xda, 0x2d, 0xbc, 0xd3, 0xeb, 0x90, 0xf7, 0x62, 0x0d, + 0xcd, 0xea, 0xdd, 0xca, 0x4a, 0x5c, 0xa4, 0xa4, 0xbc, 0xcb, 0x8a, 0xf1, 0xe6, 0x87, 0xa2, 0x1c, + 0x99, 0x94, 0x79, 0x47, 0xd2, 0xa0, 0x32, 0x15, 0xa8, 0xd0, 0xeb, 0x90, 0xb5, 0xc6, 0x3d, 0xc5, + 0x35, 0xcf, 0x54, 0xfd, 0xc9, 0xcd, 0x17, 0xc7, 0xbd, 0xa1, 0xde, 0xdf, 0xc3, 0x17, 0xee, 0x64, + 0xac, 0x71, 0x6f, 0x8f, 0x5b, 0x91, 0x8f, 0x92, 0x08, 0x8e, 0x72, 0x0e, 0x39, 0xf7, 0x50, 0xa0, + 0xef, 0x43, 0xde, 0x8b, 0x81, 0xde, 0x3f, 0x9a, 0xc8, 0xe0, 0x29, 0xd4, 0xfb, 0x22, 0x14, 0x7c, + 0x38, 0xfa, 0x99, 0xe1, 0x56, 0xdd, 0x38, 0xca, 0x4f, 0xb0, 0xdd, 0xa9, 0xf0, 0x0f, 0xfb, 0x2e, + 0xa8, 0x90, 0x7e, 0x13, 0x87, 0xea, 0xf4, 0xa9, 0xfc, 0x4f, 0x4e, 0x80, 0x3a, 0x45, 0x7a, 0xfa, + 0x15, 0x4c, 0x27, 0xe1, 0xa1, 0xa9, 0xa2, 0x5c, 0xa2, 0xd4, 0xb6, 0x4b, 0x94, 0x3e, 0x4e, 0x40, + 0x21, 0x50, 0xd3, 0x43, 0xff, 0x1f, 0xb8, 0x22, 0xe5, 0x39, 0xb9, 0x45, 0x80, 0xd7, 0x2f, 0xff, + 0x87, 0x17, 0x96, 0xb8, 0xfa, 0xc2, 0xa2, 0x7e, 0xe3, 0xb8, 0x25, 0xc2, 0xd4, 0x95, 0x4b, 0x84, + 0xcf, 0x03, 0x22, 0x26, 0x51, 0x87, 0xca, 0xb9, 0x49, 0x74, 0xe3, 0x4c, 0xe1, 0x47, 0x83, 0x67, + 0x7c, 0x55, 0xf6, 0xe5, 0x01, 0xfb, 0x70, 0xc4, 0x4e, 0xc9, 0xcf, 0xe3, 0x90, 0xf3, 0x42, 0xf7, + 0x55, 0xab, 0xf9, 0x6b, 0x90, 0x11, 0xd1, 0x89, 0x97, 0xf3, 0x45, 0x6f, 0x6e, 0x2d, 0xb4, 0x0e, + 0xb9, 0x11, 0x26, 0x2a, 0xcb, 0x5f, 0x38, 0x10, 0xf5, 0xfa, 0x77, 0x5e, 0x83, 0x42, 0xe0, 0xc7, + 0x0a, 0xf5, 0x13, 0x07, 0xed, 0x77, 0xaa, 0xb1, 0x7a, 0xf6, 0x93, 0xcf, 0x37, 0x93, 0x07, 0xf8, + 0x43, 0x7a, 0xc3, 0xe4, 0x76, 0xab, 0xd3, 0x6e, 0xed, 0x55, 0xe3, 0xf5, 0xc2, 0x27, 0x9f, 0x6f, + 0x66, 0x65, 0xcc, 0xca, 0x57, 0x77, 0xf6, 0xa0, 0x32, 0xb5, 0x31, 0x61, 0xff, 0x8e, 0xa0, 0x7c, + 0xef, 0xe4, 0x68, 0x7f, 0xb7, 0xd5, 0xe8, 0xb6, 0x95, 0x07, 0x87, 0xdd, 0x76, 0x35, 0x8e, 0x1e, + 0x87, 0x6b, 0xfb, 0xbb, 0x3f, 0xec, 0x74, 0x95, 0xd6, 0xfe, 0x6e, 0xfb, 0xa0, 0xab, 0x34, 0xba, + 0xdd, 0x46, 0x6b, 0xaf, 0x9a, 0xd8, 0xf9, 0x07, 0x40, 0xa5, 0xd1, 0x6c, 0xed, 0xd2, 0xf8, 0xac, + 0xf7, 0x55, 0x56, 0x28, 0x68, 0x41, 0x8a, 0x95, 0x02, 0x2e, 0x7d, 0x2a, 0x52, 0xbf, 0xbc, 0xb6, + 0x89, 0xee, 0x43, 0x9a, 0x55, 0x09, 0xd0, 0xe5, 0x6f, 0x47, 0xea, 0x0b, 0x8a, 0x9d, 0x74, 0x32, + 0xec, 0x3a, 0x5d, 0xfa, 0x98, 0xa4, 0x7e, 0x79, 0xed, 0x13, 0xc9, 0x90, 0xf7, 0x51, 0xc6, 0xe2, + 0xc7, 0x15, 0xf5, 0x25, 0xbc, 0x23, 0xda, 0x87, 0xac, 0x0b, 0x0c, 0x17, 0x3d, 0xf7, 0xa8, 0x2f, + 0x2c, 0x4e, 0x52, 0x73, 0x71, 0x00, 0x7f, 0xf9, 0xdb, 0x95, 0xfa, 0x82, 0x4a, 0x2b, 0xda, 0x85, + 0x8c, 0xc8, 0x9c, 0x17, 0x3c, 0xe1, 0xa8, 0x2f, 0x2a, 0x36, 0x52, 0xa3, 0xf9, 0xa5, 0x91, 0xc5, + 0x2f, 0x72, 0xea, 0x4b, 0x14, 0x91, 0xd1, 0x09, 0x40, 0x00, 0xae, 0x2f, 0xf1, 0xd4, 0xa6, 0xbe, + 0x4c, 0x71, 0x18, 0x1d, 0x42, 0xce, 0x43, 0x4f, 0x0b, 0x1f, 0xbe, 0xd4, 0x17, 0x57, 0x69, 0xd1, + 0x43, 0x28, 0x85, 0x51, 0xc3, 0x72, 0xcf, 0x59, 0xea, 0x4b, 0x96, 0x5f, 0xa9, 0xfe, 0x30, 0x84, + 0x58, 0xee, 0x79, 0x4b, 0x7d, 0xc9, 0x6a, 0x2c, 0x7a, 0x1f, 0x56, 0x66, 0x53, 0xfc, 0xe5, 0x5f, + 0xbb, 0xd4, 0xaf, 0x50, 0x9f, 0x45, 0x23, 0x40, 0x73, 0xa0, 0xc1, 0x15, 0x1e, 0xbf, 0xd4, 0xaf, + 0x52, 0xae, 0x45, 0x1a, 0x54, 0xa6, 0xf3, 0xed, 0x65, 0x1f, 0xc3, 0xd4, 0x97, 0x2e, 0xdd, 0xf2, + 0x51, 0xc2, 0x79, 0xfa, 0xb2, 0x8f, 0x63, 0xea, 0x4b, 0x57, 0x72, 0x9b, 0x8d, 0x2f, 0xbe, 0x5e, + 0x8f, 0x7f, 0xf9, 0xf5, 0x7a, 0xfc, 0xaf, 0x5f, 0xaf, 0xc7, 0x3f, 0xfd, 0x66, 0x3d, 0xf6, 0xe5, + 0x37, 0xeb, 0xb1, 0x3f, 0x7d, 0xb3, 0x1e, 0xfb, 0xf1, 0xb3, 0x67, 0x3a, 0x19, 0x8c, 0x7b, 0x5b, + 0x7d, 0x73, 0xb4, 0xdd, 0x37, 0x47, 0x98, 0xf4, 0x4e, 0x89, 0xdf, 0xf0, 0x5f, 0x2c, 0xf6, 0x32, + 0x2c, 0x3e, 0xbe, 0xf4, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, 0x8f, 0xc4, 0x2a, 0xd1, 0x28, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4844,6 +4720,13 @@ func (m *RequestInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.AbciVersion) > 0 { + i -= len(m.AbciVersion) + copy(dAtA[i:], m.AbciVersion) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AbciVersion))) + i-- + dAtA[i] = 0x22 + } if m.P2PVersion != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.P2PVersion)) i-- @@ -6692,110 +6575,6 @@ func (m *ResponseProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *ConsensusParams) 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 *ConsensusParams) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ConsensusParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Version != nil { - { - size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - if m.Validator != nil { - { - size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.Evidence != nil { - { - size, err := m.Evidence.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Block != nil { - { - size, err := m.Block.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *BlockParams) 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 *BlockParams) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *BlockParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.MaxGas != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.MaxGas)) - i-- - dAtA[i] = 0x10 - } - if m.MaxBytes != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.MaxBytes)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - func (m *CommitInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7212,12 +6991,12 @@ func (m *Misbehavior) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n56, err56 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err56 != nil { - return 0, err56 + n52, err52 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err52 != nil { + return 0, err52 } - i -= n56 - i = encodeVarintTypes(dAtA, i, uint64(n56)) + i -= n52 + i = encodeVarintTypes(dAtA, i, uint64(n52)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7548,6 +7327,10 @@ func (m *RequestInfo) Size() (n int) { if m.P2PVersion != 0 { n += 1 + sovTypes(uint64(m.P2PVersion)) } + l = len(m.AbciVersion) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -8404,46 +8187,6 @@ func (m *ResponseProcessProposal) Size() (n int) { return n } -func (m *ConsensusParams) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Block != nil { - l = m.Block.Size() - n += 1 + l + sovTypes(uint64(l)) - } - if m.Evidence != nil { - l = m.Evidence.Size() - n += 1 + l + sovTypes(uint64(l)) - } - if m.Validator != nil { - l = m.Validator.Size() - n += 1 + l + sovTypes(uint64(l)) - } - if m.Version != nil { - l = m.Version.Size() - n += 1 + l + sovTypes(uint64(l)) - } - return n -} - -func (m *BlockParams) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.MaxBytes != 0 { - n += 1 + sovTypes(uint64(m.MaxBytes)) - } - if m.MaxGas != 0 { - n += 1 + sovTypes(uint64(m.MaxGas)) - } - return n -} - func (m *CommitInfo) Size() (n int) { if m == nil { return 0 @@ -9497,6 +9240,38 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { break } } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AbciVersion", 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.AbciVersion = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -9642,7 +9417,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ConsensusParams == nil { - m.ConsensusParams = &ConsensusParams{} + m.ConsensusParams = &types1.ConsensusParams{} } if err := m.ConsensusParams.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -12508,7 +12283,7 @@ func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ConsensusParams == nil { - m.ConsensusParams = &ConsensusParams{} + m.ConsensusParams = &types1.ConsensusParams{} } if err := m.ConsensusParams.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -13712,7 +13487,7 @@ func (m *ResponseEndBlock) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ConsensusParamUpdates == nil { - m.ConsensusParamUpdates = &ConsensusParams{} + m.ConsensusParamUpdates = &types1.ConsensusParams{} } if err := m.ConsensusParamUpdates.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -14441,288 +14216,6 @@ func (m *ResponseProcessProposal) Unmarshal(dAtA []byte) error { } return nil } -func (m *ConsensusParams) 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: ConsensusParams: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ConsensusParams: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Block", 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 m.Block == nil { - m.Block = &BlockParams{} - } - if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Evidence", 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 m.Evidence == nil { - m.Evidence = &types1.EvidenceParams{} - } - if err := m.Evidence.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Validator", 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 m.Validator == nil { - m.Validator = &types1.ValidatorParams{} - } - if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Version", 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 m.Version == nil { - m.Version = &types1.VersionParams{} - } - if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *BlockParams) 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: BlockParams: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: BlockParams: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxBytes", wireType) - } - m.MaxBytes = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxBytes |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxGas", wireType) - } - m.MaxGas = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.MaxGas |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *CommitInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/consensus/replay.go b/consensus/replay.go index 0578e8e2b3..c6bf2860bd 100644 --- a/consensus/replay.go +++ b/consensus/replay.go @@ -307,12 +307,12 @@ func (h *Handshaker) ReplayBlocks( } validatorSet := types.NewValidatorSet(validators) nextVals := types.TM2PB.ValidatorUpdates(validatorSet) - csParams := types.TM2PB.ConsensusParams(h.genDoc.ConsensusParams) + pbparams := h.genDoc.ConsensusParams.ToProto() req := abci.RequestInitChain{ Time: h.genDoc.GenesisTime, ChainId: h.genDoc.ChainID, InitialHeight: h.genDoc.InitialHeight, - ConsensusParams: csParams, + ConsensusParams: &pbparams, Validators: nextVals, AppStateBytes: h.genDoc.AppState, } @@ -344,8 +344,8 @@ func (h *Handshaker) ReplayBlocks( } if res.ConsensusParams != nil { - state.ConsensusParams = types.UpdateConsensusParams(state.ConsensusParams, res.ConsensusParams) - state.Version.Consensus.App = state.ConsensusParams.Version.AppVersion + state.ConsensusParams = state.ConsensusParams.Update(res.ConsensusParams) + state.Version.Consensus.App = state.ConsensusParams.Version.App } // We update the last results hash with the empty hash, to conform with RFC-6962. state.LastResultsHash = merkle.HashFromByteSlices(nil) diff --git a/consensus/replay_test.go b/consensus/replay_test.go index d344244827..5b81da02f9 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -1191,14 +1191,14 @@ func stateAndStore( type mockBlockStore struct { config *cfg.Config - params cmtproto.ConsensusParams + params types.ConsensusParams chain []*types.Block commits []*types.Commit base int64 } // TODO: NewBlockStore(db.NewMemDB) ... -func newMockBlockStore(config *cfg.Config, params cmtproto.ConsensusParams) *mockBlockStore { +func newMockBlockStore(config *cfg.Config, params types.ConsensusParams) *mockBlockStore { return &mockBlockStore{config, params, nil, nil, 0} } diff --git a/consensus/state.go b/consensus/state.go index 9650e80920..3e73876107 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -2250,9 +2250,10 @@ func (cs *State) signVote( func (cs *State) voteTime() time.Time { now := cmttime.Now() minVoteTime := now + // Minimum time increment between blocks + const timeIota = time.Millisecond // TODO: We should remove next line in case we don't vote for v in case cs.ProposalBlock == nil, - // even if cs.LockedBlock != nil. See https://github.com/cometbft/cometbft/tree/v0.34.x/spec/. - timeIota := time.Duration(cs.state.ConsensusParams.Block.TimeIotaMs) * time.Millisecond + // even if cs.LockedBlock != nil. See https://docs.tendermint.com/master/spec/. if cs.LockedBlock != nil { // See the BFT time spec // https://github.com/cometbft/cometbft/blob/v0.34.x/spec/consensus/bft-time.md diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index 64dfe9c3e2..566fdcec8c 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -3,8 +3,8 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" types "github.com/cometbft/cometbft/types" + mock "github.com/stretchr/testify/mock" ) // BlockStore is an autogenerated mock type for the BlockStore type diff --git a/evidence/pool_test.go b/evidence/pool_test.go index a890261552..ccc62a16d6 100644 --- a/evidence/pool_test.go +++ b/evidence/pool_test.go @@ -14,7 +14,6 @@ import ( "github.com/cometbft/cometbft/evidence" "github.com/cometbft/cometbft/evidence/mocks" "github.com/cometbft/cometbft/libs/log" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" sm "github.com/cometbft/cometbft/state" smmocks "github.com/cometbft/cometbft/state/mocks" @@ -326,12 +325,12 @@ func TestRecoverPendingEvidence(t *testing.T) { newStateStore.On("Load").Return(sm.State{ LastBlockTime: defaultEvidenceTime.Add(25 * time.Minute), LastBlockHeight: height + 15, - ConsensusParams: cmtproto.ConsensusParams{ - Block: cmtproto.BlockParams{ + ConsensusParams: types.ConsensusParams{ + Block: types.BlockParams{ MaxBytes: 22020096, MaxGas: -1, }, - Evidence: cmtproto.EvidenceParams{ + Evidence: types.EvidenceParams{ MaxAgeNumBlocks: 20, MaxAgeDuration: 20 * time.Minute, MaxBytes: defaultEvidenceMaxBytes, @@ -361,12 +360,12 @@ func initializeStateFromValidatorSet(valSet *types.ValidatorSet, height int64) s NextValidators: valSet.CopyIncrementProposerPriority(1), LastValidators: valSet, LastHeightValidatorsChanged: 1, - ConsensusParams: cmtproto.ConsensusParams{ - Block: cmtproto.BlockParams{ + ConsensusParams: types.ConsensusParams{ + Block: types.BlockParams{ MaxBytes: 22020096, MaxGas: -1, }, - Evidence: cmtproto.EvidenceParams{ + Evidence: types.EvidenceParams{ MaxAgeNumBlocks: 20, MaxAgeDuration: 20 * time.Minute, MaxBytes: 1000, diff --git a/light/rpc/client.go b/light/rpc/client.go index 88ef59f304..965b3491a4 100644 --- a/light/rpc/client.go +++ b/light/rpc/client.go @@ -234,7 +234,7 @@ func (c *Client) ConsensusParams(ctx context.Context, height *int64) (*ctypes.Re } // Validate res. - if err := types.ValidateConsensusParams(res.ConsensusParams); err != nil { + if err := res.ConsensusParams.ValidateBasic(); err != nil { return nil, err } if res.BlockHeight <= 0 { @@ -248,7 +248,7 @@ func (c *Client) ConsensusParams(ctx context.Context, height *int64) (*ctypes.Re } // Verify hash. - if cH, tH := types.HashConsensusParams(res.ConsensusParams), l.ConsensusHash; !bytes.Equal(cH, tH) { + if cH, tH := res.ConsensusParams.Hash(), l.ConsensusHash; !bytes.Equal(cH, tH) { return nil, fmt.Errorf("params hash %X does not match trusted hash %X", cH, tH) } diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 3f397d669f..5aeea175f7 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -51,16 +51,17 @@ message RequestInfo { string version = 1; uint64 block_version = 2; uint64 p2p_version = 3; + string abci_version = 4; } message RequestInitChain { google.protobuf.Timestamp time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; - string chain_id = 2; - ConsensusParams consensus_params = 3; - repeated ValidatorUpdate validators = 4 [(gogoproto.nullable) = false]; - bytes app_state_bytes = 5; - int64 initial_height = 6; + string chain_id = 2; + tendermint.types.ConsensusParams consensus_params = 3; + repeated ValidatorUpdate validators = 4 [(gogoproto.nullable) = false]; + bytes app_state_bytes = 5; + int64 initial_height = 6; } message RequestQuery { @@ -196,9 +197,9 @@ message ResponseInfo { } message ResponseInitChain { - ConsensusParams consensus_params = 1; - repeated ValidatorUpdate validators = 2 [(gogoproto.nullable) = false]; - bytes app_hash = 3; + tendermint.types.ConsensusParams consensus_params = 1; + repeated ValidatorUpdate validators = 2 [(gogoproto.nullable) = false]; + bytes app_hash = 3; } message ResponseQuery { @@ -252,9 +253,9 @@ message ResponseDeliverTx { } message ResponseEndBlock { - repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; - ConsensusParams consensus_param_updates = 2; - repeated Event events = 3 + repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; + tendermint.types.ConsensusParams consensus_param_updates = 2; + repeated Event events = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; } @@ -320,23 +321,6 @@ message ResponseProcessProposal { //---------------------------------------- // Misc. -// ConsensusParams contains all consensus-relevant parameters -// that can be adjusted by the abci app -message ConsensusParams { - BlockParams block = 1; - tendermint.types.EvidenceParams evidence = 2; - tendermint.types.ValidatorParams validator = 3; - tendermint.types.VersionParams version = 4; -} - -// BlockParams contains limits on the block size. -message BlockParams { - // Note: must be greater than 0 - int64 max_bytes = 1; - // Note: must be greater or equal to -1 - int64 max_gas = 2; -} - message CommitInfo { int32 round = 1; repeated VoteInfo votes = 2 [(gogoproto.nullable) = false]; diff --git a/proto/tendermint/blockchain/types.pb.go b/proto/tendermint/blockchain/types.pb.go index e3d0e58d1c..c64f1efbea 100644 --- a/proto/tendermint/blockchain/types.pb.go +++ b/proto/tendermint/blockchain/types.pb.go @@ -5,8 +5,8 @@ package blockchain import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" types "github.com/cometbft/cometbft/proto/tendermint/types" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -384,31 +384,31 @@ func init() { func init() { proto.RegisterFile("tendermint/blockchain/types.proto", fileDescriptor_2927480384e78499) } var fileDescriptor_2927480384e78499 = []byte{ - // 370 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xc1, 0x4e, 0xfa, 0x40, - 0x10, 0xc6, 0xdb, 0x7f, 0x81, 0x7f, 0x32, 0x50, 0x1a, 0x9b, 0xa8, 0xc4, 0x98, 0x46, 0xab, 0x12, - 0x3d, 0xd8, 0x26, 0x78, 0x25, 0x1e, 0x38, 0x11, 0x13, 0x8c, 0xa9, 0xc6, 0x83, 0x17, 0xd2, 0xe2, - 0x86, 0x36, 0x4a, 0x17, 0xd9, 0xed, 0xc1, 0xb7, 0xf0, 0x19, 0x7c, 0x1a, 0x8f, 0x1c, 0x3d, 0x1a, - 0x78, 0x11, 0xc3, 0x6c, 0x29, 0x4b, 0x03, 0xf5, 0xb6, 0x3b, 0xfd, 0xe6, 0x37, 0xdf, 0x7e, 0x99, - 0xc2, 0x31, 0x27, 0xf1, 0x33, 0x99, 0x8c, 0xa2, 0x98, 0xbb, 0xc1, 0x2b, 0x1d, 0xbc, 0x0c, 0x42, - 0x3f, 0x8a, 0x5d, 0xfe, 0x3e, 0x26, 0xcc, 0x19, 0x4f, 0x28, 0xa7, 0xe6, 0xee, 0x4a, 0xe2, 0xac, - 0x24, 0x07, 0x87, 0x52, 0x27, 0xca, 0x45, 0xbf, 0x68, 0xb2, 0x9b, 0x50, 0xeb, 0x2c, 0xae, 0x1e, - 0x79, 0x4b, 0x08, 0xe3, 0xe6, 0x1e, 0x54, 0x42, 0x12, 0x0d, 0x43, 0xde, 0x50, 0x8f, 0xd4, 0x73, - 0xcd, 0x4b, 0x6f, 0xf6, 0x05, 0x18, 0xb7, 0x34, 0x55, 0xb2, 0x31, 0x8d, 0x19, 0xd9, 0x2a, 0xbd, - 0x06, 0x7d, 0x5d, 0x78, 0x09, 0x65, 0x1c, 0x89, 0xba, 0x6a, 0x6b, 0xdf, 0x91, 0x8c, 0x8a, 0x07, - 0x08, 0xbd, 0x50, 0xd9, 0x06, 0xe8, 0xf7, 0xdc, 0xe7, 0x09, 0x4b, 0x3d, 0xd9, 0x6d, 0xa8, 0x2f, - 0x0b, 0xc5, 0xa3, 0x4d, 0x13, 0x4a, 0x81, 0xcf, 0x48, 0xe3, 0x1f, 0x56, 0xf1, 0x6c, 0x7f, 0x6a, - 0xf0, 0xbf, 0x47, 0x18, 0xf3, 0x87, 0xc4, 0xbc, 0x01, 0x1d, 0x67, 0xf4, 0x27, 0x02, 0x9d, 0x3a, - 0x3a, 0x71, 0x36, 0x46, 0xe7, 0xc8, 0xc9, 0x74, 0x15, 0xaf, 0x16, 0xc8, 0x49, 0x3d, 0xc0, 0x4e, - 0x4c, 0xfb, 0x4b, 0x9c, 0x30, 0x86, 0x83, 0xab, 0xad, 0xe6, 0x16, 0x5e, 0x2e, 0xc1, 0xae, 0xe2, - 0x19, 0x71, 0x2e, 0xd4, 0x1e, 0xd4, 0x73, 0x48, 0x0d, 0x91, 0xa7, 0xc5, 0x16, 0x33, 0xa0, 0x1e, - 0xe4, 0x71, 0x0c, 0xa3, 0xcb, 0x5e, 0x5c, 0x2a, 0xc4, 0xad, 0x05, 0xbf, 0xc0, 0x31, 0xb9, 0x60, - 0xde, 0x81, 0x91, 0xe1, 0x52, 0x7b, 0x65, 0xe4, 0x9d, 0xfd, 0xc1, 0xcb, 0xfc, 0xd5, 0xd9, 0x5a, - 0xa5, 0x53, 0x06, 0x8d, 0x25, 0xa3, 0xce, 0xe3, 0xd7, 0xcc, 0x52, 0xa7, 0x33, 0x4b, 0xfd, 0x99, - 0x59, 0xea, 0xc7, 0xdc, 0x52, 0xa6, 0x73, 0x4b, 0xf9, 0x9e, 0x5b, 0xca, 0x53, 0x7b, 0x18, 0xf1, - 0x30, 0x09, 0x9c, 0x01, 0x1d, 0xb9, 0xf2, 0x26, 0xaf, 0x8e, 0xb8, 0xc8, 0xee, 0xc6, 0xff, 0x23, - 0xa8, 0xe0, 0xc7, 0xab, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x59, 0x07, 0xbd, 0x3f, 0x03, - 0x00, 0x00, + // 373 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xc1, 0x4e, 0xf2, 0x40, + 0x14, 0x85, 0xdb, 0xbf, 0xc0, 0x9f, 0x5c, 0x28, 0x8d, 0x4d, 0x54, 0x62, 0x4c, 0xa3, 0x55, 0x89, + 0x2e, 0x6c, 0x13, 0xdc, 0xb8, 0x30, 0x2e, 0x58, 0x11, 0x13, 0x8c, 0xa9, 0xae, 0xdc, 0x90, 0x4e, + 0x1d, 0x69, 0xa3, 0x9d, 0x41, 0x66, 0xba, 0xf0, 0x2d, 0x7c, 0x06, 0x9f, 0xc6, 0x25, 0x4b, 0x97, + 0x06, 0x5e, 0xc4, 0x30, 0x53, 0x4a, 0x69, 0xa0, 0xee, 0x66, 0x6e, 0xcf, 0xfd, 0xee, 0xb9, 0x27, + 0x1d, 0x38, 0xe4, 0x98, 0x3c, 0xe1, 0x71, 0x1c, 0x11, 0xee, 0xa2, 0x57, 0x1a, 0xbc, 0x04, 0xa1, + 0x1f, 0x11, 0x97, 0xbf, 0x8f, 0x30, 0x73, 0x46, 0x63, 0xca, 0xa9, 0xb9, 0xbd, 0x94, 0x38, 0x4b, + 0xc9, 0xde, 0x7e, 0xae, 0x53, 0xc8, 0x65, 0xbf, 0x6c, 0xb2, 0xdb, 0xd0, 0xe8, 0xce, 0xaf, 0x1e, + 0x7e, 0x4b, 0x30, 0xe3, 0xe6, 0x0e, 0xd4, 0x42, 0x1c, 0x0d, 0x43, 0xde, 0x52, 0x0f, 0xd4, 0x53, + 0xcd, 0x4b, 0x6f, 0xf6, 0x19, 0x18, 0xb7, 0x34, 0x55, 0xb2, 0x11, 0x25, 0x0c, 0x6f, 0x94, 0x5e, + 0x83, 0xbe, 0x2a, 0x3c, 0x87, 0xaa, 0x18, 0x29, 0x74, 0xf5, 0xce, 0xae, 0x93, 0x33, 0x2a, 0x17, + 0x90, 0x7a, 0xa9, 0xb2, 0x0d, 0xd0, 0xef, 0xb9, 0xcf, 0x13, 0x96, 0x7a, 0xb2, 0xaf, 0xa0, 0xb9, + 0x28, 0x94, 0x8f, 0x36, 0x4d, 0xa8, 0x20, 0x9f, 0xe1, 0xd6, 0x3f, 0x51, 0x15, 0x67, 0xfb, 0x53, + 0x83, 0xff, 0x7d, 0xcc, 0x98, 0x3f, 0xc4, 0xe6, 0x0d, 0xe8, 0x62, 0xc6, 0x60, 0x2c, 0xd1, 0xa9, + 0xa3, 0x23, 0x67, 0x6d, 0x74, 0x4e, 0x3e, 0x99, 0x9e, 0xe2, 0x35, 0x50, 0x3e, 0xa9, 0x07, 0xd8, + 0x22, 0x74, 0xb0, 0xc0, 0x49, 0x63, 0x62, 0x70, 0xbd, 0xd3, 0xde, 0xc0, 0x2b, 0x24, 0xd8, 0x53, + 0x3c, 0x83, 0x14, 0x42, 0xed, 0x43, 0xb3, 0x80, 0xd4, 0x04, 0xf2, 0xb8, 0xdc, 0x62, 0x06, 0xd4, + 0x51, 0x11, 0xc7, 0x44, 0x74, 0xd9, 0xc6, 0x95, 0x52, 0xdc, 0x4a, 0xf0, 0x73, 0x1c, 0xcb, 0x17, + 0xcc, 0x3b, 0x30, 0x32, 0x5c, 0x6a, 0xaf, 0x2a, 0x78, 0x27, 0x7f, 0xf0, 0x32, 0x7f, 0x4d, 0xb6, + 0x52, 0xe9, 0x56, 0x41, 0x63, 0x49, 0xdc, 0xf5, 0xbe, 0xa6, 0x96, 0x3a, 0x99, 0x5a, 0xea, 0xcf, + 0xd4, 0x52, 0x3f, 0x66, 0x96, 0x32, 0x99, 0x59, 0xca, 0xf7, 0xcc, 0x52, 0x1e, 0x2f, 0x87, 0x11, + 0x0f, 0x13, 0xe4, 0x04, 0x34, 0x76, 0x03, 0x1a, 0x63, 0x8e, 0x9e, 0xf9, 0xf2, 0x20, 0x7e, 0x62, + 0x77, 0xed, 0xdb, 0x40, 0x35, 0xf1, 0xf1, 0xe2, 0x37, 0x00, 0x00, 0xff, 0xff, 0xea, 0x0a, 0xc8, + 0x8a, 0x3b, 0x03, 0x00, 0x00, } func (m *BlockRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/consensus/types.pb.go b/proto/tendermint/consensus/types.pb.go index 40033a9957..da9d4ba842 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/tendermint/consensus/types.pb.go @@ -5,10 +5,10 @@ package consensus import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" bits "github.com/cometbft/cometbft/proto/tendermint/libs/bits" types "github.com/cometbft/cometbft/proto/tendermint/types" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -801,61 +801,61 @@ func init() { func init() { proto.RegisterFile("tendermint/consensus/types.proto", fileDescriptor_81a22d2efc008981) } var fileDescriptor_81a22d2efc008981 = []byte{ - // 853 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x8f, 0xdb, 0x44, - 0x14, 0xb7, 0x59, 0x67, 0x93, 0x7d, 0xde, 0xec, 0xc2, 0x68, 0x5b, 0x85, 0x00, 0x49, 0x30, 0x97, - 0x15, 0x42, 0x0e, 0xca, 0x1e, 0x90, 0x0a, 0x12, 0x60, 0xfe, 0xd4, 0xad, 0x9a, 0x36, 0x72, 0x4a, - 0x85, 0xb8, 0x58, 0x4e, 0x3c, 0x4a, 0x86, 0xc6, 0x1e, 0xcb, 0x33, 0xc9, 0xb2, 0x57, 0x3e, 0x01, - 0x1f, 0x80, 0xaf, 0x81, 0xc4, 0x47, 0xe8, 0xb1, 0x47, 0x4e, 0x15, 0xca, 0x7e, 0x04, 0x04, 0x67, - 0x34, 0xe3, 0x49, 0x3c, 0xa1, 0xde, 0x85, 0xbd, 0x20, 0xf5, 0x36, 0xe3, 0xf7, 0xde, 0x6f, 0xde, - 0xfc, 0xde, 0x7b, 0x3f, 0x0f, 0xf4, 0x38, 0x4e, 0x63, 0x9c, 0x27, 0x24, 0xe5, 0xfd, 0x29, 0x4d, - 0x19, 0x4e, 0xd9, 0x92, 0xf5, 0xf9, 0x45, 0x86, 0x99, 0x9b, 0xe5, 0x94, 0x53, 0x74, 0x52, 0x7a, - 0xb8, 0x5b, 0x8f, 0xf6, 0xc9, 0x8c, 0xce, 0xa8, 0x74, 0xe8, 0x8b, 0x55, 0xe1, 0xdb, 0x7e, 0x5b, - 0x43, 0x93, 0x18, 0x3a, 0x52, 0x5b, 0x3f, 0x6b, 0x41, 0x26, 0xac, 0x3f, 0x21, 0x7c, 0xc7, 0xc3, - 0xf9, 0xc5, 0x84, 0xc3, 0x87, 0xf8, 0x3c, 0xa0, 0xcb, 0x34, 0x1e, 0x73, 0x9c, 0xa1, 0xdb, 0xb0, - 0x3f, 0xc7, 0x64, 0x36, 0xe7, 0x2d, 0xb3, 0x67, 0x9e, 0xee, 0x05, 0x6a, 0x87, 0x4e, 0xa0, 0x96, - 0x0b, 0xa7, 0xd6, 0x6b, 0x3d, 0xf3, 0xb4, 0x16, 0x14, 0x1b, 0x84, 0xc0, 0x62, 0x1c, 0x67, 0xad, - 0xbd, 0x9e, 0x79, 0xda, 0x0c, 0xe4, 0x1a, 0x7d, 0x04, 0x2d, 0x86, 0xa7, 0x34, 0x8d, 0x59, 0xc8, - 0x48, 0x3a, 0xc5, 0x21, 0xe3, 0x51, 0xce, 0x43, 0x4e, 0x12, 0xdc, 0xb2, 0x24, 0xe6, 0x2d, 0x65, - 0x1f, 0x0b, 0xf3, 0x58, 0x58, 0x1f, 0x93, 0x04, 0xa3, 0xf7, 0xe1, 0x8d, 0x45, 0xc4, 0x78, 0x38, - 0xa5, 0x49, 0x42, 0x78, 0x58, 0x1c, 0x57, 0x93, 0xc7, 0x1d, 0x0b, 0xc3, 0x17, 0xf2, 0xbb, 0x4c, - 0xd5, 0xf9, 0xd3, 0x84, 0xe6, 0x43, 0x7c, 0xfe, 0x24, 0x5a, 0x90, 0xd8, 0x5b, 0xd0, 0xe9, 0xd3, - 0x1b, 0x26, 0xfe, 0x2d, 0xdc, 0x9a, 0x88, 0xb0, 0x30, 0x13, 0xb9, 0x31, 0xcc, 0xc3, 0x39, 0x8e, - 0x62, 0x9c, 0xcb, 0x9b, 0xd8, 0x83, 0xae, 0xab, 0xd5, 0xa0, 0xe0, 0x6b, 0x14, 0xe5, 0x7c, 0x8c, - 0xb9, 0x2f, 0xdd, 0x3c, 0xeb, 0xd9, 0x8b, 0xae, 0x11, 0x20, 0x89, 0xb1, 0x63, 0x41, 0x9f, 0x82, - 0x5d, 0x22, 0x33, 0x79, 0x63, 0x7b, 0xd0, 0xd1, 0xf1, 0x44, 0x25, 0x5c, 0x51, 0x09, 0xd7, 0x23, - 0xfc, 0xf3, 0x3c, 0x8f, 0x2e, 0x02, 0xd8, 0x02, 0x31, 0xf4, 0x16, 0x1c, 0x10, 0xa6, 0x48, 0x90, - 0xd7, 0x6f, 0x04, 0x0d, 0xc2, 0x8a, 0xcb, 0x3b, 0x3e, 0x34, 0x46, 0x39, 0xcd, 0x28, 0x8b, 0x16, - 0xe8, 0x13, 0x68, 0x64, 0x6a, 0x2d, 0xef, 0x6c, 0x0f, 0xda, 0x15, 0x69, 0x2b, 0x0f, 0x95, 0xf1, - 0x36, 0xc2, 0xf9, 0xd9, 0x04, 0x7b, 0x63, 0x1c, 0x3d, 0x7a, 0x70, 0x25, 0x7f, 0x1f, 0x00, 0xda, - 0xc4, 0x84, 0x19, 0x5d, 0x84, 0x3a, 0x99, 0xaf, 0x6f, 0x2c, 0x23, 0xba, 0x90, 0x75, 0x41, 0x77, - 0xe1, 0x50, 0xf7, 0x56, 0x74, 0xfe, 0xcb, 0xf5, 0x55, 0x6e, 0xb6, 0x86, 0xe6, 0x3c, 0x85, 0x03, - 0x6f, 0xc3, 0xc9, 0x0d, 0x6b, 0xfb, 0x21, 0x58, 0x82, 0x7b, 0x75, 0xf6, 0xed, 0xea, 0x52, 0xaa, - 0x33, 0xa5, 0xa7, 0x33, 0x00, 0xeb, 0x09, 0xe5, 0xa2, 0x03, 0xad, 0x15, 0xe5, 0x58, 0xb1, 0x59, - 0x11, 0x29, 0xbc, 0x02, 0xe9, 0xe3, 0xfc, 0x68, 0x42, 0xdd, 0x8f, 0x98, 0x8c, 0xbb, 0x59, 0x7e, - 0x67, 0x60, 0x09, 0x34, 0x99, 0xdf, 0x51, 0x55, 0xab, 0x8d, 0xc9, 0x2c, 0xc5, 0xf1, 0x90, 0xcd, - 0x1e, 0x5f, 0x64, 0x38, 0x90, 0xce, 0x02, 0x8a, 0xa4, 0x31, 0xfe, 0x41, 0x36, 0x54, 0x2d, 0x28, - 0x36, 0xce, 0xaf, 0x26, 0x1c, 0x8a, 0x0c, 0xc6, 0x98, 0x0f, 0xa3, 0xef, 0x07, 0x67, 0xff, 0x47, - 0x26, 0x5f, 0x41, 0xa3, 0x68, 0x70, 0x12, 0xab, 0xee, 0x7e, 0xf3, 0xe5, 0x40, 0x59, 0xbb, 0x7b, - 0x5f, 0x7a, 0xc7, 0x82, 0xe5, 0xf5, 0x8b, 0x6e, 0x5d, 0x7d, 0x08, 0xea, 0x32, 0xf6, 0x5e, 0xec, - 0xfc, 0x61, 0x82, 0xad, 0x52, 0xf7, 0x08, 0x67, 0xaf, 0x4e, 0xe6, 0xe8, 0x0e, 0xd4, 0x44, 0x07, - 0x30, 0x39, 0x9c, 0xff, 0xb5, 0xb9, 0x8b, 0x10, 0xe7, 0x2f, 0x0b, 0xea, 0x43, 0xcc, 0x58, 0x34, - 0xc3, 0xe8, 0x3e, 0x1c, 0xa5, 0xf8, 0xbc, 0x18, 0xa8, 0x50, 0xca, 0x68, 0xd1, 0x77, 0x8e, 0x5b, - 0xf5, 0x03, 0x70, 0x75, 0x99, 0xf6, 0x8d, 0xe0, 0x30, 0xd5, 0x65, 0x7b, 0x08, 0xc7, 0x02, 0x6b, - 0x25, 0xf4, 0x30, 0x94, 0x89, 0x4a, 0xbe, 0xec, 0xc1, 0x7b, 0x57, 0x82, 0x95, 0xda, 0xe9, 0x1b, - 0x41, 0x33, 0xdd, 0x11, 0x53, 0x5d, 0x5a, 0x2a, 0x46, 0xb8, 0xc4, 0xd9, 0x28, 0x88, 0xaf, 0x49, - 0x0b, 0xfa, 0xfa, 0x1f, 0x22, 0x50, 0x70, 0xfd, 0xee, 0xf5, 0x08, 0xa3, 0x47, 0x0f, 0xfc, 0x5d, - 0x0d, 0x40, 0x9f, 0x01, 0x94, 0x52, 0xaa, 0xd8, 0xee, 0x56, 0xa3, 0x6c, 0xb5, 0xc2, 0x37, 0x82, - 0x83, 0xad, 0x98, 0x0a, 0x29, 0x90, 0x03, 0xbd, 0xff, 0xb2, 0x3c, 0x96, 0xb1, 0xa2, 0x0b, 0x7d, - 0xa3, 0x18, 0x6b, 0x74, 0x07, 0x1a, 0xf3, 0x88, 0x85, 0x32, 0xaa, 0x2e, 0xa3, 0xde, 0xa9, 0x8e, - 0x52, 0xb3, 0xef, 0x1b, 0x41, 0x7d, 0xae, 0x64, 0xe0, 0x3e, 0x1c, 0x89, 0x38, 0xf9, 0x3b, 0x49, - 0xc4, 0x38, 0xb6, 0x1a, 0xd7, 0x15, 0x54, 0x1f, 0x5c, 0x51, 0xd0, 0x95, 0x3e, 0xc8, 0x77, 0xa1, - 0xb9, 0xc5, 0x12, 0xfd, 0xd4, 0x3a, 0xb8, 0x8e, 0x44, 0x6d, 0x90, 0x04, 0x89, 0xab, 0x72, 0xeb, - 0xd5, 0x60, 0x8f, 0x2d, 0x13, 0xef, 0x9b, 0x67, 0xeb, 0x8e, 0xf9, 0x7c, 0xdd, 0x31, 0x7f, 0x5f, - 0x77, 0xcc, 0x9f, 0x2e, 0x3b, 0xc6, 0xf3, 0xcb, 0x8e, 0xf1, 0xdb, 0x65, 0xc7, 0xf8, 0xee, 0xe3, - 0x19, 0xe1, 0xf3, 0xe5, 0xc4, 0x9d, 0xd2, 0xa4, 0xaf, 0xbf, 0x26, 0xca, 0x65, 0xf1, 0xea, 0xa8, - 0x7a, 0xb7, 0x4c, 0xf6, 0xa5, 0xed, 0xec, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x5c, 0x91, - 0x04, 0xd6, 0x08, 0x00, 0x00, + // 856 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x8e, 0xe3, 0x44, + 0x10, 0xb6, 0x19, 0x67, 0x92, 0x94, 0x93, 0x19, 0x68, 0xcd, 0xae, 0x42, 0x80, 0x24, 0x98, 0xcb, + 0x08, 0x21, 0x07, 0x65, 0x0e, 0x2b, 0xad, 0x90, 0x00, 0xf3, 0xb3, 0xde, 0xd5, 0x66, 0x37, 0x38, + 0xab, 0x15, 0xe2, 0x62, 0x39, 0x71, 0x93, 0x34, 0x1b, 0xbb, 0x2d, 0x77, 0x27, 0xc3, 0x5c, 0x79, + 0x02, 0x1e, 0x80, 0xd7, 0x40, 0xe2, 0x11, 0xe6, 0x38, 0x47, 0x4e, 0x23, 0x94, 0x79, 0x04, 0x04, + 0x67, 0xd4, 0xed, 0x4e, 0xec, 0x30, 0x9e, 0x81, 0xb9, 0x20, 0x71, 0xeb, 0x4e, 0x55, 0x7d, 0x5d, + 0xf5, 0x55, 0xd5, 0x17, 0x43, 0x8f, 0xe3, 0x38, 0xc4, 0x69, 0x44, 0x62, 0xde, 0x9f, 0xd2, 0x98, + 0xe1, 0x98, 0x2d, 0x59, 0x9f, 0x9f, 0x25, 0x98, 0xd9, 0x49, 0x4a, 0x39, 0x45, 0x47, 0xb9, 0x87, + 0xbd, 0xf5, 0x68, 0x1f, 0xcd, 0xe8, 0x8c, 0x4a, 0x87, 0xbe, 0x38, 0x65, 0xbe, 0xed, 0xb7, 0x0b, + 0x68, 0x12, 0xa3, 0x88, 0xd4, 0x2e, 0xbe, 0xb5, 0x20, 0x13, 0xd6, 0x9f, 0x10, 0xbe, 0xe3, 0x61, + 0xfd, 0xac, 0x43, 0xe3, 0x19, 0x3e, 0xf5, 0xe8, 0x32, 0x0e, 0xc7, 0x1c, 0x27, 0xe8, 0x3e, 0xec, + 0xcf, 0x31, 0x99, 0xcd, 0x79, 0x4b, 0xef, 0xe9, 0xc7, 0x7b, 0x9e, 0xba, 0xa1, 0x23, 0xa8, 0xa4, + 0xc2, 0xa9, 0xf5, 0x5a, 0x4f, 0x3f, 0xae, 0x78, 0xd9, 0x05, 0x21, 0x30, 0x18, 0xc7, 0x49, 0x6b, + 0xaf, 0xa7, 0x1f, 0x37, 0x3d, 0x79, 0x46, 0x0f, 0xa0, 0xc5, 0xf0, 0x94, 0xc6, 0x21, 0xf3, 0x19, + 0x89, 0xa7, 0xd8, 0x67, 0x3c, 0x48, 0xb9, 0xcf, 0x49, 0x84, 0x5b, 0x86, 0xc4, 0xbc, 0xa7, 0xec, + 0x63, 0x61, 0x1e, 0x0b, 0xeb, 0x0b, 0x12, 0x61, 0xf4, 0x3e, 0xbc, 0xb1, 0x08, 0x18, 0xf7, 0xa7, + 0x34, 0x8a, 0x08, 0xf7, 0xb3, 0xe7, 0x2a, 0xf2, 0xb9, 0x43, 0x61, 0xf8, 0x4c, 0xfe, 0x2e, 0x53, + 0xb5, 0xfe, 0xd0, 0xa1, 0xf9, 0x0c, 0x9f, 0xbe, 0x0c, 0x16, 0x24, 0x74, 0x16, 0x74, 0xfa, 0xea, + 0x8e, 0x89, 0x7f, 0x0d, 0xf7, 0x26, 0x22, 0xcc, 0x4f, 0x44, 0x6e, 0x0c, 0x73, 0x7f, 0x8e, 0x83, + 0x10, 0xa7, 0xb2, 0x12, 0x73, 0xd0, 0xb5, 0x0b, 0x3d, 0xc8, 0xf8, 0x1a, 0x05, 0x29, 0x1f, 0x63, + 0xee, 0x4a, 0x37, 0xc7, 0x38, 0xbf, 0xec, 0x6a, 0x1e, 0x92, 0x18, 0x3b, 0x16, 0xf4, 0x31, 0x98, + 0x39, 0x32, 0x93, 0x15, 0x9b, 0x83, 0x4e, 0x11, 0x4f, 0x74, 0xc2, 0x16, 0x9d, 0xb0, 0x1d, 0xc2, + 0x3f, 0x4d, 0xd3, 0xe0, 0xcc, 0x83, 0x2d, 0x10, 0x43, 0x6f, 0x41, 0x9d, 0x30, 0x45, 0x82, 0x2c, + 0xbf, 0xe6, 0xd5, 0x08, 0xcb, 0x8a, 0xb7, 0x5c, 0xa8, 0x8d, 0x52, 0x9a, 0x50, 0x16, 0x2c, 0xd0, + 0x47, 0x50, 0x4b, 0xd4, 0x59, 0xd6, 0x6c, 0x0e, 0xda, 0x25, 0x69, 0x2b, 0x0f, 0x95, 0xf1, 0x36, + 0xc2, 0xfa, 0x49, 0x07, 0x73, 0x63, 0x1c, 0x3d, 0x7f, 0x7a, 0x23, 0x7f, 0x1f, 0x00, 0xda, 0xc4, + 0xf8, 0x09, 0x5d, 0xf8, 0x45, 0x32, 0x5f, 0xdf, 0x58, 0x46, 0x74, 0x21, 0xfb, 0x82, 0x1e, 0x41, + 0xa3, 0xe8, 0xad, 0xe8, 0xfc, 0x87, 0xf2, 0x55, 0x6e, 0x66, 0x01, 0xcd, 0x7a, 0x05, 0x75, 0x67, + 0xc3, 0xc9, 0x1d, 0x7b, 0xfb, 0x21, 0x18, 0x82, 0x7b, 0xf5, 0xf6, 0xfd, 0xf2, 0x56, 0xaa, 0x37, + 0xa5, 0xa7, 0x35, 0x00, 0xe3, 0x25, 0xe5, 0x62, 0x02, 0x8d, 0x15, 0xe5, 0x58, 0xb1, 0x59, 0x12, + 0x29, 0xbc, 0x3c, 0xe9, 0x63, 0xfd, 0xa0, 0x43, 0xd5, 0x0d, 0x98, 0x8c, 0xbb, 0x5b, 0x7e, 0x27, + 0x60, 0x08, 0x34, 0x99, 0xdf, 0x41, 0xd9, 0xa8, 0x8d, 0xc9, 0x2c, 0xc6, 0xe1, 0x90, 0xcd, 0x5e, + 0x9c, 0x25, 0xd8, 0x93, 0xce, 0x02, 0x8a, 0xc4, 0x21, 0xfe, 0x5e, 0x0e, 0x54, 0xc5, 0xcb, 0x2e, + 0xd6, 0x2f, 0x3a, 0x34, 0x44, 0x06, 0x63, 0xcc, 0x87, 0xc1, 0x77, 0x83, 0x93, 0xff, 0x22, 0x93, + 0x2f, 0xa0, 0x96, 0x0d, 0x38, 0x09, 0xd5, 0x74, 0xbf, 0x79, 0x3d, 0x50, 0xf6, 0xee, 0xf1, 0xe7, + 0xce, 0xa1, 0x60, 0x79, 0x7d, 0xd9, 0xad, 0xaa, 0x1f, 0xbc, 0xaa, 0x8c, 0x7d, 0x1c, 0x5a, 0xbf, + 0xeb, 0x60, 0xaa, 0xd4, 0x1d, 0xc2, 0xd9, 0xff, 0x27, 0x73, 0xf4, 0x10, 0x2a, 0x62, 0x02, 0x98, + 0x5c, 0xce, 0x7f, 0x3b, 0xdc, 0x59, 0x88, 0xf5, 0xa7, 0x01, 0xd5, 0x21, 0x66, 0x2c, 0x98, 0x61, + 0xf4, 0x04, 0x0e, 0x62, 0x7c, 0x9a, 0x2d, 0x94, 0x2f, 0x65, 0x34, 0x9b, 0x3b, 0xcb, 0x2e, 0xfb, + 0x03, 0xb0, 0x8b, 0x32, 0xed, 0x6a, 0x5e, 0x23, 0x2e, 0xca, 0xf6, 0x10, 0x0e, 0x05, 0xd6, 0x4a, + 0xe8, 0xa1, 0x2f, 0x13, 0x95, 0x7c, 0x99, 0x83, 0xf7, 0x6e, 0x04, 0xcb, 0xb5, 0xd3, 0xd5, 0xbc, + 0x66, 0xbc, 0x23, 0xa6, 0x45, 0x69, 0x29, 0x59, 0xe1, 0x1c, 0x67, 0xa3, 0x20, 0x6e, 0x41, 0x5a, + 0xd0, 0x97, 0x7f, 0x13, 0x81, 0x8c, 0xeb, 0x77, 0x6f, 0x47, 0x18, 0x3d, 0x7f, 0xea, 0xee, 0x6a, + 0x00, 0xfa, 0x04, 0x20, 0x97, 0x52, 0xc5, 0x76, 0xb7, 0x1c, 0x65, 0xab, 0x15, 0xae, 0xe6, 0xd5, + 0xb7, 0x62, 0x2a, 0xa4, 0x40, 0x2e, 0xf4, 0xfe, 0x75, 0x79, 0xcc, 0x63, 0xc5, 0x14, 0xba, 0x5a, + 0xb6, 0xd6, 0xe8, 0x21, 0xd4, 0xe6, 0x01, 0xf3, 0x65, 0x54, 0x55, 0x46, 0xbd, 0x53, 0x1e, 0xa5, + 0x76, 0xdf, 0xd5, 0xbc, 0xea, 0x5c, 0xc9, 0xc0, 0x13, 0x38, 0x10, 0x71, 0xf2, 0xef, 0x24, 0x12, + 0xeb, 0xd8, 0xaa, 0xdd, 0xd6, 0xd0, 0xe2, 0xe2, 0x8a, 0x86, 0xae, 0x8a, 0x8b, 0xfc, 0x08, 0x9a, + 0x5b, 0x2c, 0x31, 0x4f, 0xad, 0xfa, 0x6d, 0x24, 0x16, 0x16, 0x49, 0x90, 0xb8, 0xca, 0xaf, 0x4e, + 0x05, 0xf6, 0xd8, 0x32, 0x72, 0xbe, 0x3a, 0x5f, 0x77, 0xf4, 0x8b, 0x75, 0x47, 0xff, 0x6d, 0xdd, + 0xd1, 0x7f, 0xbc, 0xea, 0x68, 0x17, 0x57, 0x1d, 0xed, 0xd7, 0xab, 0x8e, 0xf6, 0xcd, 0x83, 0x19, + 0xe1, 0xf3, 0xe5, 0xc4, 0x9e, 0xd2, 0xa8, 0x3f, 0xa5, 0x11, 0xe6, 0x93, 0x6f, 0x79, 0x7e, 0xc8, + 0xbe, 0x38, 0xca, 0xbe, 0x59, 0x26, 0xfb, 0xd2, 0x76, 0xf2, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xfe, 0x06, 0x66, 0x65, 0xd2, 0x08, 0x00, 0x00, } func (m *NewRoundStep) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/consensus/wal.pb.go b/proto/tendermint/consensus/wal.pb.go index c89f84866b..9ac1c9a49a 100644 --- a/proto/tendermint/consensus/wal.pb.go +++ b/proto/tendermint/consensus/wal.pb.go @@ -5,12 +5,12 @@ package consensus import ( fmt "fmt" + types "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" - types "github.com/cometbft/cometbft/proto/tendermint/types" io "io" math "math" math_bits "math/bits" @@ -372,41 +372,41 @@ func init() { func init() { proto.RegisterFile("tendermint/consensus/wal.proto", fileDescriptor_ed0b60c2d348ab09) } var fileDescriptor_ed0b60c2d348ab09 = []byte{ - // 539 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xdd, 0x8a, 0xd3, 0x40, - 0x14, 0xce, 0x6c, 0xff, 0x4f, 0x15, 0x21, 0x96, 0xa5, 0x16, 0x36, 0x8d, 0x5d, 0x84, 0x5e, 0x25, - 0xb0, 0x22, 0x88, 0x5e, 0xa8, 0xa5, 0x2b, 0x2d, 0xb8, 0x20, 0xe3, 0x8a, 0x20, 0x42, 0x48, 0x37, - 0xa7, 0x69, 0x60, 0x33, 0x53, 0x32, 0x13, 0xc5, 0x2b, 0x5f, 0xa1, 0x97, 0xbe, 0x89, 0xaf, 0xb0, - 0x97, 0x7b, 0xe9, 0xd5, 0x2a, 0xed, 0x8b, 0x48, 0x66, 0xd2, 0x36, 0xb8, 0xd9, 0xbb, 0x39, 0x73, - 0xbe, 0x73, 0xbe, 0x73, 0xbe, 0x6f, 0x06, 0x2c, 0x89, 0x2c, 0xc0, 0x24, 0x8e, 0x98, 0x74, 0x2f, - 0x38, 0x13, 0xc8, 0x44, 0x2a, 0xdc, 0x6f, 0xfe, 0xa5, 0xb3, 0x4c, 0xb8, 0xe4, 0x66, 0x67, 0x9f, - 0x77, 0x76, 0xf9, 0x5e, 0x27, 0xe4, 0x21, 0x57, 0x00, 0x37, 0x3b, 0x69, 0x6c, 0xcf, 0x2e, 0xed, - 0x25, 0xbf, 0x2f, 0x51, 0xe4, 0x88, 0xa3, 0x02, 0x42, 0xdd, 0xbb, 0xf8, 0x15, 0x99, 0xdc, 0xa6, - 0xad, 0x90, 0xf3, 0xf0, 0x12, 0x5d, 0x15, 0xcd, 0xd2, 0xb9, 0x1b, 0xa4, 0x89, 0x2f, 0x23, 0xce, - 0xf2, 0x7c, 0xff, 0xff, 0xbc, 0x8c, 0x62, 0x14, 0xd2, 0x8f, 0x97, 0x1a, 0x30, 0x40, 0x68, 0x9c, - 0x89, 0x70, 0xca, 0xe6, 0xdc, 0x7c, 0x06, 0x95, 0x58, 0x84, 0x5d, 0x62, 0x93, 0x61, 0xfb, 0xe4, - 0xc8, 0x29, 0x5b, 0xc3, 0x39, 0x43, 0x21, 0xfc, 0x10, 0x47, 0xd5, 0xab, 0x9b, 0xbe, 0x41, 0x33, - 0xbc, 0x79, 0x0c, 0x8d, 0x25, 0x62, 0xe2, 0x45, 0x41, 0xf7, 0xc0, 0x26, 0xc3, 0xd6, 0x08, 0xd6, - 0x37, 0xfd, 0xfa, 0x7b, 0xc4, 0x64, 0x3a, 0xa6, 0xf5, 0x2c, 0x35, 0x0d, 0x06, 0x2b, 0x02, 0xed, - 0xf3, 0x28, 0x46, 0x9e, 0x4a, 0xc5, 0xf5, 0x0a, 0x9a, 0xdb, 0x49, 0x73, 0xc2, 0x47, 0x8e, 0x1e, - 0xd5, 0xd9, 0x8e, 0xea, 0x8c, 0x73, 0xc0, 0xa8, 0x99, 0x91, 0xfd, 0xfc, 0xd3, 0x27, 0x74, 0x57, - 0x64, 0x1e, 0x42, 0x7d, 0x81, 0x51, 0xb8, 0x90, 0x8a, 0xb4, 0x42, 0xf3, 0xc8, 0xec, 0x40, 0x2d, - 0xe1, 0x29, 0x0b, 0xba, 0x15, 0x9b, 0x0c, 0x6b, 0x54, 0x07, 0xa6, 0x09, 0x55, 0x21, 0x71, 0xd9, - 0xad, 0xda, 0x64, 0x78, 0x9f, 0xaa, 0xf3, 0xe0, 0x18, 0x5a, 0xa7, 0x2c, 0x98, 0xe8, 0xb2, 0x7d, - 0x3b, 0x52, 0x6c, 0x37, 0xf8, 0x75, 0x00, 0xf0, 0xe9, 0xcd, 0xbb, 0x7c, 0x6d, 0xf3, 0x0b, 0x1c, - 0x2a, 0xf9, 0xbd, 0xc0, 0x97, 0xbe, 0xa7, 0x7a, 0x7b, 0x42, 0xfa, 0x12, 0xf3, 0x25, 0x9e, 0x14, - 0x55, 0xd3, 0x36, 0x9e, 0x66, 0xf8, 0xb1, 0x2f, 0x7d, 0x9a, 0xa1, 0x3f, 0x64, 0xe0, 0x89, 0x41, - 0x1f, 0xe2, 0xed, 0x6b, 0xf3, 0x05, 0x34, 0x63, 0x11, 0x7a, 0x11, 0x9b, 0x73, 0xb5, 0xd5, 0xdd, - 0x2e, 0x68, 0xc7, 0x26, 0x06, 0x6d, 0xc4, 0xb9, 0x79, 0x6f, 0xe1, 0x9e, 0xd4, 0xfa, 0xea, 0xfa, - 0x8a, 0xaa, 0x7f, 0x5c, 0x5e, 0x5f, 0x70, 0x62, 0x62, 0xd0, 0xb6, 0x2c, 0x18, 0xf3, 0x1a, 0x00, - 0x59, 0xe0, 0xe5, 0x62, 0x54, 0x55, 0x97, 0x7e, 0x79, 0x97, 0x9d, 0x7a, 0x13, 0x83, 0xb6, 0x70, - 0x1b, 0x8c, 0x6a, 0x50, 0x11, 0x69, 0x3c, 0xf8, 0x01, 0x0f, 0x32, 0x9a, 0xa0, 0xa0, 0xde, 0x73, - 0xa8, 0x66, 0x54, 0xb9, 0x56, 0xbd, 0x5b, 0x86, 0x9f, 0x6f, 0xdf, 0xa6, 0x76, 0x7c, 0x95, 0x39, - 0xae, 0x2a, 0xcc, 0x13, 0xfd, 0x34, 0xb5, 0x28, 0x76, 0xf9, 0x38, 0x7b, 0x22, 0xf5, 0x2e, 0x47, - 0x1f, 0xaf, 0xd6, 0x16, 0xb9, 0x5e, 0x5b, 0xe4, 0xef, 0xda, 0x22, 0xab, 0x8d, 0x65, 0x5c, 0x6f, - 0x2c, 0xe3, 0xf7, 0xc6, 0x32, 0x3e, 0xbf, 0x0c, 0x23, 0xb9, 0x48, 0x67, 0xce, 0x05, 0x8f, 0xdd, - 0xe2, 0xf7, 0xda, 0x1f, 0xf5, 0x47, 0x2d, 0xfb, 0x9c, 0xb3, 0xba, 0xca, 0x3d, 0xfd, 0x17, 0x00, - 0x00, 0xff, 0xff, 0x0b, 0xad, 0x1c, 0x1b, 0x07, 0x04, 0x00, 0x00, + // 543 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xdf, 0x8a, 0xd3, 0x4e, + 0x14, 0xce, 0x6c, 0xff, 0x9f, 0xfe, 0x7e, 0x08, 0xb1, 0x2c, 0xb5, 0xb0, 0x69, 0xec, 0x22, 0xf4, + 0x2a, 0x81, 0x15, 0x51, 0xbc, 0x51, 0x4b, 0x57, 0x5a, 0x70, 0x41, 0xc7, 0x05, 0x41, 0x84, 0x90, + 0x36, 0xa7, 0x69, 0x60, 0x33, 0x53, 0x32, 0x13, 0xc5, 0x2b, 0x5f, 0xa1, 0x97, 0xbe, 0x89, 0xaf, + 0xb0, 0x97, 0x7b, 0xe9, 0xd5, 0x2a, 0xed, 0x8b, 0x48, 0x66, 0xd2, 0x36, 0xb8, 0xf1, 0x6e, 0xce, + 0x9c, 0xef, 0x9c, 0xef, 0x9c, 0xef, 0x9b, 0x01, 0x4b, 0x22, 0x0b, 0x30, 0x89, 0x23, 0x26, 0xdd, + 0x39, 0x67, 0x02, 0x99, 0x48, 0x85, 0xfb, 0xc5, 0xbf, 0x72, 0x56, 0x09, 0x97, 0xdc, 0xec, 0x1c, + 0xf2, 0xce, 0x3e, 0xdf, 0xeb, 0x84, 0x3c, 0xe4, 0x0a, 0xe0, 0x66, 0x27, 0x8d, 0xed, 0xd9, 0xa5, + 0xbd, 0xe4, 0xd7, 0x15, 0x8a, 0x1c, 0x71, 0x52, 0x40, 0xa8, 0x7b, 0x17, 0x3f, 0x23, 0x93, 0xbb, + 0xb4, 0x15, 0x72, 0x1e, 0x5e, 0xa1, 0xab, 0xa2, 0x59, 0xba, 0x70, 0x83, 0x34, 0xf1, 0x65, 0xc4, + 0x59, 0x9e, 0xef, 0xff, 0x9d, 0x97, 0x51, 0x8c, 0x42, 0xfa, 0xf1, 0x4a, 0x03, 0x06, 0x08, 0x8d, + 0x0b, 0x11, 0x4e, 0xd9, 0x82, 0x9b, 0x4f, 0xa0, 0x12, 0x8b, 0xb0, 0x4b, 0x6c, 0x32, 0x6c, 0x9f, + 0x9d, 0x38, 0x65, 0x6b, 0x38, 0x17, 0x28, 0x84, 0x1f, 0xe2, 0xa8, 0x7a, 0x7d, 0xdb, 0x37, 0x68, + 0x86, 0x37, 0x4f, 0xa1, 0xb1, 0x42, 0x4c, 0xbc, 0x28, 0xe8, 0x1e, 0xd9, 0x64, 0xd8, 0x1a, 0xc1, + 0xe6, 0xb6, 0x5f, 0x7f, 0x8b, 0x98, 0x4c, 0xc7, 0xb4, 0x9e, 0xa5, 0xa6, 0xc1, 0x60, 0x4d, 0xa0, + 0x7d, 0x19, 0xc5, 0xc8, 0x53, 0xa9, 0xb8, 0x5e, 0x40, 0x73, 0x37, 0x69, 0x4e, 0xf8, 0xc0, 0xd1, + 0xa3, 0x3a, 0xbb, 0x51, 0x9d, 0x71, 0x0e, 0x18, 0x35, 0x33, 0xb2, 0xef, 0xbf, 0xfa, 0x84, 0xee, + 0x8b, 0xcc, 0x63, 0xa8, 0x2f, 0x31, 0x0a, 0x97, 0x52, 0x91, 0x56, 0x68, 0x1e, 0x99, 0x1d, 0xa8, + 0x25, 0x3c, 0x65, 0x41, 0xb7, 0x62, 0x93, 0x61, 0x8d, 0xea, 0xc0, 0x34, 0xa1, 0x2a, 0x24, 0xae, + 0xba, 0x55, 0x9b, 0x0c, 0xff, 0xa7, 0xea, 0x3c, 0x38, 0x85, 0xd6, 0x39, 0x0b, 0x26, 0xba, 0xec, + 0xd0, 0x8e, 0x14, 0xdb, 0x0d, 0x7e, 0x1c, 0x01, 0x7c, 0x78, 0xf5, 0x26, 0x5f, 0xdb, 0xfc, 0x04, + 0xc7, 0x4a, 0x7e, 0x2f, 0xf0, 0xa5, 0xef, 0xa9, 0xde, 0x9e, 0x90, 0xbe, 0xc4, 0x7c, 0x89, 0x47, + 0x45, 0xd5, 0xb4, 0x8d, 0xe7, 0x19, 0x7e, 0xec, 0x4b, 0x9f, 0x66, 0xe8, 0xf7, 0x19, 0x78, 0x62, + 0xd0, 0xfb, 0x78, 0xf7, 0xda, 0x7c, 0x0e, 0xcd, 0x58, 0x84, 0x5e, 0xc4, 0x16, 0x5c, 0x6d, 0xf5, + 0x6f, 0x17, 0xb4, 0x63, 0x13, 0x83, 0x36, 0xe2, 0xdc, 0xbc, 0xd7, 0xf0, 0x9f, 0xd4, 0xfa, 0xea, + 0xfa, 0x8a, 0xaa, 0x7f, 0x58, 0x5e, 0x5f, 0x70, 0x62, 0x62, 0xd0, 0xb6, 0x2c, 0x18, 0xf3, 0x12, + 0x00, 0x59, 0xe0, 0xe5, 0x62, 0x54, 0x55, 0x97, 0x7e, 0x79, 0x97, 0xbd, 0x7a, 0x13, 0x83, 0xb6, + 0x70, 0x17, 0x8c, 0x6a, 0x50, 0x11, 0x69, 0x3c, 0xf8, 0x06, 0xf7, 0x32, 0x9a, 0xa0, 0xa0, 0xde, + 0x33, 0xa8, 0x66, 0x54, 0xb9, 0x56, 0xbd, 0x3b, 0x86, 0x5f, 0xee, 0xde, 0xa6, 0x76, 0x7c, 0x9d, + 0x39, 0xae, 0x2a, 0xcc, 0x33, 0xfd, 0x34, 0xb5, 0x28, 0x76, 0xf9, 0x38, 0x07, 0x22, 0xf5, 0x2e, + 0x47, 0xef, 0xae, 0x37, 0x16, 0xb9, 0xd9, 0x58, 0xe4, 0xf7, 0xc6, 0x22, 0xeb, 0xad, 0x65, 0xdc, + 0x6c, 0x2d, 0xe3, 0xe7, 0xd6, 0x32, 0x3e, 0x3e, 0x0d, 0x23, 0xb9, 0x4c, 0x67, 0xce, 0x9c, 0xc7, + 0xee, 0x9c, 0xc7, 0x28, 0x67, 0x0b, 0x79, 0x38, 0xe8, 0x4f, 0x5a, 0xf6, 0x31, 0x67, 0x75, 0x95, + 0x7b, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x81, 0x69, 0x90, 0x03, 0x04, 0x00, 0x00, } func (m *MsgInfo) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/crypto/keys.pb.go b/proto/tendermint/crypto/keys.pb.go index c5cdf19a2f..dc7ece4e99 100644 --- a/proto/tendermint/crypto/keys.pb.go +++ b/proto/tendermint/crypto/keys.pb.go @@ -120,7 +120,7 @@ func init() { func init() { proto.RegisterFile("tendermint/crypto/keys.proto", fileDescriptor_cb048658b234868c) } var fileDescriptor_cb048658b234868c = []byte{ - // 199 bytes of a gzipped FileDescriptorProto + // 204 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x44, 0xc8, 0xea, 0x41, 0x64, 0xa5, @@ -129,11 +129,11 @@ var fileDescriptor_cb048658b234868c = []byte{ 0xa9, 0xa9, 0xa1, 0xa5, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x8f, 0x07, 0x43, 0x10, 0x4c, 0x40, 0x48, 0x8e, 0x8b, 0xb3, 0x38, 0x35, 0xb9, 0xc0, 0xc8, 0xd4, 0x2c, 0xdb, 0x50, 0x82, 0x09, 0x2a, 0x8b, 0x10, 0xb2, 0xe2, 0x78, 0xb1, 0x40, 0x9e, 0xf1, 0xc5, 0x42, 0x79, 0x46, 0x27, 0x56, 0x2e, 0xe6, - 0xe2, 0xd2, 0x5c, 0xa7, 0xa0, 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, 0xb2, - 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0xf2, 0x05, 0x12, 0x13, - 0xe2, 0x4c, 0x0c, 0x1f, 0x26, 0xb1, 0x81, 0x25, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe8, - 0x1d, 0x1e, 0xe2, 0xfd, 0x00, 0x00, 0x00, + 0xe2, 0xd2, 0x5c, 0x27, 0xbf, 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, + 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x4d, 0x2d, + 0x49, 0x4a, 0x2b, 0x41, 0x30, 0x20, 0x4e, 0xc4, 0xf0, 0x5d, 0x12, 0x1b, 0x58, 0xc2, 0x18, 0x10, + 0x00, 0x00, 0xff, 0xff, 0xa3, 0xfb, 0xf7, 0x98, 0xf9, 0x00, 0x00, 0x00, } func (this *PublicKey) Compare(that interface{}) int { diff --git a/proto/tendermint/crypto/proof.pb.go b/proto/tendermint/crypto/proof.pb.go index 82fb943fcd..3b6d0036d7 100644 --- a/proto/tendermint/crypto/proof.pb.go +++ b/proto/tendermint/crypto/proof.pb.go @@ -324,29 +324,30 @@ func init() { func init() { proto.RegisterFile("tendermint/crypto/proof.proto", fileDescriptor_6b60b6ba2ab5b856) } var fileDescriptor_6b60b6ba2ab5b856 = []byte{ - // 351 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbb, 0x4e, 0xc3, 0x30, - 0x14, 0x4d, 0xea, 0xf4, 0x75, 0xdb, 0x01, 0xac, 0x0a, 0x45, 0x45, 0x84, 0x28, 0x53, 0xa6, 0x44, - 0x2a, 0x0b, 0x13, 0x43, 0x61, 0x40, 0x30, 0x14, 0x79, 0x60, 0x60, 0x41, 0x6e, 0xeb, 0x36, 0x11, - 0x6d, 0x6c, 0x25, 0x8e, 0x44, 0xff, 0x82, 0xcf, 0xea, 0xd8, 0x91, 0x09, 0xa1, 0xf6, 0x47, 0x90, - 0xed, 0xa0, 0x16, 0x55, 0x6c, 0xe7, 0x71, 0x7d, 0x7c, 0xac, 0x6b, 0xb8, 0x90, 0x2c, 0x9b, 0xb2, - 0x7c, 0x99, 0x66, 0x32, 0x9e, 0xe4, 0x2b, 0x21, 0x79, 0x2c, 0x72, 0xce, 0x67, 0x91, 0xc8, 0xb9, - 0xe4, 0xf8, 0x74, 0x6f, 0x47, 0xc6, 0xee, 0xf7, 0xe6, 0x7c, 0xce, 0xb5, 0x1b, 0x2b, 0x64, 0x06, - 0x83, 0x19, 0xd4, 0x9f, 0xd4, 0x39, 0xdc, 0x83, 0xba, 0xe4, 0x92, 0x2e, 0x5c, 0xdb, 0xb7, 0x43, - 0x44, 0x0c, 0x51, 0x6a, 0x9a, 0x4d, 0xd9, 0xbb, 0x5b, 0x33, 0xaa, 0x26, 0xf8, 0x1c, 0xda, 0x0b, - 0x46, 0x67, 0xaf, 0x09, 0x2d, 0x12, 0x17, 0xf9, 0x76, 0xd8, 0x25, 0x2d, 0x25, 0xdc, 0xd3, 0x22, - 0x51, 0x47, 0x68, 0x99, 0xc9, 0xc2, 0x75, 0x7c, 0x14, 0x76, 0x89, 0x21, 0xc1, 0x23, 0x34, 0x9f, - 0xe9, 0xa2, 0x64, 0x23, 0x81, 0x4f, 0x00, 0xbd, 0xb1, 0x95, 0xbe, 0xa7, 0x4b, 0x14, 0xc4, 0x11, - 0xd4, 0x75, 0x79, 0x7d, 0x4b, 0x67, 0xe0, 0x46, 0x47, 0xed, 0x23, 0x5d, 0x92, 0x98, 0xb1, 0xe0, - 0x01, 0x5a, 0x77, 0x7c, 0x99, 0x66, 0xfc, 0x6f, 0x5a, 0xdb, 0xa4, 0xe9, 0xce, 0xa2, 0x94, 0x3a, - 0xad, 0x4d, 0x0c, 0xc1, 0x67, 0xd0, 0xe0, 0xa5, 0x54, 0x32, 0xd2, 0x72, 0xc5, 0x82, 0x5b, 0x68, - 0xea, 0xec, 0x91, 0xc0, 0x18, 0x1c, 0xb9, 0x12, 0xac, 0xca, 0xd2, 0xf8, 0x37, 0xbe, 0xb6, 0x2f, - 0x8b, 0xc1, 0x99, 0x52, 0x49, 0xab, 0x77, 0x6b, 0x1c, 0xdc, 0x40, 0xab, 0x0a, 0x29, 0xf0, 0x00, - 0x10, 0x17, 0x85, 0x6b, 0xfb, 0x28, 0xec, 0x0c, 0xfa, 0xff, 0x3d, 0x65, 0x24, 0x86, 0xce, 0xfa, - 0xeb, 0xd2, 0x22, 0x6a, 0x78, 0x48, 0xd6, 0x5b, 0xcf, 0xde, 0x6c, 0x3d, 0xfb, 0x7b, 0xeb, 0xd9, - 0x1f, 0x3b, 0xcf, 0xda, 0xec, 0x3c, 0xeb, 0x73, 0xe7, 0x59, 0x2f, 0xd7, 0xf3, 0x54, 0x26, 0xe5, - 0x38, 0x9a, 0xf0, 0x65, 0x7c, 0xb0, 0xf2, 0x03, 0x68, 0x56, 0x7a, 0xf4, 0x1d, 0xc6, 0x0d, 0x6d, - 0x5c, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0x43, 0x5d, 0xb9, 0x45, 0x2a, 0x02, 0x00, 0x00, + // 357 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbd, 0x6a, 0xe3, 0x40, + 0x10, 0x96, 0x2c, 0xf9, 0x6f, 0xed, 0xe2, 0x6e, 0x31, 0x87, 0xf0, 0x71, 0x3a, 0xa1, 0x4a, 0x95, + 0x04, 0x4e, 0xea, 0x14, 0x4e, 0x8a, 0x90, 0x40, 0x1c, 0x54, 0xa4, 0x48, 0x13, 0xd6, 0xf6, 0xca, + 0x12, 0xb1, 0x34, 0x8b, 0x34, 0x82, 0xf8, 0x2d, 0xf2, 0x58, 0x2e, 0x5d, 0xa6, 0x0a, 0xc1, 0x7e, + 0x91, 0xb0, 0xbb, 0x0a, 0x26, 0x98, 0x74, 0xdf, 0xcf, 0xec, 0x37, 0xdf, 0x20, 0x91, 0x7f, 0xc8, + 0x8b, 0x25, 0x2f, 0xf3, 0xac, 0xc0, 0x68, 0x51, 0x6e, 0x04, 0x42, 0x24, 0x4a, 0x80, 0x24, 0x14, + 0x25, 0x20, 0xd0, 0xdf, 0x47, 0x3b, 0xd4, 0xf6, 0x78, 0xb4, 0x82, 0x15, 0x28, 0x37, 0x92, 0x48, + 0x0f, 0xfa, 0x09, 0x69, 0xdf, 0xcb, 0x77, 0x74, 0x44, 0xda, 0x08, 0xc8, 0xd6, 0x8e, 0xe9, 0x99, + 0x81, 0x15, 0x6b, 0x22, 0xd5, 0xac, 0x58, 0xf2, 0x17, 0xa7, 0xa5, 0x55, 0x45, 0xe8, 0x5f, 0xd2, + 0x5f, 0x73, 0x96, 0x3c, 0xa5, 0xac, 0x4a, 0x1d, 0xcb, 0x33, 0x83, 0x61, 0xdc, 0x93, 0xc2, 0x35, + 0xab, 0x52, 0xf9, 0x84, 0xd5, 0x05, 0x56, 0x8e, 0xed, 0x59, 0xc1, 0x30, 0xd6, 0xc4, 0xbf, 0x25, + 0xdd, 0x07, 0xb6, 0xae, 0xf9, 0x4c, 0xd0, 0x5f, 0xc4, 0x7a, 0xe6, 0x1b, 0xb5, 0x67, 0x18, 0x4b, + 0x48, 0x43, 0xd2, 0x56, 0xe5, 0xd5, 0x96, 0xc1, 0xc4, 0x09, 0x4f, 0xda, 0x87, 0xaa, 0x64, 0xac, + 0xc7, 0xfc, 0x1b, 0xd2, 0xbb, 0x82, 0x3c, 0x2b, 0xe0, 0x7b, 0x5a, 0x5f, 0xa7, 0xa9, 0xce, 0xa2, + 0x46, 0x95, 0xd6, 0x8f, 0x35, 0xa1, 0x7f, 0x48, 0x07, 0x6a, 0x94, 0xb2, 0xa5, 0xe4, 0x86, 0xf9, + 0x97, 0xa4, 0xab, 0xb2, 0x67, 0x82, 0x52, 0x62, 0xe3, 0x46, 0xf0, 0x26, 0x4b, 0xe1, 0xaf, 0xf8, + 0xd6, 0xb1, 0x2c, 0x25, 0xf6, 0x92, 0x21, 0x6b, 0xee, 0x56, 0xd8, 0xbf, 0x20, 0xbd, 0x26, 0xa4, + 0xa2, 0x13, 0x62, 0x81, 0xa8, 0x1c, 0xd3, 0xb3, 0x82, 0xc1, 0x64, 0xfc, 0xd3, 0x29, 0x33, 0x31, + 0xb5, 0xb7, 0xef, 0xff, 0x8d, 0x58, 0x0e, 0x4f, 0xef, 0xb6, 0x7b, 0xd7, 0xdc, 0xed, 0x5d, 0xf3, + 0x63, 0xef, 0x9a, 0xaf, 0x07, 0xd7, 0xd8, 0x1d, 0x5c, 0xe3, 0xed, 0xe0, 0x1a, 0x8f, 0xe7, 0xab, + 0x0c, 0xd3, 0x7a, 0x1e, 0x2e, 0x20, 0x8f, 0x16, 0x90, 0x73, 0x9c, 0x27, 0x78, 0x04, 0xfa, 0x73, + 0x9e, 0xfc, 0x0a, 0xf3, 0x8e, 0x32, 0xce, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x5a, 0xb3, + 0xb6, 0x26, 0x02, 0x00, 0x00, } func (m *Proof) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/libs/bits/types.pb.go b/proto/tendermint/libs/bits/types.pb.go index c0ebcb9760..29fe10c763 100644 --- a/proto/tendermint/libs/bits/types.pb.go +++ b/proto/tendermint/libs/bits/types.pb.go @@ -81,18 +81,18 @@ func init() { func init() { proto.RegisterFile("tendermint/libs/bits/types.proto", fileDescriptor_e91ab2672920d7d4) } var fileDescriptor_e91ab2672920d7d4 = []byte{ - // 168 bytes of a gzipped FileDescriptorProto + // 173 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, 0x4f, 0xca, 0x2c, 0x29, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, 0xa8, 0xd0, 0x03, 0xa9, 0xd0, 0x03, 0xa9, 0x50, 0x32, 0xe1, 0xe2, 0x70, 0xca, 0x2c, 0x71, 0x2c, 0x2a, 0x4a, 0xac, 0x14, 0x12, 0xe2, 0x62, 0x01, 0x89, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0x81, 0xd9, 0x42, 0x22, 0x5c, 0xac, 0xa9, 0x39, 0xa9, 0xb9, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0x2c, - 0x41, 0x10, 0x8e, 0x53, 0xe8, 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, 0x59, - 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x39, 0x09, 0x89, 0x09, - 0x76, 0x8d, 0x3e, 0x36, 0xe7, 0x26, 0xb1, 0x81, 0xe5, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x5b, 0x0c, 0xe3, 0x3e, 0xcd, 0x00, 0x00, 0x00, + 0x41, 0x10, 0x8e, 0x53, 0xe0, 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, 0x99, + 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x27, 0xe7, 0xe7, 0xa6, 0x96, + 0x24, 0xa5, 0x95, 0x20, 0x18, 0x60, 0x97, 0xe8, 0x63, 0x73, 0x6a, 0x12, 0x1b, 0x58, 0xce, 0x18, + 0x10, 0x00, 0x00, 0xff, 0xff, 0x09, 0xfd, 0x78, 0xed, 0xc9, 0x00, 0x00, 0x00, } func (m *BitArray) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/mempool/types.pb.go b/proto/tendermint/mempool/types.pb.go index 14d1197ef9..b97454e32b 100644 --- a/proto/tendermint/mempool/types.pb.go +++ b/proto/tendermint/mempool/types.pb.go @@ -263,7 +263,7 @@ func init() { func init() { proto.RegisterFile("tendermint/mempool/types.proto", fileDescriptor_2af51926fdbcbc05) } var fileDescriptor_2af51926fdbcbc05 = []byte{ - // 268 bytes of a gzipped FileDescriptorProto + // 274 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0x4d, 0xcd, 0x2d, 0xc8, 0xcf, 0xcf, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41, @@ -276,11 +276,12 @@ var fileDescriptor_2af51926fdbcbc05 = []byte{ 0x6a, 0x21, 0x53, 0x2e, 0xf6, 0xe2, 0xd4, 0xd4, 0xbc, 0xf8, 0x92, 0x0a, 0x09, 0x26, 0xb0, 0x06, 0x29, 0x6c, 0x1a, 0x20, 0xae, 0xf3, 0x60, 0x08, 0x62, 0x2b, 0x86, 0xb8, 0xd3, 0x94, 0x8b, 0xbd, 0x3c, 0x31, 0xaf, 0x04, 0xa4, 0x8d, 0x19, 0xb7, 0x36, 0x88, 0x9b, 0x41, 0xda, 0xca, 0xc1, 0x2c, - 0x27, 0x56, 0x2e, 0xe6, 0xe2, 0xd2, 0x5c, 0xa7, 0xe0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, + 0x27, 0x56, 0x2e, 0xe6, 0xe2, 0xd2, 0x5c, 0x27, 0xff, 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, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, - 0x0a, 0x61, 0x24, 0x26, 0x38, 0x78, 0xf5, 0x31, 0x43, 0x3f, 0x89, 0x0d, 0x2c, 0x63, 0x0c, 0x08, - 0x00, 0x00, 0xff, 0xff, 0x3b, 0xd2, 0x5d, 0x18, 0x9a, 0x01, 0x00, 0x00, + 0x96, 0x63, 0x88, 0x32, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, + 0xce, 0xcf, 0x4d, 0x2d, 0x49, 0x4a, 0x2b, 0x41, 0x30, 0xc0, 0x41, 0xab, 0x8f, 0x19, 0xf2, 0x49, + 0x6c, 0x60, 0x19, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x66, 0x7b, 0xde, 0x37, 0x96, 0x01, + 0x00, 0x00, } func (m *Txs) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/tendermint/p2p/conn.pb.go index d4bf5e0cf2..d07bb9c4d4 100644 --- a/proto/tendermint/p2p/conn.pb.go +++ b/proto/tendermint/p2p/conn.pb.go @@ -5,9 +5,9 @@ package p2p import ( fmt "fmt" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" io "io" math "math" math_bits "math/bits" @@ -318,32 +318,32 @@ func init() { func init() { proto.RegisterFile("tendermint/p2p/conn.proto", fileDescriptor_22474b5527c8fa9f) } var fileDescriptor_22474b5527c8fa9f = []byte{ - // 395 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x3d, 0x8f, 0xd3, 0x40, - 0x10, 0xf5, 0xe2, 0xbb, 0x1c, 0x99, 0x84, 0x13, 0x5a, 0x51, 0x24, 0xd1, 0xc9, 0x89, 0x5c, 0xa5, - 0x40, 0xb6, 0x64, 0x44, 0x03, 0xa2, 0xc0, 0x7c, 0x88, 0xd3, 0x29, 0xba, 0xc8, 0x74, 0x34, 0x96, - 0x3f, 0x96, 0xf5, 0x2a, 0xe7, 0xdd, 0x55, 0x76, 0x5d, 0xf8, 0x5f, 0xf0, 0xb3, 0x8e, 0xee, 0x4a, - 0xaa, 0x08, 0x39, 0x7f, 0x04, 0x79, 0x1d, 0x88, 0x23, 0x71, 0xdd, 0x7b, 0x33, 0xf3, 0xe6, 0x43, - 0xf3, 0x60, 0xaa, 0x09, 0xcf, 0xc9, 0xb6, 0x64, 0x5c, 0xfb, 0x32, 0x90, 0x7e, 0x26, 0x38, 0xf7, - 0xe4, 0x56, 0x68, 0x81, 0x2f, 0x8f, 0x29, 0x4f, 0x06, 0x72, 0xf6, 0x82, 0x0a, 0x2a, 0x4c, 0xca, - 0x6f, 0x51, 0x57, 0x35, 0xbb, 0xea, 0x35, 0xc8, 0xb6, 0xb5, 0xd4, 0xc2, 0xdf, 0x90, 0x5a, 0x75, - 0x59, 0x77, 0x0c, 0xb0, 0x4e, 0xb2, 0x0d, 0xd1, 0x6b, 0xc6, 0x69, 0x8f, 0x09, 0x4e, 0xdd, 0x02, - 0x86, 0x1d, 0x5b, 0x29, 0x8a, 0x5f, 0x02, 0x64, 0x45, 0xc2, 0x39, 0xb9, 0x8b, 0x59, 0x3e, 0x41, - 0x0b, 0xb4, 0x3c, 0x0f, 0x9f, 0x35, 0xbb, 0xf9, 0xf0, 0x43, 0x17, 0xbd, 0xfe, 0x18, 0x0d, 0x0f, - 0x05, 0xd7, 0x39, 0x9e, 0x82, 0x4d, 0xc4, 0xf7, 0xc9, 0x93, 0x05, 0x5a, 0x3e, 0x0d, 0x2f, 0x9a, - 0xdd, 0xdc, 0xfe, 0x74, 0xfb, 0x39, 0x6a, 0x63, 0x18, 0xc3, 0x59, 0x9e, 0xe8, 0x64, 0x62, 0x2f, - 0xd0, 0x72, 0x1c, 0x19, 0xec, 0xfe, 0x44, 0x30, 0xe8, 0x46, 0xe1, 0x77, 0x30, 0x92, 0x06, 0xc5, - 0x92, 0x71, 0x6a, 0x06, 0x8d, 0x82, 0x99, 0x77, 0x7a, 0xaa, 0x77, 0xdc, 0xf9, 0x8b, 0x15, 0x81, - 0xfc, 0xc7, 0xfa, 0x72, 0xc1, 0xa9, 0x59, 0xe0, 0x71, 0xb9, 0x38, 0x91, 0x0b, 0x4e, 0xf1, 0x1b, - 0x38, 0xb0, 0xb8, 0x54, 0xd4, 0xac, 0x38, 0x0a, 0xa6, 0xff, 0x57, 0xaf, 0x54, 0x2b, 0x1e, 0xca, - 0xbf, 0x24, 0x3c, 0x07, 0x5b, 0x55, 0xa5, 0x1b, 0xc3, 0xe5, 0xfb, 0x4a, 0x17, 0x5f, 0x19, 0x5d, - 0x11, 0xa5, 0x12, 0x4a, 0xf0, 0x5b, 0xb8, 0x90, 0x55, 0x1a, 0x6f, 0x48, 0x7d, 0x38, 0xe7, 0xaa, - 0xdf, 0xb1, 0xfb, 0x89, 0xb7, 0xae, 0xd2, 0x3b, 0x96, 0xdd, 0x90, 0x3a, 0x3c, 0xbb, 0xdf, 0xcd, - 0xad, 0x68, 0x20, 0xab, 0xf4, 0x86, 0xd4, 0xf8, 0x39, 0xd8, 0x8a, 0x75, 0x87, 0x8c, 0xa3, 0x16, - 0x86, 0xb7, 0xf7, 0x8d, 0x83, 0x1e, 0x1a, 0x07, 0xfd, 0x6e, 0x1c, 0xf4, 0x63, 0xef, 0x58, 0x0f, - 0x7b, 0xc7, 0xfa, 0xb5, 0x77, 0xac, 0x6f, 0xaf, 0x29, 0xd3, 0x45, 0x95, 0x7a, 0x99, 0x28, 0xfd, - 0xde, 0xd7, 0xfb, 0x0e, 0x32, 0xee, 0x38, 0xb5, 0x54, 0x3a, 0x30, 0xd1, 0x57, 0x7f, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x30, 0xfd, 0xb2, 0x8d, 0x6b, 0x02, 0x00, 0x00, + // 397 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x4d, 0x8f, 0xd3, 0x30, + 0x10, 0x8d, 0xc9, 0x6e, 0x97, 0x4e, 0xcb, 0x0a, 0x59, 0x1c, 0xda, 0x6a, 0x95, 0x56, 0x3d, 0xf5, + 0x80, 0x12, 0x11, 0x6e, 0x20, 0x0e, 0x84, 0x0f, 0xb1, 0xaa, 0x2a, 0xaa, 0x70, 0xe3, 0x12, 0xe5, + 0xc3, 0xeb, 0x58, 0xdd, 0xd8, 0x56, 0xed, 0x1c, 0xf2, 0x2f, 0xf8, 0x59, 0xcb, 0xad, 0x47, 0x4e, + 0x15, 0x4a, 0xff, 0x08, 0x4a, 0x5c, 0x68, 0x2a, 0xb1, 0xb7, 0xf7, 0x66, 0xfc, 0x66, 0xde, 0x93, + 0x07, 0xc6, 0x9a, 0xf0, 0x8c, 0x6c, 0x0b, 0xc6, 0xb5, 0x27, 0x7d, 0xe9, 0xa5, 0x82, 0x73, 0x57, + 0x6e, 0x85, 0x16, 0xf8, 0xfa, 0xd4, 0x72, 0xa5, 0x2f, 0x27, 0x2f, 0xa8, 0xa0, 0xa2, 0x6d, 0x79, + 0x0d, 0x32, 0xaf, 0x26, 0x37, 0x9d, 0x01, 0xe9, 0xb6, 0x92, 0x5a, 0x78, 0x1b, 0x52, 0x29, 0xd3, + 0x9d, 0x0f, 0x01, 0xd6, 0x71, 0xba, 0x21, 0x7a, 0xcd, 0x38, 0xed, 0x30, 0xc1, 0xe9, 0x3c, 0x87, + 0xbe, 0x61, 0x2b, 0x45, 0xf1, 0x4b, 0x80, 0x34, 0x8f, 0x39, 0x27, 0xf7, 0x11, 0xcb, 0x46, 0x68, + 0x86, 0x16, 0x97, 0xc1, 0xb3, 0x7a, 0x3f, 0xed, 0x7f, 0x30, 0xd5, 0xdb, 0x8f, 0x61, 0xff, 0xf8, + 0xe0, 0x36, 0xc3, 0x63, 0xb0, 0x89, 0xb8, 0x1b, 0x3d, 0x99, 0xa1, 0xc5, 0xd3, 0xe0, 0xaa, 0xde, + 0x4f, 0xed, 0x4f, 0x5f, 0x3f, 0x87, 0x4d, 0x0d, 0x63, 0xb8, 0xc8, 0x62, 0x1d, 0x8f, 0xec, 0x19, + 0x5a, 0x0c, 0xc3, 0x16, 0xcf, 0x7f, 0x22, 0xe8, 0x99, 0x55, 0xf8, 0x1d, 0x0c, 0x64, 0x8b, 0x22, + 0xc9, 0x38, 0x6d, 0x17, 0x0d, 0xfc, 0x89, 0x7b, 0x1e, 0xd5, 0x3d, 0x79, 0xfe, 0x62, 0x85, 0x20, + 0xff, 0xb1, 0xae, 0x5c, 0x70, 0xda, 0x1a, 0x78, 0x5c, 0x2e, 0xce, 0xe4, 0x82, 0x53, 0xfc, 0x06, + 0x8e, 0x2c, 0x2a, 0x14, 0x6d, 0x2d, 0x0e, 0xfc, 0xf1, 0xff, 0xd5, 0x2b, 0xd5, 0x88, 0xfb, 0xf2, + 0x2f, 0x09, 0x2e, 0xc1, 0x56, 0x65, 0x31, 0x8f, 0xe0, 0xfa, 0x7d, 0xa9, 0xf3, 0x6f, 0x8c, 0xae, + 0x88, 0x52, 0x31, 0x25, 0xf8, 0x2d, 0x5c, 0xc9, 0x32, 0x89, 0x36, 0xa4, 0x3a, 0xc6, 0xb9, 0xe9, + 0x4e, 0x34, 0x7f, 0xe2, 0xae, 0xcb, 0xe4, 0x9e, 0xa5, 0x4b, 0x52, 0x05, 0x17, 0x0f, 0xfb, 0xa9, + 0x15, 0xf6, 0x64, 0x99, 0x2c, 0x49, 0x85, 0x9f, 0x83, 0xad, 0x98, 0x09, 0x32, 0x0c, 0x1b, 0x18, + 0x2c, 0x1f, 0x6a, 0x07, 0xed, 0x6a, 0x07, 0xfd, 0xae, 0x1d, 0xf4, 0xe3, 0xe0, 0x58, 0xbb, 0x83, + 0x63, 0xfd, 0x3a, 0x38, 0xd6, 0xf7, 0x57, 0x94, 0xe9, 0xbc, 0x4c, 0xdc, 0x54, 0x14, 0x5e, 0x2a, + 0x0a, 0xa2, 0x93, 0x3b, 0x7d, 0x02, 0xe6, 0x32, 0xce, 0xcf, 0x29, 0xe9, 0xb5, 0xd5, 0xd7, 0x7f, + 0x02, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xf9, 0x75, 0xae, 0x67, 0x02, 0x00, 0x00, } func (m *PacketPing) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/pex.pb.go b/proto/tendermint/p2p/pex.pb.go index b4a39fe985..d5f9ce997c 100644 --- a/proto/tendermint/p2p/pex.pb.go +++ b/proto/tendermint/p2p/pex.pb.go @@ -197,7 +197,7 @@ func init() { func init() { proto.RegisterFile("tendermint/p2p/pex.proto", fileDescriptor_81c2f011fd13be57) } var fileDescriptor_81c2f011fd13be57 = []byte{ - // 268 bytes of a gzipped FileDescriptorProto + // 273 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x43, 0xc8, 0xe8, 0x15, 0x18, 0x15, 0x48, 0x49, 0xa1, 0xa9, @@ -210,11 +210,12 @@ var fileDescriptor_81c2f011fd13be57 = []byte{ 0x5c, 0xdc, 0x05, 0xa9, 0x15, 0xf1, 0x45, 0x10, 0xe3, 0x25, 0x18, 0x15, 0x18, 0xb1, 0x99, 0x84, 0x70, 0x80, 0x07, 0x43, 0x10, 0x57, 0x01, 0x9c, 0x27, 0x64, 0xce, 0xc5, 0x09, 0xd2, 0x0e, 0x71, 0x06, 0x13, 0x58, 0xb3, 0x04, 0x16, 0xcd, 0x60, 0xf7, 0x7a, 0x30, 0x04, 0x71, 0x14, 0x40, 0xd9, - 0x4e, 0xac, 0x5c, 0xcc, 0xc5, 0xa5, 0xb9, 0x4e, 0xfe, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, + 0x4e, 0xac, 0x5c, 0xcc, 0xc5, 0xa5, 0xb9, 0x4e, 0xde, 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, 0x65, 0x9a, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f, - 0x14, 0x66, 0xc8, 0xc1, 0x07, 0x0e, 0x29, 0xd4, 0xf0, 0x4c, 0x62, 0x03, 0x8b, 0x1a, 0x03, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x3c, 0x0b, 0xcb, 0x40, 0x92, 0x01, 0x00, 0x00, + 0x2c, 0xc7, 0x10, 0x65, 0x98, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, + 0x9c, 0x9f, 0x9b, 0x5a, 0x92, 0x94, 0x56, 0x82, 0x60, 0x40, 0x42, 0x09, 0x35, 0x2c, 0x93, 0xd8, + 0xc0, 0xa2, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0xad, 0x52, 0xe1, 0x8e, 0x01, 0x00, + 0x00, } func (m *PexRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/types.pb.go b/proto/tendermint/p2p/types.pb.go index ed71161496..c5401b6a96 100644 --- a/proto/tendermint/p2p/types.pb.go +++ b/proto/tendermint/p2p/types.pb.go @@ -305,37 +305,38 @@ func init() { func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) } var fileDescriptor_c8a29e659aeca578 = []byte{ - // 479 bytes of a gzipped FileDescriptorProto + // 483 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x3d, 0x8f, 0xda, 0x40, 0x10, 0xc5, 0xc6, 0x7c, 0xdc, 0x10, 0x8e, 0xcb, 0x0a, 0x45, 0x3e, 0x0a, 0x1b, 0xa1, 0x14, 0x54, - 0x20, 0x39, 0x4a, 0x91, 0x2e, 0x21, 0x34, 0x34, 0x77, 0xd6, 0x2a, 0x4a, 0x91, 0xc6, 0x02, 0xef, - 0x1e, 0xac, 0x30, 0xbb, 0xab, 0xf5, 0x5e, 0x42, 0xfe, 0x45, 0x7e, 0xd6, 0x95, 0x57, 0xa6, 0xb2, - 0x22, 0x53, 0xe6, 0x4f, 0x44, 0x5e, 0xfb, 0x12, 0x1f, 0x4a, 0x37, 0x6f, 0xbe, 0xde, 0xcc, 0xd3, - 0x83, 0x91, 0xa6, 0x9c, 0x50, 0x75, 0x60, 0x5c, 0xcf, 0x65, 0x20, 0xe7, 0xfa, 0xbb, 0xa4, 0xe9, - 0x4c, 0x2a, 0xa1, 0x05, 0xba, 0xfc, 0x57, 0x9b, 0xc9, 0x40, 0x8e, 0x86, 0x5b, 0xb1, 0x15, 0xa6, - 0x34, 0x2f, 0xa2, 0xb2, 0x6b, 0x12, 0x02, 0xdc, 0x50, 0xfd, 0x81, 0x10, 0x45, 0xd3, 0x14, 0xbd, - 0x02, 0x9b, 0x11, 0xd7, 0x1a, 0x5b, 0xd3, 0x8b, 0x45, 0x3b, 0xcf, 0x7c, 0x7b, 0xb5, 0xc4, 0x36, - 0x23, 0x26, 0x2f, 0x5d, 0xbb, 0x96, 0x0f, 0xb1, 0xcd, 0x24, 0x42, 0xe0, 0x48, 0xa1, 0xb4, 0xdb, - 0x1c, 0x5b, 0xd3, 0x3e, 0x36, 0xf1, 0xe4, 0x13, 0x0c, 0xc2, 0x62, 0x75, 0x2c, 0x92, 0xcf, 0x54, - 0xa5, 0x4c, 0x70, 0x74, 0x0d, 0x4d, 0x19, 0x48, 0xb3, 0xd7, 0x59, 0x74, 0xf2, 0xcc, 0x6f, 0x86, - 0x41, 0x88, 0x8b, 0x1c, 0x1a, 0x42, 0x6b, 0x93, 0x88, 0x78, 0x6f, 0x96, 0x3b, 0xb8, 0x04, 0xe8, - 0x0a, 0x9a, 0x6b, 0x29, 0xcd, 0x5a, 0x07, 0x17, 0xe1, 0xe4, 0xb7, 0x0d, 0x83, 0x25, 0xbd, 0x5b, - 0xdf, 0x27, 0xfa, 0x46, 0x10, 0xba, 0xe2, 0x77, 0x02, 0x85, 0x70, 0x25, 0x2b, 0xa6, 0xe8, 0x6b, - 0x49, 0x65, 0x38, 0x7a, 0x81, 0x3f, 0x7b, 0xfe, 0xfc, 0xec, 0xec, 0xa2, 0x85, 0xf3, 0x90, 0xf9, - 0x0d, 0x3c, 0x90, 0x67, 0x87, 0xbe, 0x83, 0x01, 0x29, 0x49, 0x22, 0x2e, 0x08, 0x8d, 0x18, 0xa9, - 0x9e, 0x7e, 0x99, 0x67, 0x7e, 0xbf, 0xce, 0xbf, 0xc4, 0x7d, 0x52, 0x83, 0x04, 0xf9, 0xd0, 0x4b, - 0x58, 0xaa, 0x29, 0x8f, 0xd6, 0x84, 0x28, 0x73, 0xfa, 0x05, 0x86, 0x32, 0x55, 0xc8, 0x8b, 0x5c, - 0xe8, 0x70, 0xaa, 0xbf, 0x09, 0xb5, 0x77, 0x1d, 0x53, 0x7c, 0x82, 0x45, 0xe5, 0xe9, 0xfc, 0x56, - 0x59, 0xa9, 0x20, 0x1a, 0x41, 0x37, 0xde, 0xad, 0x39, 0xa7, 0x49, 0xea, 0xb6, 0xc7, 0xd6, 0xf4, - 0x05, 0xfe, 0x8b, 0x8b, 0xa9, 0x83, 0xe0, 0x6c, 0x4f, 0x95, 0xdb, 0x29, 0xa7, 0x2a, 0x88, 0xde, - 0x43, 0x4b, 0xe8, 0x1d, 0x55, 0x6e, 0xd7, 0x88, 0xf1, 0xfa, 0x5c, 0x8c, 0x33, 0x1d, 0x6f, 0x8b, - 0xde, 0x4a, 0x91, 0x72, 0x70, 0xb2, 0x81, 0xe1, 0xff, 0x9a, 0xd0, 0x35, 0x74, 0xf5, 0x31, 0x62, - 0x9c, 0xd0, 0x63, 0xe9, 0x12, 0xdc, 0xd1, 0xc7, 0x55, 0x01, 0xd1, 0x1c, 0x7a, 0x4a, 0xc6, 0xe6, - 0x79, 0x9a, 0xa6, 0x95, 0x6c, 0x97, 0x79, 0xe6, 0x03, 0x0e, 0x3f, 0x56, 0xfe, 0xc2, 0xa0, 0x64, - 0x5c, 0xc5, 0x8b, 0xdb, 0x87, 0xdc, 0xb3, 0x1e, 0x73, 0xcf, 0xfa, 0x95, 0x7b, 0xd6, 0x8f, 0x93, - 0xd7, 0x78, 0x3c, 0x79, 0x8d, 0x9f, 0x27, 0xaf, 0xf1, 0xe5, 0xed, 0x96, 0xe9, 0xdd, 0xfd, 0x66, - 0x16, 0x8b, 0xc3, 0xbc, 0x66, 0xf0, 0xba, 0xd7, 0x8d, 0x8d, 0x9f, 0x9b, 0x7f, 0xd3, 0x36, 0xd9, - 0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xb3, 0x68, 0x97, 0x15, 0x03, 0x00, 0x00, + 0xa0, 0x90, 0x2a, 0x5d, 0x42, 0x68, 0x50, 0xa4, 0x8b, 0xb5, 0x8a, 0x52, 0xa4, 0x41, 0xe0, 0x5d, + 0x60, 0x85, 0xd9, 0x5d, 0xad, 0xf7, 0x12, 0xf2, 0x2f, 0xf2, 0xb3, 0xae, 0xbc, 0x32, 0x95, 0x15, + 0x99, 0x32, 0x7f, 0x22, 0xf2, 0xae, 0x2f, 0xc7, 0xa1, 0xeb, 0xe6, 0xcd, 0x9b, 0x99, 0x37, 0xf3, + 0x34, 0xd0, 0xd3, 0x94, 0x13, 0xaa, 0xf6, 0x8c, 0xeb, 0xb1, 0x9c, 0xc8, 0xb1, 0xfe, 0x29, 0x69, + 0x3a, 0x92, 0x4a, 0x68, 0x81, 0x2e, 0x1f, 0xb9, 0x91, 0x9c, 0xc8, 0x5e, 0x77, 0x23, 0x36, 0xc2, + 0x50, 0xe3, 0x22, 0xb2, 0x55, 0x83, 0x08, 0xe0, 0x86, 0xea, 0x0f, 0x84, 0x28, 0x9a, 0xa6, 0xe8, + 0x15, 0xb8, 0x8c, 0xf8, 0x4e, 0xdf, 0x19, 0x5e, 0x4c, 0xeb, 0x79, 0x16, 0xba, 0xf3, 0x19, 0x76, + 0x19, 0x31, 0x79, 0xe9, 0xbb, 0x27, 0xf9, 0x08, 0xbb, 0x4c, 0x22, 0x04, 0x9e, 0x14, 0x4a, 0xfb, + 0xd5, 0xbe, 0x33, 0x6c, 0x63, 0x13, 0x0f, 0xbe, 0x40, 0x27, 0x2a, 0x46, 0xc7, 0x22, 0xf9, 0x4a, + 0x55, 0xca, 0x04, 0x47, 0xd7, 0x50, 0x95, 0x13, 0x69, 0xe6, 0x7a, 0xd3, 0x46, 0x9e, 0x85, 0xd5, + 0x68, 0x12, 0xe1, 0x22, 0x87, 0xba, 0x50, 0x5b, 0x25, 0x22, 0xde, 0x99, 0xe1, 0x1e, 0xb6, 0x00, + 0x5d, 0x41, 0x75, 0x29, 0xa5, 0x19, 0xeb, 0xe1, 0x22, 0x1c, 0xfc, 0x75, 0xa1, 0x33, 0xa3, 0xeb, + 0xe5, 0x6d, 0xa2, 0x6f, 0x04, 0xa1, 0x73, 0xbe, 0x16, 0x28, 0x82, 0x2b, 0x59, 0x2a, 0x2d, 0xbe, + 0x5b, 0x29, 0xa3, 0xd1, 0x9a, 0x84, 0xa3, 0xa7, 0xc7, 0x8f, 0xce, 0x36, 0x9a, 0x7a, 0x77, 0x59, + 0x58, 0xc1, 0x1d, 0x79, 0xb6, 0xe8, 0x3b, 0xe8, 0x10, 0x2b, 0xb2, 0xe0, 0x82, 0xd0, 0x05, 0x23, + 0xe5, 0xd1, 0x2f, 0xf3, 0x2c, 0x6c, 0x9f, 0xea, 0xcf, 0x70, 0x9b, 0x9c, 0x40, 0x82, 0x42, 0x68, + 0x25, 0x2c, 0xd5, 0x94, 0x2f, 0x96, 0x84, 0x28, 0xb3, 0xfa, 0x05, 0x06, 0x9b, 0x2a, 0xec, 0x45, + 0x3e, 0x34, 0x38, 0xd5, 0x3f, 0x84, 0xda, 0xf9, 0x9e, 0x21, 0x1f, 0x60, 0xc1, 0x3c, 0xac, 0x5f, + 0xb3, 0x4c, 0x09, 0x51, 0x0f, 0x9a, 0xf1, 0x76, 0xc9, 0x39, 0x4d, 0x52, 0xbf, 0xde, 0x77, 0x86, + 0x2f, 0xf0, 0x7f, 0x5c, 0x74, 0xed, 0x05, 0x67, 0x3b, 0xaa, 0xfc, 0x86, 0xed, 0x2a, 0x21, 0x7a, + 0x0f, 0x35, 0xa1, 0xb7, 0x54, 0xf9, 0x4d, 0x63, 0xc6, 0xeb, 0x73, 0x33, 0xce, 0x7c, 0xfc, 0x5c, + 0xd4, 0x96, 0x8e, 0xd8, 0xc6, 0xc1, 0x0a, 0xba, 0xcf, 0x15, 0xa1, 0x6b, 0x68, 0xea, 0xc3, 0x82, + 0x71, 0x42, 0x0f, 0xf6, 0x4b, 0x70, 0x43, 0x1f, 0xe6, 0x05, 0x44, 0x63, 0x68, 0x29, 0x19, 0x9b, + 0xe3, 0x69, 0x9a, 0x96, 0xb6, 0x5d, 0xe6, 0x59, 0x08, 0x38, 0xfa, 0x58, 0xfe, 0x17, 0x06, 0x25, + 0xe3, 0x32, 0x9e, 0x7e, 0xba, 0xcb, 0x03, 0xe7, 0x3e, 0x0f, 0x9c, 0x3f, 0x79, 0xe0, 0xfc, 0x3a, + 0x06, 0x95, 0xfb, 0x63, 0x50, 0xf9, 0x7d, 0x0c, 0x2a, 0xdf, 0xde, 0x6c, 0x98, 0xde, 0xde, 0xae, + 0x46, 0xb1, 0xd8, 0x8f, 0x63, 0xb1, 0xa7, 0x7a, 0xb5, 0xd6, 0x8f, 0x81, 0x7d, 0xe1, 0xa7, 0x8f, + 0xbf, 0xaa, 0x9b, 0xec, 0xdb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xae, 0xdb, 0x56, 0x6d, 0x11, + 0x03, 0x00, 0x00, } func (m *NetAddress) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/privval/types.pb.go b/proto/tendermint/privval/types.pb.go index 9b7cfb37b7..81be6de756 100644 --- a/proto/tendermint/privval/types.pb.go +++ b/proto/tendermint/privval/types.pb.go @@ -5,10 +5,10 @@ package privval import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" types "github.com/cometbft/cometbft/proto/tendermint/types" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -678,54 +678,55 @@ func init() { func init() { proto.RegisterFile("tendermint/privval/types.proto", fileDescriptor_cb4e437a5328cf9c) } var fileDescriptor_cb4e437a5328cf9c = []byte{ - // 750 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x4f, 0x13, 0x41, - 0x18, 0xde, 0x85, 0x7e, 0xc0, 0x5b, 0x5a, 0xca, 0x80, 0x58, 0x1a, 0x5c, 0x6a, 0x8d, 0x4a, 0x7a, - 0x68, 0x0d, 0x26, 0x26, 0x06, 0x2f, 0x02, 0x1b, 0xdb, 0x34, 0x6c, 0xeb, 0xb4, 0x08, 0x21, 0x31, - 0x9b, 0x7e, 0x8c, 0xcb, 0x06, 0xba, 0x3b, 0xee, 0x6c, 0x49, 0x7a, 0xf6, 0xe6, 0xc9, 0xc4, 0x3f, - 0xe1, 0xd9, 0x5f, 0xc1, 0x91, 0xa3, 0x27, 0x63, 0xe0, 0x8f, 0x98, 0xce, 0x4e, 0xb7, 0xdb, 0x2f, - 0xa2, 0xe1, 0xb6, 0xf3, 0xbe, 0xef, 0x3c, 0x1f, 0x33, 0xcf, 0x66, 0x40, 0x71, 0x89, 0xd5, 0x26, - 0x4e, 0xc7, 0xb4, 0xdc, 0x02, 0x75, 0xcc, 0xcb, 0xcb, 0xc6, 0x45, 0xc1, 0xed, 0x51, 0xc2, 0xf2, - 0xd4, 0xb1, 0x5d, 0x1b, 0xa1, 0x61, 0x3f, 0x2f, 0xfa, 0xe9, 0xcd, 0xc0, 0x9e, 0x96, 0xd3, 0xa3, - 0xae, 0x5d, 0x38, 0x27, 0x3d, 0xb1, 0x63, 0xa4, 0xcb, 0x91, 0x82, 0x78, 0xe9, 0x35, 0xc3, 0x36, - 0x6c, 0xfe, 0x59, 0xe8, 0x7f, 0x79, 0xd5, 0x6c, 0x09, 0x56, 0x30, 0xe9, 0xd8, 0x2e, 0xa9, 0x99, - 0x86, 0x45, 0x1c, 0xd5, 0x71, 0x6c, 0x07, 0x21, 0x08, 0xb5, 0xec, 0x36, 0x49, 0xc9, 0x19, 0x79, - 0x3b, 0x8c, 0xf9, 0x37, 0xca, 0x40, 0xac, 0x4d, 0x58, 0xcb, 0x31, 0xa9, 0x6b, 0xda, 0x56, 0x6a, - 0x2e, 0x23, 0x6f, 0x2f, 0xe2, 0x60, 0x29, 0x9b, 0x83, 0x78, 0xb5, 0xdb, 0x2c, 0x93, 0x1e, 0x26, - 0x9f, 0xbb, 0x84, 0xb9, 0x68, 0x03, 0x16, 0x5a, 0x67, 0x0d, 0xd3, 0xd2, 0xcd, 0x36, 0x87, 0x5a, - 0xc4, 0x51, 0xbe, 0x2e, 0xb5, 0xb3, 0x5f, 0x65, 0x48, 0x0c, 0x86, 0x19, 0xb5, 0x2d, 0x46, 0xd0, - 0x2e, 0x44, 0x69, 0xb7, 0xa9, 0x9f, 0x93, 0x1e, 0x1f, 0x8e, 0xed, 0x6c, 0xe6, 0x03, 0x27, 0xe0, - 0xb9, 0xcd, 0x57, 0xbb, 0xcd, 0x0b, 0xb3, 0x55, 0x26, 0xbd, 0xbd, 0xd0, 0xd5, 0xef, 0x2d, 0x09, - 0x47, 0x28, 0x07, 0x41, 0xbb, 0x10, 0x26, 0x7d, 0xe9, 0x5c, 0x57, 0x6c, 0xe7, 0x69, 0x7e, 0xf2, - 0xf0, 0xf2, 0x13, 0x3e, 0xb1, 0xb7, 0x27, 0x7b, 0x02, 0xcb, 0xfd, 0xea, 0x07, 0xdb, 0x25, 0x03, - 0xe9, 0x39, 0x08, 0x5d, 0xda, 0x2e, 0x11, 0x4a, 0xd6, 0x83, 0x70, 0xde, 0x99, 0xf2, 0x61, 0x3e, - 0x33, 0x62, 0x73, 0x6e, 0xd4, 0xe6, 0x17, 0x19, 0x10, 0x27, 0x6c, 0x7b, 0xe0, 0xc2, 0xea, 0x8b, - 0x7f, 0x41, 0x17, 0x0e, 0x3d, 0x8e, 0x7b, 0xf9, 0x3b, 0x83, 0xd5, 0x7e, 0xb5, 0xea, 0xd8, 0xd4, - 0x66, 0x8d, 0x8b, 0x81, 0xc7, 0x57, 0xb0, 0x40, 0x45, 0x49, 0x28, 0x49, 0x4f, 0x2a, 0xf1, 0x37, - 0xf9, 0xb3, 0x77, 0xf9, 0xfd, 0x2e, 0xc3, 0xba, 0xe7, 0x77, 0x48, 0x26, 0x3c, 0xbf, 0xf9, 0x1f, - 0x36, 0xe1, 0x7d, 0xc8, 0x79, 0x2f, 0xff, 0x71, 0x88, 0x55, 0x4d, 0xcb, 0x10, 0xbe, 0xb3, 0x09, - 0x58, 0xf2, 0x96, 0x9e, 0xb2, 0xec, 0xcf, 0x30, 0x44, 0x0f, 0x09, 0x63, 0x0d, 0x83, 0xa0, 0x32, - 0x2c, 0x8b, 0x10, 0xea, 0x8e, 0x37, 0x2e, 0xc4, 0x3e, 0x9e, 0xc6, 0x38, 0x12, 0xf7, 0xa2, 0x84, - 0xe3, 0x74, 0x24, 0xff, 0x1a, 0x24, 0x87, 0x60, 0x1e, 0x99, 0xd0, 0x9f, 0xbd, 0x0b, 0xcd, 0x9b, - 0x2c, 0x4a, 0x38, 0x41, 0x47, 0xff, 0x90, 0xf7, 0xb0, 0xc2, 0x4c, 0xc3, 0xd2, 0xfb, 0x89, 0xf0, - 0xe5, 0xcd, 0x73, 0xc0, 0x27, 0xd3, 0x00, 0xc7, 0x42, 0x5d, 0x94, 0xf0, 0x32, 0x1b, 0xcb, 0xf9, - 0x29, 0xac, 0x31, 0x7e, 0x5f, 0x03, 0x50, 0x21, 0x33, 0xc4, 0x51, 0x9f, 0xcd, 0x42, 0x1d, 0xcd, - 0x73, 0x51, 0xc2, 0x88, 0x4d, 0xa6, 0xfc, 0x23, 0x3c, 0xe0, 0x72, 0x07, 0x97, 0xe8, 0x4b, 0x0e, - 0x73, 0xf0, 0xe7, 0xb3, 0xc0, 0xc7, 0x72, 0x5a, 0x94, 0xf0, 0x2a, 0x9b, 0x12, 0xdf, 0x4f, 0x90, - 0x12, 0xd2, 0x03, 0x04, 0x42, 0x7e, 0x84, 0x33, 0xe4, 0x66, 0xcb, 0x1f, 0x8f, 0x67, 0x51, 0xc2, - 0xeb, 0x6c, 0x7a, 0x70, 0x0f, 0x60, 0x89, 0x9a, 0x96, 0xe1, 0xab, 0x8f, 0x72, 0xec, 0xad, 0xa9, - 0x37, 0x38, 0x4c, 0x59, 0x51, 0xc2, 0x31, 0x3a, 0x5c, 0xa2, 0x77, 0x10, 0x17, 0x28, 0x42, 0xe2, - 0x02, 0x87, 0xc9, 0xcc, 0x86, 0xf1, 0x85, 0x2d, 0xd1, 0xc0, 0x7a, 0x2f, 0x0c, 0xf3, 0xac, 0xdb, - 0xc9, 0xfd, 0x90, 0x21, 0xc2, 0x43, 0xce, 0x10, 0x82, 0x84, 0x8a, 0x71, 0x05, 0xd7, 0xf4, 0x23, - 0xad, 0xac, 0x55, 0x8e, 0xb5, 0xa4, 0x84, 0x14, 0x48, 0xfb, 0x35, 0xf5, 0xa4, 0xaa, 0xee, 0xd7, - 0xd5, 0x03, 0x1d, 0xab, 0xb5, 0x6a, 0x45, 0xab, 0xa9, 0x49, 0x19, 0xa5, 0x60, 0x4d, 0xf4, 0xb5, - 0x8a, 0xbe, 0x5f, 0xd1, 0x34, 0x75, 0xbf, 0x5e, 0xaa, 0x68, 0xc9, 0x39, 0xf4, 0x08, 0x36, 0x44, - 0x67, 0x58, 0xd6, 0xeb, 0xa5, 0x43, 0xb5, 0x72, 0x54, 0x4f, 0xce, 0xa3, 0x87, 0xb0, 0x2a, 0xda, - 0x58, 0x7d, 0x7b, 0xe0, 0x37, 0x42, 0x01, 0xc4, 0x63, 0x5c, 0xaa, 0xab, 0x7e, 0x27, 0xbc, 0x57, - 0xbb, 0xba, 0x51, 0xe4, 0xeb, 0x1b, 0x45, 0xfe, 0x73, 0xa3, 0xc8, 0xdf, 0x6e, 0x15, 0xe9, 0xfa, - 0x56, 0x91, 0x7e, 0xdd, 0x2a, 0xd2, 0xe9, 0x6b, 0xc3, 0x74, 0xcf, 0xba, 0xcd, 0x7c, 0xcb, 0xee, - 0x14, 0x82, 0x6f, 0x57, 0xf0, 0x61, 0xec, 0xbf, 0x57, 0x93, 0x2f, 0x65, 0x33, 0xc2, 0x3b, 0x2f, - 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x2a, 0xe5, 0x4a, 0x46, 0x07, 0x00, 0x00, + // 756 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x4f, 0xe3, 0x46, + 0x18, 0xb6, 0x21, 0x1f, 0xf0, 0x86, 0x84, 0x30, 0x50, 0x1a, 0x22, 0x6a, 0xd2, 0x54, 0x6d, 0x51, + 0x0e, 0x49, 0x45, 0xd5, 0x5e, 0xe8, 0xa5, 0x80, 0xd5, 0x44, 0x11, 0x76, 0x3a, 0x09, 0x05, 0x21, + 0x55, 0x56, 0x3e, 0x06, 0x63, 0x41, 0x3c, 0x5e, 0x8f, 0x83, 0x94, 0xf3, 0xde, 0xf6, 0xb4, 0xd2, + 0xfe, 0x89, 0x3d, 0xef, 0xaf, 0xe0, 0xc8, 0x71, 0x4f, 0xab, 0x15, 0xfc, 0x91, 0x55, 0xc6, 0x13, + 0xdb, 0xf9, 0x42, 0xbb, 0xe2, 0x36, 0xf3, 0xbe, 0xef, 0x3c, 0x1f, 0x33, 0x8f, 0x65, 0x50, 0x3c, + 0x62, 0xf7, 0x88, 0xdb, 0xb7, 0x6c, 0xaf, 0xe2, 0xb8, 0xd6, 0xdd, 0x5d, 0xfb, 0xb6, 0xe2, 0x0d, + 0x1d, 0xc2, 0xca, 0x8e, 0x4b, 0x3d, 0x8a, 0x50, 0xd8, 0x2f, 0x8b, 0x7e, 0x7e, 0x37, 0x72, 0xa6, + 0xeb, 0x0e, 0x1d, 0x8f, 0x56, 0x6e, 0xc8, 0x50, 0x9c, 0x98, 0xe8, 0x72, 0xa4, 0x28, 0x5e, 0x7e, + 0xcb, 0xa4, 0x26, 0xe5, 0xcb, 0xca, 0x68, 0xe5, 0x57, 0x8b, 0x35, 0xd8, 0xc0, 0xa4, 0x4f, 0x3d, + 0xd2, 0xb4, 0x4c, 0x9b, 0xb8, 0xaa, 0xeb, 0x52, 0x17, 0x21, 0x88, 0x75, 0x69, 0x8f, 0xe4, 0xe4, + 0x82, 0xbc, 0x1f, 0xc7, 0x7c, 0x8d, 0x0a, 0x90, 0xea, 0x11, 0xd6, 0x75, 0x2d, 0xc7, 0xb3, 0xa8, + 0x9d, 0x5b, 0x2a, 0xc8, 0xfb, 0xab, 0x38, 0x5a, 0x2a, 0x96, 0x20, 0xdd, 0x18, 0x74, 0xea, 0x64, + 0x88, 0xc9, 0xab, 0x01, 0x61, 0x1e, 0xda, 0x81, 0x95, 0xee, 0x75, 0xdb, 0xb2, 0x0d, 0xab, 0xc7, + 0xa1, 0x56, 0x71, 0x92, 0xef, 0x6b, 0xbd, 0xe2, 0x1b, 0x19, 0x32, 0xe3, 0x61, 0xe6, 0x50, 0x9b, + 0x11, 0x74, 0x08, 0x49, 0x67, 0xd0, 0x31, 0x6e, 0xc8, 0x90, 0x0f, 0xa7, 0x0e, 0x76, 0xcb, 0x91, + 0x1b, 0xf0, 0xdd, 0x96, 0x1b, 0x83, 0xce, 0xad, 0xd5, 0xad, 0x93, 0xe1, 0x51, 0xec, 0xfe, 0xd3, + 0x9e, 0x84, 0x13, 0x0e, 0x07, 0x41, 0x87, 0x10, 0x27, 0x23, 0xe9, 0x5c, 0x57, 0xea, 0xe0, 0xe7, + 0xf2, 0xec, 0xe5, 0x95, 0x67, 0x7c, 0x62, 0xff, 0x4c, 0xf1, 0x02, 0xd6, 0x47, 0xd5, 0xff, 0xa8, + 0x47, 0xc6, 0xd2, 0x4b, 0x10, 0xbb, 0xa3, 0x1e, 0x11, 0x4a, 0xb6, 0xa3, 0x70, 0xfe, 0x9d, 0xf2, + 0x61, 0x3e, 0x33, 0x61, 0x73, 0x69, 0xd2, 0xe6, 0x6b, 0x19, 0x10, 0x27, 0xec, 0xf9, 0xe0, 0xc2, + 0xea, 0x6f, 0x5f, 0x83, 0x2e, 0x1c, 0xfa, 0x1c, 0x2f, 0xf2, 0x77, 0x0d, 0x9b, 0xa3, 0x6a, 0xc3, + 0xa5, 0x0e, 0x65, 0xed, 0xdb, 0xb1, 0xc7, 0x3f, 0x61, 0xc5, 0x11, 0x25, 0xa1, 0x24, 0x3f, 0xab, + 0x24, 0x38, 0x14, 0xcc, 0x3e, 0xe7, 0xf7, 0x9d, 0x0c, 0xdb, 0xbe, 0xdf, 0x90, 0x4c, 0x78, 0xfe, + 0xeb, 0x5b, 0xd8, 0x84, 0xf7, 0x90, 0xf3, 0x45, 0xfe, 0xd3, 0x90, 0x6a, 0x58, 0xb6, 0x29, 0x7c, + 0x17, 0x33, 0xb0, 0xe6, 0x6f, 0x7d, 0x65, 0xc5, 0x0f, 0x71, 0x48, 0x9e, 0x12, 0xc6, 0xda, 0x26, + 0x41, 0x75, 0x58, 0x17, 0x21, 0x34, 0x5c, 0x7f, 0x5c, 0x88, 0xfd, 0x71, 0x1e, 0xe3, 0x44, 0xdc, + 0xab, 0x12, 0x4e, 0x3b, 0x13, 0xf9, 0xd7, 0x20, 0x1b, 0x82, 0xf9, 0x64, 0x42, 0x7f, 0xf1, 0x39, + 0x34, 0x7f, 0xb2, 0x2a, 0xe1, 0x8c, 0x33, 0xf9, 0x85, 0xfc, 0x0b, 0x1b, 0xcc, 0x32, 0x6d, 0x63, + 0x94, 0x88, 0x40, 0xde, 0x32, 0x07, 0xfc, 0x69, 0x1e, 0xe0, 0x54, 0xa8, 0xab, 0x12, 0x5e, 0x67, + 0x53, 0x39, 0xbf, 0x84, 0x2d, 0xc6, 0xdf, 0x6b, 0x0c, 0x2a, 0x64, 0xc6, 0x38, 0xea, 0x2f, 0x8b, + 0x50, 0x27, 0xf3, 0x5c, 0x95, 0x30, 0x62, 0xb3, 0x29, 0xff, 0x1f, 0xbe, 0xe3, 0x72, 0xc7, 0x8f, + 0x18, 0x48, 0x8e, 0x73, 0xf0, 0x5f, 0x17, 0x81, 0x4f, 0xe5, 0xb4, 0x2a, 0xe1, 0x4d, 0x36, 0x27, + 0xbe, 0x57, 0x90, 0x13, 0xd2, 0x23, 0x04, 0x42, 0x7e, 0x82, 0x33, 0x94, 0x16, 0xcb, 0x9f, 0x8e, + 0x67, 0x55, 0xc2, 0xdb, 0x6c, 0x7e, 0x70, 0x4f, 0x60, 0xcd, 0xb1, 0x6c, 0x33, 0x50, 0x9f, 0xe4, + 0xd8, 0x7b, 0x73, 0x5f, 0x30, 0x4c, 0x59, 0x55, 0xc2, 0x29, 0x27, 0xdc, 0xa2, 0x7f, 0x20, 0x2d, + 0x50, 0x84, 0xc4, 0x15, 0x0e, 0x53, 0x58, 0x0c, 0x13, 0x08, 0x5b, 0x73, 0x22, 0xfb, 0xa3, 0x38, + 0x2c, 0xb3, 0x41, 0xbf, 0xf4, 0x5e, 0x86, 0x04, 0x0f, 0x39, 0x43, 0x08, 0x32, 0x2a, 0xc6, 0x3a, + 0x6e, 0x1a, 0x67, 0x5a, 0x5d, 0xd3, 0xcf, 0xb5, 0xac, 0x84, 0x14, 0xc8, 0x07, 0x35, 0xf5, 0xa2, + 0xa1, 0x1e, 0xb7, 0xd4, 0x13, 0x03, 0xab, 0xcd, 0x86, 0xae, 0x35, 0xd5, 0xac, 0x8c, 0x72, 0xb0, + 0x25, 0xfa, 0x9a, 0x6e, 0x1c, 0xeb, 0x9a, 0xa6, 0x1e, 0xb7, 0x6a, 0xba, 0x96, 0x5d, 0x42, 0x3f, + 0xc0, 0x8e, 0xe8, 0x84, 0x65, 0xa3, 0x55, 0x3b, 0x55, 0xf5, 0xb3, 0x56, 0x76, 0x19, 0x7d, 0x0f, + 0x9b, 0xa2, 0x8d, 0xd5, 0xbf, 0x4f, 0x82, 0x46, 0x2c, 0x82, 0x78, 0x8e, 0x6b, 0x2d, 0x35, 0xe8, + 0xc4, 0x8f, 0xf4, 0xfb, 0x47, 0x45, 0x7e, 0x78, 0x54, 0xe4, 0xcf, 0x8f, 0x8a, 0xfc, 0xf6, 0x49, + 0x91, 0x1e, 0x9e, 0x14, 0xe9, 0xe3, 0x93, 0x22, 0x5d, 0xfe, 0x61, 0x5a, 0xde, 0xf5, 0xa0, 0x53, + 0xee, 0xd2, 0x7e, 0xa5, 0x4b, 0xfb, 0xc4, 0xeb, 0x5c, 0x79, 0xe1, 0xc2, 0xff, 0x57, 0xcd, 0xfe, + 0x25, 0x3b, 0x09, 0xde, 0xf9, 0xfd, 0x4b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x9f, 0x99, 0x3e, + 0x42, 0x07, 0x00, 0x00, } func (m *RemoteSignerError) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/rpc/grpc/types.pb.go b/proto/tendermint/rpc/grpc/types.pb.go index 86f2ddd0bc..d61c39e9e1 100644 --- a/proto/tendermint/rpc/grpc/types.pb.go +++ b/proto/tendermint/rpc/grpc/types.pb.go @@ -6,8 +6,8 @@ package coregrpc import ( context "context" fmt "fmt" - proto "github.com/gogo/protobuf/proto" types "github.com/cometbft/cometbft/abci/types" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -205,27 +205,28 @@ func init() { func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) } var fileDescriptor_0ffff5682c662b95 = []byte{ - // 316 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, 0x07, 0x11, 0x25, 0x95, - 0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, 0x08, 0x05, 0x7a, 0x45, 0x05, - 0xc9, 0x7a, 0x20, 0x05, 0x52, 0xd2, 0x48, 0xba, 0x12, 0x93, 0x92, 0x33, 0x91, 0x75, 0x28, 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, 0x53, 0x19, 0xb9, 0x84, - 0x61, 0x02, 0xc8, 0xfa, 0xac, 0xb9, 0x38, 0x92, 0x33, 0x52, 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9, - 0x8d, 0x14, 0xf4, 0x90, 0x5c, 0x08, 0x72, 0x8c, 0x1e, 0x4c, 0x9f, 0x33, 0x48, 0x61, 0x48, 0x45, - 0x10, 0x7b, 0x32, 0x84, 0x21, 0xe4, 0xc8, 0xc5, 0x95, 0x92, 0x9a, 0x93, 0x59, 0x96, 0x5a, 0x04, - 0xd2, 0xce, 0x04, 0xd6, 0xae, 0x84, 0x53, 0xbb, 0x0b, 0x44, 0x69, 0x48, 0x45, 0x10, 0x67, 0x0a, - 0x8c, 0x69, 0xb4, 0x97, 0x91, 0x8b, 0x07, 0xee, 0x1e, 0xc7, 0x00, 0x4f, 0x21, 0x6f, 0x2e, 0x16, - 0x90, 0x83, 0x85, 0x50, 0x9c, 0x01, 0x0b, 0x28, 0x3d, 0xa4, 0x80, 0x90, 0x52, 0xc4, 0xa1, 0x02, - 0xe1, 0x6b, 0xa1, 0x04, 0x2e, 0x6e, 0x64, 0xcf, 0xaa, 0xe3, 0x33, 0x13, 0x49, 0xa1, 0x94, 0x06, - 0x5e, 0xa3, 0x91, 0x54, 0x3a, 0xf9, 0x9c, 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, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x52, 0xf4, 0x62, - 0x49, 0x1f, 0xd6, 0xc9, 0xf9, 0x45, 0xa9, 0x20, 0x46, 0x12, 0x1b, 0x38, 0xc6, 0x8d, 0x01, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xf6, 0x4b, 0x02, 0xd8, 0x46, 0x02, 0x00, 0x00, + // 321 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x3f, 0x4f, 0xc2, 0x40, + 0x18, 0xc6, 0x39, 0x62, 0xfc, 0xf3, 0x82, 0x0c, 0xc7, 0x62, 0x30, 0x39, 0xb1, 0x31, 0x91, 0xe9, + 0x48, 0x70, 0x64, 0x02, 0x1d, 0x34, 0x2e, 0xa4, 0x61, 0x72, 0x51, 0x7a, 0x7d, 0x85, 0x46, 0xe9, + 0xd5, 0xeb, 0x61, 0xea, 0xb7, 0x70, 0xf1, 0xe3, 0xb8, 0x3b, 0x32, 0x3a, 0x9a, 0xf6, 0x8b, 0x98, + 0x2b, 0xd4, 0x9e, 0x03, 0x2c, 0xcd, 0xd3, 0xe6, 0xf7, 0xbb, 0x3c, 0xef, 0xdb, 0x83, 0x13, 0x8d, + 0xa1, 0x8f, 0x6a, 0x1e, 0x84, 0xba, 0xab, 0x22, 0xd1, 0x9d, 0x9a, 0x87, 0x7e, 0x8b, 0x30, 0xe6, + 0x91, 0x92, 0x5a, 0xd2, 0x66, 0x09, 0x70, 0x15, 0x09, 0x6e, 0x80, 0xd6, 0xb1, 0x65, 0x4d, 0x3c, + 0x11, 0xd8, 0x86, 0x73, 0x08, 0x35, 0x17, 0x5f, 0x16, 0x18, 0xeb, 0x51, 0x10, 0x4e, 0x9d, 0x33, + 0xa0, 0xeb, 0xd7, 0xa1, 0x92, 0x13, 0x5f, 0x4c, 0x62, 0x3d, 0x4e, 0x68, 0x03, 0xaa, 0x3a, 0x39, + 0x22, 0x6d, 0xd2, 0xa9, 0xbb, 0x55, 0x9d, 0x38, 0x0d, 0xa8, 0xbb, 0x18, 0x47, 0x32, 0x8c, 0x31, + 0xb7, 0x3e, 0x08, 0x34, 0x8b, 0x0f, 0xb6, 0xd7, 0x87, 0x7d, 0x31, 0x43, 0xf1, 0x74, 0xbf, 0xb6, + 0x6b, 0xbd, 0x36, 0xb7, 0x1a, 0x9a, 0x32, 0xbc, 0xf0, 0x2e, 0x0d, 0x38, 0x4e, 0xdc, 0x3d, 0xb1, + 0x0a, 0x74, 0x00, 0xe0, 0xe3, 0x73, 0xf0, 0x8a, 0xca, 0xe8, 0xd5, 0x5c, 0x77, 0x36, 0xea, 0x57, + 0x2b, 0x74, 0x9c, 0xb8, 0x07, 0x7e, 0x11, 0x7b, 0x9f, 0x04, 0xea, 0x7f, 0x7d, 0x06, 0xa3, 0x1b, + 0x7a, 0x0b, 0x3b, 0xa6, 0x30, 0xfd, 0x57, 0xa3, 0x58, 0x14, 0xb7, 0x16, 0xd1, 0x3a, 0xdd, 0x40, + 0x94, 0x53, 0xd3, 0x07, 0xa8, 0xd9, 0xc3, 0x9e, 0x6f, 0x3b, 0xd3, 0x02, 0x5b, 0x9d, 0xad, 0x47, + 0x5b, 0xe4, 0xf0, 0xfa, 0x2b, 0x65, 0x64, 0x99, 0x32, 0xf2, 0x93, 0x32, 0xf2, 0x9e, 0xb1, 0xca, + 0x32, 0x63, 0x95, 0xef, 0x8c, 0x55, 0xee, 0xf8, 0x34, 0xd0, 0xb3, 0x85, 0xc7, 0x85, 0x9c, 0x77, + 0x85, 0x9c, 0xa3, 0xf6, 0x1e, 0x75, 0x19, 0x8a, 0xbb, 0xd1, 0x17, 0x52, 0xa1, 0x09, 0xde, 0x6e, + 0xfe, 0xb7, 0x2f, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x87, 0x53, 0x29, 0xbe, 0x42, 0x02, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go index 26c4c4b956..b4cf02339b 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -5,13 +5,13 @@ package state import ( fmt "fmt" + types "github.com/cometbft/cometbft/abci/types" + types1 "github.com/cometbft/cometbft/proto/tendermint/types" + version "github.com/cometbft/cometbft/proto/tendermint/version" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/cometbft/cometbft/abci/types" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" - version "github.com/cometbft/cometbft/proto/tendermint/version" io "io" math "math" math_bits "math/bits" @@ -475,58 +475,58 @@ func init() { func init() { proto.RegisterFile("tendermint/state/types.proto", fileDescriptor_ccfacf933f22bf93) } var fileDescriptor_ccfacf933f22bf93 = []byte{ - // 805 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x8e, 0xe3, 0x44, - 0x10, 0x8e, 0xc9, 0x6e, 0x7e, 0xca, 0x93, 0x64, 0xb7, 0x07, 0x21, 0x6f, 0x96, 0x75, 0xb2, 0xe1, - 0x47, 0x23, 0x0e, 0x8e, 0xb4, 0x1c, 0x10, 0x97, 0x95, 0xd6, 0x09, 0xb0, 0x91, 0x56, 0x08, 0x3c, - 0xa3, 0x39, 0x70, 0xb1, 0x3a, 0x71, 0x8f, 0x6d, 0x91, 0xd8, 0x96, 0xbb, 0x13, 0x86, 0x07, 0xe0, - 0x3e, 0x57, 0xde, 0x68, 0x8e, 0x73, 0x44, 0x1c, 0x06, 0xc8, 0xbc, 0x08, 0xea, 0x1f, 0xdb, 0x9d, - 0x84, 0x91, 0x06, 0xed, 0xad, 0x5d, 0xf5, 0xd5, 0x57, 0x5f, 0x55, 0x57, 0xb5, 0xe1, 0x63, 0x46, - 0x92, 0x80, 0xe4, 0xab, 0x38, 0x61, 0x63, 0xca, 0x30, 0x23, 0x63, 0xf6, 0x6b, 0x46, 0xa8, 0x93, - 0xe5, 0x29, 0x4b, 0xd1, 0x93, 0xca, 0xeb, 0x08, 0x6f, 0xff, 0xc3, 0x30, 0x0d, 0x53, 0xe1, 0x1c, - 0xf3, 0x93, 0xc4, 0xf5, 0x9f, 0x6b, 0x2c, 0x78, 0xbe, 0x88, 0x75, 0x92, 0xbe, 0x9e, 0x42, 0xd8, - 0x77, 0xbc, 0xc3, 0x03, 0xef, 0x06, 0x2f, 0xe3, 0x00, 0xb3, 0x34, 0x57, 0x88, 0x17, 0x07, 0x88, - 0x0c, 0xe7, 0x78, 0x55, 0x10, 0xd8, 0x9a, 0x7b, 0x43, 0x72, 0x1a, 0xa7, 0xc9, 0x4e, 0x82, 0x41, - 0x98, 0xa6, 0xe1, 0x92, 0x8c, 0xc5, 0xd7, 0x7c, 0x7d, 0x31, 0x66, 0xf1, 0x8a, 0x50, 0x86, 0x57, - 0x99, 0x04, 0x8c, 0xfe, 0x34, 0xa0, 0xf3, 0xc6, 0x9d, 0xcc, 0x3c, 0x42, 0xb3, 0x34, 0xa1, 0x84, - 0xa2, 0x09, 0x98, 0x01, 0x59, 0xc6, 0x1b, 0x92, 0xfb, 0xec, 0x92, 0x5a, 0xc6, 0xb0, 0x7e, 0x62, - 0xbe, 0x1a, 0x39, 0x5a, 0x33, 0x78, 0x91, 0x4e, 0x11, 0x30, 0x95, 0xd8, 0xb3, 0x4b, 0x0f, 0x82, - 0xe2, 0x48, 0xd1, 0x6b, 0x68, 0x93, 0x24, 0xf0, 0xe7, 0xcb, 0x74, 0xf1, 0xb3, 0xf5, 0xc1, 0xd0, - 0x38, 0x31, 0x5f, 0xbd, 0xbc, 0x97, 0xe2, 0x9b, 0x24, 0x70, 0x39, 0xd0, 0x6b, 0x11, 0x75, 0x42, - 0x53, 0x30, 0xe7, 0x24, 0x8c, 0x13, 0xc5, 0x50, 0x17, 0x0c, 0x9f, 0xdc, 0xcb, 0xe0, 0x72, 0xac, - 0xe4, 0x80, 0x79, 0x79, 0x1e, 0xfd, 0x66, 0x40, 0xf7, 0xbc, 0x68, 0x28, 0x9d, 0x25, 0x17, 0x29, - 0x9a, 0x40, 0xa7, 0x6c, 0xb1, 0x4f, 0x09, 0xb3, 0x0c, 0x41, 0x6d, 0xeb, 0xd4, 0xb2, 0x81, 0x65, - 0xe0, 0x29, 0x61, 0xde, 0xd1, 0x46, 0xfb, 0x42, 0x0e, 0x1c, 0x2f, 0x31, 0x65, 0x7e, 0x44, 0xe2, - 0x30, 0x62, 0xfe, 0x22, 0xc2, 0x49, 0x48, 0x02, 0x51, 0x67, 0xdd, 0x7b, 0xca, 0x5d, 0x6f, 0x85, - 0x67, 0x22, 0x1d, 0xa3, 0xdf, 0x0d, 0x38, 0x9e, 0x70, 0x9d, 0x09, 0x5d, 0xd3, 0x1f, 0xc4, 0xfd, - 0x09, 0x31, 0x1e, 0x3c, 0x59, 0x14, 0x66, 0x5f, 0xde, 0xab, 0xd2, 0xf3, 0xf2, 0x50, 0xcf, 0x1e, - 0x81, 0xfb, 0xe8, 0xfa, 0x76, 0x50, 0xf3, 0x7a, 0x8b, 0x5d, 0xf3, 0xff, 0xd6, 0x46, 0xe1, 0xe9, - 0xce, 0xfd, 0x0b, 0x61, 0xdf, 0x42, 0x97, 0xf7, 0xd7, 0xcf, 0x0b, 0xab, 0x92, 0x35, 0x70, 0xf6, - 0x77, 0xc2, 0xd9, 0x09, 0xf6, 0x3a, 0x3c, 0xac, 0x9a, 0xa5, 0x8f, 0xa0, 0x21, 0x75, 0xa8, 0xfc, - 0xea, 0x6b, 0x14, 0x41, 0xf3, 0x5c, 0x4e, 0x2b, 0x7a, 0x03, 0xed, 0xb2, 0x04, 0x95, 0xe5, 0x85, - 0x9e, 0x45, 0x4d, 0x75, 0x55, 0xbe, 0x2a, 0xbc, 0x8a, 0x42, 0x7d, 0x68, 0xd1, 0xf4, 0x82, 0xfd, - 0x82, 0x73, 0x22, 0xf2, 0xb4, 0xbd, 0xf2, 0x7b, 0xf4, 0x4f, 0x03, 0x1e, 0x9f, 0x72, 0xa1, 0xe8, - 0x6b, 0x68, 0x2a, 0x2e, 0x95, 0xe6, 0xd9, 0x61, 0x31, 0x4a, 0x94, 0x4a, 0x51, 0xe0, 0xd1, 0xe7, - 0xd0, 0x5a, 0x44, 0x38, 0x4e, 0xfc, 0x58, 0x36, 0xb2, 0xed, 0x9a, 0xdb, 0xdb, 0x41, 0x73, 0xc2, - 0x6d, 0xb3, 0xa9, 0xd7, 0x14, 0xce, 0x59, 0x80, 0x3e, 0x83, 0x6e, 0x9c, 0xc4, 0x2c, 0xc6, 0x4b, - 0xd5, 0x7e, 0xab, 0x2b, 0xca, 0xee, 0x28, 0xab, 0xec, 0x3c, 0xfa, 0x02, 0xc4, 0x3d, 0xc8, 0xd9, - 0x2e, 0x90, 0x75, 0x81, 0xec, 0x71, 0x87, 0x18, 0x5e, 0x85, 0xf5, 0xa0, 0xa3, 0x61, 0xe3, 0xc0, - 0x7a, 0x74, 0xa8, 0x5d, 0xce, 0x87, 0x88, 0x9a, 0x4d, 0xdd, 0x63, 0xae, 0x7d, 0x7b, 0x3b, 0x30, - 0xdf, 0x15, 0x54, 0xb3, 0xa9, 0x67, 0x96, 0xbc, 0xb3, 0x00, 0xbd, 0x83, 0x9e, 0xc6, 0xc9, 0x5f, - 0x04, 0xeb, 0xb1, 0x60, 0xed, 0x3b, 0xf2, 0xb9, 0x70, 0x8a, 0xe7, 0xc2, 0x39, 0x2b, 0x9e, 0x0b, - 0xb7, 0xc5, 0x69, 0xaf, 0xfe, 0x1a, 0x18, 0x5e, 0xa7, 0xe4, 0xe2, 0x5e, 0xf4, 0x1d, 0xf4, 0x12, - 0x72, 0xc9, 0xfc, 0x72, 0x43, 0xa8, 0xd5, 0x78, 0xd0, 0x4e, 0x75, 0x79, 0x58, 0xb5, 0x9e, 0xe8, - 0x35, 0x80, 0xc6, 0xd1, 0x7c, 0x10, 0x87, 0x16, 0xc1, 0x85, 0x88, 0xb2, 0x34, 0x92, 0xd6, 0xc3, - 0x84, 0xf0, 0x30, 0x4d, 0xc8, 0x04, 0x6c, 0x7d, 0x85, 0x2a, 0xbe, 0x72, 0x9b, 0xda, 0xe2, 0xb2, - 0x9e, 0x57, 0xdb, 0x54, 0x45, 0xab, 0xbd, 0xfa, 0xcf, 0xdd, 0x86, 0xf7, 0xdc, 0xed, 0xef, 0xe1, - 0xd3, 0x9d, 0xdd, 0xde, 0xe3, 0x2f, 0xe5, 0x99, 0x42, 0xde, 0x50, 0x5b, 0xf6, 0x5d, 0xa2, 0x42, - 0x63, 0x31, 0x88, 0x39, 0xa1, 0xeb, 0x25, 0xa3, 0x7e, 0x84, 0x69, 0x64, 0x1d, 0x0d, 0x8d, 0x93, - 0x23, 0x39, 0x88, 0x9e, 0xb4, 0xbf, 0xc5, 0x34, 0x42, 0xcf, 0xa0, 0x85, 0xb3, 0x4c, 0x42, 0x3a, - 0x02, 0xd2, 0xc4, 0x59, 0xc6, 0x5d, 0xee, 0x8f, 0xd7, 0x5b, 0xdb, 0xb8, 0xd9, 0xda, 0xc6, 0xdf, - 0x5b, 0xdb, 0xb8, 0xba, 0xb3, 0x6b, 0x37, 0x77, 0x76, 0xed, 0x8f, 0x3b, 0xbb, 0xf6, 0xd3, 0x57, - 0x61, 0xcc, 0xa2, 0xf5, 0xdc, 0x59, 0xa4, 0xab, 0xb1, 0xfe, 0x23, 0xab, 0x8e, 0xf2, 0x6f, 0xba, - 0xff, 0x1f, 0x9e, 0x37, 0x84, 0xfd, 0xcb, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x1a, 0xb9, - 0x2e, 0xa2, 0x07, 0x00, 0x00, + // 807 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbd, 0x8e, 0xdb, 0x46, + 0x10, 0x3e, 0xe6, 0x6c, 0xfd, 0x0c, 0x4f, 0x92, 0xbd, 0x17, 0x04, 0xb4, 0x1c, 0x53, 0xb2, 0xf2, + 0x83, 0x43, 0x0a, 0x0a, 0xb0, 0xab, 0x34, 0x06, 0x4c, 0x29, 0x89, 0x05, 0x38, 0x41, 0x40, 0x1b, + 0x2e, 0xd2, 0x10, 0x4b, 0x72, 0x45, 0x12, 0x91, 0x48, 0x82, 0xbb, 0x52, 0x2e, 0x0f, 0x90, 0xde, + 0x6d, 0xde, 0xc8, 0xa5, 0xcb, 0x20, 0xc5, 0x25, 0xd1, 0xbd, 0x48, 0xb0, 0x3f, 0x24, 0x57, 0x52, + 0x0e, 0xb8, 0xc0, 0xdd, 0x72, 0xe6, 0x9b, 0x6f, 0xbe, 0x99, 0x9d, 0x59, 0xc2, 0xa7, 0x8c, 0x64, + 0x11, 0x29, 0xd7, 0x69, 0xc6, 0xa6, 0x94, 0x61, 0x46, 0xa6, 0xec, 0xd7, 0x82, 0x50, 0xa7, 0x28, + 0x73, 0x96, 0xa3, 0x7b, 0x8d, 0xd7, 0x11, 0xde, 0xe1, 0xc7, 0x71, 0x1e, 0xe7, 0xc2, 0x39, 0xe5, + 0x27, 0x89, 0x1b, 0x3e, 0xd4, 0x58, 0x70, 0x10, 0xa6, 0x3a, 0xc9, 0x50, 0x4f, 0x21, 0xec, 0x7b, + 0xde, 0xf1, 0x91, 0x77, 0x8b, 0x57, 0x69, 0x84, 0x59, 0x5e, 0x2a, 0xc4, 0xa3, 0x23, 0x44, 0x81, + 0x4b, 0xbc, 0xae, 0x08, 0x6c, 0xcd, 0xbd, 0x25, 0x25, 0x4d, 0xf3, 0x6c, 0x2f, 0xc1, 0x28, 0xce, + 0xf3, 0x78, 0x45, 0xa6, 0xe2, 0x2b, 0xd8, 0x2c, 0xa7, 0x2c, 0x5d, 0x13, 0xca, 0xf0, 0xba, 0x90, + 0x80, 0xc9, 0x9f, 0x06, 0xf4, 0x9e, 0xbb, 0xb3, 0x85, 0x47, 0x68, 0x91, 0x67, 0x94, 0x50, 0x34, + 0x03, 0x33, 0x22, 0xab, 0x74, 0x4b, 0x4a, 0x9f, 0x5d, 0x52, 0xcb, 0x18, 0x9f, 0x5e, 0x98, 0x4f, + 0x26, 0x8e, 0xd6, 0x0c, 0x5e, 0xa4, 0x53, 0x05, 0xcc, 0x25, 0xf6, 0xf5, 0xa5, 0x07, 0x51, 0x75, + 0xa4, 0xe8, 0x19, 0x74, 0x49, 0x16, 0xf9, 0xc1, 0x2a, 0x0f, 0x7f, 0xb6, 0x3e, 0x1a, 0x1b, 0x17, + 0xe6, 0x93, 0xc7, 0x37, 0x52, 0x7c, 0x93, 0x45, 0x2e, 0x07, 0x7a, 0x1d, 0xa2, 0x4e, 0x68, 0x0e, + 0x66, 0x40, 0xe2, 0x34, 0x53, 0x0c, 0xa7, 0x82, 0xe1, 0xb3, 0x1b, 0x19, 0x5c, 0x8e, 0x95, 0x1c, + 0x10, 0xd4, 0xe7, 0xc9, 0x6f, 0x06, 0xf4, 0xdf, 0x54, 0x0d, 0xa5, 0x8b, 0x6c, 0x99, 0xa3, 0x19, + 0xf4, 0xea, 0x16, 0xfb, 0x94, 0x30, 0xcb, 0x10, 0xd4, 0xb6, 0x4e, 0x2d, 0x1b, 0x58, 0x07, 0xbe, + 0x22, 0xcc, 0x3b, 0xdb, 0x6a, 0x5f, 0xc8, 0x81, 0xf3, 0x15, 0xa6, 0xcc, 0x4f, 0x48, 0x1a, 0x27, + 0xcc, 0x0f, 0x13, 0x9c, 0xc5, 0x24, 0x12, 0x75, 0x9e, 0x7a, 0xf7, 0xb9, 0xeb, 0x85, 0xf0, 0xcc, + 0xa4, 0x63, 0xf2, 0xbb, 0x01, 0xe7, 0x33, 0xae, 0x33, 0xa3, 0x1b, 0xfa, 0xa3, 0xb8, 0x3f, 0x21, + 0xc6, 0x83, 0x7b, 0x61, 0x65, 0xf6, 0xe5, 0xbd, 0x2a, 0x3d, 0x8f, 0x8f, 0xf5, 0x1c, 0x10, 0xb8, + 0x77, 0xde, 0x5d, 0x8d, 0x4e, 0xbc, 0x41, 0xb8, 0x6f, 0xfe, 0xdf, 0xda, 0x28, 0xdc, 0xdf, 0xbb, + 0x7f, 0x21, 0xec, 0x5b, 0xe8, 0xf3, 0xfe, 0xfa, 0x65, 0x65, 0x55, 0xb2, 0x46, 0xce, 0xe1, 0x4e, + 0x38, 0x7b, 0xc1, 0x5e, 0x8f, 0x87, 0x35, 0xb3, 0xf4, 0x09, 0xb4, 0xa4, 0x0e, 0x95, 0x5f, 0x7d, + 0x4d, 0x12, 0x68, 0xbf, 0x91, 0xd3, 0x8a, 0x9e, 0x43, 0xb7, 0x2e, 0x41, 0x65, 0x79, 0xa4, 0x67, + 0x51, 0x53, 0xdd, 0x94, 0xaf, 0x0a, 0x6f, 0xa2, 0xd0, 0x10, 0x3a, 0x34, 0x5f, 0xb2, 0x5f, 0x70, + 0x49, 0x44, 0x9e, 0xae, 0x57, 0x7f, 0x4f, 0xfe, 0x69, 0xc1, 0xdd, 0x57, 0x5c, 0x28, 0xfa, 0x1a, + 0xda, 0x8a, 0x4b, 0xa5, 0x79, 0x70, 0x5c, 0x8c, 0x12, 0xa5, 0x52, 0x54, 0x78, 0xf4, 0x25, 0x74, + 0xc2, 0x04, 0xa7, 0x99, 0x9f, 0xca, 0x46, 0x76, 0x5d, 0x73, 0x77, 0x35, 0x6a, 0xcf, 0xb8, 0x6d, + 0x31, 0xf7, 0xda, 0xc2, 0xb9, 0x88, 0xd0, 0x17, 0xd0, 0x4f, 0xb3, 0x94, 0xa5, 0x78, 0xa5, 0xda, + 0x6f, 0xf5, 0x45, 0xd9, 0x3d, 0x65, 0x95, 0x9d, 0x47, 0x5f, 0x81, 0xb8, 0x07, 0x39, 0xdb, 0x15, + 0xf2, 0x54, 0x20, 0x07, 0xdc, 0x21, 0x86, 0x57, 0x61, 0x3d, 0xe8, 0x69, 0xd8, 0x34, 0xb2, 0xee, + 0x1c, 0x6b, 0x97, 0xf3, 0x21, 0xa2, 0x16, 0x73, 0xf7, 0x9c, 0x6b, 0xdf, 0x5d, 0x8d, 0xcc, 0x97, + 0x15, 0xd5, 0x62, 0xee, 0x99, 0x35, 0xef, 0x22, 0x42, 0x2f, 0x61, 0xa0, 0x71, 0xf2, 0x17, 0xc1, + 0xba, 0x2b, 0x58, 0x87, 0x8e, 0x7c, 0x2e, 0x9c, 0xea, 0xb9, 0x70, 0x5e, 0x57, 0xcf, 0x85, 0xdb, + 0xe1, 0xb4, 0x6f, 0xff, 0x1a, 0x19, 0x5e, 0xaf, 0xe6, 0xe2, 0x5e, 0xf4, 0x1d, 0x0c, 0x32, 0x72, + 0xc9, 0xfc, 0x7a, 0x43, 0xa8, 0xd5, 0xba, 0xd5, 0x4e, 0xf5, 0x79, 0x58, 0xb3, 0x9e, 0xe8, 0x19, + 0x80, 0xc6, 0xd1, 0xbe, 0x15, 0x87, 0x16, 0xc1, 0x85, 0x88, 0xb2, 0x34, 0x92, 0xce, 0xed, 0x84, + 0xf0, 0x30, 0x4d, 0xc8, 0x0c, 0x6c, 0x7d, 0x85, 0x1a, 0xbe, 0x7a, 0x9b, 0xba, 0xe2, 0xb2, 0x1e, + 0x36, 0xdb, 0xd4, 0x44, 0xab, 0xbd, 0xfa, 0xcf, 0xdd, 0x86, 0x0f, 0xdc, 0xed, 0x1f, 0xe0, 0xf3, + 0xbd, 0xdd, 0x3e, 0xe0, 0xaf, 0xe5, 0x99, 0x42, 0xde, 0x58, 0x5b, 0xf6, 0x7d, 0xa2, 0x4a, 0x63, + 0x35, 0x88, 0x25, 0xa1, 0x9b, 0x15, 0xa3, 0x7e, 0x82, 0x69, 0x62, 0x9d, 0x8d, 0x8d, 0x8b, 0x33, + 0x39, 0x88, 0x9e, 0xb4, 0xbf, 0xc0, 0x34, 0x41, 0x0f, 0xa0, 0x83, 0x8b, 0x42, 0x42, 0x7a, 0x02, + 0xd2, 0xc6, 0x45, 0xc1, 0x5d, 0xee, 0xf7, 0xef, 0x76, 0xb6, 0xf1, 0x7e, 0x67, 0x1b, 0x7f, 0xef, + 0x6c, 0xe3, 0xed, 0xb5, 0x7d, 0xf2, 0xfe, 0xda, 0x3e, 0xf9, 0xe3, 0xda, 0x3e, 0xf9, 0xe9, 0x69, + 0x9c, 0xb2, 0x64, 0x13, 0x38, 0x61, 0xbe, 0x9e, 0x86, 0xf9, 0x9a, 0xb0, 0x60, 0xc9, 0x9a, 0x83, + 0xfc, 0x93, 0x1e, 0xfe, 0x83, 0x83, 0x96, 0xb0, 0x3f, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0xdd, + 0xc0, 0x8c, 0x41, 0x9e, 0x07, 0x00, 0x00, } func (m *ABCIResponses) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/statesync/types.pb.go b/proto/tendermint/statesync/types.pb.go index c54d57798a..a45dffaf50 100644 --- a/proto/tendermint/statesync/types.pb.go +++ b/proto/tendermint/statesync/types.pb.go @@ -393,32 +393,32 @@ func init() { func init() { proto.RegisterFile("tendermint/statesync/types.proto", fileDescriptor_a1c2869546ca7914) } var fileDescriptor_a1c2869546ca7914 = []byte{ - // 393 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, 0x07, 0x61, 0x54, 0x68, 0x7b, 0x92, - 0xa0, 0x3d, 0xf6, 0xe6, 0x5e, 0x5c, 0x68, 0x2f, 0xdb, 0x18, 0x42, 0x2e, 0x61, 0x2d, 0x6f, 0x24, - 0x11, 0xb4, 0x52, 0xf4, 0xad, 0x20, 0x7e, 0x80, 0x9c, 0x72, 0xc9, 0x63, 0xe5, 0xe8, 0x63, 0xc8, - 0x29, 0xd8, 0x2f, 0x12, 0xb4, 0x92, 0x65, 0xc5, 0x31, 0x09, 0x81, 0xdc, 0x76, 0xc6, 0xe3, 0xd1, - 0xcc, 0xc0, 0x07, 0x63, 0xc9, 0xc5, 0x82, 0xa7, 0x51, 0x28, 0xa4, 0x8b, 0x92, 0x49, 0x8e, 0x4b, - 0xe1, 0xb9, 0x72, 0x99, 0x70, 0x74, 0x92, 0x34, 0x96, 0x31, 0x19, 0xed, 0x14, 0x4e, 0xa5, 0xb0, - 0xef, 0x1b, 0xd0, 0xfd, 0xc7, 0x11, 0x99, 0xcf, 0xc9, 0x0c, 0x86, 0x28, 0x58, 0x82, 0x41, 0x2c, - 0xf1, 0x34, 0xe5, 0x17, 0x19, 0x47, 0x69, 0xea, 0x63, 0xfd, 0xfb, 0x87, 0x1f, 0x5f, 0x9d, 0x43, - 0xff, 0x76, 0xfe, 0x6f, 0xe5, 0xb4, 0x50, 0x4f, 0x35, 0x3a, 0xc0, 0x3d, 0x8e, 0x1c, 0x03, 0xa9, - 0xdb, 0x62, 0x12, 0x0b, 0xe4, 0x66, 0x43, 0xf9, 0x7e, 0x7b, 0xd5, 0xb7, 0x90, 0x4f, 0x35, 0x3a, - 0xc4, 0x7d, 0x92, 0xfc, 0x01, 0xc3, 0x0b, 0x32, 0x71, 0x5e, 0x85, 0x6d, 0x2a, 0x53, 0xfb, 0xb0, - 0xe9, 0xef, 0x5c, 0xba, 0x0b, 0xda, 0xf7, 0x6a, 0x98, 0xfc, 0x85, 0x8f, 0x5b, 0xab, 0x32, 0x60, - 0x4b, 0x79, 0x7d, 0x79, 0xd1, 0xab, 0x0a, 0x67, 0x78, 0x75, 0x62, 0xd2, 0x86, 0x26, 0x66, 0x91, - 0x4d, 0x60, 0xb0, 0xbf, 0x90, 0x7d, 0xad, 0xc3, 0xf0, 0x59, 0x3d, 0xf2, 0x09, 0x3a, 0x01, 0x0f, - 0xfd, 0xa0, 0xd8, 0xbb, 0x45, 0x4b, 0x94, 0xf3, 0x67, 0x71, 0x1a, 0x31, 0xa9, 0xf6, 0x32, 0x68, - 0x89, 0x72, 0x5e, 0x7d, 0x11, 0x55, 0x65, 0x83, 0x96, 0x88, 0x10, 0x68, 0x05, 0x0c, 0x03, 0x15, - 0xbe, 0x4f, 0xd5, 0x9b, 0x7c, 0x86, 0x5e, 0xc4, 0x25, 0x5b, 0x30, 0xc9, 0xcc, 0xb6, 0xe2, 0x2b, - 0x6c, 0x1f, 0x41, 0xbf, 0x3e, 0xcb, 0x9b, 0x73, 0x8c, 0xa0, 0x1d, 0x8a, 0x05, 0xbf, 0x2c, 0x63, - 0x14, 0xc0, 0xbe, 0xd2, 0xc1, 0x78, 0xb2, 0xd0, 0xfb, 0xf8, 0xe6, 0xac, 0xea, 0x59, 0xd6, 0x2b, - 0x00, 0x31, 0xa1, 0x1b, 0x85, 0x88, 0xa1, 0xf0, 0x55, 0xbd, 0x1e, 0xdd, 0xc2, 0xc9, 0xec, 0x76, - 0x6d, 0xe9, 0xab, 0xb5, 0xa5, 0x3f, 0xac, 0x2d, 0xfd, 0x66, 0x63, 0x69, 0xab, 0x8d, 0xa5, 0xdd, - 0x6d, 0x2c, 0xed, 0xe4, 0x97, 0x1f, 0xca, 0x20, 0x9b, 0x3b, 0x5e, 0x1c, 0xb9, 0xb5, 0xcb, 0xa9, - 0x3d, 0xd5, 0xd1, 0xb8, 0x87, 0xae, 0x6a, 0xde, 0x51, 0xbf, 0xfd, 0x7c, 0x0c, 0x00, 0x00, 0xff, - 0xff, 0xcc, 0x16, 0xc2, 0x8b, 0x74, 0x03, 0x00, 0x00, + // 397 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x3f, 0x6b, 0xdb, 0x40, + 0x1c, 0x95, 0xfc, 0x9f, 0x5f, 0xad, 0x62, 0x1f, 0xa6, 0x88, 0x0e, 0xc2, 0xa8, 0xd0, 0x76, 0x92, + 0xa0, 0x1d, 0xba, 0xbb, 0x8b, 0x0b, 0xed, 0xd0, 0x6b, 0x03, 0x21, 0x4b, 0x38, 0xcb, 0x67, 0x49, + 0x04, 0x9d, 0x14, 0xfd, 0x4e, 0x10, 0x7f, 0x80, 0x4c, 0x59, 0xf2, 0xb1, 0x32, 0x7a, 0x0c, 0x99, + 0x82, 0xfd, 0x45, 0x82, 0x4e, 0xb2, 0xac, 0x38, 0x26, 0x21, 0x90, 0xed, 0xde, 0xd3, 0xd3, 0xbb, + 0xf7, 0x1e, 0x1c, 0x8c, 0x25, 0x17, 0x73, 0x9e, 0x46, 0xa1, 0x90, 0x2e, 0x4a, 0x26, 0x39, 0x2e, + 0x85, 0xe7, 0xca, 0x65, 0xc2, 0xd1, 0x49, 0xd2, 0x58, 0xc6, 0x64, 0xb4, 0x53, 0x38, 0x95, 0xc2, + 0xbe, 0x6b, 0x40, 0xf7, 0x0f, 0x47, 0x64, 0x3e, 0x27, 0x47, 0x30, 0x44, 0xc1, 0x12, 0x0c, 0x62, + 0x89, 0xa7, 0x29, 0x3f, 0xcf, 0x38, 0x4a, 0x53, 0x1f, 0xeb, 0x5f, 0xdf, 0x7d, 0xfb, 0xec, 0x1c, + 0xfa, 0xdb, 0xf9, 0xb7, 0x95, 0xd3, 0x42, 0x3d, 0xd5, 0xe8, 0x00, 0xf7, 0x38, 0x72, 0x0c, 0xa4, + 0x6e, 0x8b, 0x49, 0x2c, 0x90, 0x9b, 0x0d, 0xe5, 0xfb, 0xe5, 0x45, 0xdf, 0x42, 0x3e, 0xd5, 0xe8, + 0x10, 0xf7, 0x49, 0xf2, 0x0b, 0x0c, 0x2f, 0xc8, 0xc4, 0x59, 0x15, 0xb6, 0xa9, 0x4c, 0xed, 0xc3, + 0xa6, 0x3f, 0x73, 0xe9, 0x2e, 0x68, 0xdf, 0xab, 0x61, 0xf2, 0x1b, 0xde, 0x6f, 0xad, 0xca, 0x80, + 0x2d, 0xe5, 0xf5, 0xe9, 0x59, 0xaf, 0x2a, 0x9c, 0xe1, 0xd5, 0x89, 0x49, 0x1b, 0x9a, 0x98, 0x45, + 0x36, 0x81, 0xc1, 0xfe, 0x42, 0xf6, 0x95, 0x0e, 0xc3, 0x27, 0xf5, 0xc8, 0x07, 0xe8, 0x04, 0x3c, + 0xf4, 0x83, 0x62, 0xef, 0x16, 0x2d, 0x51, 0xce, 0x2f, 0xe2, 0x34, 0x62, 0x52, 0xed, 0x65, 0xd0, + 0x12, 0xe5, 0xbc, 0xba, 0x11, 0x55, 0x65, 0x83, 0x96, 0x88, 0x10, 0x68, 0x05, 0x0c, 0x03, 0x15, + 0xbe, 0x4f, 0xd5, 0x99, 0x7c, 0x84, 0x5e, 0xc4, 0x25, 0x9b, 0x33, 0xc9, 0xcc, 0xb6, 0xe2, 0x2b, + 0x6c, 0xff, 0x87, 0x7e, 0x7d, 0x96, 0x57, 0xe7, 0x18, 0x41, 0x3b, 0x14, 0x73, 0x7e, 0x51, 0xc6, + 0x28, 0x80, 0x7d, 0xa9, 0x83, 0xf1, 0x68, 0xa1, 0xb7, 0xf1, 0xcd, 0x59, 0xd5, 0xb3, 0xac, 0x57, + 0x00, 0x62, 0x42, 0x37, 0x0a, 0x11, 0x43, 0xe1, 0xab, 0x7a, 0x3d, 0xba, 0x85, 0x93, 0xbf, 0x37, + 0x6b, 0x4b, 0x5f, 0xad, 0x2d, 0xfd, 0x7e, 0x6d, 0xe9, 0xd7, 0x1b, 0x4b, 0x5b, 0x6d, 0x2c, 0xed, + 0x76, 0x63, 0x69, 0x27, 0x3f, 0xfc, 0x50, 0x06, 0xd9, 0xcc, 0xf1, 0xe2, 0xc8, 0xf5, 0xe2, 0x88, + 0xcb, 0xd9, 0x42, 0xee, 0x0e, 0xea, 0xc1, 0xb8, 0x87, 0x5e, 0xd4, 0xac, 0xa3, 0xbe, 0x7d, 0x7f, + 0x08, 0x00, 0x00, 0xff, 0xff, 0x04, 0xbe, 0xb0, 0x90, 0x70, 0x03, 0x00, 0x00, } func (m *Message) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/store/types.pb.go b/proto/tendermint/store/types.pb.go index 384fbe52ae..ce29389f5a 100644 --- a/proto/tendermint/store/types.pb.go +++ b/proto/tendermint/store/types.pb.go @@ -81,18 +81,18 @@ func init() { func init() { proto.RegisterFile("tendermint/store/types.proto", fileDescriptor_ff9e53a0a74267f7) } var fileDescriptor_ff9e53a0a74267f7 = []byte{ - // 165 bytes of a gzipped FileDescriptorProto + // 171 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0xc8, 0xea, 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, 0x05, 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, 0x79, 0x7a, 0x66, - 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x92, 0x9b, 0x90, 0x98, 0x60, 0x27, 0xe9, - 0xa3, 0xbb, 0x37, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xef, 0xa6, 0x30, - 0x63, 0xca, 0x00, 0x00, 0x00, + 0x39, 0xf9, 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, 0x71, 0x7a, 0x66, + 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x72, 0x7e, 0x6e, 0x6a, 0x49, 0x52, 0x5a, + 0x09, 0x82, 0x01, 0x76, 0x8e, 0x3e, 0xba, 0x5b, 0x93, 0xd8, 0xc0, 0xe2, 0xc6, 0x80, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xb7, 0x2b, 0x34, 0x2a, 0xc6, 0x00, 0x00, 0x00, } func (m *BlockStoreState) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/block.pb.go b/proto/tendermint/types/block.pb.go index f2077aad8b..b8016552e2 100644 --- a/proto/tendermint/types/block.pb.go +++ b/proto/tendermint/types/block.pb.go @@ -98,7 +98,7 @@ func init() { func init() { proto.RegisterFile("tendermint/types/block.proto", fileDescriptor_70840e82f4357ab1) } var fileDescriptor_70840e82f4357ab1 = []byte{ - // 266 bytes of a gzipped FileDescriptorProto + // 272 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xca, 0xc9, 0x4f, 0xce, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0xc8, 0xea, 0x81, 0x65, 0xa5, @@ -111,11 +111,11 @@ var fileDescriptor_70840e82f4357ab1 = []byte{ 0xab, 0x14, 0x72, 0xe0, 0xe2, 0x80, 0xb9, 0x42, 0x82, 0x19, 0xac, 0x4b, 0x0e, 0x53, 0x97, 0x2b, 0x54, 0x85, 0x4f, 0x66, 0x71, 0x09, 0x54, 0x37, 0x5c, 0x97, 0x90, 0x25, 0x17, 0x77, 0x4e, 0x62, 0x71, 0x49, 0x7c, 0x72, 0x7e, 0x6e, 0x6e, 0x66, 0x89, 0x04, 0x0b, 0x2e, 0x07, 0x3b, 0x83, 0xe5, - 0x83, 0xb8, 0x40, 0x8a, 0x21, 0x6c, 0xa7, 0xc0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, + 0x83, 0xb8, 0x40, 0x8a, 0x21, 0x6c, 0x27, 0xdf, 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, 0x4f, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0x0e, - 0x36, 0x04, 0x13, 0x12, 0xf8, 0xe8, 0x41, 0x9a, 0xc4, 0x06, 0x16, 0x37, 0x06, 0x04, 0x00, 0x00, - 0xff, 0xff, 0x79, 0x8c, 0xb5, 0x43, 0xd1, 0x01, 0x00, 0x00, + 0x63, 0x88, 0x32, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, + 0xcf, 0x4d, 0x2d, 0x49, 0x4a, 0x2b, 0x41, 0x30, 0x20, 0x01, 0x8f, 0x1e, 0x9c, 0x49, 0x6c, 0x60, + 0x71, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0xdf, 0xde, 0x0a, 0xcd, 0x01, 0x00, 0x00, } func (m *Block) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 7098310430..3969590262 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -318,38 +318,38 @@ func init() { func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xce, 0xa5, 0x4e, 0xe2, 0x5c, 0x1b, 0x08, 0xa7, 0xaa, 0xb2, 0x22, 0x64, 0x5b, 0x1e, 0x90, - 0x59, 0x6c, 0xa9, 0x1d, 0xd8, 0x5d, 0x06, 0x82, 0x40, 0x94, 0x6b, 0xd5, 0x81, 0x25, 0xba, 0xd8, - 0x87, 0x6d, 0xe1, 0xf8, 0x4e, 0xf6, 0x65, 0xe8, 0xc2, 0x6f, 0xe8, 0xef, 0xe0, 0x97, 0x74, 0xec, - 0x08, 0x4b, 0x40, 0xce, 0x1f, 0x41, 0x77, 0x4e, 0xec, 0xa8, 0x01, 0x16, 0x10, 0xcb, 0xe9, 0xfd, - 0x78, 0xee, 0x79, 0x1f, 0x3d, 0xaf, 0x5e, 0x68, 0x0b, 0x9a, 0x47, 0xb4, 0x58, 0xa4, 0xb9, 0xf0, - 0xc5, 0x0d, 0xa7, 0xa5, 0x1f, 0x92, 0x9c, 0xe5, 0x69, 0x48, 0x32, 0x8f, 0x17, 0x4c, 0x30, 0x34, - 0x6e, 0x11, 0x9e, 0x42, 0x4c, 0x8e, 0x63, 0x16, 0x33, 0xd5, 0xf4, 0x65, 0x54, 0xe3, 0x26, 0x4f, - 0xf7, 0x98, 0xd4, 0xbb, 0xe9, 0x5a, 0x31, 0x63, 0x71, 0x46, 0x7d, 0x95, 0xcd, 0x97, 0x1f, 0x7d, - 0x91, 0x2e, 0x68, 0x29, 0xc8, 0x82, 0xd7, 0x00, 0xe7, 0x33, 0x1c, 0x9f, 0x6f, 0x27, 0x07, 0x19, - 0x0b, 0x3f, 0x4d, 0x5f, 0x22, 0x04, 0xb5, 0x84, 0x94, 0x89, 0x01, 0x6c, 0xe0, 0x1e, 0x61, 0x15, - 0xa3, 0x6b, 0xf8, 0x98, 0x93, 0x42, 0xcc, 0x4a, 0x2a, 0x66, 0x09, 0x25, 0x11, 0x2d, 0x8c, 0xae, - 0x0d, 0xdc, 0xc3, 0x53, 0xd7, 0x7b, 0x28, 0xd4, 0x6b, 0x08, 0x2f, 0x48, 0x21, 0x2e, 0xa9, 0x78, - 0xa5, 0xf0, 0x81, 0x76, 0xb7, 0xb2, 0x3a, 0x78, 0xc4, 0x77, 0x8b, 0x4e, 0x00, 0x4f, 0x7e, 0x0d, - 0x47, 0xc7, 0xb0, 0x27, 0x98, 0x20, 0x99, 0x92, 0x31, 0xc2, 0x75, 0xd2, 0x68, 0xeb, 0xb6, 0xda, - 0x9c, 0x6f, 0x5d, 0xf8, 0xa4, 0x25, 0x29, 0x18, 0x67, 0x25, 0xc9, 0xd0, 0x19, 0xd4, 0xa4, 0x1c, - 0xf5, 0xfd, 0xd1, 0xa9, 0xb5, 0x2f, 0xf3, 0x32, 0x8d, 0x73, 0x1a, 0xbd, 0x2d, 0xe3, 0xab, 0x1b, - 0x4e, 0xb1, 0x02, 0xa3, 0x13, 0xd8, 0x4f, 0x68, 0x1a, 0x27, 0x42, 0x0d, 0x18, 0xe3, 0x4d, 0x26, - 0xc5, 0x14, 0x6c, 0x99, 0x47, 0xc6, 0x81, 0x2a, 0xd7, 0x09, 0x7a, 0x0e, 0x87, 0x9c, 0x65, 0xb3, - 0xba, 0xa3, 0xd9, 0xc0, 0x3d, 0x08, 0x8e, 0xaa, 0x95, 0xa5, 0x5f, 0xbc, 0x7b, 0x83, 0x65, 0x0d, - 0xeb, 0x9c, 0x65, 0x2a, 0x42, 0xaf, 0xa1, 0x3e, 0x97, 0xf6, 0xce, 0xd2, 0xc8, 0xe8, 0x29, 0xe3, - 0x9c, 0x3f, 0x18, 0xb7, 0xd9, 0x44, 0x70, 0x58, 0xad, 0xac, 0xc1, 0x26, 0xc1, 0x03, 0x45, 0x30, - 0x8d, 0x50, 0x00, 0x87, 0xcd, 0x1a, 0x8d, 0xbe, 0x22, 0x9b, 0x78, 0xf5, 0xa2, 0xbd, 0xed, 0xa2, - 0xbd, 0xab, 0x2d, 0x22, 0xd0, 0xa5, 0xef, 0xb7, 0xdf, 0x2d, 0x80, 0xdb, 0x6f, 0xe8, 0x19, 0xd4, - 0xc3, 0x84, 0xa4, 0xb9, 0xd4, 0x33, 0xb0, 0x81, 0x3b, 0xac, 0x67, 0x9d, 0xcb, 0x9a, 0x9c, 0xa5, - 0x9a, 0xd3, 0xc8, 0xf9, 0xd2, 0x85, 0xa3, 0x46, 0xd6, 0x35, 0x13, 0xf4, 0x7f, 0xf8, 0xba, 0x6b, - 0x96, 0xf6, 0x2f, 0xcd, 0xea, 0xfd, 0xbd, 0x59, 0xfd, 0xdf, 0x9b, 0x15, 0xbc, 0xbf, 0xab, 0x4c, - 0x70, 0x5f, 0x99, 0xe0, 0x47, 0x65, 0x82, 0xdb, 0xb5, 0xd9, 0xb9, 0x5f, 0x9b, 0x9d, 0xaf, 0x6b, - 0xb3, 0xf3, 0xe1, 0x45, 0x9c, 0x8a, 0x64, 0x39, 0xf7, 0x42, 0xb6, 0xf0, 0x77, 0x0f, 0xb6, 0x0d, - 0xeb, 0xc3, 0x7e, 0x78, 0xcc, 0xf3, 0xbe, 0xaa, 0x9f, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6d, - 0xdd, 0x12, 0x5d, 0x31, 0x04, 0x00, 0x00, + // 490 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x41, 0x6e, 0x9b, 0x40, + 0x14, 0xf5, 0x38, 0xc4, 0xc6, 0x93, 0xb8, 0x75, 0x47, 0x51, 0x84, 0xac, 0x0a, 0x10, 0x8b, 0x8a, + 0x6e, 0x40, 0x8a, 0x6f, 0x40, 0xba, 0xa8, 0xab, 0x46, 0x8d, 0x26, 0x51, 0x16, 0xdd, 0x58, 0x03, + 0x4c, 0x00, 0x15, 0x98, 0x11, 0x8c, 0x17, 0xd9, 0xf4, 0x0c, 0x39, 0x47, 0x4f, 0x92, 0x65, 0x96, + 0xed, 0xc6, 0xad, 0xf0, 0x45, 0xaa, 0x19, 0x6c, 0x13, 0x25, 0x6d, 0x37, 0xad, 0xba, 0x41, 0xff, + 0xbf, 0xff, 0x78, 0xff, 0xe9, 0x7d, 0x0d, 0xb4, 0x05, 0x2d, 0x63, 0x5a, 0x15, 0x59, 0x29, 0x7c, + 0x71, 0xc3, 0x69, 0xed, 0x47, 0xa4, 0x64, 0x65, 0x16, 0x91, 0xdc, 0xe3, 0x15, 0x13, 0x0c, 0x4d, + 0x3a, 0x86, 0xa7, 0x18, 0xd3, 0xa3, 0x84, 0x25, 0x4c, 0x0d, 0x7d, 0x59, 0xb5, 0xbc, 0xe9, 0xcb, + 0x27, 0x4a, 0xea, 0xbb, 0x99, 0x5a, 0x09, 0x63, 0x49, 0x4e, 0x7d, 0xd5, 0x85, 0xcb, 0x6b, 0x5f, + 0x64, 0x05, 0xad, 0x05, 0x29, 0x78, 0x4b, 0x70, 0x3e, 0xc3, 0xc9, 0xe9, 0x76, 0x73, 0x90, 0xb3, + 0xe8, 0xd3, 0xfc, 0x0d, 0x42, 0x50, 0x4b, 0x49, 0x9d, 0x1a, 0xc0, 0x06, 0xee, 0x21, 0x56, 0x35, + 0xba, 0x82, 0xcf, 0x39, 0xa9, 0xc4, 0xa2, 0xa6, 0x62, 0x91, 0x52, 0x12, 0xd3, 0xca, 0xe8, 0xdb, + 0xc0, 0x3d, 0x38, 0x71, 0xbd, 0xc7, 0x46, 0xbd, 0x9d, 0xe0, 0x39, 0xa9, 0xc4, 0x05, 0x15, 0x6f, + 0x15, 0x3f, 0xd0, 0xee, 0x56, 0x56, 0x0f, 0x8f, 0xf9, 0x43, 0xd0, 0x09, 0xe0, 0xf1, 0xaf, 0xe9, + 0xe8, 0x08, 0xee, 0x0b, 0x26, 0x48, 0xae, 0x6c, 0x8c, 0x71, 0xdb, 0xec, 0xbc, 0xf5, 0x3b, 0x6f, + 0xce, 0xb7, 0x3e, 0x7c, 0xd1, 0x89, 0x54, 0x8c, 0xb3, 0x9a, 0xe4, 0x68, 0x06, 0x35, 0x69, 0x47, + 0xfd, 0xfe, 0xec, 0xc4, 0x7a, 0x6a, 0xf3, 0x22, 0x4b, 0x4a, 0x1a, 0x9f, 0xd5, 0xc9, 0xe5, 0x0d, + 0xa7, 0x58, 0x91, 0xd1, 0x31, 0x1c, 0xa4, 0x34, 0x4b, 0x52, 0xa1, 0x16, 0x4c, 0xf0, 0xa6, 0x93, + 0x66, 0x2a, 0xb6, 0x2c, 0x63, 0x63, 0x4f, 0xc1, 0x6d, 0x83, 0x5e, 0xc3, 0x11, 0x67, 0xf9, 0xa2, + 0x9d, 0x68, 0x36, 0x70, 0xf7, 0x82, 0xc3, 0x66, 0x65, 0xe9, 0xe7, 0x1f, 0xde, 0x63, 0x89, 0x61, + 0x9d, 0xb3, 0x5c, 0x55, 0xe8, 0x1d, 0xd4, 0x43, 0x19, 0xef, 0x22, 0x8b, 0x8d, 0x7d, 0x15, 0x9c, + 0xf3, 0x87, 0xe0, 0x36, 0x97, 0x08, 0x0e, 0x9a, 0x95, 0x35, 0xdc, 0x34, 0x78, 0xa8, 0x04, 0xe6, + 0x31, 0x0a, 0xe0, 0x68, 0x77, 0x46, 0x63, 0xa0, 0xc4, 0xa6, 0x5e, 0x7b, 0x68, 0x6f, 0x7b, 0x68, + 0xef, 0x72, 0xcb, 0x08, 0x74, 0x99, 0xfb, 0xed, 0x77, 0x0b, 0xe0, 0xee, 0x37, 0xf4, 0x0a, 0xea, + 0x51, 0x4a, 0xb2, 0x52, 0xfa, 0x19, 0xda, 0xc0, 0x1d, 0xb5, 0xbb, 0x4e, 0x25, 0x26, 0x77, 0xa9, + 0xe1, 0x3c, 0x76, 0xbe, 0xf4, 0xe1, 0x78, 0x67, 0xeb, 0x8a, 0x09, 0xfa, 0x3f, 0x72, 0x7d, 0x18, + 0x96, 0xf6, 0x2f, 0xc3, 0xda, 0xff, 0xfb, 0xb0, 0x06, 0xbf, 0x0f, 0x2b, 0x38, 0xbb, 0x6b, 0x4c, + 0x70, 0xdf, 0x98, 0xe0, 0x47, 0x63, 0x82, 0xdb, 0xb5, 0xd9, 0xbb, 0x5f, 0x9b, 0xbd, 0xaf, 0x6b, + 0xb3, 0xf7, 0x71, 0x96, 0x64, 0x22, 0x5d, 0x86, 0x5e, 0xc4, 0x0a, 0x3f, 0x62, 0x05, 0x15, 0xe1, + 0xb5, 0xe8, 0x8a, 0xf6, 0x51, 0x3f, 0x7e, 0xc8, 0xe1, 0x40, 0xe1, 0xb3, 0x9f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xc4, 0x4e, 0xf7, 0xa8, 0x2d, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/events.pb.go b/proto/tendermint/types/events.pb.go index a9aa26a799..1f210e37f7 100644 --- a/proto/tendermint/types/events.pb.go +++ b/proto/tendermint/types/events.pb.go @@ -89,7 +89,7 @@ func init() { func init() { proto.RegisterFile("tendermint/types/events.proto", fileDescriptor_72cfafd446dedf7c) } var fileDescriptor_72cfafd446dedf7c = []byte{ - // 189 bytes of a gzipped FileDescriptorProto + // 195 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x2d, 0x4b, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0x48, 0xeb, 0x81, 0xa5, @@ -97,11 +97,12 @@ var fileDescriptor_72cfafd446dedf7c = []byte{ 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, 0x0a, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, + 0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0xf2, 0x3d, 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, 0xf3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, - 0x7d, 0x64, 0xe7, 0x22, 0x98, 0x60, 0xc7, 0xea, 0xa3, 0x7b, 0x25, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, - 0x08, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xe9, 0x14, 0x02, 0xe5, 0x00, 0x00, 0x00, + 0xc6, 0x63, 0x39, 0x86, 0x28, 0xe3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, + 0xfd, 0xe4, 0xfc, 0xdc, 0xd4, 0x92, 0xa4, 0xb4, 0x12, 0x04, 0x03, 0xec, 0x50, 0x7d, 0x74, 0x6f, + 0x24, 0xb1, 0x81, 0xc5, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xb3, 0x7f, 0x37, 0xe1, + 0x00, 0x00, 0x00, } func (m *EventDataRoundState) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/evidence.pb.go b/proto/tendermint/types/evidence.pb.go index daab3dc34f..8e7fb2d9a4 100644 --- a/proto/tendermint/types/evidence.pb.go +++ b/proto/tendermint/types/evidence.pb.go @@ -320,41 +320,41 @@ func init() { func init() { proto.RegisterFile("tendermint/types/evidence.proto", fileDescriptor_6825fabc78e0a168) } var fileDescriptor_6825fabc78e0a168 = []byte{ - // 532 bytes of a gzipped FileDescriptorProto + // 533 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xed, 0x3a, 0xa9, 0xc2, 0xb6, 0x40, 0x58, 0x5a, 0x48, 0x43, 0xe4, 0x44, 0xe1, 0xd0, - 0x48, 0x80, 0x2d, 0x95, 0x03, 0x17, 0x2e, 0x35, 0x20, 0x15, 0x29, 0x42, 0x60, 0xa1, 0x1e, 0xb8, - 0x58, 0x6b, 0x7b, 0xeb, 0xac, 0x6a, 0xef, 0x5a, 0xf1, 0x24, 0xa8, 0x3c, 0x45, 0x1e, 0xab, 0x17, - 0xa4, 0x1e, 0x39, 0x01, 0x4a, 0x78, 0x10, 0xe4, 0xf5, 0x9f, 0x44, 0x75, 0xcc, 0x89, 0x4b, 0xe4, - 0xcc, 0xfc, 0xbe, 0x9d, 0x99, 0xcf, 0xb3, 0x46, 0x7d, 0xa0, 0xdc, 0xa7, 0xd3, 0x88, 0x71, 0x30, - 0xe1, 0x2a, 0xa6, 0x89, 0x49, 0xe7, 0xcc, 0xa7, 0xdc, 0xa3, 0x46, 0x3c, 0x15, 0x20, 0x70, 0x7b, - 0x0d, 0x18, 0x12, 0xe8, 0x1e, 0x04, 0x22, 0x10, 0x32, 0x69, 0xa6, 0x4f, 0x19, 0xd7, 0xed, 0x07, - 0x42, 0x04, 0x21, 0x35, 0xe5, 0x3f, 0x77, 0x76, 0x61, 0x02, 0x8b, 0x68, 0x02, 0x24, 0x8a, 0x73, - 0xa0, 0x57, 0xa9, 0x24, 0x7f, 0xf3, 0xec, 0xa0, 0x92, 0x9d, 0x93, 0x90, 0xf9, 0x04, 0xc4, 0x34, - 0x23, 0x86, 0x7f, 0x54, 0xd4, 0x7a, 0x97, 0xf7, 0x86, 0x09, 0x7a, 0xec, 0xcf, 0xe2, 0x90, 0x79, - 0x04, 0xa8, 0x33, 0x17, 0x40, 0x9d, 0xa2, 0xed, 0x8e, 0x3a, 0x50, 0x47, 0x7b, 0x27, 0xc7, 0xc6, - 0xed, 0xbe, 0x8d, 0xb7, 0x85, 0xe0, 0x5c, 0x00, 0x2d, 0x4e, 0x3a, 0x53, 0xec, 0x43, 0x7f, 0x5b, - 0x02, 0x73, 0xd4, 0x0b, 0x59, 0x30, 0x01, 0xc7, 0x0b, 0x19, 0xe5, 0xe0, 0x10, 0x00, 0xe2, 0x5d, - 0xae, 0xeb, 0xec, 0xc8, 0x3a, 0xcf, 0xaa, 0x75, 0xc6, 0xa9, 0xea, 0x8d, 0x14, 0x9d, 0x4a, 0xcd, - 0x46, 0xad, 0xa3, 0xb0, 0x2e, 0x69, 0x35, 0x91, 0x96, 0xcc, 0xa2, 0xe1, 0x62, 0x07, 0x1d, 0x6e, - 0xed, 0x14, 0xbf, 0x40, 0xbb, 0x72, 0x52, 0x92, 0x8f, 0xf8, 0xa8, 0x5a, 0x3a, 0xe5, 0xed, 0x66, - 0x4a, 0x9d, 0x96, 0xb8, 0x9b, 0x77, 0xfa, 0x4f, 0xdc, 0xc2, 0xcf, 0x11, 0x06, 0x01, 0x24, 0x4c, - 0xdd, 0x64, 0x3c, 0x70, 0x62, 0xf1, 0x95, 0x4e, 0x3b, 0xda, 0x40, 0x1d, 0x69, 0x76, 0x5b, 0x66, - 0xce, 0x65, 0xe2, 0x63, 0x1a, 0xc7, 0xc7, 0xe8, 0x7e, 0xf9, 0x7e, 0x72, 0xb4, 0x21, 0xd1, 0x7b, - 0x65, 0x38, 0x03, 0x2d, 0x74, 0xa7, 0x5c, 0x84, 0x4e, 0x53, 0x36, 0xd2, 0x35, 0xb2, 0x55, 0x31, - 0x8a, 0x55, 0x31, 0x3e, 0x17, 0x84, 0xd5, 0xba, 0xfe, 0xd9, 0x57, 0x16, 0xbf, 0xfa, 0xaa, 0xbd, - 0x96, 0x0d, 0xbf, 0xef, 0xa0, 0xa3, 0x5a, 0x53, 0xf1, 0x7b, 0xf4, 0xc0, 0x13, 0xfc, 0x22, 0x64, - 0x9e, 0xec, 0xdb, 0x0d, 0x85, 0x77, 0x99, 0x3b, 0xd4, 0xab, 0x79, 0x39, 0x56, 0xca, 0xd8, 0xed, - 0x0d, 0x99, 0x8c, 0xe0, 0xa7, 0xe8, 0xae, 0x27, 0xa2, 0x48, 0x70, 0x67, 0x42, 0x53, 0x4e, 0x3a, - 0xa7, 0xd9, 0xfb, 0x59, 0xf0, 0x4c, 0xc6, 0xf0, 0x07, 0x74, 0xe0, 0x5e, 0x7d, 0x23, 0x1c, 0x18, - 0xa7, 0x4e, 0x39, 0x6d, 0xd2, 0xd1, 0x06, 0xda, 0x68, 0xef, 0xe4, 0xc9, 0x16, 0x97, 0x0b, 0xc6, - 0x7e, 0x58, 0x0a, 0xcb, 0x58, 0x52, 0x63, 0x7c, 0xa3, 0xc6, 0xf8, 0xff, 0xe1, 0xe7, 0x18, 0xed, - 0x17, 0xee, 0x8d, 0x59, 0x02, 0xf8, 0x35, 0x6a, 0x6d, 0xdc, 0x1e, 0x4d, 0x1e, 0x59, 0x99, 0xa2, - 0xdc, 0xd3, 0x46, 0x7a, 0xa4, 0x5d, 0x2a, 0xac, 0x4f, 0xd7, 0x4b, 0x5d, 0xbd, 0x59, 0xea, 0xea, - 0xef, 0xa5, 0xae, 0x2e, 0x56, 0xba, 0x72, 0xb3, 0xd2, 0x95, 0x1f, 0x2b, 0x5d, 0xf9, 0xf2, 0x2a, - 0x60, 0x30, 0x99, 0xb9, 0x86, 0x27, 0x22, 0x73, 0xf3, 0x7a, 0xaf, 0x1f, 0xb3, 0xaf, 0xc8, 0xed, - 0xab, 0xef, 0xee, 0xca, 0xf8, 0xcb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x21, 0x16, 0x68, - 0x9d, 0x04, 0x00, 0x00, + 0x10, 0xc6, 0xe3, 0x38, 0xa9, 0xc2, 0xb6, 0x40, 0x58, 0x5a, 0x48, 0x43, 0xe4, 0x44, 0xe1, 0xd0, + 0x48, 0x80, 0x2d, 0xb5, 0x57, 0x2e, 0x35, 0x20, 0x15, 0x29, 0x20, 0x64, 0xa1, 0x1e, 0xb8, 0x58, + 0xeb, 0xcd, 0xc6, 0x59, 0xd5, 0xde, 0x8d, 0xe2, 0x49, 0x50, 0x79, 0x8a, 0x3c, 0x56, 0x2f, 0x48, + 0x3d, 0x72, 0x02, 0x94, 0xf0, 0x20, 0xc8, 0xeb, 0x3f, 0x89, 0xea, 0x98, 0x13, 0x97, 0xc8, 0x99, + 0xf9, 0x7d, 0x3b, 0x33, 0x9f, 0x67, 0x8d, 0xba, 0xc0, 0xc4, 0x88, 0xcd, 0x42, 0x2e, 0xc0, 0x82, + 0xeb, 0x29, 0x8b, 0x2c, 0xb6, 0xe0, 0x23, 0x26, 0x28, 0x33, 0xa7, 0x33, 0x09, 0x12, 0x37, 0x37, + 0x80, 0xa9, 0x80, 0xf6, 0xa1, 0x2f, 0x7d, 0xa9, 0x92, 0x56, 0xfc, 0x94, 0x70, 0xed, 0xae, 0x2f, + 0xa5, 0x1f, 0x30, 0x4b, 0xfd, 0xf3, 0xe6, 0x63, 0x0b, 0x78, 0xc8, 0x22, 0x20, 0xe1, 0x34, 0x05, + 0x3a, 0x85, 0x4a, 0xea, 0x37, 0xcd, 0xf6, 0x0a, 0xd9, 0x05, 0x09, 0xf8, 0x88, 0x80, 0x9c, 0x25, + 0x44, 0xff, 0x8f, 0x86, 0x1a, 0xef, 0xd2, 0xde, 0x30, 0x41, 0x4f, 0x47, 0xf3, 0x69, 0xc0, 0x29, + 0x01, 0xe6, 0x2e, 0x24, 0x30, 0x37, 0x6b, 0xbb, 0xa5, 0xf5, 0xb4, 0xc1, 0xfe, 0xe9, 0x89, 0x79, + 0xb7, 0x6f, 0xf3, 0x6d, 0x26, 0xb8, 0x94, 0xc0, 0xb2, 0x93, 0x2e, 0x2a, 0xce, 0xd1, 0x68, 0x57, + 0x02, 0x0b, 0xd4, 0x09, 0xb8, 0x3f, 0x01, 0x97, 0x06, 0x9c, 0x09, 0x70, 0x09, 0x00, 0xa1, 0x57, + 0x9b, 0x3a, 0x55, 0x55, 0xe7, 0x45, 0xb1, 0xce, 0x30, 0x56, 0xbd, 0x51, 0xa2, 0x73, 0xa5, 0xd9, + 0xaa, 0x75, 0x1c, 0x94, 0x25, 0xed, 0x3a, 0xd2, 0xa3, 0x79, 0xd8, 0x5f, 0x56, 0xd1, 0xd1, 0xce, + 0x4e, 0xf1, 0x2b, 0xb4, 0xa7, 0x26, 0x25, 0xe9, 0x88, 0x4f, 0x8a, 0xa5, 0x63, 0xde, 0xa9, 0xc7, + 0xd4, 0x79, 0x8e, 0x7b, 0x69, 0xa7, 0xff, 0xc4, 0x6d, 0xfc, 0x12, 0x61, 0x90, 0x40, 0x82, 0xd8, + 0x4d, 0x2e, 0x7c, 0x77, 0x2a, 0xbf, 0xb2, 0x59, 0x4b, 0xef, 0x69, 0x03, 0xdd, 0x69, 0xaa, 0xcc, + 0xa5, 0x4a, 0x7c, 0x8a, 0xe3, 0xf8, 0x04, 0x3d, 0xcc, 0xdf, 0x4f, 0x8a, 0xd6, 0x14, 0xfa, 0x20, + 0x0f, 0x27, 0xa0, 0x8d, 0xee, 0xe5, 0x8b, 0xd0, 0xaa, 0xab, 0x46, 0xda, 0x66, 0xb2, 0x2a, 0x66, + 0xb6, 0x2a, 0xe6, 0xe7, 0x8c, 0xb0, 0x1b, 0x37, 0x3f, 0xbb, 0x95, 0xe5, 0xaf, 0xae, 0xe6, 0x6c, + 0x64, 0xfd, 0xef, 0x55, 0x74, 0x5c, 0x6a, 0x2a, 0x7e, 0x8f, 0x1e, 0x51, 0x29, 0xc6, 0x01, 0xa7, + 0xaa, 0x6f, 0x2f, 0x90, 0xf4, 0x2a, 0x75, 0xa8, 0x53, 0xf2, 0x72, 0xec, 0x98, 0x71, 0x9a, 0x5b, + 0x32, 0x15, 0xc1, 0xcf, 0xd1, 0x7d, 0x2a, 0xc3, 0x50, 0x0a, 0x77, 0xc2, 0x62, 0x4e, 0x39, 0xa7, + 0x3b, 0x07, 0x49, 0xf0, 0x42, 0xc5, 0xf0, 0x47, 0x74, 0xe8, 0x5d, 0x7f, 0x23, 0x02, 0xb8, 0x60, + 0x6e, 0x3e, 0x6d, 0xd4, 0xd2, 0x7b, 0xfa, 0x60, 0xff, 0xf4, 0xd9, 0x0e, 0x97, 0x33, 0xc6, 0x79, + 0x9c, 0x0b, 0xf3, 0x58, 0x54, 0x62, 0x7c, 0xad, 0xc4, 0xf8, 0xff, 0xe1, 0xe7, 0x10, 0x1d, 0x64, + 0xee, 0x0d, 0x79, 0x04, 0xf8, 0x35, 0x6a, 0x6c, 0xdd, 0x1e, 0x5d, 0x1d, 0x59, 0x98, 0x22, 0xdf, + 0xd3, 0x5a, 0x7c, 0xa4, 0x93, 0x2b, 0xec, 0x0f, 0x37, 0x2b, 0x43, 0xbb, 0x5d, 0x19, 0xda, 0xef, + 0x95, 0xa1, 0x2d, 0xd7, 0x46, 0xe5, 0x76, 0x6d, 0x54, 0x7e, 0xac, 0x8d, 0xca, 0x97, 0x33, 0x9f, + 0xc3, 0x64, 0xee, 0x99, 0x54, 0x86, 0x16, 0x95, 0x21, 0x03, 0x6f, 0x0c, 0x9b, 0x87, 0xe4, 0x0b, + 0x72, 0xf7, 0xda, 0x7b, 0x7b, 0x2a, 0x7e, 0xf6, 0x37, 0x00, 0x00, 0xff, 0xff, 0xab, 0xbe, 0xb8, + 0x21, 0x99, 0x04, 0x00, 0x00, } func (m *Evidence) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/params.pb.go b/proto/tendermint/types/params.pb.go index d3deb576ac..7f3761cf2b 100644 --- a/proto/tendermint/types/params.pb.go +++ b/proto/tendermint/types/params.pb.go @@ -30,10 +30,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // ConsensusParams contains consensus critical parameters that determine the // validity of blocks. type ConsensusParams struct { - Block BlockParams `protobuf:"bytes,1,opt,name=block,proto3" json:"block"` - Evidence EvidenceParams `protobuf:"bytes,2,opt,name=evidence,proto3" json:"evidence"` - Validator ValidatorParams `protobuf:"bytes,3,opt,name=validator,proto3" json:"validator"` - Version VersionParams `protobuf:"bytes,4,opt,name=version,proto3" json:"version"` + Block *BlockParams `protobuf:"bytes,1,opt,name=block,proto3" json:"block,omitempty"` + Evidence *EvidenceParams `protobuf:"bytes,2,opt,name=evidence,proto3" json:"evidence,omitempty"` + Validator *ValidatorParams `protobuf:"bytes,3,opt,name=validator,proto3" json:"validator,omitempty"` + Version *VersionParams `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` } func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } @@ -69,32 +69,32 @@ func (m *ConsensusParams) XXX_DiscardUnknown() { var xxx_messageInfo_ConsensusParams proto.InternalMessageInfo -func (m *ConsensusParams) GetBlock() BlockParams { +func (m *ConsensusParams) GetBlock() *BlockParams { if m != nil { return m.Block } - return BlockParams{} + return nil } -func (m *ConsensusParams) GetEvidence() EvidenceParams { +func (m *ConsensusParams) GetEvidence() *EvidenceParams { if m != nil { return m.Evidence } - return EvidenceParams{} + return nil } -func (m *ConsensusParams) GetValidator() ValidatorParams { +func (m *ConsensusParams) GetValidator() *ValidatorParams { if m != nil { return m.Validator } - return ValidatorParams{} + return nil } -func (m *ConsensusParams) GetVersion() VersionParams { +func (m *ConsensusParams) GetVersion() *VersionParams { if m != nil { return m.Version } - return VersionParams{} + return nil } // BlockParams contains limits on the block size. @@ -105,11 +105,6 @@ type BlockParams struct { // Max gas per block. // Note: must be greater or equal to -1 MaxGas int64 `protobuf:"varint,2,opt,name=max_gas,json=maxGas,proto3" json:"max_gas,omitempty"` - // Minimum time increment between consecutive blocks (in milliseconds) If the - // block header timestamp is ahead of the system clock, decrease this value. - // - // Not exposed to the application. - TimeIotaMs int64 `protobuf:"varint,3,opt,name=time_iota_ms,json=timeIotaMs,proto3" json:"time_iota_ms,omitempty"` } func (m *BlockParams) Reset() { *m = BlockParams{} } @@ -159,13 +154,6 @@ func (m *BlockParams) GetMaxGas() int64 { return 0 } -func (m *BlockParams) GetTimeIotaMs() int64 { - if m != nil { - return m.TimeIotaMs - } - return 0 -} - // EvidenceParams determine how we handle evidence of malfeasance. type EvidenceParams struct { // Max age of evidence, in blocks. @@ -287,7 +275,7 @@ func (m *ValidatorParams) GetPubKeyTypes() []string { // VersionParams contains the ABCI application version. type VersionParams struct { - AppVersion uint64 `protobuf:"varint,1,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty"` + App uint64 `protobuf:"varint,1,opt,name=app,proto3" json:"app,omitempty"` } func (m *VersionParams) Reset() { *m = VersionParams{} } @@ -323,9 +311,9 @@ func (m *VersionParams) XXX_DiscardUnknown() { var xxx_messageInfo_VersionParams proto.InternalMessageInfo -func (m *VersionParams) GetAppVersion() uint64 { +func (m *VersionParams) GetApp() uint64 { if m != nil { - return m.AppVersion + return m.App } return 0 } @@ -397,41 +385,40 @@ func init() { func init() { proto.RegisterFile("tendermint/types/params.proto", fileDescriptor_e12598271a686f57) } var fileDescriptor_e12598271a686f57 = []byte{ - // 537 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x31, 0x6f, 0xd3, 0x40, - 0x18, 0xcd, 0xd5, 0xa5, 0x4d, 0xbe, 0x34, 0x4d, 0x75, 0x42, 0x22, 0x14, 0xd5, 0x0e, 0x1e, 0x50, - 0x25, 0x24, 0x5b, 0x82, 0x01, 0xd1, 0xa5, 0xc2, 0x50, 0x15, 0x84, 0x82, 0x90, 0x05, 0x0c, 0x5d, - 0xac, 0x73, 0x72, 0xb8, 0x56, 0x73, 0x3e, 0xcb, 0x77, 0x8e, 0x92, 0x7f, 0xc1, 0xd8, 0xb1, 0x23, - 0xfc, 0x03, 0x7e, 0x42, 0xc7, 0x8e, 0x4c, 0x80, 0x92, 0x85, 0x9f, 0x81, 0x7c, 0xce, 0xe1, 0x38, - 0x65, 0xf3, 0x7d, 0xdf, 0x7b, 0xef, 0xfc, 0xde, 0xd3, 0xc1, 0x81, 0xa4, 0xc9, 0x88, 0x66, 0x2c, - 0x4e, 0xa4, 0x2b, 0x67, 0x29, 0x15, 0x6e, 0x4a, 0x32, 0xc2, 0x84, 0x93, 0x66, 0x5c, 0x72, 0xbc, - 0x57, 0xad, 0x1d, 0xb5, 0xde, 0xbf, 0x1b, 0xf1, 0x88, 0xab, 0xa5, 0x5b, 0x7c, 0x95, 0xb8, 0x7d, - 0x33, 0xe2, 0x3c, 0x1a, 0x53, 0x57, 0x9d, 0xc2, 0xfc, 0xb3, 0x3b, 0xca, 0x33, 0x22, 0x63, 0x9e, - 0x94, 0x7b, 0xfb, 0x72, 0x03, 0xba, 0x2f, 0x79, 0x22, 0x68, 0x22, 0x72, 0xf1, 0x5e, 0xdd, 0x80, - 0x9f, 0xc3, 0x9d, 0x70, 0xcc, 0x87, 0x17, 0x3d, 0xd4, 0x47, 0x87, 0xed, 0x27, 0x07, 0xce, 0xfa, - 0x5d, 0x8e, 0x57, 0xac, 0x4b, 0xb4, 0xb7, 0x79, 0xfd, 0xd3, 0x6a, 0xf8, 0x25, 0x03, 0x7b, 0xd0, - 0xa4, 0x93, 0x78, 0x44, 0x93, 0x21, 0xed, 0x6d, 0x28, 0x76, 0xff, 0x36, 0xfb, 0x64, 0x89, 0xa8, - 0x09, 0xfc, 0xe3, 0xe1, 0x13, 0x68, 0x4d, 0xc8, 0x38, 0x1e, 0x11, 0xc9, 0xb3, 0x9e, 0xa1, 0x44, - 0x1e, 0xde, 0x16, 0xf9, 0xa4, 0x21, 0x35, 0x95, 0x8a, 0x89, 0x8f, 0x61, 0x7b, 0x42, 0x33, 0x11, - 0xf3, 0xa4, 0xb7, 0xa9, 0x44, 0xac, 0xff, 0x88, 0x94, 0x80, 0x9a, 0x84, 0x66, 0xd9, 0x14, 0xda, - 0x2b, 0x3e, 0xf1, 0x03, 0x68, 0x31, 0x32, 0x0d, 0xc2, 0x99, 0xa4, 0x42, 0x25, 0x63, 0xf8, 0x4d, - 0x46, 0xa6, 0x5e, 0x71, 0xc6, 0xf7, 0x60, 0xbb, 0x58, 0x46, 0x44, 0x28, 0xdb, 0x86, 0xbf, 0xc5, - 0xc8, 0xf4, 0x94, 0x08, 0xdc, 0x87, 0x1d, 0x19, 0x33, 0x1a, 0xc4, 0x5c, 0x92, 0x80, 0x09, 0xe5, - 0xc7, 0xf0, 0xa1, 0x98, 0xbd, 0xe1, 0x92, 0x0c, 0x84, 0xfd, 0x0d, 0xc1, 0x6e, 0x3d, 0x11, 0xfc, - 0x18, 0x70, 0xa1, 0x46, 0x22, 0x1a, 0x24, 0x39, 0x0b, 0x54, 0xb4, 0xfa, 0xce, 0x2e, 0x23, 0xd3, - 0x17, 0x11, 0x7d, 0x97, 0x33, 0xf5, 0x73, 0x02, 0x0f, 0x60, 0x4f, 0x83, 0x75, 0xb7, 0xcb, 0xe8, - 0xef, 0x3b, 0x65, 0xf9, 0x8e, 0x2e, 0xdf, 0x79, 0xb5, 0x04, 0x78, 0xcd, 0xc2, 0xea, 0xe5, 0x2f, - 0x0b, 0xf9, 0xbb, 0xa5, 0x9e, 0xde, 0xd4, 0x6d, 0x1a, 0x75, 0x9b, 0xf6, 0x31, 0x74, 0xd7, 0x72, - 0xc7, 0x36, 0x74, 0xd2, 0x3c, 0x0c, 0x2e, 0xe8, 0x2c, 0x50, 0x99, 0xf6, 0x50, 0xdf, 0x38, 0x6c, - 0xf9, 0xed, 0x34, 0x0f, 0xdf, 0xd2, 0xd9, 0x87, 0x62, 0x74, 0xd4, 0xfc, 0x7e, 0x65, 0xa1, 0x3f, - 0x57, 0x16, 0xb2, 0x8f, 0xa0, 0x53, 0xcb, 0x1c, 0x5b, 0xd0, 0x26, 0x69, 0x1a, 0xe8, 0xa6, 0x0a, - 0x8f, 0x9b, 0x3e, 0x90, 0x34, 0x5d, 0xc2, 0x56, 0xb8, 0x67, 0xb0, 0xf3, 0x9a, 0x88, 0x73, 0x3a, - 0x5a, 0x52, 0x1f, 0x41, 0x57, 0x25, 0x13, 0xac, 0xd7, 0xd2, 0x51, 0xe3, 0x81, 0xee, 0xc6, 0x86, - 0x4e, 0x85, 0xab, 0x1a, 0x6a, 0x6b, 0xd4, 0x29, 0x11, 0xde, 0xc7, 0xaf, 0x73, 0x13, 0x5d, 0xcf, - 0x4d, 0x74, 0x33, 0x37, 0xd1, 0xef, 0xb9, 0x89, 0xbe, 0x2c, 0xcc, 0xc6, 0xcd, 0xc2, 0x6c, 0xfc, - 0x58, 0x98, 0x8d, 0xb3, 0x67, 0x51, 0x2c, 0xcf, 0xf3, 0xd0, 0x19, 0x72, 0xe6, 0xae, 0x3e, 0xcb, - 0xea, 0xb3, 0x7c, 0x77, 0xeb, 0x4f, 0x36, 0xdc, 0x52, 0xf3, 0xa7, 0x7f, 0x03, 0x00, 0x00, 0xff, - 0xff, 0xfe, 0xe0, 0x3d, 0x9c, 0xcd, 0x03, 0x00, 0x00, + // 515 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0xeb, 0xa5, 0x6c, 0xed, 0x5b, 0xba, 0x56, 0x16, 0x12, 0x61, 0x68, 0x49, 0xc9, 0x01, + 0x4d, 0x9a, 0x94, 0x48, 0xf4, 0x04, 0x42, 0x9a, 0x28, 0xa0, 0xf1, 0x47, 0x43, 0x10, 0x21, 0x0e, + 0xbb, 0x44, 0x4e, 0xe3, 0x65, 0xd1, 0xea, 0x38, 0x8a, 0x9d, 0xaa, 0xbd, 0xf1, 0x11, 0x38, 0x72, + 0xdc, 0x11, 0xbe, 0x01, 0x1f, 0x61, 0xc7, 0x1d, 0x39, 0x01, 0x6a, 0x2f, 0x7c, 0x0c, 0x14, 0x27, + 0x21, 0x6b, 0xb7, 0x9b, 0xe3, 0xe7, 0xf7, 0xd8, 0x79, 0x9e, 0x57, 0x86, 0x5d, 0x49, 0xe3, 0x80, + 0xa6, 0x2c, 0x8a, 0xa5, 0x23, 0xe7, 0x09, 0x15, 0x4e, 0x42, 0x52, 0xc2, 0x84, 0x9d, 0xa4, 0x5c, + 0x72, 0xdc, 0xaf, 0x65, 0x5b, 0xc9, 0x3b, 0x77, 0x42, 0x1e, 0x72, 0x25, 0x3a, 0xf9, 0xaa, 0xe0, + 0x76, 0x8c, 0x90, 0xf3, 0x70, 0x42, 0x1d, 0xf5, 0xe5, 0x67, 0x27, 0x4e, 0x90, 0xa5, 0x44, 0x46, + 0x3c, 0x2e, 0x74, 0xeb, 0xf3, 0x06, 0xf4, 0x9e, 0xf3, 0x58, 0xd0, 0x58, 0x64, 0xe2, 0xbd, 0xba, + 0x01, 0x0f, 0xe1, 0x96, 0x3f, 0xe1, 0xe3, 0x33, 0x1d, 0x0d, 0xd0, 0x5e, 0xe7, 0xd1, 0xae, 0xbd, + 0x7e, 0x97, 0x3d, 0xca, 0xe5, 0x82, 0x76, 0x0b, 0x16, 0x3f, 0x85, 0x16, 0x9d, 0x46, 0x01, 0x8d, + 0xc7, 0x54, 0xdf, 0x50, 0xbe, 0xc1, 0x75, 0xdf, 0xcb, 0x92, 0x28, 0xad, 0xff, 0x1d, 0xf8, 0x00, + 0xda, 0x53, 0x32, 0x89, 0x02, 0x22, 0x79, 0xaa, 0x6b, 0xca, 0xfe, 0xe0, 0xba, 0xfd, 0x53, 0x85, + 0x94, 0xfe, 0xda, 0x83, 0x1f, 0xc3, 0xd6, 0x94, 0xa6, 0x22, 0xe2, 0xb1, 0xde, 0x54, 0x76, 0xf3, + 0x06, 0x7b, 0x01, 0x94, 0xe6, 0x8a, 0xb7, 0x5e, 0x43, 0xe7, 0x4a, 0x1e, 0x7c, 0x1f, 0xda, 0x8c, + 0xcc, 0x3c, 0x7f, 0x2e, 0xa9, 0x50, 0x0d, 0x68, 0x6e, 0x8b, 0x91, 0xd9, 0x28, 0xff, 0xc6, 0x77, + 0x61, 0x2b, 0x17, 0x43, 0x22, 0x54, 0x48, 0xcd, 0xdd, 0x64, 0x64, 0x76, 0x48, 0xc4, 0x9b, 0x66, + 0x4b, 0xeb, 0x37, 0xad, 0xef, 0x08, 0xb6, 0x57, 0x33, 0xe2, 0x7d, 0xc0, 0xb9, 0x83, 0x84, 0xd4, + 0x8b, 0x33, 0xe6, 0xa9, 0xb2, 0xaa, 0x73, 0x7b, 0x8c, 0xcc, 0x9e, 0x85, 0xf4, 0x5d, 0xc6, 0xd4, + 0x0f, 0x08, 0x7c, 0x04, 0xfd, 0x0a, 0xae, 0xe6, 0x54, 0x96, 0x79, 0xcf, 0x2e, 0x06, 0x69, 0x57, + 0x83, 0xb4, 0x5f, 0x94, 0xc0, 0xa8, 0x75, 0xf1, 0xcb, 0x6c, 0x7c, 0xfd, 0x6d, 0x22, 0x77, 0xbb, + 0x38, 0xaf, 0x52, 0x56, 0xa3, 0x68, 0xab, 0x51, 0xac, 0x03, 0xe8, 0xad, 0xf5, 0x89, 0x2d, 0xe8, + 0x26, 0x99, 0xef, 0x9d, 0xd1, 0xb9, 0xa7, 0x1a, 0xd3, 0xd1, 0x40, 0xdb, 0x6b, 0xbb, 0x9d, 0x24, + 0xf3, 0xdf, 0xd2, 0xf9, 0xc7, 0x7c, 0xeb, 0x49, 0xeb, 0xc7, 0xb9, 0x89, 0xfe, 0x9e, 0x9b, 0xc8, + 0xda, 0x87, 0xee, 0x4a, 0xa3, 0xb8, 0x0f, 0x1a, 0x49, 0x12, 0x95, 0xad, 0xe9, 0xe6, 0xcb, 0x2b, + 0xf0, 0x31, 0xdc, 0x7e, 0x45, 0xc4, 0x29, 0x0d, 0x4a, 0xf6, 0x21, 0xf4, 0x54, 0x15, 0xde, 0x7a, + 0xd7, 0x5d, 0xb5, 0x7d, 0x54, 0x15, 0x6e, 0x41, 0xb7, 0xe6, 0xea, 0xda, 0x3b, 0x15, 0x75, 0x48, + 0xc4, 0xe8, 0xc3, 0xb7, 0x85, 0x81, 0x2e, 0x16, 0x06, 0xba, 0x5c, 0x18, 0xe8, 0xcf, 0xc2, 0x40, + 0x5f, 0x96, 0x46, 0xe3, 0x72, 0x69, 0x34, 0x7e, 0x2e, 0x8d, 0xc6, 0xf1, 0x30, 0x8c, 0xe4, 0x69, + 0xe6, 0xdb, 0x63, 0xce, 0x9c, 0x31, 0x67, 0x54, 0xfa, 0x27, 0xb2, 0x5e, 0x14, 0x0f, 0x66, 0xfd, + 0xad, 0xf9, 0x9b, 0x6a, 0x7f, 0xf8, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xfc, 0x4b, 0xf8, 0x86, + 0x03, 0x00, 0x00, } func (this *ConsensusParams) Equal(that interface{}) bool { @@ -453,16 +440,16 @@ func (this *ConsensusParams) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.Block.Equal(&that1.Block) { + if !this.Block.Equal(that1.Block) { return false } - if !this.Evidence.Equal(&that1.Evidence) { + if !this.Evidence.Equal(that1.Evidence) { return false } - if !this.Validator.Equal(&that1.Validator) { + if !this.Validator.Equal(that1.Validator) { return false } - if !this.Version.Equal(&that1.Version) { + if !this.Version.Equal(that1.Version) { return false } return true @@ -492,9 +479,6 @@ func (this *BlockParams) Equal(that interface{}) bool { if this.MaxGas != that1.MaxGas { return false } - if this.TimeIotaMs != that1.TimeIotaMs { - return false - } return true } func (this *EvidenceParams) Equal(that interface{}) bool { @@ -575,7 +559,7 @@ func (this *VersionParams) Equal(that interface{}) bool { } else if this == nil { return false } - if this.AppVersion != that1.AppVersion { + if this.App != that1.App { return false } return true @@ -627,46 +611,54 @@ func (m *ConsensusParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - { - size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Version != nil { + { + size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintParams(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintParams(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x22 } - i-- - dAtA[i] = 0x22 - { - size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Validator != nil { + { + size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintParams(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintParams(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x1a } - i-- - dAtA[i] = 0x1a - { - size, err := m.Evidence.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Evidence != nil { + { + size, err := m.Evidence.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintParams(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintParams(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 - { - size, err := m.Block.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Block != nil { + { + size, err := m.Block.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintParams(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintParams(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -690,11 +682,6 @@ func (m *BlockParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.TimeIotaMs != 0 { - i = encodeVarintParams(dAtA, i, uint64(m.TimeIotaMs)) - i-- - dAtA[i] = 0x18 - } if m.MaxGas != 0 { i = encodeVarintParams(dAtA, i, uint64(m.MaxGas)) i-- @@ -801,8 +788,8 @@ func (m *VersionParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.AppVersion != 0 { - i = encodeVarintParams(dAtA, i, uint64(m.AppVersion)) + if m.App != 0 { + i = encodeVarintParams(dAtA, i, uint64(m.App)) i-- dAtA[i] = 0x8 } @@ -867,7 +854,7 @@ func NewPopulatedValidatorParams(r randyParams, easy bool) *ValidatorParams { func NewPopulatedVersionParams(r randyParams, easy bool) *VersionParams { this := &VersionParams{} - this.AppVersion = uint64(uint64(r.Uint32())) + this.App = uint64(uint64(r.Uint32())) if !easy && r.Intn(10) != 0 { } return this @@ -951,14 +938,22 @@ func (m *ConsensusParams) Size() (n int) { } var l int _ = l - l = m.Block.Size() - n += 1 + l + sovParams(uint64(l)) - l = m.Evidence.Size() - n += 1 + l + sovParams(uint64(l)) - l = m.Validator.Size() - n += 1 + l + sovParams(uint64(l)) - l = m.Version.Size() - n += 1 + l + sovParams(uint64(l)) + if m.Block != nil { + l = m.Block.Size() + n += 1 + l + sovParams(uint64(l)) + } + if m.Evidence != nil { + l = m.Evidence.Size() + n += 1 + l + sovParams(uint64(l)) + } + if m.Validator != nil { + l = m.Validator.Size() + n += 1 + l + sovParams(uint64(l)) + } + if m.Version != nil { + l = m.Version.Size() + n += 1 + l + sovParams(uint64(l)) + } return n } @@ -974,9 +969,6 @@ func (m *BlockParams) Size() (n int) { if m.MaxGas != 0 { n += 1 + sovParams(uint64(m.MaxGas)) } - if m.TimeIotaMs != 0 { - n += 1 + sovParams(uint64(m.TimeIotaMs)) - } return n } @@ -1018,8 +1010,8 @@ func (m *VersionParams) Size() (n int) { } var l int _ = l - if m.AppVersion != 0 { - n += 1 + sovParams(uint64(m.AppVersion)) + if m.App != 0 { + n += 1 + sovParams(uint64(m.App)) } return n } @@ -1103,6 +1095,9 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Block == nil { + m.Block = &BlockParams{} + } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1136,6 +1131,9 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Evidence == nil { + m.Evidence = &EvidenceParams{} + } if err := m.Evidence.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1169,6 +1167,9 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Validator == nil { + m.Validator = &ValidatorParams{} + } if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1202,6 +1203,9 @@ func (m *ConsensusParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Version == nil { + m.Version = &VersionParams{} + } if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1294,25 +1298,6 @@ func (m *BlockParams) Unmarshal(dAtA []byte) error { break } } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeIotaMs", wireType) - } - m.TimeIotaMs = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowParams - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TimeIotaMs |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipParams(dAtA[iNdEx:]) @@ -1568,9 +1553,9 @@ func (m *VersionParams) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AppVersion", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field App", wireType) } - m.AppVersion = 0 + m.App = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowParams @@ -1580,7 +1565,7 @@ func (m *VersionParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.AppVersion |= uint64(b&0x7F) << shift + m.App |= uint64(b&0x7F) << shift if b < 0x80 { break } diff --git a/proto/tendermint/types/params.proto b/proto/tendermint/types/params.proto index 1eeb555387..89b6f06e76 100644 --- a/proto/tendermint/types/params.proto +++ b/proto/tendermint/types/params.proto @@ -11,10 +11,10 @@ option (gogoproto.equal_all) = true; // ConsensusParams contains consensus critical parameters that determine the // validity of blocks. message ConsensusParams { - BlockParams block = 1 [(gogoproto.nullable) = false]; - EvidenceParams evidence = 2 [(gogoproto.nullable) = false]; - ValidatorParams validator = 3 [(gogoproto.nullable) = false]; - VersionParams version = 4 [(gogoproto.nullable) = false]; + BlockParams block = 1; + EvidenceParams evidence = 2; + ValidatorParams validator = 3; + VersionParams version = 4; } // BlockParams contains limits on the block size. @@ -25,11 +25,8 @@ message BlockParams { // Max gas per block. // Note: must be greater or equal to -1 int64 max_gas = 2; - // Minimum time increment between consecutive blocks (in milliseconds) If the - // block header timestamp is ahead of the system clock, decrease this value. - // - // Not exposed to the application. - int64 time_iota_ms = 3; + + reserved 3; // was TimeIotaMs see https://github.com/tendermint/tendermint/pull/5792 } // EvidenceParams determine how we handle evidence of malfeasance. @@ -68,7 +65,7 @@ message VersionParams { option (gogoproto.populate) = true; option (gogoproto.equal) = true; - uint64 app_version = 1; + uint64 app = 1; } // HashedParams is a subset of ConsensusParams. diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go index 424ab7916a..ae5e54a52d 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/tendermint/types/validator.pb.go @@ -5,9 +5,9 @@ package types import ( fmt "fmt" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" io "io" math "math" math_bits "math/bits" @@ -213,30 +213,30 @@ func init() { func init() { proto.RegisterFile("tendermint/types/validator.proto", fileDescriptor_4e92274df03d3088) } var fileDescriptor_4e92274df03d3088 = []byte{ - // 361 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4e, 0xc2, 0x40, - 0x10, 0xc6, 0xbb, 0x40, 0x40, 0x17, 0x12, 0x71, 0xe3, 0xa1, 0x41, 0x52, 0x2b, 0x27, 0x12, 0x4d, - 0x9b, 0x68, 0x0c, 0x07, 0x6e, 0x5c, 0xb9, 0x60, 0x49, 0x38, 0x78, 0x69, 0x5a, 0xba, 0xa9, 0x1b, - 0x0a, 0xbb, 0xd9, 0x6e, 0x31, 0xfb, 0x16, 0x3e, 0x8b, 0x4f, 0xc1, 0x91, 0xa3, 0x27, 0x63, 0xe0, - 0x45, 0x4c, 0x5b, 0xfa, 0x27, 0xa8, 0xe1, 0x36, 0x9d, 0xef, 0x9b, 0x99, 0x5f, 0x37, 0x1f, 0xd4, - 0x05, 0x5e, 0x79, 0x98, 0x2f, 0xc9, 0x4a, 0x98, 0x42, 0x32, 0x1c, 0x9a, 0x6b, 0x27, 0x20, 0x9e, - 0x23, 0x28, 0x37, 0x18, 0xa7, 0x82, 0xa2, 0x76, 0xe1, 0x30, 0x12, 0x47, 0xe7, 0xca, 0xa7, 0x3e, - 0x4d, 0x44, 0x33, 0xae, 0x52, 0x5f, 0xa7, 0x5b, 0xda, 0x34, 0xe7, 0x92, 0x09, 0x6a, 0x2e, 0xb0, - 0x0c, 0x53, 0xb5, 0xf7, 0x01, 0x60, 0x6b, 0x96, 0x6d, 0x9e, 0x62, 0x81, 0x86, 0x10, 0xe6, 0x97, - 0x42, 0x15, 0xe8, 0xd5, 0x7e, 0xf3, 0xe1, 0xda, 0x38, 0xbe, 0x65, 0xe4, 0x33, 0x56, 0xc9, 0x8e, - 0x06, 0xf0, 0x8c, 0x71, 0xca, 0x68, 0x88, 0xb9, 0x5a, 0xd1, 0xc1, 0xa9, 0xd1, 0xdc, 0x8c, 0xee, - 0x21, 0x12, 0x54, 0x38, 0x81, 0xbd, 0xa6, 0x82, 0xac, 0x7c, 0x9b, 0xd1, 0x37, 0xcc, 0xd5, 0xaa, - 0x0e, 0xfa, 0x55, 0xab, 0x9d, 0x28, 0xb3, 0x44, 0x98, 0xc4, 0xfd, 0x18, 0xfa, 0x3c, 0xdf, 0x82, - 0x54, 0xd8, 0x70, 0x3c, 0x8f, 0xe3, 0x30, 0xc6, 0x05, 0xfd, 0x96, 0x95, 0x7d, 0xa2, 0x21, 0x6c, - 0xb0, 0xc8, 0xb5, 0x17, 0x58, 0x1e, 0x68, 0xba, 0x65, 0x9a, 0xf4, 0x31, 0x8c, 0x49, 0xe4, 0x06, - 0x64, 0x3e, 0xc6, 0x72, 0x54, 0xdb, 0x7c, 0xdd, 0x28, 0x56, 0x9d, 0x45, 0xee, 0x18, 0x4b, 0x74, - 0x0b, 0x5b, 0x7f, 0xc0, 0x34, 0xd7, 0x05, 0x07, 0xba, 0x83, 0x97, 0xd9, 0x1f, 0xd8, 0x8c, 0x13, - 0xca, 0x89, 0x90, 0x6a, 0x2d, 0x85, 0xce, 0x84, 0xc9, 0xa1, 0xdf, 0x5b, 0xc0, 0x8b, 0x29, 0x59, - 0xb2, 0x00, 0x17, 0xe4, 0x4f, 0x05, 0x1f, 0x38, 0xcd, 0xf7, 0x2f, 0x59, 0xe5, 0x17, 0xd9, 0xe8, - 0x79, 0xb3, 0xd3, 0xc0, 0x76, 0xa7, 0x81, 0xef, 0x9d, 0x06, 0xde, 0xf7, 0x9a, 0xb2, 0xdd, 0x6b, - 0xca, 0xe7, 0x5e, 0x53, 0x5e, 0x06, 0x3e, 0x11, 0xaf, 0x91, 0x6b, 0xcc, 0xe9, 0xd2, 0x2c, 0x67, - 0xac, 0x28, 0xd3, 0x04, 0x1d, 0xe7, 0xcf, 0xad, 0x27, 0xfd, 0xc7, 0x9f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x48, 0xbf, 0x34, 0x35, 0x9a, 0x02, 0x00, 0x00, + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x6a, 0xea, 0x40, + 0x14, 0xc6, 0x33, 0x2a, 0x7a, 0xef, 0x28, 0x5c, 0xef, 0x70, 0x17, 0xc1, 0x2b, 0x69, 0xea, 0x4a, + 0x68, 0x49, 0xa0, 0x52, 0xba, 0x70, 0xe7, 0x56, 0x0a, 0x12, 0xc1, 0x45, 0x37, 0x21, 0x7f, 0xa6, + 0xe9, 0x60, 0xe2, 0x0c, 0x93, 0x89, 0x65, 0xde, 0xa2, 0xcf, 0xd2, 0xa7, 0x70, 0xe9, 0xb2, 0xab, + 0x52, 0xf4, 0x45, 0x4a, 0x12, 0x93, 0x88, 0x6d, 0x71, 0x77, 0x72, 0xbe, 0xef, 0x7c, 0xe7, 0x97, + 0xe1, 0x40, 0x5d, 0xe0, 0x95, 0x8f, 0x79, 0x44, 0x56, 0xc2, 0x14, 0x92, 0xe1, 0xd8, 0x5c, 0x3b, + 0x21, 0xf1, 0x1d, 0x41, 0xb9, 0xc1, 0x38, 0x15, 0x14, 0x75, 0x2b, 0x87, 0x91, 0x39, 0x7a, 0xff, + 0x02, 0x1a, 0xd0, 0x4c, 0x34, 0xd3, 0x2a, 0xf7, 0xf5, 0xfa, 0x47, 0x49, 0x1e, 0x97, 0x4c, 0x50, + 0x73, 0x89, 0x65, 0x9c, 0xab, 0x83, 0x57, 0x00, 0x3b, 0x8b, 0x22, 0x79, 0x8e, 0x05, 0x1a, 0x43, + 0x58, 0x6e, 0x8a, 0x55, 0xa0, 0xd7, 0x87, 0xed, 0x9b, 0xff, 0xc6, 0xe9, 0x2e, 0xa3, 0x9c, 0xb1, + 0x8e, 0xec, 0xe8, 0x0e, 0xfe, 0x62, 0x9c, 0x32, 0x1a, 0x63, 0xae, 0xd6, 0x74, 0x70, 0x6e, 0xb4, + 0x34, 0xa3, 0x6b, 0x88, 0x04, 0x15, 0x4e, 0x68, 0xaf, 0xa9, 0x20, 0xab, 0xc0, 0x66, 0xf4, 0x19, + 0x73, 0xb5, 0xae, 0x83, 0x61, 0xdd, 0xea, 0x66, 0xca, 0x22, 0x13, 0x66, 0x69, 0x3f, 0x85, 0xfe, + 0x5d, 0xa6, 0x20, 0x15, 0xb6, 0x1c, 0xdf, 0xe7, 0x38, 0x4e, 0x71, 0xc1, 0xb0, 0x63, 0x15, 0x9f, + 0x68, 0x0c, 0x5b, 0x2c, 0x71, 0xed, 0x25, 0x96, 0x07, 0x9a, 0xfe, 0x31, 0x4d, 0xfe, 0x18, 0xc6, + 0x2c, 0x71, 0x43, 0xe2, 0x4d, 0xb1, 0x9c, 0x34, 0x36, 0xef, 0x17, 0x8a, 0xd5, 0x64, 0x89, 0x3b, + 0xc5, 0x12, 0x5d, 0xc2, 0xce, 0x37, 0x30, 0xed, 0x75, 0xc5, 0x81, 0xae, 0xe0, 0xdf, 0xe2, 0x0f, + 0x6c, 0xc6, 0x09, 0xe5, 0x44, 0x48, 0xb5, 0x91, 0x43, 0x17, 0xc2, 0xec, 0xd0, 0x1f, 0x2c, 0xe1, + 0x9f, 0x39, 0x89, 0x58, 0x88, 0x2b, 0xf2, 0xdb, 0x8a, 0x0f, 0x9c, 0xe7, 0xfb, 0x91, 0xac, 0xf6, + 0x85, 0x6c, 0x72, 0xbf, 0xd9, 0x69, 0x60, 0xbb, 0xd3, 0xc0, 0xc7, 0x4e, 0x03, 0x2f, 0x7b, 0x4d, + 0xd9, 0xee, 0x35, 0xe5, 0x6d, 0xaf, 0x29, 0x0f, 0xa3, 0x80, 0x88, 0xa7, 0xc4, 0x35, 0x3c, 0x1a, + 0x99, 0x1e, 0x8d, 0xb0, 0x70, 0x1f, 0x45, 0x55, 0xe4, 0xd7, 0x73, 0x7a, 0x7b, 0x6e, 0x33, 0xeb, + 0x8f, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x1e, 0xd7, 0x2c, 0x96, 0x02, 0x00, 0x00, } func (m *ValidatorSet) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/version/types.pb.go b/proto/tendermint/version/types.pb.go index 415869b038..7337add2e8 100644 --- a/proto/tendermint/version/types.pb.go +++ b/proto/tendermint/version/types.pb.go @@ -141,7 +141,7 @@ func init() { func init() { proto.RegisterFile("tendermint/version/types.proto", fileDescriptor_f9b42966edc5edad) } var fileDescriptor_f9b42966edc5edad = []byte{ - // 218 bytes of a gzipped FileDescriptorProto + // 223 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41, @@ -151,11 +151,11 @@ var fileDescriptor_f9b42966edc5edad = []byte{ 0x25, 0x98, 0x14, 0x18, 0x35, 0x38, 0x83, 0xe0, 0x7c, 0x25, 0x4b, 0x2e, 0x4e, 0xe7, 0xfc, 0xbc, 0xe2, 0xd4, 0xbc, 0xe2, 0xd2, 0x62, 0x21, 0x11, 0x2e, 0xd6, 0xa4, 0x9c, 0xfc, 0xe4, 0x6c, 0xa8, 0x09, 0x10, 0x8e, 0x90, 0x00, 0x17, 0x73, 0x62, 0x41, 0x01, 0x58, 0x27, 0x4b, 0x10, 0x88, 0x69, - 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 0x53, 0xf0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, + 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 0x93, 0xff, 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, 0x59, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x79, - 0x14, 0x89, 0x09, 0xf1, 0x06, 0x66, 0x20, 0x24, 0xb1, 0x81, 0x65, 0x8c, 0x01, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x42, 0x43, 0x65, 0xc7, 0x21, 0x01, 0x00, 0x00, + 0x31, 0x44, 0x99, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x27, 0xe7, + 0xe7, 0xa6, 0x96, 0x24, 0xa5, 0x95, 0x20, 0x18, 0x10, 0x2f, 0x60, 0x06, 0x40, 0x12, 0x1b, 0x58, + 0xc6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xc7, 0x18, 0x2b, 0x1d, 0x01, 0x00, 0x00, } func (this *Consensus) Equal(that interface{}) bool { diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index 3ae9b41e02..af43db6fe1 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -3,8 +3,8 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" abcicli "github.com/cometbft/cometbft/abci/client" + mock "github.com/stretchr/testify/mock" types "github.com/cometbft/cometbft/abci/types" ) diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index 847b2cfcd0..a981e7ea44 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -3,8 +3,8 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" abcicli "github.com/cometbft/cometbft/abci/client" + mock "github.com/stretchr/testify/mock" types "github.com/cometbft/cometbft/abci/types" ) diff --git a/proxy/mocks/client_creator.go b/proxy/mocks/client_creator.go index b1c38fa089..3ce6f9d578 100644 --- a/proxy/mocks/client_creator.go +++ b/proxy/mocks/client_creator.go @@ -3,8 +3,8 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" abcicli "github.com/cometbft/cometbft/abci/client" + mock "github.com/stretchr/testify/mock" ) // ClientCreator is an autogenerated mock type for the ClientCreator type diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go index d6e310c398..2a607a7565 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -67,7 +67,7 @@ type ResultBlockResults struct { BeginBlockEvents []abci.Event `json:"begin_block_events"` EndBlockEvents []abci.Event `json:"end_block_events"` ValidatorUpdates []abci.ValidatorUpdate `json:"validator_updates"` - ConsensusParamUpdates *abci.ConsensusParams `json:"consensus_param_updates"` + ConsensusParamUpdates *cmtproto.ConsensusParams `json:"consensus_param_updates"` } type ResultDataCommitment struct { @@ -167,8 +167,8 @@ type ResultValidators struct { // ConsensusParams for given height type ResultConsensusParams struct { - BlockHeight int64 `json:"block_height"` - ConsensusParams cmtproto.ConsensusParams `json:"consensus_params"` + BlockHeight int64 `json:"block_height"` + ConsensusParams types.ConsensusParams `json:"consensus_params"` } // Info about the consensus state. diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go index 86f2ddd0bc..d61c39e9e1 100644 --- a/rpc/grpc/types.pb.go +++ b/rpc/grpc/types.pb.go @@ -6,8 +6,8 @@ package coregrpc import ( context "context" fmt "fmt" - proto "github.com/gogo/protobuf/proto" types "github.com/cometbft/cometbft/abci/types" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -205,27 +205,28 @@ func init() { func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) } var fileDescriptor_0ffff5682c662b95 = []byte{ - // 316 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, 0x07, 0x11, 0x25, 0x95, - 0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, 0x08, 0x05, 0x7a, 0x45, 0x05, - 0xc9, 0x7a, 0x20, 0x05, 0x52, 0xd2, 0x48, 0xba, 0x12, 0x93, 0x92, 0x33, 0x91, 0x75, 0x28, 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, 0x53, 0x19, 0xb9, 0x84, - 0x61, 0x02, 0xc8, 0xfa, 0xac, 0xb9, 0x38, 0x92, 0x33, 0x52, 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9, - 0x8d, 0x14, 0xf4, 0x90, 0x5c, 0x08, 0x72, 0x8c, 0x1e, 0x4c, 0x9f, 0x33, 0x48, 0x61, 0x48, 0x45, - 0x10, 0x7b, 0x32, 0x84, 0x21, 0xe4, 0xc8, 0xc5, 0x95, 0x92, 0x9a, 0x93, 0x59, 0x96, 0x5a, 0x04, - 0xd2, 0xce, 0x04, 0xd6, 0xae, 0x84, 0x53, 0xbb, 0x0b, 0x44, 0x69, 0x48, 0x45, 0x10, 0x67, 0x0a, - 0x8c, 0x69, 0xb4, 0x97, 0x91, 0x8b, 0x07, 0xee, 0x1e, 0xc7, 0x00, 0x4f, 0x21, 0x6f, 0x2e, 0x16, - 0x90, 0x83, 0x85, 0x50, 0x9c, 0x01, 0x0b, 0x28, 0x3d, 0xa4, 0x80, 0x90, 0x52, 0xc4, 0xa1, 0x02, - 0xe1, 0x6b, 0xa1, 0x04, 0x2e, 0x6e, 0x64, 0xcf, 0xaa, 0xe3, 0x33, 0x13, 0x49, 0xa1, 0x94, 0x06, - 0x5e, 0xa3, 0x91, 0x54, 0x3a, 0xf9, 0x9c, 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, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x52, 0xf4, 0x62, - 0x49, 0x1f, 0xd6, 0xc9, 0xf9, 0x45, 0xa9, 0x20, 0x46, 0x12, 0x1b, 0x38, 0xc6, 0x8d, 0x01, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xf6, 0x4b, 0x02, 0xd8, 0x46, 0x02, 0x00, 0x00, + // 321 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x3f, 0x4f, 0xc2, 0x40, + 0x18, 0xc6, 0x39, 0x62, 0xfc, 0xf3, 0x82, 0x0c, 0xc7, 0x62, 0x30, 0x39, 0xb1, 0x31, 0x91, 0xe9, + 0x48, 0x70, 0x64, 0x02, 0x1d, 0x34, 0x2e, 0xa4, 0x61, 0x72, 0x51, 0x7a, 0x7d, 0x85, 0x46, 0xe9, + 0xd5, 0xeb, 0x61, 0xea, 0xb7, 0x70, 0xf1, 0xe3, 0xb8, 0x3b, 0x32, 0x3a, 0x9a, 0xf6, 0x8b, 0x98, + 0x2b, 0xd4, 0x9e, 0x03, 0x2c, 0xcd, 0xd3, 0xe6, 0xf7, 0xbb, 0x3c, 0xef, 0xdb, 0x83, 0x13, 0x8d, + 0xa1, 0x8f, 0x6a, 0x1e, 0x84, 0xba, 0xab, 0x22, 0xd1, 0x9d, 0x9a, 0x87, 0x7e, 0x8b, 0x30, 0xe6, + 0x91, 0x92, 0x5a, 0xd2, 0x66, 0x09, 0x70, 0x15, 0x09, 0x6e, 0x80, 0xd6, 0xb1, 0x65, 0x4d, 0x3c, + 0x11, 0xd8, 0x86, 0x73, 0x08, 0x35, 0x17, 0x5f, 0x16, 0x18, 0xeb, 0x51, 0x10, 0x4e, 0x9d, 0x33, + 0xa0, 0xeb, 0xd7, 0xa1, 0x92, 0x13, 0x5f, 0x4c, 0x62, 0x3d, 0x4e, 0x68, 0x03, 0xaa, 0x3a, 0x39, + 0x22, 0x6d, 0xd2, 0xa9, 0xbb, 0x55, 0x9d, 0x38, 0x0d, 0xa8, 0xbb, 0x18, 0x47, 0x32, 0x8c, 0x31, + 0xb7, 0x3e, 0x08, 0x34, 0x8b, 0x0f, 0xb6, 0xd7, 0x87, 0x7d, 0x31, 0x43, 0xf1, 0x74, 0xbf, 0xb6, + 0x6b, 0xbd, 0x36, 0xb7, 0x1a, 0x9a, 0x32, 0xbc, 0xf0, 0x2e, 0x0d, 0x38, 0x4e, 0xdc, 0x3d, 0xb1, + 0x0a, 0x74, 0x00, 0xe0, 0xe3, 0x73, 0xf0, 0x8a, 0xca, 0xe8, 0xd5, 0x5c, 0x77, 0x36, 0xea, 0x57, + 0x2b, 0x74, 0x9c, 0xb8, 0x07, 0x7e, 0x11, 0x7b, 0x9f, 0x04, 0xea, 0x7f, 0x7d, 0x06, 0xa3, 0x1b, + 0x7a, 0x0b, 0x3b, 0xa6, 0x30, 0xfd, 0x57, 0xa3, 0x58, 0x14, 0xb7, 0x16, 0xd1, 0x3a, 0xdd, 0x40, + 0x94, 0x53, 0xd3, 0x07, 0xa8, 0xd9, 0xc3, 0x9e, 0x6f, 0x3b, 0xd3, 0x02, 0x5b, 0x9d, 0xad, 0x47, + 0x5b, 0xe4, 0xf0, 0xfa, 0x2b, 0x65, 0x64, 0x99, 0x32, 0xf2, 0x93, 0x32, 0xf2, 0x9e, 0xb1, 0xca, + 0x32, 0x63, 0x95, 0xef, 0x8c, 0x55, 0xee, 0xf8, 0x34, 0xd0, 0xb3, 0x85, 0xc7, 0x85, 0x9c, 0x77, + 0x85, 0x9c, 0xa3, 0xf6, 0x1e, 0x75, 0x19, 0x8a, 0xbb, 0xd1, 0x17, 0x52, 0xa1, 0x09, 0xde, 0x6e, + 0xfe, 0xb7, 0x2f, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x87, 0x53, 0x29, 0xbe, 0x42, 0x02, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/state/execution.go b/state/execution.go index 02786fc6bf..cdc9fce83d 100644 --- a/state/execution.go +++ b/state/execution.go @@ -486,7 +486,7 @@ func extendedCommitInfo(c abci.CommitInfo) abci.ExtendedCommitInfo { } func validateValidatorUpdates(abciUpdates []abci.ValidatorUpdate, - params cmtproto.ValidatorParams) error { + params types.ValidatorParams) error { for _, valUpdate := range abciUpdates { if valUpdate.GetPower() < 0 { return fmt.Errorf("voting power can't be negative %v", valUpdate) @@ -542,13 +542,13 @@ func updateState( lastHeightParamsChanged := state.LastHeightConsensusParamsChanged if abciResponses.EndBlock.ConsensusParamUpdates != nil { // NOTE: must not mutate s.ConsensusParams - nextParams = types.UpdateConsensusParams(state.ConsensusParams, abciResponses.EndBlock.ConsensusParamUpdates) - err := types.ValidateConsensusParams(nextParams) + nextParams = state.ConsensusParams.Update(abciResponses.EndBlock.ConsensusParamUpdates) + err := nextParams.ValidateBasic() if err != nil { return state, fmt.Errorf("error updating consensus params: %v", err) } - state.Version.Consensus.App = nextParams.Version.AppVersion + state.Version.Consensus.App = nextParams.Version.App // Change results from this height but only applies to the next height. lastHeightParamsChanged = header.Height + 1 diff --git a/state/execution_test.go b/state/execution_test.go index 32d7dc36c6..4f03832a09 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -25,7 +25,6 @@ import ( "github.com/cometbft/cometbft/crypto/tmhash" "github.com/cometbft/cometbft/libs/log" mmock "github.com/cometbft/cometbft/mempool/mock" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" "github.com/cometbft/cometbft/proxy" sm "github.com/cometbft/cometbft/state" @@ -367,13 +366,13 @@ func TestValidateValidatorUpdates(t *testing.T) { pk2, err := cryptoenc.PubKeyToProto(pubkey2) assert.NoError(t, err) - defaultValidatorParams := cmtproto.ValidatorParams{PubKeyTypes: []string{types.ABCIPubKeyTypeEd25519}} + defaultValidatorParams := types.ValidatorParams{PubKeyTypes: []string{types.ABCIPubKeyTypeEd25519}} testCases := []struct { name string abciUpdates []abci.ValidatorUpdate - validatorParams cmtproto.ValidatorParams + validatorParams types.ValidatorParams shouldErr bool }{ diff --git a/state/export_test.go b/state/export_test.go index b8c118f10f..a15414c926 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -5,7 +5,6 @@ import ( abci "github.com/cometbft/cometbft/abci/types" cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cometbft/cometbft/types" ) @@ -36,7 +35,7 @@ func UpdateState( // ValidateValidatorUpdates is an alias for validateValidatorUpdates exported // from execution.go, exclusively and explicitly for testing. -func ValidateValidatorUpdates(abciUpdates []abci.ValidatorUpdate, params cmtproto.ValidatorParams) error { +func ValidateValidatorUpdates(abciUpdates []abci.ValidatorUpdate, params types.ValidatorParams) error { return validateValidatorUpdates(abciUpdates, params) } diff --git a/state/helpers_test.go b/state/helpers_test.go index ec0a4cac9e..a0e6e68ae2 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -22,7 +22,7 @@ import ( type paramsChangeTestCase struct { height int64 - params cmtproto.ConsensusParams + params types.ConsensusParams } func newTestApp() proxy.AppConns { @@ -215,7 +215,7 @@ func makeHeaderPartsResponsesParams( block := makeBlock(state, state.LastBlockHeight+1) abciResponses := &cmtstate.ABCIResponses{ BeginBlock: &abci.ResponseBeginBlock{}, - EndBlock: &abci.ResponseEndBlock{ConsensusParamUpdates: types.TM2PB.ConsensusParams(¶ms)}, + EndBlock: &abci.ResponseEndBlock{ConsensusParamUpdates: ¶ms}, } return block.Header, types.BlockID{Hash: block.Hash(), PartSetHeader: types.PartSetHeader{}}, abciResponses } @@ -262,9 +262,9 @@ func (app *testApp) BeginBlock(req abci.RequestBeginBlock) abci.ResponseBeginBlo func (app *testApp) EndBlock(req abci.RequestEndBlock) abci.ResponseEndBlock { return abci.ResponseEndBlock{ ValidatorUpdates: app.ValidatorUpdates, - ConsensusParamUpdates: &abci.ConsensusParams{ + ConsensusParamUpdates: &cmtproto.ConsensusParams{ Version: &cmtproto.VersionParams{ - AppVersion: 1}}} + App: 1}}} } func (app *testApp) DeliverTx(req abci.RequestDeliverTx) abci.ResponseDeliverTx { diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go index 263d22dee9..8990d41a7e 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -3,8 +3,8 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" state "github.com/cometbft/cometbft/state" + mock "github.com/stretchr/testify/mock" types "github.com/cometbft/cometbft/types" ) diff --git a/state/mocks/store.go b/state/mocks/store.go index fd9607e9b5..ba6db08439 100644 --- a/state/mocks/store.go +++ b/state/mocks/store.go @@ -3,14 +3,12 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" state "github.com/cometbft/cometbft/state" + mock "github.com/stretchr/testify/mock" tendermintstate "github.com/cometbft/cometbft/proto/tendermint/state" - tenderminttypes "github.com/cometbft/cometbft/types" - - types "github.com/cometbft/cometbft/proto/tendermint/types" + types "github.com/cometbft/cometbft/types" ) // Store is an autogenerated mock type for the Store type @@ -112,18 +110,18 @@ func (_m *Store) LoadConsensusParams(_a0 int64) (types.ConsensusParams, error) { } // LoadFromDBOrGenesisDoc provides a mock function with given fields: _a0 -func (_m *Store) LoadFromDBOrGenesisDoc(_a0 *tenderminttypes.GenesisDoc) (state.State, error) { +func (_m *Store) LoadFromDBOrGenesisDoc(_a0 *types.GenesisDoc) (state.State, error) { ret := _m.Called(_a0) var r0 state.State - if rf, ok := ret.Get(0).(func(*tenderminttypes.GenesisDoc) state.State); ok { + if rf, ok := ret.Get(0).(func(*types.GenesisDoc) state.State); ok { r0 = rf(_a0) } else { r0 = ret.Get(0).(state.State) } var r1 error - if rf, ok := ret.Get(1).(func(*tenderminttypes.GenesisDoc) error); ok { + if rf, ok := ret.Get(1).(func(*types.GenesisDoc) error); ok { r1 = rf(_a0) } else { r1 = ret.Error(1) @@ -177,15 +175,15 @@ func (_m *Store) LoadLastABCIResponse(_a0 int64) (*tendermintstate.ABCIResponses } // LoadValidators provides a mock function with given fields: _a0 -func (_m *Store) LoadValidators(_a0 int64) (*tenderminttypes.ValidatorSet, error) { +func (_m *Store) LoadValidators(_a0 int64) (*types.ValidatorSet, error) { ret := _m.Called(_a0) - var r0 *tenderminttypes.ValidatorSet - if rf, ok := ret.Get(0).(func(int64) *tenderminttypes.ValidatorSet); ok { + var r0 *types.ValidatorSet + if rf, ok := ret.Get(0).(func(int64) *types.ValidatorSet); ok { r0 = rf(_a0) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*tenderminttypes.ValidatorSet) + r0 = ret.Get(0).(*types.ValidatorSet) } } diff --git a/state/rollback.go b/state/rollback.go index f061f4815a..69d1965d95 100644 --- a/state/rollback.go +++ b/state/rollback.go @@ -77,7 +77,7 @@ func Rollback(bs BlockStore, ss Store) (int64, []byte, error) { Version: cmtstate.Version{ Consensus: cmtversion.Consensus{ Block: version.BlockProtocol, - App: previousParams.Version.AppVersion, + App: previousParams.Version.App, }, Software: version.TMCoreSemVer, }, diff --git a/state/rollback_test.go b/state/rollback_test.go index a18efdeeb4..d4403fc7f6 100644 --- a/state/rollback_test.go +++ b/state/rollback_test.go @@ -29,7 +29,7 @@ func TestRollback(t *testing.T) { // perform the rollback over a version bump newParams := types.DefaultConsensusParams() - newParams.Version.AppVersion = 11 + newParams.Version.App = 11 newParams.Block.MaxBytes = 1000 nextState := initialState.Copy() nextState.LastBlockHeight = nextHeight @@ -122,7 +122,7 @@ func setupStateStore(t *testing.T, height int64) state.Store { valSet, _ := types.RandValidatorSet(5, 10) params := types.DefaultConsensusParams() - params.Version.AppVersion = 10 + params.Version.App = 10 initialState := state.State{ Version: cmtstate.Version{ diff --git a/state/state.go b/state/state.go index 80047edc53..da6b73e46d 100644 --- a/state/state.go +++ b/state/state.go @@ -10,7 +10,6 @@ import ( "github.com/gogo/protobuf/proto" cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" "github.com/cometbft/cometbft/types" cmttime "github.com/cometbft/cometbft/types/time" @@ -70,7 +69,7 @@ type State struct { // Consensus parameters used for validating blocks. // Changes returned by EndBlock and updated after Commit. - ConsensusParams cmtproto.ConsensusParams + ConsensusParams types.ConsensusParams LastHeightConsensusParamsChanged int64 // Merkle root of the results from executing prev block @@ -166,7 +165,7 @@ func (state *State) ToProto() (*cmtstate.State, error) { } sm.LastHeightValidatorsChanged = state.LastHeightValidatorsChanged - sm.ConsensusParams = state.ConsensusParams + sm.ConsensusParams = state.ConsensusParams.ToProto() sm.LastHeightConsensusParamsChanged = state.LastHeightConsensusParamsChanged sm.LastResultsHash = state.LastResultsHash sm.AppHash = state.AppHash @@ -217,7 +216,7 @@ func FromProto(pb *cmtstate.State) (*State, error) { //nolint:golint } state.LastHeightValidatorsChanged = pb.LastHeightValidatorsChanged - state.ConsensusParams = pb.ConsensusParams + state.ConsensusParams = types.ConsensusParamsFromProto(pb.ConsensusParams) state.LastHeightConsensusParamsChanged = pb.LastHeightConsensusParamsChanged state.LastResultsHash = pb.LastResultsHash state.AppHash = pb.AppHash @@ -254,7 +253,7 @@ func (state State) MakeBlock( state.Version.Consensus, state.ChainID, timestamp, state.LastBlockID, state.Validators.Hash(), state.NextValidators.Hash(), - types.HashConsensusParams(state.ConsensusParams), state.AppHash, state.LastResultsHash, + state.ConsensusParams.Hash(), state.AppHash, state.LastResultsHash, proposerAddress, ) diff --git a/state/state_test.go b/state/state_test.go index 5df36bedd4..f4c698b0e8 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -19,7 +19,6 @@ import ( cryptoenc "github.com/cometbft/cometbft/crypto/encoding" cmtrand "github.com/cometbft/cometbft/libs/rand" cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" sm "github.com/cometbft/cometbft/state" "github.com/cometbft/cometbft/types" ) @@ -1016,12 +1015,12 @@ func TestConsensusParamsChangesSaveLoad(t *testing.T) { // Each valset is just one validator. // create list of them. - params := make([]cmtproto.ConsensusParams, N+1) + params := make([]types.ConsensusParams, N+1) params[0] = state.ConsensusParams for i := 1; i < N+1; i++ { params[i] = *types.DefaultConsensusParams() params[i].Block.MaxBytes += int64(i) - params[i].Block.TimeIotaMs = 10 + } // Build the params history by running updateState @@ -1037,7 +1036,7 @@ func TestConsensusParamsChangesSaveLoad(t *testing.T) { changeIndex++ cp = params[changeIndex] } - header, blockID, responses := makeHeaderPartsResponsesParams(state, cp) + header, blockID, responses := makeHeaderPartsResponsesParams(state, cp.ToProto()) validatorUpdates, err = types.PB2TM.ValidatorUpdates(responses.EndBlock.ValidatorUpdates) require.NoError(t, err) state, err = sm.UpdateState(state, blockID, &header, responses, validatorUpdates) diff --git a/state/store.go b/state/store.go index 6051471ab9..3d2dafe287 100644 --- a/state/store.go +++ b/state/store.go @@ -65,7 +65,7 @@ type Store interface { // LoadLastABCIResponse loads the last abciResponse for a given height LoadLastABCIResponse(int64) (*cmtstate.ABCIResponses, error) // LoadConsensusParams loads the consensus params for a given height - LoadConsensusParams(int64) (cmtproto.ConsensusParams, error) + LoadConsensusParams(int64) (types.ConsensusParams, error) // Save overwrites the previous state with the updated one Save(State) error // SaveABCIResponses saves ABCIResponses for a given height @@ -315,10 +315,11 @@ func (store dbStore) PruneStates(from int64, to int64) error { } if p.ConsensusParams.Equal(&cmtproto.ConsensusParams{}) { - p.ConsensusParams, err = store.LoadConsensusParams(h) + params, err := store.LoadConsensusParams(h) if err != nil { return err } + p.ConsensusParams = params.ToProto() p.LastHeightChanged = h bz, err := p.Marshal() @@ -588,15 +589,17 @@ func (store dbStore) saveValidatorsInfo(height, lastHeightChanged int64, valSet // ConsensusParamsInfo represents the latest consensus params, or the last height it changed // LoadConsensusParams loads the ConsensusParams for a given height. -func (store dbStore) LoadConsensusParams(height int64) (cmtproto.ConsensusParams, error) { - empty := cmtproto.ConsensusParams{} - +func (store dbStore) LoadConsensusParams(height int64) (types.ConsensusParams, error) { + var ( + empty = types.ConsensusParams{} + emptypb = cmtproto.ConsensusParams{} + ) paramsInfo, err := store.loadConsensusParamsInfo(height) if err != nil { return empty, fmt.Errorf("could not find consensus params for height #%d: %w", height, err) } - if paramsInfo.ConsensusParams.Equal(&empty) { + if paramsInfo.ConsensusParams.Equal(&emptypb) { paramsInfo2, err := store.loadConsensusParamsInfo(paramsInfo.LastHeightChanged) if err != nil { return empty, fmt.Errorf( @@ -610,7 +613,7 @@ func (store dbStore) LoadConsensusParams(height int64) (cmtproto.ConsensusParams paramsInfo = paramsInfo2 } - return paramsInfo.ConsensusParams, nil + return types.ConsensusParamsFromProto(paramsInfo.ConsensusParams), nil } func (store dbStore) loadConsensusParamsInfo(height int64) (*cmtstate.ConsensusParamsInfo, error) { @@ -637,13 +640,13 @@ func (store dbStore) loadConsensusParamsInfo(height int64) (*cmtstate.ConsensusP // It should be called from s.Save(), right before the state itself is persisted. // If the consensus params did not change after processing the latest block, // only the last height for which they changed is persisted. -func (store dbStore) saveConsensusParamsInfo(nextHeight, changeHeight int64, params cmtproto.ConsensusParams) error { +func (store dbStore) saveConsensusParamsInfo(nextHeight, changeHeight int64, params types.ConsensusParams) error { paramsInfo := &cmtstate.ConsensusParamsInfo{ LastHeightChanged: changeHeight, } if changeHeight == nextHeight { - paramsInfo.ConsensusParams = params + paramsInfo.ConsensusParams = params.ToProto() } bz, err := paramsInfo.Marshal() if err != nil { diff --git a/state/store_test.go b/state/store_test.go index 742babf746..62ff0ea547 100644 --- a/state/store_test.go +++ b/state/store_test.go @@ -16,7 +16,6 @@ import ( "github.com/cometbft/cometbft/crypto/ed25519" cmtrand "github.com/cometbft/cometbft/libs/rand" cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" sm "github.com/cometbft/cometbft/state" "github.com/cometbft/cometbft/types" ) @@ -139,8 +138,8 @@ func TestPruneStates(t *testing.T) { LastBlockHeight: h - 1, Validators: validatorSet, NextValidators: validatorSet, - ConsensusParams: cmtproto.ConsensusParams{ - Block: cmtproto.BlockParams{MaxBytes: 10e6}, + ConsensusParams: types.ConsensusParams{ + Block: types.BlockParams{MaxBytes: 10e6}, }, LastHeightValidatorsChanged: valsChanged, LastHeightConsensusParamsChanged: paramsChanged, @@ -188,9 +187,10 @@ func TestPruneStates(t *testing.T) { params, err := stateStore.LoadConsensusParams(h) if expectParams[h] { require.NoError(t, err, "params height %v", h) - require.False(t, params.Equal(&cmtproto.ConsensusParams{})) + require.NotEmpty(t, params) } else { require.Error(t, err, "params height %v", h) + require.Empty(t, params) } abci, err := stateStore.LoadABCIResponses(h) diff --git a/state/txindex/mocks/tx_indexer.go b/state/txindex/mocks/tx_indexer.go index 3b20b073e6..daaca389f1 100644 --- a/state/txindex/mocks/tx_indexer.go +++ b/state/txindex/mocks/tx_indexer.go @@ -5,8 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" query "github.com/cometbft/cometbft/libs/pubsub/query" + mock "github.com/stretchr/testify/mock" txindex "github.com/cometbft/cometbft/state/txindex" diff --git a/state/validation.go b/state/validation.go index f040f47f7a..287aec31aa 100644 --- a/state/validation.go +++ b/state/validation.go @@ -57,10 +57,9 @@ func validateBlock(state State, block *types.Block) error { block.AppHash, ) } - hashCP := types.HashConsensusParams(state.ConsensusParams) - if !bytes.Equal(block.ConsensusHash, hashCP) { + if !bytes.Equal(block.ConsensusHash, state.ConsensusParams.Hash()) { return fmt.Errorf("wrong Block.Header.ConsensusHash. Expected %X, got %v", - hashCP, + state.ConsensusParams.Hash(), block.ConsensusHash, ) } diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index df9127c5fb..8de25f7056 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -5,8 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" state "github.com/cometbft/cometbft/state" + mock "github.com/stretchr/testify/mock" types "github.com/cometbft/cometbft/types" ) diff --git a/test/e2e/runner/setup.go b/test/e2e/runner/setup.go index 403ccc786c..13aa469c62 100644 --- a/test/e2e/runner/setup.go +++ b/test/e2e/runner/setup.go @@ -130,7 +130,7 @@ func MakeGenesis(testnet *e2e.Testnet) (types.GenesisDoc, error) { InitialHeight: testnet.InitialHeight, } // set the app version to 1 - genesis.ConsensusParams.Version.AppVersion = 1 + genesis.ConsensusParams.Version.App = 1 for validator, power := range testnet.Validators { genesis.Validators = append(genesis.Validators, types.GenesisValidator{ Name: validator.Name, diff --git a/test/maverick/consensus/replay.go b/test/maverick/consensus/replay.go index 9dea19638e..b65816d4c1 100644 --- a/test/maverick/consensus/replay.go +++ b/test/maverick/consensus/replay.go @@ -308,12 +308,12 @@ func (h *Handshaker) ReplayBlocks( } validatorSet := types.NewValidatorSet(validators) nextVals := types.TM2PB.ValidatorUpdates(validatorSet) - csParams := types.TM2PB.ConsensusParams(h.genDoc.ConsensusParams) + pbparams := h.genDoc.ConsensusParams.ToProto() req := abci.RequestInitChain{ Time: h.genDoc.GenesisTime, ChainId: h.genDoc.ChainID, InitialHeight: h.genDoc.InitialHeight, - ConsensusParams: csParams, + ConsensusParams: &pbparams, Validators: nextVals, AppStateBytes: h.genDoc.AppState, } @@ -345,8 +345,8 @@ func (h *Handshaker) ReplayBlocks( } if res.ConsensusParams != nil { - state.ConsensusParams = types.UpdateConsensusParams(state.ConsensusParams, res.ConsensusParams) - state.Version.Consensus.App = state.ConsensusParams.Version.AppVersion + state.ConsensusParams = state.ConsensusParams.Update(res.ConsensusParams) + state.Version.Consensus.App = state.ConsensusParams.Version.App } // We update the last results hash with the empty hash, to conform with RFC-6962. state.LastResultsHash = merkle.HashFromByteSlices(nil) diff --git a/test/maverick/consensus/state.go b/test/maverick/consensus/state.go index d67a81de98..726f3da835 100644 --- a/test/maverick/consensus/state.go +++ b/test/maverick/consensus/state.go @@ -1849,9 +1849,10 @@ func (cs *State) signVote( func (cs *State) voteTime() time.Time { now := cmttime.Now() minVoteTime := now + // Minimum time increment between blocks + const timeIota = time.Millisecond // TODO: We should remove next line in case we don't vote for v in case cs.ProposalBlock == nil, - // even if cs.LockedBlock != nil. See https://github.com/cometbft/cometbft/tree/v0.34.x/spec/. - timeIota := time.Duration(cs.state.ConsensusParams.Block.TimeIotaMs) * time.Millisecond + // even if cs.LockedBlock != nil. See https://docs.tendermint.com/master/spec/. if cs.LockedBlock != nil { // See the BFT time spec // https://github.com/cometbft/cometbft/blob/v0.34.x/spec/consensus/bft-time.md diff --git a/types/genesis.go b/types/genesis.go index b773101f48..88209dd561 100644 --- a/types/genesis.go +++ b/types/genesis.go @@ -12,7 +12,6 @@ import ( cmtbytes "github.com/cometbft/cometbft/libs/bytes" cmtjson "github.com/cometbft/cometbft/libs/json" cmtos "github.com/cometbft/cometbft/libs/os" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" cmttime "github.com/cometbft/cometbft/types/time" ) @@ -37,13 +36,13 @@ type GenesisValidator struct { // GenesisDoc defines the initial conditions for a CometBFT blockchain, in particular its validator set. type GenesisDoc struct { - GenesisTime time.Time `json:"genesis_time"` - ChainID string `json:"chain_id"` - InitialHeight int64 `json:"initial_height"` - ConsensusParams *cmtproto.ConsensusParams `json:"consensus_params,omitempty"` - Validators []GenesisValidator `json:"validators,omitempty"` - AppHash cmtbytes.HexBytes `json:"app_hash"` - AppState json.RawMessage `json:"app_state,omitempty"` + GenesisTime time.Time `json:"genesis_time"` + ChainID string `json:"chain_id"` + InitialHeight int64 `json:"initial_height"` + ConsensusParams *ConsensusParams `json:"consensus_params,omitempty"` + Validators []GenesisValidator `json:"validators,omitempty"` + AppHash cmtbytes.HexBytes `json:"app_hash"` + AppState json.RawMessage `json:"app_state,omitempty"` } // SaveAs is a utility method for saving GenensisDoc as a JSON file. @@ -83,7 +82,7 @@ func (genDoc *GenesisDoc) ValidateAndComplete() error { if genDoc.ConsensusParams == nil { genDoc.ConsensusParams = DefaultConsensusParams() - } else if err := ValidateConsensusParams(*genDoc.ConsensusParams); err != nil { + } else if err := genDoc.ConsensusParams.ValidateBasic(); err != nil { return err } diff --git a/types/params.go b/types/params.go index 6d9e5c3b37..35281998ab 100644 --- a/types/params.go +++ b/types/params.go @@ -5,7 +5,8 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/cometbft/cometbft/crypto/secp256k1" "github.com/cometbft/cometbft/crypto/tmhash" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" ) @@ -19,11 +20,52 @@ const ( // MaxBlockPartsCount is the maximum number of block parts. MaxBlockPartsCount = (MaxBlockSizeBytes / BlockPartSizeBytes) + 1 + + ABCIPubKeyTypeEd25519 = ed25519.KeyType + ABCIPubKeyTypeSecp256k1 = secp256k1.KeyType ) +var ABCIPubKeyTypesToNames = map[string]string{ + ABCIPubKeyTypeEd25519: ed25519.PubKeyName, + ABCIPubKeyTypeSecp256k1: secp256k1.PubKeyName, +} + +// ConsensusParams contains consensus critical parameters that determine the +// validity of blocks. +type ConsensusParams struct { + Block BlockParams `json:"block"` + Evidence EvidenceParams `json:"evidence"` + Validator ValidatorParams `json:"validator"` + Version VersionParams `json:"version"` +} + +// BlockParams define limits on the block size and gas plus minimum time +// between blocks. +type BlockParams struct { + MaxBytes int64 `json:"max_bytes"` + MaxGas int64 `json:"max_gas"` +} + +// EvidenceParams determine how we handle evidence of malfeasance. +type EvidenceParams struct { + MaxAgeNumBlocks int64 `json:"max_age_num_blocks"` // only accept new evidence more recent than this + MaxAgeDuration time.Duration `json:"max_age_duration"` + MaxBytes int64 `json:"max_bytes"` +} + +// ValidatorParams restrict the public key types validators can use. +// NOTE: uses ABCI pubkey naming, not Amino names. +type ValidatorParams struct { + PubKeyTypes []string `json:"pub_key_types"` +} + +type VersionParams struct { + App uint64 `json:"app"` +} + // DefaultConsensusParams returns a default ConsensusParams. -func DefaultConsensusParams() *cmtproto.ConsensusParams { - return &cmtproto.ConsensusParams{ +func DefaultConsensusParams() *ConsensusParams { + return &ConsensusParams{ Block: DefaultBlockParams(), Evidence: DefaultEvidenceParams(), Validator: DefaultValidatorParams(), @@ -32,17 +74,16 @@ func DefaultConsensusParams() *cmtproto.ConsensusParams { } // DefaultBlockParams returns a default BlockParams. -func DefaultBlockParams() cmtproto.BlockParams { - return cmtproto.BlockParams{ - MaxBytes: 22020096, // 21MB - MaxGas: -1, - TimeIotaMs: 1000, // 1s +func DefaultBlockParams() BlockParams { + return BlockParams{ + MaxBytes: 22020096, // 21MB + MaxGas: -1, } } // DefaultEvidenceParams returns a default EvidenceParams. -func DefaultEvidenceParams() cmtproto.EvidenceParams { - return cmtproto.EvidenceParams{ +func DefaultEvidenceParams() EvidenceParams { + return EvidenceParams{ MaxAgeNumBlocks: 100000, // 27.8 hrs at 1block/s MaxAgeDuration: 48 * time.Hour, MaxBytes: 1048576, // 1MB @@ -51,19 +92,19 @@ func DefaultEvidenceParams() cmtproto.EvidenceParams { // DefaultValidatorParams returns a default ValidatorParams, which allows // only ed25519 pubkeys. -func DefaultValidatorParams() cmtproto.ValidatorParams { - return cmtproto.ValidatorParams{ +func DefaultValidatorParams() ValidatorParams { + return ValidatorParams{ PubKeyTypes: []string{ABCIPubKeyTypeEd25519}, } } -func DefaultVersionParams() cmtproto.VersionParams { - return cmtproto.VersionParams{ - AppVersion: 0, +func DefaultVersionParams() VersionParams { + return VersionParams{ + App: 0, } } -func IsValidPubkeyType(params cmtproto.ValidatorParams, pubkeyType string) bool { +func IsValidPubkeyType(params ValidatorParams, pubkeyType string) bool { for i := 0; i < len(params.PubKeyTypes); i++ { if params.PubKeyTypes[i] == pubkeyType { return true @@ -74,7 +115,7 @@ func IsValidPubkeyType(params cmtproto.ValidatorParams, pubkeyType string) bool // Validate validates the ConsensusParams to ensure all values are within their // allowed limits, and returns an error if they are not. -func ValidateConsensusParams(params cmtproto.ConsensusParams) error { +func (params ConsensusParams) ValidateBasic() error { if params.Block.MaxBytes <= 0 { return fmt.Errorf("block.MaxBytes must be greater than 0. Got %d", params.Block.MaxBytes) @@ -89,11 +130,6 @@ func ValidateConsensusParams(params cmtproto.ConsensusParams) error { params.Block.MaxGas) } - if params.Block.TimeIotaMs <= 0 { - return fmt.Errorf("block.TimeIotaMs must be greater than 0. Got %v", - params.Block.TimeIotaMs) - } - if params.Evidence.MaxAgeNumBlocks <= 0 { return fmt.Errorf("evidence.MaxAgeNumBlocks must be greater than 0. Got %d", params.Evidence.MaxAgeNumBlocks) @@ -134,7 +170,7 @@ func ValidateConsensusParams(params cmtproto.ConsensusParams) error { // Only the Block.MaxBytes and Block.MaxGas are included in the hash. // This allows the ConsensusParams to evolve more without breaking the block // protocol. No need for a Merkle tree here, just a small struct to hash. -func HashConsensusParams(params cmtproto.ConsensusParams) []byte { +func (params ConsensusParams) Hash() []byte { hasher := tmhash.New() hp := cmtproto.HashedParams{ @@ -156,7 +192,7 @@ func HashConsensusParams(params cmtproto.ConsensusParams) []byte { // Update returns a copy of the params with updates from the non-zero fields of p2. // NOTE: note: must not modify the original -func UpdateConsensusParams(params cmtproto.ConsensusParams, params2 *abci.ConsensusParams) cmtproto.ConsensusParams { +func (params ConsensusParams) Update(params2 *cmtproto.ConsensusParams) ConsensusParams { res := params // explicit copy if params2 == nil { @@ -179,7 +215,47 @@ func UpdateConsensusParams(params cmtproto.ConsensusParams, params2 *abci.Consen res.Validator.PubKeyTypes = append([]string{}, params2.Validator.PubKeyTypes...) } if params2.Version != nil { - res.Version.AppVersion = params2.Version.AppVersion + res.Version.App = params2.Version.App } return res } + +func (params *ConsensusParams) ToProto() cmtproto.ConsensusParams { + return cmtproto.ConsensusParams{ + Block: &cmtproto.BlockParams{ + MaxBytes: params.Block.MaxBytes, + MaxGas: params.Block.MaxGas, + }, + Evidence: &cmtproto.EvidenceParams{ + MaxAgeNumBlocks: params.Evidence.MaxAgeNumBlocks, + MaxAgeDuration: params.Evidence.MaxAgeDuration, + MaxBytes: params.Evidence.MaxBytes, + }, + Validator: &cmtproto.ValidatorParams{ + PubKeyTypes: params.Validator.PubKeyTypes, + }, + Version: &cmtproto.VersionParams{ + App: params.Version.App, + }, + } +} + +func ConsensusParamsFromProto(pbParams cmtproto.ConsensusParams) ConsensusParams { + return ConsensusParams{ + Block: BlockParams{ + MaxBytes: pbParams.Block.MaxBytes, + MaxGas: pbParams.Block.MaxGas, + }, + Evidence: EvidenceParams{ + MaxAgeNumBlocks: pbParams.Evidence.MaxAgeNumBlocks, + MaxAgeDuration: pbParams.Evidence.MaxAgeDuration, + MaxBytes: pbParams.Evidence.MaxBytes, + }, + Validator: ValidatorParams{ + PubKeyTypes: pbParams.Validator.PubKeyTypes, + }, + Version: VersionParams{ + App: pbParams.Version.App, + }, + } +} diff --git a/types/params_test.go b/types/params_test.go index f7d5d89433..226e35ab94 100644 --- a/types/params_test.go +++ b/types/params_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/assert" - abci "github.com/cometbft/cometbft/abci/types" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" ) @@ -19,77 +18,73 @@ var ( func TestConsensusParamsValidation(t *testing.T) { testCases := []struct { - params cmtproto.ConsensusParams + params ConsensusParams valid bool }{ // test block params - 0: {makeParams(1, 0, 10, 2, 0, valEd25519), true}, - 1: {makeParams(0, 0, 10, 2, 0, valEd25519), false}, - 2: {makeParams(47*1024*1024, 0, 10, 2, 0, valEd25519), true}, - 3: {makeParams(10, 0, 10, 2, 0, valEd25519), true}, - 4: {makeParams(100*1024*1024, 0, 10, 2, 0, valEd25519), true}, - 5: {makeParams(101*1024*1024, 0, 10, 2, 0, valEd25519), false}, - 6: {makeParams(1024*1024*1024, 0, 10, 2, 0, valEd25519), false}, - 7: {makeParams(1024*1024*1024, 0, 10, -1, 0, valEd25519), false}, - 8: {makeParams(1, 0, -10, 2, 0, valEd25519), false}, + 0: {makeParams(1, 0, 2, 0, valEd25519), true}, + 1: {makeParams(0, 0, 2, 0, valEd25519), false}, + 2: {makeParams(47*1024*1024, 0, 2, 0, valEd25519), true}, + 3: {makeParams(10, 0, 2, 0, valEd25519), true}, + 4: {makeParams(100*1024*1024, 0, 2, 0, valEd25519), true}, + 5: {makeParams(101*1024*1024, 0, 2, 0, valEd25519), false}, + 6: {makeParams(1024*1024*1024, 0, 2, 0, valEd25519), false}, // test evidence params - 9: {makeParams(1, 0, 10, 0, 0, valEd25519), false}, - 10: {makeParams(1, 0, 10, 2, 2, valEd25519), false}, - 11: {makeParams(1000, 0, 10, 2, 1, valEd25519), true}, - 12: {makeParams(1, 0, 10, -1, 0, valEd25519), false}, + 7: {makeParams(1, 0, 0, 0, valEd25519), false}, + 8: {makeParams(1, 0, 2, 2, valEd25519), false}, + 9: {makeParams(1000, 0, 2, 1, valEd25519), true}, + 10: {makeParams(1, 0, -1, 0, valEd25519), false}, // test no pubkey type provided - 13: {makeParams(1, 0, 10, 2, 0, []string{}), false}, + 11: {makeParams(1, 0, 2, 0, []string{}), false}, // test invalid pubkey type provided - 14: {makeParams(1, 0, 10, 2, 0, []string{"potatoes make good pubkeys"}), false}, + 12: {makeParams(1, 0, 2, 0, []string{"potatoes make good pubkeys"}), false}, } for i, tc := range testCases { if tc.valid { - assert.NoErrorf(t, ValidateConsensusParams(tc.params), "expected no error for valid params (#%d)", i) + assert.NoErrorf(t, tc.params.ValidateBasic(), "expected no error for valid params (#%d)", i) } else { - assert.Errorf(t, ValidateConsensusParams(tc.params), "expected error for non valid params (#%d)", i) + assert.Errorf(t, tc.params.ValidateBasic(), "expected error for non valid params (#%d)", i) } } } func makeParams( blockBytes, blockGas int64, - blockTimeIotaMs int64, evidenceAge int64, maxEvidenceBytes int64, pubkeyTypes []string, -) cmtproto.ConsensusParams { - return cmtproto.ConsensusParams{ - Block: cmtproto.BlockParams{ - MaxBytes: blockBytes, - MaxGas: blockGas, - TimeIotaMs: blockTimeIotaMs, +) ConsensusParams { + return ConsensusParams{ + Block: BlockParams{ + MaxBytes: blockBytes, + MaxGas: blockGas, }, - Evidence: cmtproto.EvidenceParams{ + Evidence: EvidenceParams{ MaxAgeNumBlocks: evidenceAge, MaxAgeDuration: time.Duration(evidenceAge), MaxBytes: maxEvidenceBytes, }, - Validator: cmtproto.ValidatorParams{ + Validator: ValidatorParams{ PubKeyTypes: pubkeyTypes, }, } } func TestConsensusParamsHash(t *testing.T) { - params := []cmtproto.ConsensusParams{ - makeParams(4, 2, 10, 3, 1, valEd25519), - makeParams(1, 4, 10, 3, 1, valEd25519), - makeParams(1, 2, 10, 4, 1, valEd25519), - makeParams(2, 5, 10, 7, 1, valEd25519), - makeParams(1, 7, 10, 6, 1, valEd25519), - makeParams(9, 5, 10, 4, 1, valEd25519), - makeParams(7, 8, 10, 9, 1, valEd25519), - makeParams(4, 6, 10, 5, 1, valEd25519), + params := []ConsensusParams{ + makeParams(4, 2, 3, 1, valEd25519), + makeParams(1, 4, 3, 1, valEd25519), + makeParams(1, 2, 4, 1, valEd25519), + makeParams(2, 5, 7, 1, valEd25519), + makeParams(1, 7, 6, 1, valEd25519), + makeParams(9, 5, 4, 1, valEd25519), + makeParams(7, 8, 9, 1, valEd25519), + makeParams(4, 6, 5, 1, valEd25519), } hashes := make([][]byte, len(params)) for i := range params { - hashes[i] = HashConsensusParams(params[i]) + hashes[i] = params[i].Hash() } // make sure there are no duplicates... @@ -104,21 +99,21 @@ func TestConsensusParamsHash(t *testing.T) { func TestConsensusParamsUpdate(t *testing.T) { testCases := []struct { - params cmtproto.ConsensusParams - updates *abci.ConsensusParams - updatedParams cmtproto.ConsensusParams + params ConsensusParams + updates *cmtproto.ConsensusParams + updatedParams ConsensusParams }{ // empty updates { - makeParams(1, 2, 10, 3, 0, valEd25519), - &abci.ConsensusParams{}, - makeParams(1, 2, 10, 3, 0, valEd25519), + makeParams(1, 2, 3, 0, valEd25519), + &cmtproto.ConsensusParams{}, + makeParams(1, 2, 3, 0, valEd25519), }, // fine updates { - makeParams(1, 2, 10, 3, 0, valEd25519), - &abci.ConsensusParams{ - Block: &abci.BlockParams{ + makeParams(1, 2, 3, 0, valEd25519), + &cmtproto.ConsensusParams{ + Block: &cmtproto.BlockParams{ MaxBytes: 100, MaxGas: 200, }, @@ -131,21 +126,44 @@ func TestConsensusParamsUpdate(t *testing.T) { PubKeyTypes: valSecp256k1, }, }, - makeParams(100, 200, 10, 300, 50, valSecp256k1), + makeParams(100, 200, 300, 50, valSecp256k1), }, } + for _, tc := range testCases { - assert.Equal(t, tc.updatedParams, UpdateConsensusParams(tc.params, tc.updates)) + assert.Equal(t, tc.updatedParams, tc.params.Update(tc.updates)) } } func TestConsensusParamsUpdate_AppVersion(t *testing.T) { - params := makeParams(1, 2, 10, 3, 0, valEd25519) + params := makeParams(1, 2, 3, 0, valEd25519) + + assert.EqualValues(t, 0, params.Version.App) + + updated := params.Update( + &cmtproto.ConsensusParams{Version: &cmtproto.VersionParams{App: 1}}) + + assert.EqualValues(t, 1, updated.Version.App) +} - assert.EqualValues(t, 0, params.Version.AppVersion) +func TestProto(t *testing.T) { + params := []ConsensusParams{ + makeParams(4, 2, 3, 1, valEd25519), + makeParams(1, 4, 3, 1, valEd25519), + makeParams(1, 2, 4, 1, valEd25519), + makeParams(2, 5, 7, 1, valEd25519), + makeParams(1, 7, 6, 1, valEd25519), + makeParams(9, 5, 4, 1, valEd25519), + makeParams(7, 8, 9, 1, valEd25519), + makeParams(4, 6, 5, 1, valEd25519), + } + + for i := range params { + pbParams := params[i].ToProto() - updated := UpdateConsensusParams(params, - &abci.ConsensusParams{Version: &cmtproto.VersionParams{AppVersion: 1}}) + oriParams := ConsensusParamsFromProto(pbParams) - assert.EqualValues(t, 1, updated.Version.AppVersion) + assert.Equal(t, params[i], oriParams) + + } } diff --git a/types/protobuf.go b/types/protobuf.go index ad16171fbf..2a0790fc6e 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -3,27 +3,10 @@ package types import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/secp256k1" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" ) -//------------------------------------------------------- -// Use strings to distinguish types in ABCI messages - -const ( - ABCIPubKeyTypeEd25519 = ed25519.KeyType - ABCIPubKeyTypeSecp256k1 = secp256k1.KeyType -) - -// TODO: Make non-global by allowing for registration of more pubkey types - -var ABCIPubKeyTypesToNames = map[string]string{ - ABCIPubKeyTypeEd25519: ed25519.PubKeyName, - ABCIPubKeyTypeSecp256k1: secp256k1.PubKeyName, -} - //------------------------------------------------------- // TM2PB is used for converting CometBFT ABCI to protobuf ABCI. @@ -97,17 +80,6 @@ func (tm2pb) ValidatorUpdates(vals *ValidatorSet) []abci.ValidatorUpdate { return validators } -func (tm2pb) ConsensusParams(params *cmtproto.ConsensusParams) *abci.ConsensusParams { - return &abci.ConsensusParams{ - Block: &abci.BlockParams{ - MaxBytes: params.Block.MaxBytes, - MaxGas: params.Block.MaxGas, - }, - Evidence: ¶ms.Evidence, - Validator: ¶ms.Validator, - } -} - // XXX: panics on nil or unknown pubkey type func (tm2pb) NewValidatorUpdate(pubkey crypto.PubKey, power int64) abci.ValidatorUpdate { pubkeyABCI, err := cryptoenc.PubKeyToProto(pubkey) diff --git a/types/protobuf_test.go b/types/protobuf_test.go index ea4cd71a3f..3c8b66bcea 100644 --- a/types/protobuf_test.go +++ b/types/protobuf_test.go @@ -52,14 +52,6 @@ func TestABCIValidators(t *testing.T) { assert.Equal(t, tmValExpected, tmVals[0]) } -func TestABCIConsensusParams(t *testing.T) { - cp := DefaultConsensusParams() - abciCP := TM2PB.ConsensusParams(cp) - cp2 := UpdateConsensusParams(*cp, abciCP) - - assert.Equal(t, *cp, cp2) -} - type pubKeyEddie struct{} func (pubKeyEddie) Address() Address { return []byte{} } From 86e67b726f017e6c05c4a627c137ba78667dbb66 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 20 Sep 2023 16:39:59 +0200 Subject: [PATCH 3/7] chore: add --hard flag to rollback command to remove block as well (#1083) --- cmd/cometbft/commands/rollback.go | 26 ++++-- consensus/replay_test.go | 2 + rpc/core/blocks_test.go | 1 + state/mocks/block_store.go | 14 ++++ state/rollback.go | 19 ++++- state/rollback_test.go | 127 +++++++++++++++++++++++++++++- state/services.go | 2 + store/store.go | 47 +++++++++++ store/store_test.go | 3 + 9 files changed, 227 insertions(+), 14 deletions(-) diff --git a/cmd/cometbft/commands/rollback.go b/cmd/cometbft/commands/rollback.go index 027813ef93..b5dd1ded25 100644 --- a/cmd/cometbft/commands/rollback.go +++ b/cmd/cometbft/commands/rollback.go @@ -14,6 +14,12 @@ import ( "github.com/cometbft/cometbft/store" ) +var removeBlock = false + +func init() { + RollbackStateCmd.Flags().BoolVar(&removeBlock, "hard", false, "remove last block as well as state") +} + var RollbackStateCmd = &cobra.Command{ Use: "rollback", Short: "rollback CometBFT state by one height", @@ -21,17 +27,23 @@ var RollbackStateCmd = &cobra.Command{ A state rollback is performed to recover from an incorrect application state transition, when CometBFT has persisted an incorrect app hash and is thus unable to make progress. Rollback overwrites a state at height n with the state at height n - 1. -The application should also roll back to height n - 1. No blocks are removed, so upon -restarting CometBFT the transactions in block n will be re-executed against the -application. +The application should also roll back to height n - 1. If the --hard flag is not used, +no blocks will be removed so upon restarting Tendermint the transactions in block n will be +re-executed against the application. Using --hard will also remove block n. This can +be done multiple times. `, RunE: func(cmd *cobra.Command, args []string) error { - height, hash, err := RollbackState(config) + height, hash, err := RollbackState(config, removeBlock) if err != nil { return fmt.Errorf("failed to rollback state: %w", err) } - fmt.Printf("Rolled back state to height %d and hash %v", height, hash) + if removeBlock { + fmt.Printf("Rolled back both state and block to height %d and hash %X\n", height, hash) + } else { + fmt.Printf("Rolled back state to height %d and hash %X\n", height, hash) + } + return nil }, } @@ -39,7 +51,7 @@ application. // RollbackState takes the state at the current height n and overwrites it with the state // at height n - 1. Note state here refers to CometBFT state not application state. // Returns the latest state height and app hash alongside an error if there was one. -func RollbackState(config *cfg.Config) (int64, []byte, error) { +func RollbackState(config *cfg.Config, removeBlock bool) (int64, []byte, error) { // use the parsed config to load the block and state store blockStore, stateStore, err := loadStateAndBlockStore(config) if err != nil { @@ -51,7 +63,7 @@ func RollbackState(config *cfg.Config) (int64, []byte, error) { }() // rollback the last state - return state.Rollback(blockStore, stateStore) + return state.Rollback(blockStore, stateStore, removeBlock) } func loadStateAndBlockStore(config *cfg.Config) (*store.BlockStore, state.Store, error) { diff --git a/consensus/replay_test.go b/consensus/replay_test.go index 5b81da02f9..c80a7d9369 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -1241,6 +1241,8 @@ func (bs *mockBlockStore) PruneBlocks(height int64) (uint64, error) { return pruned, nil } +func (bs *mockBlockStore) DeleteLatestBlock() error { return nil } + //--------------------------------------- // Test handshake/init chain diff --git a/rpc/core/blocks_test.go b/rpc/core/blocks_test.go index 0755449c4c..3d0d80eac7 100644 --- a/rpc/core/blocks_test.go +++ b/rpc/core/blocks_test.go @@ -298,6 +298,7 @@ func (mockBlockStore) LoadSeenCommit(height int64) *types.Commit { retur func (mockBlockStore) PruneBlocks(height int64) (uint64, error) { return 0, nil } func (mockBlockStore) SaveBlock(block *types.Block, blockParts *types.PartSet, seenCommit *types.Commit) { } +func (mockBlockStore) DeleteLatestBlock() error { return nil } func (store mockBlockStore) LoadBlockMeta(height int64) *types.BlockMeta { if height > store.height { diff --git a/state/mocks/block_store.go b/state/mocks/block_store.go index 792dbe2106..e38de9c88b 100644 --- a/state/mocks/block_store.go +++ b/state/mocks/block_store.go @@ -27,6 +27,20 @@ func (_m *BlockStore) Base() int64 { return r0 } +// DeleteLatestBlock provides a mock function with given fields: +func (_m *BlockStore) DeleteLatestBlock() error { + ret := _m.Called() + + var r0 error + if rf, ok := ret.Get(0).(func() error); ok { + r0 = rf() + } else { + r0 = ret.Error(0) + } + + return r0 +} + // Height provides a mock function with given fields: func (_m *BlockStore) Height() int64 { ret := _m.Called() diff --git a/state/rollback.go b/state/rollback.go index 69d1965d95..6420192cf7 100644 --- a/state/rollback.go +++ b/state/rollback.go @@ -12,7 +12,7 @@ import ( // Rollback overwrites the current CometBFT state (height n) with the most // recent previous state (height n - 1). // Note that this function does not affect application state. -func Rollback(bs BlockStore, ss Store) (int64, []byte, error) { +func Rollback(bs BlockStore, ss Store, removeBlock bool) (int64, []byte, error) { invalidState, err := ss.Load() if err != nil { return -1, nil, err @@ -24,9 +24,14 @@ func Rollback(bs BlockStore, ss Store) (int64, []byte, error) { height := bs.Height() // NOTE: persistence of state and blocks don't happen atomically. Therefore it is possible that - // when the user stopped the node the state wasn't updated but the blockstore was. In this situation - // we don't need to rollback any state and can just return early + // when the user stopped the node the state wasn't updated but the blockstore was. Discard the + // pending block before continuing. if height == invalidState.LastBlockHeight+1 { + if removeBlock { + if err := bs.DeleteLatestBlock(); err != nil { + return -1, nil, fmt.Errorf("failed to remove final block from blockstore: %w", err) + } + } return invalidState.LastBlockHeight, invalidState.AppHash, nil } @@ -108,5 +113,13 @@ func Rollback(bs BlockStore, ss Store) (int64, []byte, error) { return -1, nil, fmt.Errorf("failed to save rolled back state: %w", err) } + // If removeBlock is true then also remove the block associated with the previous state. + // This will mean both the last state and last block height is equal to n - 1 + if removeBlock { + if err := bs.DeleteLatestBlock(); err != nil { + return -1, nil, fmt.Errorf("failed to remove final block from blockstore: %w", err) + } + } + return rolledBackState.LastBlockHeight, rolledBackState.AppHash, nil } diff --git a/state/rollback_test.go b/state/rollback_test.go index d4403fc7f6..2e120494a6 100644 --- a/state/rollback_test.go +++ b/state/rollback_test.go @@ -3,6 +3,7 @@ package state_test import ( "crypto/rand" "testing" + "time" dbm "github.com/cometbft/cometbft-db" "github.com/stretchr/testify/require" @@ -13,6 +14,7 @@ import ( cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" "github.com/cometbft/cometbft/state" "github.com/cometbft/cometbft/state/mocks" + "github.com/cometbft/cometbft/store" "github.com/cometbft/cometbft/types" "github.com/cometbft/cometbft/version" ) @@ -50,6 +52,7 @@ func TestRollback(t *testing.T) { BlockID: initialState.LastBlockID, Header: types.Header{ Height: initialState.LastBlockHeight, + Time: initialState.LastBlockTime, AppHash: crypto.CRandBytes(tmhash.Size), LastBlockID: makeBlockIDRandom(), LastResultsHash: initialState.LastResultsHash, @@ -61,6 +64,7 @@ func TestRollback(t *testing.T) { Height: nextState.LastBlockHeight, AppHash: initialState.AppHash, LastBlockID: block.BlockID, + Time: nextState.LastBlockTime, LastResultsHash: nextState.LastResultsHash, }, } @@ -69,7 +73,7 @@ func TestRollback(t *testing.T) { blockStore.On("Height").Return(nextHeight) // rollback the state - rollbackHeight, rollbackHash, err := state.Rollback(blockStore, stateStore) + rollbackHeight, rollbackHash, err := state.Rollback(blockStore, stateStore, false) require.NoError(t, err) require.EqualValues(t, height, rollbackHeight) require.EqualValues(t, initialState.AppHash, rollbackHash) @@ -81,6 +85,120 @@ func TestRollback(t *testing.T) { require.EqualValues(t, initialState, loadedState) } +func TestRollbackHard(t *testing.T) { + const height int64 = 100 + blockStore := store.NewBlockStore(dbm.NewMemDB()) + stateStore := state.NewStore(dbm.NewMemDB(), state.StoreOptions{DiscardABCIResponses: false}) + + valSet, _ := types.RandValidatorSet(5, 10) + + params := types.DefaultConsensusParams() + params.Version.App = 10 + now := time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC) + + block := &types.Block{ + Header: types.Header{ + Version: cmtversion.Consensus{Block: version.BlockProtocol, App: 1}, + ChainID: "test-chain", + Time: now, + Height: height, + AppHash: crypto.CRandBytes(tmhash.Size), + LastBlockID: makeBlockIDRandom(), + LastCommitHash: crypto.CRandBytes(tmhash.Size), + DataHash: crypto.CRandBytes(tmhash.Size), + ValidatorsHash: valSet.Hash(), + NextValidatorsHash: valSet.CopyIncrementProposerPriority(1).Hash(), + ConsensusHash: params.Hash(), + LastResultsHash: crypto.CRandBytes(tmhash.Size), + EvidenceHash: crypto.CRandBytes(tmhash.Size), + ProposerAddress: crypto.CRandBytes(crypto.AddressSize), + }, + LastCommit: &types.Commit{Height: height - 1}, + } + + partSet := block.MakePartSet(types.BlockPartSizeBytes) + blockStore.SaveBlock(block, partSet, &types.Commit{Height: block.Height}) + + currState := state.State{ + Version: cmtstate.Version{ + Consensus: block.Header.Version, + Software: version.TMCoreSemVer, + }, + LastBlockHeight: block.Height, + LastBlockTime: block.Time, + AppHash: crypto.CRandBytes(tmhash.Size), + LastValidators: valSet, + Validators: valSet.CopyIncrementProposerPriority(1), + NextValidators: valSet.CopyIncrementProposerPriority(2), + ConsensusParams: *params, + LastHeightConsensusParamsChanged: height + 1, + LastHeightValidatorsChanged: height + 1, + LastResultsHash: crypto.CRandBytes(tmhash.Size), + } + require.NoError(t, stateStore.Bootstrap(currState)) + + nextBlock := &types.Block{ + Header: types.Header{ + Version: cmtversion.Consensus{Block: version.BlockProtocol, App: 1}, + ChainID: block.ChainID, + Time: block.Time, + Height: currState.LastBlockHeight + 1, + AppHash: currState.AppHash, + LastBlockID: types.BlockID{Hash: block.Hash(), PartSetHeader: partSet.Header()}, + LastCommitHash: crypto.CRandBytes(tmhash.Size), + DataHash: crypto.CRandBytes(tmhash.Size), + ValidatorsHash: valSet.CopyIncrementProposerPriority(1).Hash(), + NextValidatorsHash: valSet.CopyIncrementProposerPriority(2).Hash(), + ConsensusHash: params.Hash(), + LastResultsHash: currState.LastResultsHash, + EvidenceHash: crypto.CRandBytes(tmhash.Size), + ProposerAddress: crypto.CRandBytes(crypto.AddressSize), + }, + LastCommit: &types.Commit{Height: currState.LastBlockHeight}, + } + + nextPartSet := nextBlock.MakePartSet(types.BlockPartSizeBytes) + blockStore.SaveBlock(nextBlock, nextPartSet, &types.Commit{Height: nextBlock.Height}) + + rollbackHeight, rollbackHash, err := state.Rollback(blockStore, stateStore, true) + require.NoError(t, err) + require.Equal(t, rollbackHeight, currState.LastBlockHeight) + require.Equal(t, rollbackHash, currState.AppHash) + + // state should not have been changed + loadedState, err := stateStore.Load() + require.NoError(t, err) + require.Equal(t, currState, loadedState) + + // resave the same block + blockStore.SaveBlock(nextBlock, nextPartSet, &types.Commit{Height: nextBlock.Height}) + + params.Version.App = 11 + + nextState := state.State{ + Version: cmtstate.Version{ + Consensus: block.Header.Version, + Software: version.TMCoreSemVer, + }, + LastBlockHeight: nextBlock.Height, + LastBlockTime: nextBlock.Time, + AppHash: crypto.CRandBytes(tmhash.Size), + LastValidators: valSet.CopyIncrementProposerPriority(1), + Validators: valSet.CopyIncrementProposerPriority(2), + NextValidators: valSet.CopyIncrementProposerPriority(3), + ConsensusParams: *params, + LastHeightConsensusParamsChanged: nextBlock.Height + 1, + LastHeightValidatorsChanged: nextBlock.Height + 1, + LastResultsHash: crypto.CRandBytes(tmhash.Size), + } + require.NoError(t, stateStore.Save(nextState)) + + rollbackHeight, rollbackHash, err = state.Rollback(blockStore, stateStore, true) + require.NoError(t, err) + require.Equal(t, rollbackHeight, currState.LastBlockHeight) + require.Equal(t, rollbackHash, currState.AppHash) +} + func TestRollbackNoState(t *testing.T) { stateStore := state.NewStore(dbm.NewMemDB(), state.StoreOptions{ @@ -88,7 +206,7 @@ func TestRollbackNoState(t *testing.T) { }) blockStore := &mocks.BlockStore{} - _, _, err := state.Rollback(blockStore, stateStore) + _, _, err := state.Rollback(blockStore, stateStore, false) require.Error(t, err) require.Contains(t, err.Error(), "no state found") } @@ -101,7 +219,7 @@ func TestRollbackNoBlocks(t *testing.T) { blockStore.On("LoadBlockMeta", height).Return(nil) blockStore.On("LoadBlockMeta", height-1).Return(nil) - _, _, err := state.Rollback(blockStore, stateStore) + _, _, err := state.Rollback(blockStore, stateStore, false) require.Error(t, err) require.Contains(t, err.Error(), "block at height 99 not found") } @@ -112,7 +230,7 @@ func TestRollbackDifferentStateHeight(t *testing.T) { blockStore := &mocks.BlockStore{} blockStore.On("Height").Return(height + 2) - _, _, err := state.Rollback(blockStore, stateStore) + _, _, err := state.Rollback(blockStore, stateStore, false) require.Error(t, err) require.Equal(t, err.Error(), "statestore height (100) is not one below or equal to blockstore height (102)") } @@ -138,6 +256,7 @@ func setupStateStore(t *testing.T, height int64) state.Store { AppHash: tmhash.Sum([]byte("app_hash")), LastResultsHash: tmhash.Sum([]byte("last_results_hash")), LastBlockHeight: height, + LastBlockTime: time.Now(), LastValidators: valSet, Validators: valSet.CopyIncrementProposerPriority(1), NextValidators: valSet.CopyIncrementProposerPriority(2), diff --git a/state/services.go b/state/services.go index bb6606bcac..b3e4e28bd4 100644 --- a/state/services.go +++ b/state/services.go @@ -34,6 +34,8 @@ type BlockStore interface { LoadBlockCommit(height int64) *types.Commit LoadSeenCommit(height int64) *types.Commit + + DeleteLatestBlock() error } //----------------------------------------------------------------------------- diff --git a/store/store.go b/store/store.go index 5b946d9f37..72655359ec 100644 --- a/store/store.go +++ b/store/store.go @@ -521,3 +521,50 @@ func mustEncode(pb proto.Message) []byte { } return bz } + +//----------------------------------------------------------------------------- + +// DeleteLatestBlock removes the block pointed to by height, +// lowering height by one. +func (bs *BlockStore) DeleteLatestBlock() error { + bs.mtx.RLock() + targetHeight := bs.height + bs.mtx.RUnlock() + + batch := bs.db.NewBatch() + defer batch.Close() + + // delete what we can, skipping what's already missing, to ensure partial + // blocks get deleted fully. + if meta := bs.LoadBlockMeta(targetHeight); meta != nil { + if err := batch.Delete(calcBlockHashKey(meta.BlockID.Hash)); err != nil { + return err + } + for p := 0; p < int(meta.BlockID.PartSetHeader.Total); p++ { + if err := batch.Delete(calcBlockPartKey(targetHeight, p)); err != nil { + return err + } + } + } + if err := batch.Delete(calcBlockCommitKey(targetHeight)); err != nil { + return err + } + if err := batch.Delete(calcSeenCommitKey(targetHeight)); err != nil { + return err + } + // delete last, so as to not leave keys built on meta.BlockID dangling + if err := batch.Delete(calcBlockMetaKey(targetHeight)); err != nil { + return err + } + + bs.mtx.Lock() + bs.height = targetHeight - 1 + bs.mtx.Unlock() + bs.saveState() + + err := batch.WriteSync() + if err != nil { + return fmt.Errorf("failed to delete height %v: %w", targetHeight, err) + } + return nil +} diff --git a/store/store_test.go b/store/store_test.go index e8250f2f2c..f962fa0cf1 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -398,6 +398,9 @@ func TestLoadBaseMeta(t *testing.T) { baseBlock := bs.LoadBaseMeta() assert.EqualValues(t, 4, baseBlock.Header.Height) assert.EqualValues(t, 4, bs.Base()) + + require.NoError(t, bs.DeleteLatestBlock()) + require.EqualValues(t, 9, bs.Height()) } func TestLoadBlockPart(t *testing.T) { From 43db8d098f74f0f8c76618c216feb1abed6ad247 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 22 Sep 2023 09:38:01 +0200 Subject: [PATCH 4/7] feat: mempool v1 records which peer it has sent the tx (#1089) This PR records that we have sent the peer the transaction to avoid doing it a second time --- mempool/v1/reactor.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mempool/v1/reactor.go b/mempool/v1/reactor.go index eb80e4509a..3741e7df3c 100644 --- a/mempool/v1/reactor.go +++ b/mempool/v1/reactor.go @@ -269,6 +269,10 @@ func (memR *Reactor) broadcastTxRoutine(peer p2p.Peer) { if !success { time.Sleep(mempool.PeerCatchupSleepIntervalMS * time.Millisecond) continue + } else { + // record that we have sent the peer the transaction + // to avoid doing it a second time + memTx.SetPeer(peerID) } } From fdc1e51ad0a1ecbca0cf085df7306c0c033c6148 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 07:59:54 +0000 Subject: [PATCH 5/7] build(deps): Bump github.com/celestiaorg/nmt from 0.19.0 to 0.20.0 (#1084) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 96abcba119..3e4bddab96 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.0 github.com/btcsuite/btcd/btcec/v2 v2.2.1 github.com/btcsuite/btcd/btcutil v1.1.2 - github.com/celestiaorg/nmt v0.19.0 + github.com/celestiaorg/nmt v0.20.0 github.com/cometbft/cometbft-db v0.7.0 github.com/go-git/go-git/v5 v5.5.1 github.com/vektra/mockery/v2 v2.14.0 diff --git a/go.sum b/go.sum index 3dcbd28026..ebd1a9e276 100644 --- a/go.sum +++ b/go.sum @@ -150,8 +150,8 @@ github.com/bufbuild/protocompile v0.1.0/go.mod h1:ix/MMMdsT3fzxfw91dvbfzKW3fRRnu github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/celestiaorg/nmt v0.19.0 h1:9VXFeI/gt+q8h5HeCE0RjXJhOxsFzxJUjHrkvF9CMYE= -github.com/celestiaorg/nmt v0.19.0/go.mod h1:Oz15Ub6YPez9uJV0heoU4WpFctxazuIhKyUtaYNio7E= +github.com/celestiaorg/nmt v0.20.0 h1:9i7ultZ8Wv5ytt8ZRaxKQ5KOOMo4A2K2T/aPGjIlSas= +github.com/celestiaorg/nmt v0.20.0/go.mod h1:Oz15Ub6YPez9uJV0heoU4WpFctxazuIhKyUtaYNio7E= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= From 322710fee3f9b8ca205b70703ec2e2d1b874e709 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 25 Sep 2023 10:32:53 +0200 Subject: [PATCH 6/7] feat: mempools should correctly respect time based TTL (#1088) TTLs are currently only checked on `Update` which is only when a block is committed. In the rare event that a block takes several rounds to commit (because of a faulty transaction that is halting the chain), a transaction can outlast the TTLDuration that was set by the node operator. This PR initiates a separate go routine for both the `v1` and `cat` mempools that will routinely check for expired transactions and remove them regardless of when `Update` is called --- mempool/cat/pool.go | 24 +++++++++++++++++---- mempool/cat/reactor.go | 43 +++++++++++++++++++++++++------------ mempool/cat/reactor_test.go | 23 ++++++++++++++++++++ mempool/v1/mempool.go | 16 +++++++++++++- mempool/v1/reactor.go | 16 ++++++++++++++ mempool/v1/reactor_test.go | 39 ++++++++++++++++++++++++++------- 6 files changed, 134 insertions(+), 27 deletions(-) diff --git a/mempool/cat/pool.go b/mempool/cat/pool.go index 3ad2651a50..30e8b38696 100644 --- a/mempool/cat/pool.go +++ b/mempool/cat/pool.go @@ -59,7 +59,8 @@ type TxPool struct { txsAvailable chan struct{} // one value sent per height when mempool is not empty preCheckFn mempool.PreCheckFunc postCheckFn mempool.PostCheckFunc - height int64 // the latest height passed to Update + height int64 // the latest height passed to Update + lastPurgeTime time.Time // the last time we attempted to purge transactions via the TTL // Thread-safe cache of rejected transactions for quick look-up rejectedTxCache *LRUTxCache @@ -186,6 +187,22 @@ func (txmp *TxPool) IsRejectedTx(txKey types.TxKey) bool { return txmp.rejectedTxCache.Has(txKey) } +// CheckToPurgeExpiredTxs checks if there has been adequate time since the last time +// the txpool looped through all transactions and if so, performs a purge of any transaction +// that has expired according to the TTLDuration. This is thread safe. +func (txmp *TxPool) CheckToPurgeExpiredTxs() { + txmp.updateMtx.Lock() + defer txmp.updateMtx.Unlock() + if txmp.config.TTLDuration > 0 && time.Since(txmp.lastPurgeTime) > txmp.config.TTLDuration { + expirationAge := time.Now().Add(-txmp.config.TTLDuration) + // a height of 0 means no transactions will be removed because of height + // (in other words, no transaction has a height less than 0) + numExpired := txmp.store.purgeExpiredTxs(0, expirationAge) + txmp.metrics.EvictedTxs.Add(float64(numExpired)) + txmp.lastPurgeTime = time.Now() + } +} + // CheckTx adds the given transaction to the mempool if it fits and passes the // application's ABCI CheckTx method. This should be viewed as the entry method for new transactions // into the network. In practice this happens via an RPC endpoint @@ -464,6 +481,7 @@ func (txmp *TxPool) Update( if newPostFn != nil { txmp.postCheckFn = newPostFn } + txmp.lastPurgeTime = time.Now() txmp.updateMtx.Unlock() txmp.metrics.SuccessfulTxs.Add(float64(len(blockTxs))) @@ -681,8 +699,6 @@ func (txmp *TxPool) canAddTx(size int64) bool { // purgeExpiredTxs removes all transactions from the mempool that have exceeded // their respective height or time-based limits as of the given blockHeight. // Transactions removed by this operation are not removed from the rejectedTxCache. -// -// The caller must hold txmp.mtx exclusively. func (txmp *TxPool) purgeExpiredTxs(blockHeight int64) { if txmp.config.TTLNumBlocks == 0 && txmp.config.TTLDuration == 0 { return // nothing to do @@ -704,7 +720,7 @@ func (txmp *TxPool) purgeExpiredTxs(blockHeight int64) { // purge old evicted and seen transactions if txmp.config.TTLDuration == 0 { - // ensure that evictedTxs and seenByPeersSet are eventually pruned + // ensure that seenByPeersSet are eventually pruned expirationAge = now.Add(-time.Hour) } txmp.seenByPeersSet.Prune(expirationAge) diff --git a/mempool/cat/reactor.go b/mempool/cat/reactor.go index 9a4583bc8d..4e246c2326 100644 --- a/mempool/cat/reactor.go +++ b/mempool/cat/reactor.go @@ -97,23 +97,38 @@ func (memR *Reactor) SetLogger(l log.Logger) { // OnStart implements Service. func (memR *Reactor) OnStart() error { - if memR.opts.ListenOnly { + if !memR.opts.ListenOnly { + go func() { + for { + select { + case <-memR.Quit(): + return + + // listen in for any newly verified tx via RPC, then immediately + // broadcast it to all connected peers. + case nextTx := <-memR.mempool.next(): + memR.broadcastNewTx(nextTx) + } + } + }() + } else { memR.Logger.Info("Tx broadcasting is disabled") - return nil } - go func() { - for { - select { - case <-memR.Quit(): - return - - // listen in for any newly verified tx via RFC, then immediately - // broadcasts it to all connected peers. - case nextTx := <-memR.mempool.next(): - memR.broadcastNewTx(nextTx) + // run a separate go routine to check for time based TTLs + if memR.mempool.config.TTLDuration > 0 { + go func() { + ticker := time.NewTicker(memR.mempool.config.TTLDuration) + for { + select { + case <-ticker.C: + memR.mempool.CheckToPurgeExpiredTxs() + case <-memR.Quit(): + return + } } - } - }() + }() + } + return nil } diff --git a/mempool/cat/reactor_test.go b/mempool/cat/reactor_test.go index 2a7dd753ba..62e167b735 100644 --- a/mempool/cat/reactor_test.go +++ b/mempool/cat/reactor_test.go @@ -177,6 +177,29 @@ func TestMempoolVectors(t *testing.T) { } } +func TestReactorEventuallyRemovesExpiredTransaction(t *testing.T) { + reactor, _ := setupReactor(t) + reactor.mempool.config.TTLDuration = 100 * time.Millisecond + + tx := newDefaultTx("hello") + key := tx.Key() + txMsg := &protomem.Message{ + Sum: &protomem.Message_Txs{Txs: &protomem.Txs{Txs: [][]byte{tx}}}, + } + txMsgBytes, err := txMsg.Marshal() + require.NoError(t, err) + + peer := genPeer() + require.NoError(t, reactor.Start()) + reactor.InitPeer(peer) + reactor.Receive(mempool.MempoolChannel, peer, txMsgBytes) + require.True(t, reactor.mempool.Has(key)) + + // wait for the transaction to expire + time.Sleep(reactor.mempool.config.TTLDuration * 2) + require.False(t, reactor.mempool.Has(key)) +} + func TestLegacyReactorReceiveBasic(t *testing.T) { config := cfg.TestConfig() // if there were more than two reactors, the order of transactions could not be diff --git a/mempool/v1/mempool.go b/mempool/v1/mempool.go index beb1ebb271..159dca0481 100644 --- a/mempool/v1/mempool.go +++ b/mempool/v1/mempool.go @@ -50,7 +50,8 @@ type TxMempool struct { txsAvailable chan struct{} // one value sent per height when mempool is not empty preCheck mempool.PreCheckFunc postCheck mempool.PostCheckFunc - height int64 // the latest height passed to Update + height int64 // the latest height passed to Update + lastPurgeTime time.Time // the last time we attempted to purge transactions via the TTL txs *clist.CList // valid transactions (passed CheckTx) txByKey map[types.TxKey]*clist.CElement @@ -723,6 +724,17 @@ func (txmp *TxMempool) canAddTx(wtx *WrappedTx) error { return nil } +// CheckToPurgeExpiredTxs checks if there has been adequate time since the last time +// the txpool looped through all transactions and if so, performs a purge of any transaction +// that has expired according to the TTLDuration. This is thread safe. +func (txmp *TxMempool) CheckToPurgeExpiredTxs() { + txmp.mtx.Lock() + defer txmp.mtx.Unlock() + if txmp.config.TTLDuration > 0 && time.Since(txmp.lastPurgeTime) > txmp.config.TTLDuration { + txmp.purgeExpiredTxs(txmp.height) + } +} + // purgeExpiredTxs removes all transactions from the mempool that have exceeded // their respective height or time-based limits as of the given blockHeight. // Transactions removed by this operation are not removed from the cache. @@ -752,6 +764,8 @@ func (txmp *TxMempool) purgeExpiredTxs(blockHeight int64) { } cur = next } + + txmp.lastPurgeTime = now } func (txmp *TxMempool) notifyTxsAvailable() { diff --git a/mempool/v1/reactor.go b/mempool/v1/reactor.go index 3741e7df3c..37e03a8ce9 100644 --- a/mempool/v1/reactor.go +++ b/mempool/v1/reactor.go @@ -117,6 +117,22 @@ func (memR *Reactor) OnStart() error { if !memR.config.Broadcast { memR.Logger.Info("Tx broadcasting is disabled") } + + // run a separate go routine to check for time based TTLs + if memR.mempool.config.TTLDuration > 0 { + go func() { + ticker := time.NewTicker(memR.mempool.config.TTLDuration) + for { + select { + case <-ticker.C: + memR.mempool.CheckToPurgeExpiredTxs() + case <-memR.Quit(): + return + } + } + }() + } + return nil } diff --git a/mempool/v1/reactor_test.go b/mempool/v1/reactor_test.go index 6618eeba20..1ae9fbddfa 100644 --- a/mempool/v1/reactor_test.go +++ b/mempool/v1/reactor_test.go @@ -95,6 +95,36 @@ func TestMempoolVectors(t *testing.T) { } } +func TestReactorEventuallyRemovesExpiredTransaction(t *testing.T) { + config := cfg.TestConfig() + config.Mempool.TTLDuration = 100 * time.Millisecond + const N = 1 + reactor := makeAndConnectReactors(config, N)[0] + + tx := types.Tx([]byte("test")) + key := tx.Key() + txMsg := &memproto.Message{ + Sum: &memproto.Message_Txs{Txs: &memproto.Txs{Txs: [][]byte{tx}}}, + } + txMsgBytes, err := txMsg.Marshal() + require.NoError(t, err) + + peer := mock.NewPeer(nil) + reactor.InitPeer(peer) + reactor.Receive(mempool.MempoolChannel, peer, txMsgBytes) + reactor.mempool.Lock() + _, has := reactor.mempool.txByKey[key] + reactor.mempool.Unlock() + require.True(t, has) + + // wait for the transaction to expire + time.Sleep(reactor.mempool.config.TTLDuration * 2) + reactor.mempool.Lock() + _, has = reactor.mempool.txByKey[key] + reactor.mempool.Unlock() + require.False(t, has) +} + func TestLegacyReactorReceiveBasic(t *testing.T) { config := cfg.TestConfig() // if there were more than two reactors, the order of transactions could not be @@ -130,7 +160,7 @@ func makeAndConnectReactors(config *cfg.Config, n int) []*Reactor { for i := 0; i < n; i++ { app := kvstore.NewApplication() cc := proxy.NewLocalClientCreator(app) - mempool, cleanup := newMempoolWithApp(cc) + mempool, cleanup := newMempoolWithAppAndConfig(cc, config) defer cleanup() reactors[i] = NewReactor(config.Mempool, mempool) // so we dont start the consensus states @@ -158,13 +188,6 @@ func mempoolLogger() log.Logger { }) } -func newMempoolWithApp(cc proxy.ClientCreator) (*TxMempool, func()) { - conf := cfg.ResetTestRoot("mempool_test") - - mp, cu := newMempoolWithAppAndConfig(cc, conf) - return mp, cu -} - func newMempoolWithAppAndConfig(cc proxy.ClientCreator, conf *cfg.Config) (*TxMempool, func()) { appConnMem, _ := cc.NewABCIClient() appConnMem.SetLogger(log.TestingLogger().With("module", "abci-client", "connection", "mempool")) From 13b9e92ba0bb545ab853380e34e30150016b9413 Mon Sep 17 00:00:00 2001 From: rene <41963722+renaynay@users.noreply.github.com> Date: Mon, 25 Sep 2023 23:50:12 +0200 Subject: [PATCH 7/7] fix(types): Implement nil check on commit.ValidateBasic (#1094) Found in celestia-node header validation check. If a malformed `ExtendedHeader` with a nil Commit is broadcasted through the network, it would cause recipients to panic. We decided the check belongs in core as ValidatorSet also does a nil check. --- types/block.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/types/block.go b/types/block.go index 65cef983c2..60b846978b 100644 --- a/types/block.go +++ b/types/block.go @@ -881,6 +881,10 @@ func (commit *Commit) IsCommit() bool { // ValidateBasic performs basic validation that doesn't involve state data. // Does not actually check the cryptographic signatures. func (commit *Commit) ValidateBasic() error { + if commit == nil { + return errors.New("nil commit") + } + if commit.Height < 0 { return errors.New("negative Height") }