From 5d982c48eead458d5fce1ae3c695f702ed0b596a Mon Sep 17 00:00:00 2001 From: mconcat Date: Sat, 10 Jul 2021 14:46:16 +0900 Subject: [PATCH 01/23] add extension signing --- internal/consensus/state.go | 20 +++++++++++++++----- state/execution.go | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 738a8645d21..a8bc304fc00 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -1424,8 +1424,7 @@ func (cs *State) enterPrecommit(height int64, round int32) { logger.Error("failed publishing event relock", "err", err) } - // XXX: need to add vote extension here - cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) + cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) return } @@ -1446,7 +1445,6 @@ func (cs *State) enterPrecommit(height int64, round int32) { logger.Error("failed publishing event lock", "err", err) } - // XXX: need to add vote extension here cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) return } @@ -1530,7 +1528,6 @@ func (cs *State) enterCommit(height int64, commitRound int32) { cs.tryFinalizeCommit(height) }() - // XXX: SelfAuthenticating AppData VoteExtension should be excluded here blockID, ok := cs.Votes.Precommits(commitRound).TwoThirdsMajority() if !ok { panic("RunActionCommit() expects +2/3 precommits") @@ -2213,12 +2210,24 @@ func (cs *State) signVote( timeout = time.Second } + // If the signedMessage type is for precommit, add VoteExtension + switch msgType { + case tmproto.PrecommitType: + ext, err := cs.blockExec.VoteExtension(cs.Height, cs.Round) + if err != nil { + return nil, err + } + vote.VoteExtension = ext + default: + } + ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() err := cs.privValidator.SignVote(ctx, cs.state.ChainID, v) vote.Signature = v.Signature + return vote, err } @@ -2247,7 +2256,8 @@ func (cs *State) voteTime() time.Time { } // sign the vote and publish on internalMsgQueue -func (cs *State) signAddVote(msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { +func (cs *State) signAddVote( + msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { if cs.privValidator == nil { // the node does not have a key return nil } diff --git a/state/execution.go b/state/execution.go index cfb3572c0a8..a01662306a8 100644 --- a/state/execution.go +++ b/state/execution.go @@ -236,6 +236,21 @@ func (blockExec *BlockExecutor) ApplyBlock( return state, nil } +func (blockExec *BlockExecutor) VoteExtension(height int64, round int32) (types.VoteExtension, error) { + ctx := context.Background() + req := abci.RequestVoteExtension{ + Height: uint64(height), + Round: uint64(round), + } + + resp, err := blockExec.proxyApp.VoteExtensionSync(ctx, req) + if err != nil { + return types.VoteExtension{}, err + } + + return types.VoteExtensionFromProto(resp.VoteExtension), nil +} + // Commit locks the mempool, runs the ABCI Commit message, and updates the // mempool. // It returns the result of calling abci.Commit (the AppHash) and the height to retain (if any). @@ -368,8 +383,6 @@ func execBlockOnProxyApp( return nil, err } - abciResponses.VoteExtension, err = proxyAppConn.VoteExtensionSync(ctx, abci.RequestVoteExtension{Height: block.Height, Round: round}) - logger.Info("executed block", "height", block.Height, "num_valid_txs", validTxs, "num_invalid_txs", invalidTxs) return abciResponses, nil } @@ -502,7 +515,6 @@ func updateState( LastHeightConsensusParamsChanged: lastHeightParamsChanged, LastResultsHash: ABCIResponsesResultsHash(abciResponses), AppHash: nil, - VoteExtension: types.VoteExtension{}, }, nil } From 08c4f89b3038378a014adebe51d09d8300d5d49f Mon Sep 17 00:00:00 2001 From: mconcat Date: Fri, 9 Jul 2021 21:16:43 +0900 Subject: [PATCH 02/23] modify state execution in progress --- state/execution.go | 5 ++++- types/vote.go | 28 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/state/execution.go b/state/execution.go index 05d5bdd522f..cfb3572c0a8 100644 --- a/state/execution.go +++ b/state/execution.go @@ -368,6 +368,8 @@ func execBlockOnProxyApp( return nil, err } + abciResponses.VoteExtension, err = proxyAppConn.VoteExtensionSync(ctx, abci.RequestVoteExtension{Height: block.Height, Round: round}) + logger.Info("executed block", "height", block.Height, "num_valid_txs", validTxs, "num_invalid_txs", invalidTxs) return abciResponses, nil } @@ -483,7 +485,7 @@ func updateState( nextVersion := state.Version - // NOTE: the AppHash has not been populated. + // NOTE: the AppHash and the VoteExtension has not been populated. // It will be filled on state.Save. return State{ Version: nextVersion, @@ -500,6 +502,7 @@ func updateState( LastHeightConsensusParamsChanged: lastHeightParamsChanged, LastResultsHash: ABCIResponsesResultsHash(abciResponses), AppHash: nil, + VoteExtension: types.VoteExtension{}, }, nil } diff --git a/types/vote.go b/types/vote.go index f63ea86bed5..bb72c114585 100644 --- a/types/vote.go +++ b/types/vote.go @@ -108,6 +108,7 @@ func VoteSignBytes(chainID string, vote *tmproto.Vote) []byte { func (vote *Vote) Copy() *Vote { voteCopy := *vote + voteCopy.VoteExtension = vote.VoteExtension.Copy() return &voteCopy } @@ -207,6 +208,16 @@ func (vote *Vote) ValidateBasic() error { return nil } +func (ext VoteExtension) Copy() VoteExtension { + res := VoteExtension{ + AppDataSigned: make([]byte, len(ext.AppDataSigned)), + AppDataSelfAuthenticating: make([]byte, len(ext.AppDataSelfAuthenticating)), + } + copy(res.AppDataSigned, ext.AppDataSigned) + copy(res.AppDataSelfAuthenticating, ext.AppDataSelfAuthenticating) + return res +} + func (ext VoteExtension) IsEmpty() bool { if len(ext.AppDataSigned) != 0 { return false @@ -248,6 +259,15 @@ func (vote *Vote) ToProto() *tmproto.Vote { } } +func VoteExtensionFromProto(pext *tmproto.VoteExtension) VoteExtension { + ext := VoteExtension{} + if pext != nil { + ext.AppDataSigned = pext.AppDataSigned + ext.AppDataSelfAuthenticating = pext.AppDataSelfAuthenticating + } + return ext +} + // FromProto converts a proto generetad type to a handwritten type // return type, nil if everything converts safely, otherwise nil, error func VoteFromProto(pv *tmproto.Vote) (*Vote, error) { @@ -260,12 +280,6 @@ func VoteFromProto(pv *tmproto.Vote) (*Vote, error) { return nil, err } - ext := VoteExtension{} - if pv.VoteExtension != nil { - ext.AppDataSigned = pv.VoteExtension.AppDataSigned - ext.AppDataSelfAuthenticating = pv.VoteExtension.AppDataSelfAuthenticating - } - vote := new(Vote) vote.Type = pv.Type vote.Height = pv.Height @@ -275,7 +289,7 @@ func VoteFromProto(pv *tmproto.Vote) (*Vote, error) { vote.ValidatorAddress = pv.ValidatorAddress vote.ValidatorIndex = pv.ValidatorIndex vote.Signature = pv.Signature - vote.VoteExtension = ext + vote.VoteExtension = VoteExtensionFromProto(pv.VoteExtension) return vote, vote.ValidateBasic() } From 306296aec036bce0ad2b4af4b81445f13f7fa766 Mon Sep 17 00:00:00 2001 From: mconcat Date: Sat, 10 Jul 2021 14:46:16 +0900 Subject: [PATCH 03/23] add extension signing --- internal/consensus/state.go | 20 +++++++++++++++----- state/execution.go | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 738a8645d21..a8bc304fc00 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -1424,8 +1424,7 @@ func (cs *State) enterPrecommit(height int64, round int32) { logger.Error("failed publishing event relock", "err", err) } - // XXX: need to add vote extension here - cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) + cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) return } @@ -1446,7 +1445,6 @@ func (cs *State) enterPrecommit(height int64, round int32) { logger.Error("failed publishing event lock", "err", err) } - // XXX: need to add vote extension here cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) return } @@ -1530,7 +1528,6 @@ func (cs *State) enterCommit(height int64, commitRound int32) { cs.tryFinalizeCommit(height) }() - // XXX: SelfAuthenticating AppData VoteExtension should be excluded here blockID, ok := cs.Votes.Precommits(commitRound).TwoThirdsMajority() if !ok { panic("RunActionCommit() expects +2/3 precommits") @@ -2213,12 +2210,24 @@ func (cs *State) signVote( timeout = time.Second } + // If the signedMessage type is for precommit, add VoteExtension + switch msgType { + case tmproto.PrecommitType: + ext, err := cs.blockExec.VoteExtension(cs.Height, cs.Round) + if err != nil { + return nil, err + } + vote.VoteExtension = ext + default: + } + ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() err := cs.privValidator.SignVote(ctx, cs.state.ChainID, v) vote.Signature = v.Signature + return vote, err } @@ -2247,7 +2256,8 @@ func (cs *State) voteTime() time.Time { } // sign the vote and publish on internalMsgQueue -func (cs *State) signAddVote(msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { +func (cs *State) signAddVote( + msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { if cs.privValidator == nil { // the node does not have a key return nil } diff --git a/state/execution.go b/state/execution.go index cfb3572c0a8..a01662306a8 100644 --- a/state/execution.go +++ b/state/execution.go @@ -236,6 +236,21 @@ func (blockExec *BlockExecutor) ApplyBlock( return state, nil } +func (blockExec *BlockExecutor) VoteExtension(height int64, round int32) (types.VoteExtension, error) { + ctx := context.Background() + req := abci.RequestVoteExtension{ + Height: uint64(height), + Round: uint64(round), + } + + resp, err := blockExec.proxyApp.VoteExtensionSync(ctx, req) + if err != nil { + return types.VoteExtension{}, err + } + + return types.VoteExtensionFromProto(resp.VoteExtension), nil +} + // Commit locks the mempool, runs the ABCI Commit message, and updates the // mempool. // It returns the result of calling abci.Commit (the AppHash) and the height to retain (if any). @@ -368,8 +383,6 @@ func execBlockOnProxyApp( return nil, err } - abciResponses.VoteExtension, err = proxyAppConn.VoteExtensionSync(ctx, abci.RequestVoteExtension{Height: block.Height, Round: round}) - logger.Info("executed block", "height", block.Height, "num_valid_txs", validTxs, "num_invalid_txs", invalidTxs) return abciResponses, nil } @@ -502,7 +515,6 @@ func updateState( LastHeightConsensusParamsChanged: lastHeightParamsChanged, LastResultsHash: ABCIResponsesResultsHash(abciResponses), AppHash: nil, - VoteExtension: types.VoteExtension{}, }, nil } From dbb2c71ed6962763032a6d13ec02e03f4ec4bce8 Mon Sep 17 00:00:00 2001 From: mconcat Date: Thu, 15 Jul 2021 11:52:41 +0900 Subject: [PATCH 04/23] verify in progress --- abci/types/result.go | 10 + abci/types/types.pb.go | 364 ++++++++++----------- internal/consensus/state.go | 32 +- proto/tendermint/abci/types.proto | 2 +- proto/tendermint/types/canonical.pb.go | 260 +++------------ proto/tendermint/types/canonical.proto | 6 +- proto/tendermint/types/types.pb.go | 436 +++++++++++++++++++------ proto/tendermint/types/types.proto | 5 + state/execution.go | 44 ++- types/canonical.go | 6 +- types/vote.go | 1 + 11 files changed, 632 insertions(+), 534 deletions(-) diff --git a/abci/types/result.go b/abci/types/result.go index dba6bfd159a..a1fa168ecce 100644 --- a/abci/types/result.go +++ b/abci/types/result.go @@ -41,6 +41,16 @@ func (r ResponseQuery) IsErr() bool { return r.Code != CodeTypeOK } +// IsOK returns true if Code is OK +func (r ResponseVerifyVoteExtension) IsOK() bool { + return r.Code == CodeTypeOK +} + +// IsErr returns true if Code is something other than OK. +func (r ResponseVerifyVoteExtension) IsErr() bool { + return r.Code != CodeTypeOK +} + //--------------------------------------------------------------------------- // override JSON marshaling so we emit defaults (ie. disable omitempty) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index e30d0f6270c..80caccc8999 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -1238,7 +1238,7 @@ func (m *RequestExtendVote) GetRound() uint64 { // Verify the vote extension type RequestVerifyVoteExtension struct { - Extension types1.VoteExtension `protobuf:"bytes,1,opt,name=extension,proto3" json:"extension"` + VoteExtension types1.VoteExtension `protobuf:"bytes,1,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension"` } func (m *RequestVerifyVoteExtension) Reset() { *m = RequestVerifyVoteExtension{} } @@ -1274,9 +1274,9 @@ func (m *RequestVerifyVoteExtension) XXX_DiscardUnknown() { var xxx_messageInfo_RequestVerifyVoteExtension proto.InternalMessageInfo -func (m *RequestVerifyVoteExtension) GetExtension() types1.VoteExtension { +func (m *RequestVerifyVoteExtension) GetVoteExtension() types1.VoteExtension { if m != nil { - return m.Extension + return m.VoteExtension } return types1.VoteExtension{} } @@ -3221,181 +3221,181 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2777 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x2b, 0xc5, - 0xf1, 0xd7, 0xd3, 0xd2, 0x94, 0xad, 0x87, 0xdb, 0xe6, 0x22, 0x86, 0x8b, 0x7d, 0x19, 0x0e, 0xfc, - 0xe1, 0x02, 0xf6, 0x1f, 0x73, 0x20, 0x70, 0xc8, 0x03, 0x49, 0xc8, 0x91, 0xb9, 0x8e, 0xed, 0x8c, - 0x75, 0x2f, 0x87, 0x04, 0xee, 0x30, 0xd2, 0xb4, 0xa5, 0xe1, 0x4a, 0x33, 0xc3, 0x4c, 0x4b, 0x5c, - 0xb1, 0xcc, 0x49, 0x36, 0x9c, 0x2c, 0x58, 0x66, 0xc3, 0xe7, 0x48, 0x56, 0x59, 0x65, 0xc1, 0x82, - 0x05, 0xcb, 0xac, 0x48, 0x0e, 0xec, 0xf2, 0x05, 0xc8, 0x26, 0xe7, 0xe4, 0xf4, 0x63, 0x5e, 0x92, - 0x46, 0x92, 0x81, 0x5d, 0x76, 0x5d, 0x35, 0x55, 0xa5, 0xee, 0xea, 0xee, 0xaa, 0x5f, 0x55, 0x0b, - 0x1e, 0x27, 0xd8, 0x32, 0xb0, 0x3b, 0x32, 0x2d, 0x72, 0xa8, 0x77, 0x7b, 0xe6, 0x21, 0x99, 0x3a, - 0xd8, 0x3b, 0x70, 0x5c, 0x9b, 0xd8, 0xa8, 0x12, 0x7e, 0x3c, 0xa0, 0x1f, 0xe5, 0x27, 0x22, 0xd2, - 0x3d, 0x77, 0xea, 0x10, 0xfb, 0xd0, 0x71, 0x6d, 0xfb, 0x8a, 0xcb, 0xcb, 0x37, 0x23, 0x9f, 0x99, - 0x9d, 0xa8, 0xb5, 0xd8, 0x57, 0xa1, 0xfc, 0x00, 0x4f, 0xfd, 0xaf, 0x4f, 0xcc, 0xe9, 0x3a, 0xba, - 0xab, 0x8f, 0xfc, 0xcf, 0xfb, 0x7d, 0xdb, 0xee, 0x0f, 0xf1, 0x21, 0xa3, 0xba, 0xe3, 0xab, 0x43, - 0x62, 0x8e, 0xb0, 0x47, 0xf4, 0x91, 0x23, 0x04, 0x76, 0xfb, 0x76, 0xdf, 0x66, 0xc3, 0x43, 0x3a, - 0xe2, 0x5c, 0xe5, 0xbb, 0x22, 0x14, 0x54, 0xfc, 0xd1, 0x18, 0x7b, 0x04, 0x1d, 0x41, 0x0e, 0xf7, - 0x06, 0x76, 0x2d, 0x7d, 0x2b, 0xfd, 0xec, 0xe6, 0xd1, 0xcd, 0x83, 0x99, 0xc5, 0x1d, 0x08, 0xb9, - 0x56, 0x6f, 0x60, 0xb7, 0x53, 0x2a, 0x93, 0x45, 0xaf, 0x40, 0xfe, 0x6a, 0x38, 0xf6, 0x06, 0xb5, - 0x0c, 0x53, 0x7a, 0x22, 0x49, 0xe9, 0x98, 0x0a, 0xb5, 0x53, 0x2a, 0x97, 0xa6, 0x3f, 0x65, 0x5a, - 0x57, 0x76, 0x2d, 0xbb, 0xfc, 0xa7, 0x4e, 0xac, 0x2b, 0xf6, 0x53, 0x54, 0x16, 0x35, 0x00, 0x4c, - 0xcb, 0x24, 0x5a, 0x6f, 0xa0, 0x9b, 0x56, 0x2d, 0xc7, 0x34, 0x9f, 0x4c, 0xd6, 0x34, 0x49, 0x93, - 0x0a, 0xb6, 0x53, 0xaa, 0x64, 0xfa, 0x04, 0x9d, 0xee, 0x47, 0x63, 0xec, 0x4e, 0x6b, 0xf9, 0xe5, - 0xd3, 0xfd, 0x35, 0x15, 0xa2, 0xd3, 0x65, 0xd2, 0xa8, 0x05, 0x9b, 0x5d, 0xdc, 0x37, 0x2d, 0xad, - 0x3b, 0xb4, 0x7b, 0x0f, 0x6a, 0x1b, 0x4c, 0x59, 0x49, 0x52, 0x6e, 0x50, 0xd1, 0x06, 0x95, 0x6c, - 0xa7, 0x54, 0xe8, 0x06, 0x14, 0xfa, 0x29, 0x14, 0x7b, 0x03, 0xdc, 0x7b, 0xa0, 0x91, 0x87, 0xb5, - 0x02, 0xb3, 0xb1, 0x9f, 0x64, 0xa3, 0x49, 0xe5, 0x3a, 0x0f, 0xdb, 0x29, 0xb5, 0xd0, 0xe3, 0x43, - 0xba, 0x7e, 0x03, 0x0f, 0xcd, 0x09, 0x76, 0xa9, 0x7e, 0x71, 0xf9, 0xfa, 0xdf, 0xe2, 0x92, 0xcc, - 0x82, 0x64, 0xf8, 0x04, 0xfa, 0x05, 0x48, 0xd8, 0x32, 0xc4, 0x32, 0x24, 0x66, 0xe2, 0x56, 0xe2, - 0x3e, 0x5b, 0x86, 0xbf, 0x88, 0x22, 0x16, 0x63, 0xf4, 0x1a, 0x6c, 0xf4, 0xec, 0xd1, 0xc8, 0x24, - 0x35, 0x60, 0xda, 0x7b, 0x89, 0x0b, 0x60, 0x52, 0xed, 0x94, 0x2a, 0xe4, 0xd1, 0x19, 0x94, 0x87, - 0xa6, 0x47, 0x34, 0xcf, 0xd2, 0x1d, 0x6f, 0x60, 0x13, 0xaf, 0xb6, 0xc9, 0x2c, 0x3c, 0x9d, 0x64, - 0xe1, 0xd4, 0xf4, 0xc8, 0xa5, 0x2f, 0xdc, 0x4e, 0xa9, 0xa5, 0x61, 0x94, 0x41, 0xed, 0xd9, 0x57, - 0x57, 0xd8, 0x0d, 0x0c, 0xd6, 0xb6, 0x96, 0xdb, 0x3b, 0xa7, 0xd2, 0xbe, 0x3e, 0xb5, 0x67, 0x47, - 0x19, 0xe8, 0xb7, 0xb0, 0x33, 0xb4, 0x75, 0x23, 0x30, 0xa7, 0xf5, 0x06, 0x63, 0xeb, 0x41, 0xad, - 0xc4, 0x8c, 0x3e, 0x97, 0x38, 0x49, 0x5b, 0x37, 0x7c, 0x13, 0x4d, 0xaa, 0xd0, 0x4e, 0xa9, 0xdb, - 0xc3, 0x59, 0x26, 0xba, 0x0f, 0xbb, 0xba, 0xe3, 0x0c, 0xa7, 0xb3, 0xd6, 0xcb, 0xcc, 0xfa, 0xed, - 0x24, 0xeb, 0x75, 0xaa, 0x33, 0x6b, 0x1e, 0xe9, 0x73, 0x5c, 0x7a, 0x40, 0xf1, 0x43, 0x6a, 0x44, - 0x9b, 0xd8, 0x04, 0xd7, 0x2a, 0xcb, 0x0f, 0x68, 0x8b, 0x89, 0xde, 0xb3, 0x09, 0xa6, 0x07, 0x14, - 0x07, 0x14, 0xd2, 0xe1, 0x91, 0x09, 0x76, 0xcd, 0xab, 0x29, 0x33, 0xa3, 0xb1, 0x2f, 0x9e, 0x69, - 0x5b, 0xb5, 0x2a, 0x33, 0xf8, 0x7c, 0x92, 0xc1, 0x7b, 0x4c, 0x89, 0x9a, 0x68, 0xf9, 0x2a, 0xed, - 0x94, 0xba, 0x33, 0x99, 0x67, 0x37, 0x0a, 0x90, 0x9f, 0xe8, 0xc3, 0x31, 0x56, 0xfe, 0x0f, 0x36, - 0x23, 0x01, 0x05, 0xd5, 0xa0, 0x30, 0xc2, 0x9e, 0xa7, 0xf7, 0x31, 0x8b, 0x3f, 0x92, 0xea, 0x93, - 0x4a, 0x19, 0xb6, 0xa2, 0x41, 0x44, 0xf9, 0x2c, 0x1d, 0x68, 0xd2, 0xf8, 0x40, 0x35, 0x27, 0xd8, - 0x65, 0xd3, 0x14, 0x9a, 0x82, 0x44, 0x4f, 0x41, 0x89, 0x9d, 0x74, 0xcd, 0xff, 0x4e, 0x83, 0x54, - 0x4e, 0xdd, 0x62, 0xcc, 0x7b, 0x42, 0x68, 0x1f, 0x36, 0x9d, 0x23, 0x27, 0x10, 0xc9, 0x32, 0x11, - 0x70, 0x8e, 0x1c, 0x5f, 0xe0, 0x49, 0xd8, 0xa2, 0x6b, 0x0d, 0x24, 0x72, 0xec, 0x47, 0x36, 0x29, - 0x4f, 0x88, 0x28, 0x5f, 0x66, 0xa0, 0x3a, 0x1b, 0x78, 0xd0, 0x6b, 0x90, 0xa3, 0x31, 0x58, 0x84, - 0x53, 0xf9, 0x80, 0x07, 0xe8, 0x03, 0x3f, 0x40, 0x1f, 0x74, 0xfc, 0x00, 0xdd, 0x28, 0x7e, 0xf1, - 0xf5, 0x7e, 0xea, 0xb3, 0x7f, 0xec, 0xa7, 0x55, 0xa6, 0x81, 0x1e, 0xa3, 0x71, 0x42, 0x37, 0x2d, - 0xcd, 0x34, 0xd8, 0x94, 0x25, 0x1a, 0x04, 0x74, 0xd3, 0x3a, 0x31, 0xd0, 0x29, 0x54, 0x7b, 0xb6, - 0xe5, 0x61, 0xcb, 0x1b, 0x7b, 0x1a, 0x4f, 0x00, 0x22, 0x88, 0xc6, 0x42, 0x01, 0x4f, 0x2b, 0x4d, - 0x5f, 0xf2, 0x82, 0x09, 0xaa, 0x95, 0x5e, 0x9c, 0x81, 0x8e, 0x01, 0x26, 0xfa, 0xd0, 0x34, 0x74, - 0x62, 0xbb, 0x5e, 0x2d, 0x77, 0x2b, 0xbb, 0x30, 0x1e, 0xdc, 0xf3, 0x45, 0xee, 0x3a, 0x86, 0x4e, - 0x70, 0x23, 0x47, 0xa7, 0xab, 0x46, 0x34, 0xd1, 0x33, 0x50, 0xd1, 0x1d, 0x47, 0xf3, 0x88, 0x4e, - 0xb0, 0xd6, 0x9d, 0x12, 0xec, 0xb1, 0x00, 0xbb, 0xa5, 0x96, 0x74, 0xc7, 0xb9, 0xa4, 0xdc, 0x06, - 0x65, 0xa2, 0xa7, 0xa1, 0x4c, 0x63, 0xb1, 0xa9, 0x0f, 0xb5, 0x01, 0x36, 0xfb, 0x03, 0xc2, 0x42, - 0x69, 0x56, 0x2d, 0x09, 0x6e, 0x9b, 0x31, 0x15, 0x23, 0xd8, 0x71, 0x16, 0x87, 0x11, 0x82, 0x9c, - 0xa1, 0x13, 0x9d, 0x79, 0x72, 0x4b, 0x65, 0x63, 0xca, 0x73, 0x74, 0x32, 0x10, 0xfe, 0x61, 0x63, - 0x74, 0x03, 0x36, 0x84, 0xd9, 0x2c, 0x33, 0x2b, 0x28, 0xb4, 0x0b, 0x79, 0xc7, 0xb5, 0x27, 0x98, - 0x6d, 0x5d, 0x51, 0xe5, 0x84, 0xf2, 0xfb, 0x0c, 0x6c, 0xcf, 0x45, 0x6c, 0x6a, 0x77, 0xa0, 0x7b, - 0x03, 0xff, 0xb7, 0xe8, 0x18, 0xbd, 0x4a, 0xed, 0xea, 0x06, 0x76, 0x45, 0x96, 0xab, 0xcd, 0xbb, - 0xba, 0xcd, 0xbe, 0x0b, 0xd7, 0x08, 0x69, 0x74, 0x0e, 0xd5, 0xa1, 0xee, 0x11, 0x8d, 0x47, 0x40, - 0x2d, 0x92, 0xf1, 0xe6, 0xe3, 0xfe, 0xa9, 0xee, 0xc7, 0x4c, 0x7a, 0xa8, 0x85, 0xa1, 0xf2, 0x30, - 0xc6, 0x45, 0x2a, 0xec, 0x76, 0xa7, 0x9f, 0xe8, 0x16, 0x31, 0x2d, 0xac, 0xcd, 0xed, 0xdc, 0x63, - 0x73, 0x46, 0x5b, 0x13, 0xd3, 0xc0, 0x56, 0xcf, 0xdf, 0xb2, 0x9d, 0x40, 0x39, 0xd8, 0x52, 0x4f, - 0x51, 0xa1, 0x1c, 0xcf, 0x39, 0xa8, 0x0c, 0x19, 0xf2, 0x50, 0x38, 0x20, 0x43, 0x1e, 0xa2, 0xff, - 0x87, 0x1c, 0x5d, 0x24, 0x5b, 0x7c, 0x79, 0x41, 0xb2, 0x16, 0x7a, 0x9d, 0xa9, 0x83, 0x55, 0x26, - 0xa9, 0x28, 0xc1, 0x75, 0x08, 0xf2, 0xd0, 0xac, 0x55, 0xe5, 0x39, 0xa8, 0xcc, 0x24, 0x9a, 0xc8, - 0xfe, 0xa5, 0xa3, 0xfb, 0xa7, 0x54, 0xa0, 0x14, 0xcb, 0x2a, 0xca, 0x0d, 0xd8, 0x5d, 0x94, 0x24, - 0x94, 0x41, 0xc0, 0x8f, 0x05, 0x7b, 0xf4, 0x0a, 0x14, 0x83, 0x2c, 0xc1, 0xaf, 0xe3, 0xbc, 0xaf, - 0x7c, 0x61, 0x35, 0x10, 0xa5, 0xf7, 0x90, 0x1e, 0x6b, 0x76, 0x1e, 0x32, 0x6c, 0xe2, 0x05, 0xdd, - 0x71, 0xda, 0xba, 0x37, 0x50, 0x3e, 0x80, 0x5a, 0x52, 0x06, 0x98, 0x59, 0x46, 0x2e, 0x38, 0x86, - 0x37, 0x60, 0xe3, 0xca, 0x76, 0x47, 0x3a, 0x61, 0xc6, 0x4a, 0xaa, 0xa0, 0xe8, 0xf1, 0xe4, 0xd9, - 0x20, 0xcb, 0xd8, 0x9c, 0x50, 0x34, 0x78, 0x2c, 0x31, 0x0b, 0x50, 0x15, 0xd3, 0x32, 0x30, 0xf7, - 0x67, 0x49, 0xe5, 0x44, 0x68, 0x88, 0x4f, 0x96, 0x13, 0xf4, 0x67, 0x3d, 0xb6, 0x56, 0x66, 0x5f, - 0x52, 0x05, 0xa5, 0xd4, 0x83, 0xe3, 0x1f, 0xe6, 0x83, 0xc4, 0xb9, 0xef, 0x42, 0xde, 0xb5, 0xc7, - 0x96, 0x21, 0x42, 0x28, 0x27, 0x14, 0x1d, 0xe4, 0xe4, 0x0c, 0x80, 0x9a, 0x20, 0x85, 0x19, 0x24, - 0x3d, 0x7f, 0xee, 0xf9, 0xcd, 0x89, 0xa7, 0x07, 0x7e, 0x50, 0x43, 0x3d, 0xe5, 0x4b, 0x09, 0x8a, - 0x2a, 0xf6, 0x1c, 0x1a, 0xb9, 0x50, 0x83, 0x5a, 0xec, 0x61, 0x87, 0x84, 0x16, 0x17, 0x25, 0x39, - 0x2e, 0xdd, 0xf2, 0x25, 0xdb, 0xcc, 0xa0, 0x20, 0xd0, 0xcb, 0x02, 0xe5, 0x26, 0x03, 0x56, 0xa1, - 0x1e, 0x85, 0xb9, 0xaf, 0xfa, 0x30, 0x37, 0x9b, 0x88, 0x7a, 0xb8, 0xd6, 0x0c, 0xce, 0x7d, 0x59, - 0xe0, 0xdc, 0xdc, 0x8a, 0x1f, 0x8b, 0x01, 0xdd, 0x66, 0x0c, 0xe8, 0xe6, 0x57, 0x2c, 0x33, 0x01, - 0xe9, 0xbe, 0xea, 0x23, 0xdd, 0x8d, 0x15, 0x33, 0x9e, 0x81, 0xba, 0xc7, 0x71, 0xa8, 0xcb, 0x61, - 0xea, 0x53, 0x89, 0xda, 0x89, 0x58, 0xf7, 0x67, 0x11, 0xac, 0x5b, 0x4c, 0x04, 0x9a, 0xdc, 0xc8, - 0x02, 0xb0, 0xdb, 0x8c, 0x81, 0x5d, 0x69, 0x85, 0x0f, 0x12, 0xd0, 0xee, 0x9b, 0x51, 0xb4, 0x0b, - 0x89, 0x80, 0x59, 0xec, 0xf7, 0x22, 0xb8, 0xfb, 0x7a, 0x00, 0x77, 0x37, 0x13, 0xf1, 0xba, 0x58, - 0xc3, 0x2c, 0xde, 0x3d, 0x9f, 0xc3, 0xbb, 0x1c, 0x9f, 0x3e, 0x93, 0x68, 0x62, 0x05, 0xe0, 0x3d, - 0x9f, 0x03, 0xbc, 0xa5, 0x15, 0x06, 0x57, 0x20, 0xde, 0xf7, 0x16, 0x23, 0xde, 0x64, 0x4c, 0x2a, - 0xa6, 0xb9, 0x1e, 0xe4, 0xd5, 0x12, 0x20, 0x6f, 0x25, 0x11, 0x4a, 0x72, 0xf3, 0x6b, 0x63, 0xde, - 0xe3, 0x38, 0xe6, 0xad, 0xae, 0x38, 0xa9, 0x89, 0xa0, 0xb7, 0x9b, 0x04, 0x7a, 0xb7, 0x99, 0xc5, - 0x17, 0x12, 0x2d, 0x7e, 0x1f, 0xd4, 0xfb, 0x1c, 0x0d, 0xba, 0x33, 0xf1, 0x89, 0x06, 0x57, 0xec, - 0xba, 0xb6, 0x2b, 0xf0, 0x2b, 0x27, 0x94, 0x67, 0x29, 0x0a, 0x0a, 0x63, 0xd1, 0x12, 0x84, 0xcc, - 0xf2, 0x63, 0x24, 0xfe, 0x28, 0x7f, 0x49, 0x87, 0xba, 0x0c, 0x38, 0x44, 0x11, 0x94, 0x24, 0x10, - 0x54, 0x04, 0x37, 0x67, 0xe2, 0xb8, 0x79, 0x1f, 0x36, 0x69, 0xde, 0x9b, 0x81, 0xc4, 0xba, 0x13, - 0x40, 0xe2, 0xdb, 0xb0, 0xcd, 0x80, 0x0d, 0x47, 0xd7, 0x22, 0x61, 0xe4, 0x58, 0xce, 0xae, 0xd0, - 0x0f, 0xfc, 0x22, 0xf1, 0xcc, 0xf1, 0x22, 0xec, 0x44, 0x64, 0x83, 0x7c, 0xca, 0xf1, 0x61, 0x35, - 0x90, 0xae, 0x8b, 0xc4, 0xfa, 0xb7, 0x74, 0xe8, 0xa1, 0x10, 0x4b, 0x2f, 0x82, 0xbd, 0xe9, 0x1f, - 0x09, 0xf6, 0x66, 0xbe, 0x37, 0xec, 0x8d, 0xe2, 0x83, 0x6c, 0x1c, 0x1f, 0x7c, 0x97, 0x0e, 0xf7, - 0x24, 0x00, 0xb1, 0x3d, 0xdb, 0xc0, 0x22, 0x63, 0xb3, 0x31, 0xaa, 0x42, 0x76, 0x68, 0xf7, 0x45, - 0x5e, 0xa6, 0x43, 0x2a, 0x15, 0x24, 0x0c, 0x49, 0xe4, 0x83, 0x20, 0xd9, 0xe7, 0x99, 0x87, 0x45, - 0xb2, 0xaf, 0x42, 0xf6, 0x01, 0xe6, 0xe1, 0x7d, 0x4b, 0xa5, 0x43, 0x2a, 0xc7, 0x0e, 0x19, 0x0b, - 0xda, 0x5b, 0x2a, 0x27, 0xd0, 0x6b, 0x20, 0xb1, 0x16, 0x94, 0x66, 0x3b, 0x9e, 0x88, 0xc4, 0x8f, - 0x47, 0xd7, 0xca, 0x3b, 0x4d, 0x07, 0x17, 0x54, 0xe6, 0xdc, 0xf1, 0xd4, 0xa2, 0x23, 0x46, 0x11, - 0x2c, 0x20, 0xc5, 0xe0, 0xf4, 0x4d, 0x90, 0xe8, 0xec, 0x3d, 0x47, 0xef, 0x61, 0x16, 0x56, 0x25, - 0x35, 0x64, 0x28, 0xf7, 0x01, 0xcd, 0x27, 0x07, 0xd4, 0x86, 0x0d, 0x3c, 0xc1, 0x16, 0xa1, 0xdb, - 0x46, 0xdd, 0x7d, 0x63, 0x01, 0x56, 0xc5, 0x16, 0x69, 0xd4, 0xa8, 0x93, 0xff, 0xf5, 0xf5, 0x7e, - 0x95, 0x4b, 0xbf, 0x60, 0x8f, 0x4c, 0x82, 0x47, 0x0e, 0x99, 0xaa, 0x42, 0x5f, 0xf9, 0x73, 0x86, - 0x02, 0xc7, 0x58, 0xe2, 0x58, 0xe8, 0x5b, 0xff, 0xc8, 0x67, 0x22, 0x45, 0xc3, 0x7a, 0xfe, 0xde, - 0x03, 0xe8, 0xeb, 0x9e, 0xf6, 0xb1, 0x6e, 0x11, 0x6c, 0x08, 0xa7, 0x47, 0x38, 0x48, 0x86, 0x22, - 0xa5, 0xc6, 0x1e, 0x36, 0x44, 0xfd, 0x12, 0xd0, 0x91, 0x75, 0x16, 0x7e, 0xd8, 0x3a, 0xe3, 0x5e, - 0x2e, 0xce, 0x78, 0x39, 0x02, 0xea, 0xa4, 0x28, 0xa8, 0xa3, 0x73, 0x73, 0x5c, 0xd3, 0x76, 0x4d, - 0x32, 0x65, 0x5b, 0x93, 0x55, 0x03, 0x5a, 0xf9, 0x43, 0x26, 0xbc, 0x5a, 0x21, 0x2e, 0xff, 0x9f, - 0xf3, 0x9d, 0xf2, 0x47, 0x56, 0xad, 0xc7, 0xb3, 0x3e, 0xba, 0x84, 0xed, 0xe0, 0x66, 0x6b, 0x63, - 0x76, 0xe3, 0xfd, 0xb3, 0xba, 0x6e, 0x68, 0xa8, 0x4e, 0xe2, 0x6c, 0x0f, 0xbd, 0x0b, 0x8f, 0xce, - 0x84, 0xad, 0xc0, 0x74, 0x66, 0xdd, 0xe8, 0xf5, 0x48, 0x3c, 0x7a, 0xf9, 0xa6, 0x43, 0x67, 0x65, - 0x7f, 0xe0, 0x85, 0x3a, 0xa1, 0x05, 0x60, 0x14, 0xc4, 0x2c, 0xdc, 0xfe, 0xa7, 0xa0, 0xe4, 0x62, - 0xa2, 0x9b, 0x96, 0x16, 0x2b, 0xb1, 0xb7, 0x38, 0x53, 0x14, 0xee, 0x17, 0xf0, 0xc8, 0x42, 0x30, - 0x83, 0x7e, 0x02, 0x52, 0x88, 0x83, 0xd2, 0x09, 0xd5, 0x6a, 0x50, 0x81, 0x85, 0xb2, 0xca, 0x5f, - 0xd3, 0xa1, 0xc9, 0x78, 0x4d, 0xd7, 0x82, 0x0d, 0x17, 0x7b, 0xe3, 0x21, 0xaf, 0x54, 0xca, 0x47, - 0x2f, 0xae, 0x07, 0x83, 0x28, 0x77, 0x3c, 0x24, 0xaa, 0x50, 0x56, 0xee, 0xc3, 0x06, 0xe7, 0xa0, - 0x4d, 0x28, 0xdc, 0x3d, 0xbb, 0x73, 0x76, 0xfe, 0xce, 0x59, 0x35, 0x85, 0x00, 0x36, 0xea, 0xcd, - 0x66, 0xeb, 0xa2, 0x53, 0x4d, 0x23, 0x09, 0xf2, 0xf5, 0xc6, 0xb9, 0xda, 0xa9, 0x66, 0x28, 0x5b, - 0x6d, 0xbd, 0xdd, 0x6a, 0x76, 0xaa, 0x59, 0xb4, 0x0d, 0x25, 0x3e, 0xd6, 0x8e, 0xcf, 0xd5, 0x5f, - 0xd5, 0x3b, 0xd5, 0x5c, 0x84, 0x75, 0xd9, 0x3a, 0x7b, 0xab, 0xa5, 0x56, 0xf3, 0xca, 0x4b, 0xb4, - 0x8c, 0x4b, 0x00, 0x4e, 0x61, 0xc1, 0x96, 0x8e, 0x14, 0x6c, 0xca, 0x9f, 0x32, 0xb4, 0xac, 0x4a, - 0x42, 0x43, 0xe8, 0xed, 0x99, 0x85, 0x1f, 0x5d, 0x03, 0x4a, 0xcd, 0xac, 0x1e, 0x3d, 0x0d, 0x65, - 0x17, 0x5f, 0x61, 0xd2, 0x1b, 0x70, 0x74, 0xc6, 0xb3, 0x61, 0x49, 0x2d, 0x09, 0x2e, 0x53, 0xf2, - 0xb8, 0xd8, 0x87, 0xb8, 0x47, 0x34, 0x1e, 0x66, 0xf8, 0xa1, 0x93, 0xa8, 0x18, 0xe5, 0x5e, 0x72, - 0xa6, 0xf2, 0xc1, 0xb5, 0x7c, 0x29, 0x41, 0x5e, 0x6d, 0x75, 0xd4, 0x77, 0xab, 0x59, 0x84, 0xa0, - 0xcc, 0x86, 0xda, 0xe5, 0x59, 0xfd, 0xe2, 0xb2, 0x7d, 0x4e, 0x7d, 0xb9, 0x03, 0x15, 0xdf, 0x97, - 0x3e, 0x33, 0xaf, 0xbc, 0x17, 0x26, 0x97, 0x48, 0xd1, 0x7a, 0x0c, 0xe5, 0x19, 0xe8, 0xb6, 0x5e, - 0xb5, 0xa9, 0x96, 0x26, 0x51, 0x52, 0x79, 0x00, 0x8f, 0x2f, 0xc1, 0x76, 0x3f, 0x6e, 0xa4, 0x54, - 0xde, 0x87, 0x72, 0xbc, 0xe7, 0x13, 0xd6, 0xd8, 0xf4, 0x07, 0xf2, 0xa2, 0xc6, 0x46, 0xaf, 0x40, - 0x9e, 0xce, 0xd2, 0xc7, 0x29, 0xf3, 0xd7, 0x86, 0x4e, 0x32, 0xd2, 0x33, 0xe2, 0xd2, 0xca, 0x27, - 0x90, 0x67, 0x01, 0x80, 0xfe, 0x36, 0xeb, 0xde, 0x08, 0xe8, 0x47, 0xc7, 0xe8, 0x7d, 0x00, 0x9d, - 0x10, 0xd7, 0xec, 0x8e, 0x43, 0xc3, 0xfb, 0x8b, 0x03, 0x48, 0xdd, 0x97, 0x6b, 0xdc, 0x14, 0x91, - 0x64, 0x37, 0x54, 0x8d, 0x44, 0x93, 0x88, 0x41, 0xe5, 0x0c, 0xca, 0x71, 0x5d, 0x1f, 0xac, 0xf0, - 0x39, 0xc4, 0xc1, 0x0a, 0xc7, 0x9e, 0x02, 0xac, 0x04, 0x50, 0x27, 0xcb, 0x3b, 0x75, 0x8c, 0x50, - 0x3e, 0x4d, 0x43, 0xb1, 0xf3, 0x50, 0x1c, 0xad, 0x84, 0x26, 0x51, 0xa8, 0x9a, 0x89, 0xb6, 0x44, - 0x78, 0xd7, 0x29, 0x1b, 0xf4, 0xb2, 0xde, 0x0c, 0x2e, 0x4f, 0x6e, 0xdd, 0x9a, 0xd2, 0x6f, 0xea, - 0x89, 0x80, 0xf1, 0x06, 0x48, 0x41, 0xf8, 0xa7, 0x18, 0x5a, 0x37, 0x0c, 0x17, 0x7b, 0x9e, 0xb8, - 0xc2, 0x3e, 0xc9, 0x7a, 0x8e, 0xf6, 0xc7, 0xa2, 0xe9, 0x92, 0x55, 0x39, 0xa1, 0x18, 0x50, 0x99, - 0xc9, 0x1d, 0xe8, 0x0d, 0x28, 0x38, 0xe3, 0xae, 0xe6, 0xbb, 0x67, 0xe6, 0x35, 0xcc, 0x47, 0x67, - 0xe3, 0xee, 0xd0, 0xec, 0xdd, 0xc1, 0x53, 0x7f, 0x32, 0xce, 0xb8, 0x7b, 0x87, 0x7b, 0x91, 0xff, - 0x4a, 0x26, 0xfa, 0x2b, 0x13, 0x28, 0xfa, 0x87, 0x02, 0xfd, 0x1c, 0xa4, 0x20, 0x2d, 0x05, 0xad, - 0xe8, 0xc4, 0x7c, 0xe6, 0xf7, 0x5f, 0x02, 0x15, 0x0a, 0xf5, 0x3d, 0xb3, 0x6f, 0x61, 0x43, 0x0b, - 0x51, 0x3c, 0xfb, 0xb5, 0xa2, 0x5a, 0xe1, 0x1f, 0x4e, 0x7d, 0x08, 0xaf, 0xfc, 0x27, 0x0d, 0x45, - 0xbf, 0xe5, 0x88, 0x5e, 0x8a, 0x9c, 0xbb, 0xf2, 0x82, 0xd6, 0x87, 0x2f, 0x18, 0xb6, 0x0d, 0xe3, - 0x73, 0xcd, 0x5c, 0x7f, 0xae, 0x49, 0xfd, 0x5f, 0xbf, 0x13, 0x9f, 0xbb, 0x76, 0x27, 0xfe, 0x05, - 0x40, 0xc4, 0x26, 0xfa, 0x90, 0x96, 0x86, 0xa6, 0xd5, 0xd7, 0xb8, 0xb3, 0x39, 0xac, 0xa9, 0xb2, - 0x2f, 0xf7, 0xd8, 0x87, 0x0b, 0xe6, 0xf7, 0xdf, 0xa5, 0xa1, 0x18, 0xe4, 0xa7, 0xeb, 0x76, 0x01, - 0x6f, 0xc0, 0x86, 0x08, 0xc1, 0xbc, 0x0d, 0x28, 0xa8, 0xa0, 0x21, 0x9d, 0x8b, 0x34, 0xa4, 0x65, - 0x28, 0x8e, 0x30, 0xd1, 0x59, 0xe4, 0xe1, 0x85, 0x54, 0x40, 0xdf, 0x7e, 0x1d, 0x36, 0x23, 0x0d, - 0x59, 0x7a, 0xf3, 0xce, 0x5a, 0xef, 0x54, 0x53, 0x72, 0xe1, 0xd3, 0xcf, 0x6f, 0x65, 0xcf, 0xf0, - 0xc7, 0xf4, 0xcc, 0xaa, 0xad, 0x66, 0xbb, 0xd5, 0xbc, 0x53, 0x4d, 0xcb, 0x9b, 0x9f, 0x7e, 0x7e, - 0xab, 0xa0, 0x62, 0xd6, 0x76, 0xb9, 0xdd, 0x86, 0xad, 0xe8, 0xae, 0xc4, 0xa3, 0x38, 0x82, 0xf2, - 0x5b, 0x77, 0x2f, 0x4e, 0x4f, 0x9a, 0xf5, 0x4e, 0x4b, 0xbb, 0x77, 0xde, 0x69, 0x55, 0xd3, 0xe8, - 0x51, 0xd8, 0x39, 0x3d, 0xf9, 0x65, 0xbb, 0xa3, 0x35, 0x4f, 0x4f, 0x5a, 0x67, 0x1d, 0xad, 0xde, - 0xe9, 0xd4, 0x9b, 0x77, 0xaa, 0x99, 0xa3, 0x7f, 0x03, 0x54, 0xea, 0x8d, 0xe6, 0x09, 0xcd, 0x40, - 0x66, 0x4f, 0x27, 0xbc, 0x1d, 0x98, 0x63, 0x75, 0xec, 0xd2, 0x87, 0x65, 0x79, 0x79, 0x43, 0x0e, - 0x1d, 0x43, 0x9e, 0x95, 0xb8, 0x68, 0xf9, 0x4b, 0xb3, 0xbc, 0xa2, 0x43, 0x47, 0x27, 0xc3, 0xae, - 0xc7, 0xd2, 0xa7, 0x67, 0x79, 0x79, 0xc3, 0x0e, 0xa9, 0x20, 0x85, 0x38, 0x7a, 0xf5, 0x53, 0xac, - 0xbc, 0x46, 0xb0, 0x41, 0xa7, 0x50, 0xf0, 0xab, 0x9a, 0x55, 0x8f, 0xc3, 0xf2, 0xca, 0x8e, 0x1a, - 0x75, 0x17, 0xaf, 0x3e, 0x97, 0xbf, 0x74, 0xcb, 0x2b, 0xda, 0x83, 0xe8, 0x04, 0x36, 0x04, 0x36, - 0x5c, 0xf1, 0xe0, 0x2b, 0xaf, 0xea, 0x90, 0x51, 0xa7, 0x85, 0x75, 0xfd, 0xea, 0xf7, 0x7b, 0x79, - 0x8d, 0xce, 0x27, 0xba, 0x0b, 0x10, 0xa9, 0x35, 0xd7, 0x78, 0x98, 0x97, 0xd7, 0xe9, 0x68, 0xa2, - 0x73, 0x28, 0x06, 0xf5, 0xc1, 0xca, 0x67, 0x72, 0x79, 0x75, 0x6b, 0x11, 0xdd, 0x87, 0x52, 0x1c, - 0x17, 0xaf, 0xf7, 0xf8, 0x2d, 0xaf, 0xd9, 0x33, 0xa4, 0xf6, 0xe3, 0x20, 0x79, 0xbd, 0xc7, 0x70, - 0x79, 0xcd, 0x16, 0x22, 0xfa, 0x10, 0xb6, 0xe7, 0x41, 0xec, 0xfa, 0x6f, 0xe3, 0xf2, 0x35, 0x9a, - 0x8a, 0x68, 0x04, 0x68, 0x01, 0xf8, 0xbd, 0xc6, 0x53, 0xb9, 0x7c, 0x9d, 0x1e, 0x23, 0x3d, 0x42, - 0x11, 0x44, 0xb9, 0xc6, 0xd3, 0xb9, 0xbc, 0x4e, 0xab, 0x11, 0x39, 0xb0, 0xb3, 0x08, 0x4a, 0x5e, - 0xe7, 0x25, 0x5d, 0xbe, 0x56, 0x07, 0xb2, 0xd1, 0xfa, 0xe2, 0x9b, 0xbd, 0xf4, 0x57, 0xdf, 0xec, - 0xa5, 0xff, 0xf9, 0xcd, 0x5e, 0xfa, 0xb3, 0x6f, 0xf7, 0x52, 0x5f, 0x7d, 0xbb, 0x97, 0xfa, 0xfb, - 0xb7, 0x7b, 0xa9, 0xdf, 0x3c, 0xdf, 0x37, 0xc9, 0x60, 0xdc, 0x3d, 0xe8, 0xd9, 0xa3, 0xc3, 0xe8, - 0x9f, 0x89, 0x16, 0xfd, 0xc1, 0xa9, 0xbb, 0xc1, 0xb2, 0xe3, 0xcb, 0xff, 0x0d, 0x00, 0x00, 0xff, - 0xff, 0x14, 0xce, 0xe9, 0xdb, 0x00, 0x25, 0x00, 0x00, + // 2776 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xc5, + 0xf5, 0xd7, 0x5b, 0xea, 0x6b, 0xeb, 0xe1, 0xb2, 0x19, 0x44, 0x33, 0xd8, 0x43, 0x73, 0xe0, 0x0f, + 0x03, 0xd8, 0x7f, 0xcc, 0x81, 0xc0, 0x21, 0x0f, 0x24, 0x21, 0x47, 0x66, 0x1c, 0xdb, 0x69, 0x6b, + 0xcc, 0x21, 0x81, 0x69, 0x5a, 0xea, 0xb2, 0xd4, 0x58, 0xea, 0x6e, 0xba, 0x5b, 0x1a, 0x8b, 0x65, + 0x4e, 0xb2, 0x99, 0x93, 0xc5, 0x2c, 0xb3, 0xe1, 0x73, 0x24, 0xab, 0xac, 0xb2, 0x60, 0xc1, 0x82, + 0x65, 0x56, 0x24, 0x67, 0x66, 0x97, 0x2f, 0x40, 0x36, 0x39, 0x27, 0xa7, 0x1e, 0xfd, 0x92, 0xd4, + 0x92, 0x3c, 0xb0, 0xcb, 0xae, 0xea, 0xd6, 0xbd, 0xb7, 0xab, 0x6e, 0x55, 0xdd, 0xfb, 0xbb, 0xb7, + 0x1a, 0x9e, 0x75, 0xb1, 0xa1, 0x61, 0x7b, 0xa8, 0x1b, 0xee, 0x9e, 0xda, 0xe9, 0xea, 0x7b, 0xee, + 0xc4, 0xc2, 0xce, 0xae, 0x65, 0x9b, 0xae, 0x89, 0xca, 0xc1, 0xe0, 0x2e, 0x19, 0x14, 0x9f, 0x0b, + 0x71, 0x77, 0xed, 0x89, 0xe5, 0x9a, 0x7b, 0x96, 0x6d, 0x9a, 0x17, 0x8c, 0x5f, 0xbc, 0x19, 0x1a, + 0xa6, 0x7a, 0xc2, 0xda, 0x22, 0xa3, 0x5c, 0xf8, 0x12, 0x4f, 0xbc, 0xd1, 0xe7, 0x66, 0x64, 0x2d, + 0xd5, 0x56, 0x87, 0xde, 0xf0, 0x4e, 0xcf, 0x34, 0x7b, 0x03, 0xbc, 0x47, 0x7b, 0x9d, 0xd1, 0xc5, + 0x9e, 0xab, 0x0f, 0xb1, 0xe3, 0xaa, 0x43, 0x8b, 0x33, 0x6c, 0xf5, 0xcc, 0x9e, 0x49, 0x9b, 0x7b, + 0xa4, 0xc5, 0xa8, 0xd2, 0xf7, 0x05, 0xc8, 0xcb, 0xf8, 0x8b, 0x11, 0x76, 0x5c, 0xb4, 0x0f, 0x19, + 0xdc, 0xed, 0x9b, 0xd5, 0xe4, 0xad, 0xe4, 0xcb, 0x6b, 0xfb, 0x37, 0x77, 0xa7, 0x16, 0xb7, 0xcb, + 0xf9, 0x9a, 0xdd, 0xbe, 0xd9, 0x4a, 0xc8, 0x94, 0x17, 0xbd, 0x05, 0xd9, 0x8b, 0xc1, 0xc8, 0xe9, + 0x57, 0x53, 0x54, 0xe8, 0xb9, 0x38, 0xa1, 0x03, 0xc2, 0xd4, 0x4a, 0xc8, 0x8c, 0x9b, 0x7c, 0x4a, + 0x37, 0x2e, 0xcc, 0x6a, 0x7a, 0xf1, 0xa7, 0x0e, 0x8d, 0x0b, 0xfa, 0x29, 0xc2, 0x8b, 0xea, 0x00, + 0xba, 0xa1, 0xbb, 0x4a, 0xb7, 0xaf, 0xea, 0x46, 0x35, 0x43, 0x25, 0x9f, 0x8f, 0x97, 0xd4, 0xdd, + 0x06, 0x61, 0x6c, 0x25, 0x64, 0x41, 0xf7, 0x3a, 0x64, 0xba, 0x5f, 0x8c, 0xb0, 0x3d, 0xa9, 0x66, + 0x17, 0x4f, 0xf7, 0xd7, 0x84, 0x89, 0x4c, 0x97, 0x72, 0xa3, 0x26, 0xac, 0x75, 0x70, 0x4f, 0x37, + 0x94, 0xce, 0xc0, 0xec, 0x5e, 0x56, 0x73, 0x54, 0x58, 0x8a, 0x13, 0xae, 0x13, 0xd6, 0x3a, 0xe1, + 0x6c, 0x25, 0x64, 0xe8, 0xf8, 0x3d, 0xf4, 0x53, 0x28, 0x74, 0xfb, 0xb8, 0x7b, 0xa9, 0xb8, 0x57, + 0xd5, 0x3c, 0xd5, 0xb1, 0x13, 0xa7, 0xa3, 0x41, 0xf8, 0xda, 0x57, 0xad, 0x84, 0x9c, 0xef, 0xb2, + 0x26, 0x59, 0xbf, 0x86, 0x07, 0xfa, 0x18, 0xdb, 0x44, 0xbe, 0xb0, 0x78, 0xfd, 0x1f, 0x30, 0x4e, + 0xaa, 0x41, 0xd0, 0xbc, 0x0e, 0xfa, 0x05, 0x08, 0xd8, 0xd0, 0xf8, 0x32, 0x04, 0xaa, 0xe2, 0x56, + 0xec, 0x3e, 0x1b, 0x9a, 0xb7, 0x88, 0x02, 0xe6, 0x6d, 0xf4, 0x0e, 0xe4, 0xba, 0xe6, 0x70, 0xa8, + 0xbb, 0x55, 0xa0, 0xd2, 0xdb, 0xb1, 0x0b, 0xa0, 0x5c, 0xad, 0x84, 0xcc, 0xf9, 0xd1, 0x31, 0x94, + 0x06, 0xba, 0xe3, 0x2a, 0x8e, 0xa1, 0x5a, 0x4e, 0xdf, 0x74, 0x9d, 0xea, 0x1a, 0xd5, 0xf0, 0x62, + 0x9c, 0x86, 0x23, 0xdd, 0x71, 0xcf, 0x3c, 0xe6, 0x56, 0x42, 0x2e, 0x0e, 0xc2, 0x04, 0xa2, 0xcf, + 0xbc, 0xb8, 0xc0, 0xb6, 0xaf, 0xb0, 0xba, 0xbe, 0x58, 0xdf, 0x09, 0xe1, 0xf6, 0xe4, 0x89, 0x3e, + 0x33, 0x4c, 0x40, 0xbf, 0x85, 0xcd, 0x81, 0xa9, 0x6a, 0xbe, 0x3a, 0xa5, 0xdb, 0x1f, 0x19, 0x97, + 0xd5, 0x22, 0x55, 0xfa, 0x4a, 0xec, 0x24, 0x4d, 0x55, 0xf3, 0x54, 0x34, 0x88, 0x40, 0x2b, 0x21, + 0x6f, 0x0c, 0xa6, 0x89, 0xe8, 0x1e, 0x6c, 0xa9, 0x96, 0x35, 0x98, 0x4c, 0x6b, 0x2f, 0x51, 0xed, + 0xb7, 0xe3, 0xb4, 0xd7, 0x88, 0xcc, 0xb4, 0x7a, 0xa4, 0xce, 0x50, 0xc9, 0x01, 0xc5, 0x57, 0x44, + 0x89, 0x32, 0x36, 0x5d, 0x5c, 0x2d, 0x2f, 0x3e, 0xa0, 0x4d, 0xca, 0x7a, 0x6e, 0xba, 0x98, 0x1c, + 0x50, 0xec, 0xf7, 0x90, 0x0a, 0x4f, 0x8d, 0xb1, 0xad, 0x5f, 0x4c, 0xa8, 0x1a, 0x85, 0x8e, 0x38, + 0xba, 0x69, 0x54, 0x2b, 0x54, 0xe1, 0xab, 0x71, 0x0a, 0xcf, 0xa9, 0x10, 0x51, 0xd1, 0xf4, 0x44, + 0x5a, 0x09, 0x79, 0x73, 0x3c, 0x4b, 0xae, 0xe7, 0x21, 0x3b, 0x56, 0x07, 0x23, 0x2c, 0xfd, 0x1f, + 0xac, 0x85, 0x1c, 0x0a, 0xaa, 0x42, 0x7e, 0x88, 0x1d, 0x47, 0xed, 0x61, 0xea, 0x7f, 0x04, 0xd9, + 0xeb, 0x4a, 0x25, 0x58, 0x0f, 0x3b, 0x11, 0xe9, 0x61, 0xd2, 0x97, 0x24, 0xfe, 0x81, 0x48, 0x8e, + 0xb1, 0x4d, 0xa7, 0xc9, 0x25, 0x79, 0x17, 0xbd, 0x00, 0x45, 0x7a, 0xd2, 0x15, 0x6f, 0x9c, 0x38, + 0xa9, 0x8c, 0xbc, 0x4e, 0x89, 0xe7, 0x9c, 0x69, 0x07, 0xd6, 0xac, 0x7d, 0xcb, 0x67, 0x49, 0x53, + 0x16, 0xb0, 0xf6, 0x2d, 0x8f, 0xe1, 0x79, 0x58, 0x27, 0x6b, 0xf5, 0x39, 0x32, 0xf4, 0x23, 0x6b, + 0x84, 0xc6, 0x59, 0xa4, 0x6f, 0x52, 0x50, 0x99, 0x76, 0x3c, 0xe8, 0x1d, 0xc8, 0x10, 0x1f, 0xcc, + 0xdd, 0xa9, 0xb8, 0xcb, 0x1c, 0xf4, 0xae, 0xe7, 0xa0, 0x77, 0xdb, 0x9e, 0x83, 0xae, 0x17, 0xbe, + 0xfe, 0x6e, 0x27, 0xf1, 0xf0, 0x1f, 0x3b, 0x49, 0x99, 0x4a, 0xa0, 0x67, 0x88, 0x9f, 0x50, 0x75, + 0x43, 0xd1, 0x35, 0x3a, 0x65, 0x81, 0x38, 0x01, 0x55, 0x37, 0x0e, 0x35, 0x74, 0x04, 0x95, 0xae, + 0x69, 0x38, 0xd8, 0x70, 0x46, 0x8e, 0xc2, 0x02, 0x00, 0x77, 0xa2, 0x11, 0x57, 0xc0, 0xc2, 0x4a, + 0xc3, 0xe3, 0x3c, 0xa5, 0x8c, 0x72, 0xb9, 0x1b, 0x25, 0xa0, 0x03, 0x80, 0xb1, 0x3a, 0xd0, 0x35, + 0xd5, 0x35, 0x6d, 0xa7, 0x9a, 0xb9, 0x95, 0x9e, 0xeb, 0x0f, 0xce, 0x3d, 0x96, 0xbb, 0x96, 0xa6, + 0xba, 0xb8, 0x9e, 0x21, 0xd3, 0x95, 0x43, 0x92, 0xe8, 0x25, 0x28, 0xab, 0x96, 0xa5, 0x38, 0xae, + 0xea, 0x62, 0xa5, 0x33, 0x71, 0xb1, 0x43, 0x1d, 0xec, 0xba, 0x5c, 0x54, 0x2d, 0xeb, 0x8c, 0x50, + 0xeb, 0x84, 0x88, 0x5e, 0x84, 0x12, 0xf1, 0xc5, 0xba, 0x3a, 0x50, 0xfa, 0x58, 0xef, 0xf5, 0x5d, + 0xea, 0x4a, 0xd3, 0x72, 0x91, 0x53, 0x5b, 0x94, 0x28, 0x69, 0xfe, 0x8e, 0x53, 0x3f, 0x8c, 0x10, + 0x64, 0x34, 0xd5, 0x55, 0xa9, 0x25, 0xd7, 0x65, 0xda, 0x26, 0x34, 0x4b, 0x75, 0xfb, 0xdc, 0x3e, + 0xb4, 0x8d, 0x6e, 0x40, 0x8e, 0xab, 0x4d, 0x53, 0xb5, 0xbc, 0x87, 0xb6, 0x20, 0x6b, 0xd9, 0xe6, + 0x18, 0xd3, 0xad, 0x2b, 0xc8, 0xac, 0x23, 0xfd, 0x3e, 0x05, 0x1b, 0x33, 0x1e, 0x9b, 0xe8, 0xed, + 0xab, 0x4e, 0xdf, 0xfb, 0x16, 0x69, 0xa3, 0xb7, 0x89, 0x5e, 0x55, 0xc3, 0x36, 0x8f, 0x72, 0xd5, + 0x59, 0x53, 0xb7, 0xe8, 0x38, 0x37, 0x0d, 0xe7, 0x46, 0x27, 0x50, 0x19, 0xa8, 0x8e, 0xab, 0x30, + 0x0f, 0xa8, 0x84, 0x22, 0xde, 0xac, 0xdf, 0x3f, 0x52, 0x3d, 0x9f, 0x49, 0x0e, 0x35, 0x57, 0x54, + 0x1a, 0x44, 0xa8, 0x48, 0x86, 0xad, 0xce, 0xe4, 0x4b, 0xd5, 0x70, 0x75, 0x03, 0x2b, 0x33, 0x3b, + 0xf7, 0xcc, 0x8c, 0xd2, 0xe6, 0x58, 0xd7, 0xb0, 0xd1, 0xf5, 0xb6, 0x6c, 0xd3, 0x17, 0xf6, 0xb7, + 0xd4, 0x91, 0x64, 0x28, 0x45, 0x63, 0x0e, 0x2a, 0x41, 0xca, 0xbd, 0xe2, 0x06, 0x48, 0xb9, 0x57, + 0xe8, 0xff, 0x21, 0x43, 0x16, 0x49, 0x17, 0x5f, 0x9a, 0x13, 0xac, 0xb9, 0x5c, 0x7b, 0x62, 0x61, + 0x99, 0x72, 0x4a, 0x92, 0x7f, 0x1d, 0xfc, 0x38, 0x34, 0xad, 0x55, 0x7a, 0x05, 0xca, 0x53, 0x81, + 0x26, 0xb4, 0x7f, 0xc9, 0xf0, 0xfe, 0x49, 0x65, 0x28, 0x46, 0xa2, 0x8a, 0x74, 0x03, 0xb6, 0xe6, + 0x05, 0x09, 0xa9, 0xef, 0xd3, 0x23, 0xce, 0x1e, 0xbd, 0x05, 0x05, 0x3f, 0x4a, 0xb0, 0xeb, 0x38, + 0x6b, 0x2b, 0x8f, 0x59, 0xf6, 0x59, 0xc9, 0x3d, 0x24, 0xc7, 0x9a, 0x9e, 0x87, 0x14, 0x9d, 0x78, + 0x5e, 0xb5, 0xac, 0x96, 0xea, 0xf4, 0xa5, 0xcf, 0xa0, 0x1a, 0x17, 0x01, 0xa6, 0x96, 0x91, 0xf1, + 0x8f, 0xe1, 0x0d, 0xc8, 0x5d, 0x98, 0xf6, 0x50, 0x75, 0xa9, 0xb2, 0xa2, 0xcc, 0x7b, 0xe4, 0x78, + 0xb2, 0x68, 0x90, 0xa6, 0x64, 0xd6, 0x91, 0x14, 0x78, 0x26, 0x36, 0x0a, 0x10, 0x11, 0xdd, 0xd0, + 0x30, 0xb3, 0x67, 0x51, 0x66, 0x9d, 0x40, 0x11, 0x9b, 0x2c, 0xeb, 0x90, 0xcf, 0x3a, 0x74, 0xad, + 0x54, 0xbf, 0x20, 0xf3, 0x9e, 0x54, 0xf3, 0x8f, 0x7f, 0x10, 0x0f, 0x62, 0xe7, 0xbe, 0x05, 0x59, + 0xdb, 0x1c, 0x19, 0x1a, 0x77, 0xa1, 0xac, 0x23, 0x7d, 0x0e, 0x62, 0x7c, 0x04, 0x40, 0x47, 0x50, + 0x9a, 0x0a, 0x23, 0xc9, 0xd9, 0xc3, 0xcf, 0xae, 0x4f, 0x34, 0x46, 0xb0, 0xd3, 0x5a, 0x1c, 0x87, + 0x89, 0xd2, 0x37, 0x02, 0x14, 0x64, 0xec, 0x58, 0xc4, 0x85, 0xa1, 0x3a, 0x08, 0xf8, 0xaa, 0x8b, + 0x2d, 0x37, 0xd0, 0x3a, 0x2f, 0xda, 0x31, 0xee, 0xa6, 0xc7, 0x49, 0xb0, 0x90, 0x2f, 0x86, 0xde, + 0xe4, 0x70, 0x37, 0x1e, 0xb9, 0x72, 0xf1, 0x30, 0xde, 0x7d, 0xdb, 0xc3, 0xbb, 0xe9, 0x58, 0xf8, + 0xc3, 0xa4, 0xa6, 0x00, 0xef, 0x9b, 0x1c, 0xf0, 0x66, 0x96, 0x7c, 0x2c, 0x82, 0x78, 0x1b, 0x11, + 0xc4, 0x9b, 0x5d, 0xb2, 0xcc, 0x18, 0xc8, 0xfb, 0xb6, 0x07, 0x79, 0x73, 0x4b, 0x66, 0x3c, 0x85, + 0x79, 0x0f, 0xa2, 0x98, 0x97, 0xe1, 0xd5, 0x17, 0x62, 0xa5, 0x63, 0x41, 0xef, 0xcf, 0x42, 0xa0, + 0xb7, 0x10, 0x8b, 0x38, 0x99, 0x92, 0x39, 0xa8, 0xb7, 0x11, 0x41, 0xbd, 0xc2, 0x12, 0x1b, 0xc4, + 0xc0, 0xde, 0xf7, 0xc3, 0xb0, 0x17, 0x62, 0x91, 0x33, 0xdf, 0xef, 0x79, 0xb8, 0xf7, 0x5d, 0x1f, + 0xf7, 0xae, 0xc5, 0x02, 0x77, 0xbe, 0x86, 0x69, 0xe0, 0x7b, 0x32, 0x03, 0x7c, 0x19, 0x50, 0x7d, + 0x29, 0x56, 0xc5, 0x12, 0xe4, 0x7b, 0x32, 0x83, 0x7c, 0x8b, 0x4b, 0x14, 0x2e, 0x81, 0xbe, 0x9f, + 0xcc, 0x87, 0xbe, 0xf1, 0xe0, 0x94, 0x4f, 0x73, 0x35, 0xec, 0xab, 0xc4, 0x60, 0xdf, 0x72, 0x2c, + 0xa6, 0x64, 0xea, 0x57, 0x06, 0xbf, 0x07, 0x51, 0xf0, 0x5b, 0x59, 0x72, 0x52, 0x63, 0xd1, 0x6f, + 0x27, 0x0e, 0xfd, 0x6e, 0x50, 0x8d, 0xaf, 0xc5, 0x6a, 0x7c, 0x12, 0xf8, 0xfb, 0x0a, 0xf1, 0xbe, + 0x53, 0xfe, 0x89, 0x78, 0x59, 0x6c, 0xdb, 0xa6, 0xcd, 0x81, 0x2c, 0xeb, 0x48, 0x2f, 0x13, 0x38, + 0x14, 0xf8, 0xa2, 0x05, 0x50, 0x99, 0x06, 0xca, 0x90, 0xff, 0x91, 0xfe, 0x92, 0x0c, 0x64, 0x29, + 0x82, 0x08, 0x43, 0x29, 0x81, 0x43, 0xa9, 0x10, 0x80, 0x4e, 0x45, 0x01, 0xf4, 0x0e, 0xac, 0x91, + 0x00, 0x38, 0x85, 0x8d, 0x55, 0xcb, 0xc7, 0xc6, 0xb7, 0x61, 0x83, 0x22, 0x1c, 0x06, 0xb3, 0x79, + 0xe4, 0xc8, 0xd0, 0xe0, 0x5d, 0x26, 0x03, 0xec, 0x22, 0xb1, 0x10, 0xf2, 0x3a, 0x6c, 0x86, 0x78, + 0xfd, 0xc0, 0xca, 0x80, 0x62, 0xc5, 0xe7, 0xae, 0xf1, 0x08, 0xfb, 0xb7, 0x64, 0x60, 0xa1, 0x00, + 0x54, 0xcf, 0xc3, 0xbf, 0xc9, 0x1f, 0x09, 0xff, 0xa6, 0x9e, 0x18, 0xff, 0x86, 0x81, 0x42, 0x3a, + 0x0a, 0x14, 0xbe, 0x4f, 0x06, 0x7b, 0xe2, 0xa3, 0xd9, 0xae, 0xa9, 0x61, 0x1e, 0xba, 0x69, 0x1b, + 0x55, 0x20, 0x3d, 0x30, 0x7b, 0x3c, 0x40, 0x93, 0x26, 0xe1, 0xf2, 0x03, 0x86, 0xc0, 0xe3, 0x81, + 0x1f, 0xf5, 0xb3, 0xd4, 0xc2, 0x3c, 0xea, 0x57, 0x20, 0x7d, 0x89, 0x99, 0x7b, 0x5f, 0x97, 0x49, + 0x93, 0xf0, 0xd1, 0x43, 0x46, 0x9d, 0xf6, 0xba, 0xcc, 0x3a, 0xe8, 0x1d, 0x10, 0x68, 0x2d, 0x4a, + 0x31, 0x2d, 0x87, 0x7b, 0xe2, 0x67, 0xc3, 0x6b, 0x65, 0x25, 0xa7, 0xdd, 0x53, 0xc2, 0x73, 0x62, + 0x39, 0x72, 0xc1, 0xe2, 0xad, 0x10, 0x28, 0x10, 0x22, 0xb8, 0xfa, 0x26, 0x08, 0x64, 0xf6, 0x8e, + 0xa5, 0x76, 0x31, 0x75, 0xab, 0x82, 0x1c, 0x10, 0xa4, 0x7b, 0x80, 0x66, 0x83, 0x03, 0x6a, 0x41, + 0x0e, 0x8f, 0xb1, 0xe1, 0x92, 0x6d, 0x23, 0xe6, 0xbe, 0x31, 0x07, 0xb4, 0x62, 0xc3, 0xad, 0x57, + 0x89, 0x91, 0xff, 0xf5, 0xdd, 0x4e, 0x85, 0x71, 0xbf, 0x66, 0x0e, 0x75, 0x17, 0x0f, 0x2d, 0x77, + 0x22, 0x73, 0x79, 0xe9, 0xcf, 0x29, 0x82, 0x20, 0x23, 0x81, 0x63, 0xae, 0x6d, 0xbd, 0x23, 0x9f, + 0x0a, 0x65, 0x0f, 0xab, 0xd9, 0x7b, 0x1b, 0xa0, 0xa7, 0x3a, 0xca, 0x7d, 0xd5, 0x70, 0xb1, 0xc6, + 0x8d, 0x1e, 0xa2, 0x20, 0x11, 0x0a, 0xa4, 0x37, 0x72, 0xb0, 0xc6, 0x13, 0x19, 0xbf, 0x1f, 0x5a, + 0x67, 0xfe, 0x87, 0xad, 0x33, 0x6a, 0xe5, 0xc2, 0x94, 0x95, 0x43, 0xe8, 0x4e, 0x08, 0xa3, 0x3b, + 0x32, 0x37, 0xcb, 0xd6, 0x4d, 0x5b, 0x77, 0x27, 0x74, 0x6b, 0xd2, 0xb2, 0xdf, 0x97, 0xfe, 0x90, + 0x0a, 0xae, 0x56, 0x00, 0xd0, 0xff, 0xe7, 0x6c, 0x27, 0xfd, 0x91, 0xa6, 0xed, 0xd1, 0xa8, 0x8f, + 0xce, 0x60, 0xc3, 0xbf, 0xd9, 0xca, 0x88, 0xde, 0x78, 0xef, 0xac, 0xae, 0xea, 0x1a, 0x2a, 0xe3, + 0x28, 0xd9, 0x41, 0x1f, 0xc3, 0xd3, 0x53, 0x6e, 0xcb, 0x57, 0x9d, 0x5a, 0xd5, 0x7b, 0x3d, 0x15, + 0xf5, 0x5e, 0x9e, 0xea, 0xc0, 0x58, 0xe9, 0x1f, 0x78, 0xa1, 0x0e, 0x49, 0x26, 0x18, 0x06, 0x31, + 0x73, 0xb7, 0xff, 0x05, 0x28, 0xda, 0xd8, 0x55, 0x75, 0x43, 0x89, 0xe4, 0xda, 0xeb, 0x8c, 0xc8, + 0x33, 0xf8, 0x53, 0x78, 0x6a, 0x2e, 0x98, 0x41, 0x3f, 0x01, 0x21, 0xc0, 0x41, 0xc9, 0x98, 0xb4, + 0xd5, 0x4f, 0xc5, 0x02, 0x5e, 0xe9, 0xaf, 0xc9, 0x40, 0x65, 0x34, 0xb9, 0x6b, 0x42, 0xce, 0xc6, + 0xce, 0x68, 0xc0, 0x52, 0x96, 0xd2, 0xfe, 0xeb, 0xab, 0xc1, 0x20, 0x42, 0x1d, 0x0d, 0x5c, 0x99, + 0x0b, 0x4b, 0xf7, 0x20, 0xc7, 0x28, 0x68, 0x0d, 0xf2, 0x77, 0x8f, 0xef, 0x1c, 0x9f, 0x7c, 0x74, + 0x5c, 0x49, 0x20, 0x80, 0x5c, 0xad, 0xd1, 0x68, 0x9e, 0xb6, 0x2b, 0x49, 0x24, 0x40, 0xb6, 0x56, + 0x3f, 0x91, 0xdb, 0x95, 0x14, 0x21, 0xcb, 0xcd, 0x0f, 0x9b, 0x8d, 0x76, 0x25, 0x8d, 0x36, 0xa0, + 0xc8, 0xda, 0xca, 0xc1, 0x89, 0xfc, 0xab, 0x5a, 0xbb, 0x92, 0x09, 0x91, 0xce, 0x9a, 0xc7, 0x1f, + 0x34, 0xe5, 0x4a, 0x56, 0x7a, 0x83, 0xe4, 0x73, 0x31, 0xc0, 0x29, 0xc8, 0xdc, 0x92, 0xa1, 0xcc, + 0x4d, 0xfa, 0x53, 0x8a, 0xe4, 0x57, 0x71, 0x68, 0x08, 0x7d, 0x38, 0xb5, 0xf0, 0xfd, 0x6b, 0x40, + 0xa9, 0xa9, 0xd5, 0xa3, 0x17, 0xa1, 0x64, 0xe3, 0x0b, 0xec, 0x76, 0xfb, 0x0c, 0x9d, 0xb1, 0x68, + 0x58, 0x94, 0x8b, 0x9c, 0x4a, 0x85, 0x1c, 0xc6, 0xf6, 0x39, 0xee, 0xba, 0x0a, 0x73, 0x33, 0xec, + 0xd0, 0x09, 0x84, 0x8d, 0x50, 0xcf, 0x18, 0x51, 0xfa, 0xec, 0x5a, 0xb6, 0x14, 0x20, 0x2b, 0x37, + 0xdb, 0xf2, 0xc7, 0x95, 0x34, 0x42, 0x50, 0xa2, 0x4d, 0xe5, 0xec, 0xb8, 0x76, 0x7a, 0xd6, 0x3a, + 0x21, 0xb6, 0xdc, 0x84, 0xb2, 0x67, 0x4b, 0x8f, 0x98, 0x95, 0x3e, 0x09, 0x82, 0x4b, 0x28, 0x7b, + 0x3d, 0x78, 0xc2, 0x8c, 0x73, 0x3a, 0xd7, 0xbc, 0x84, 0x67, 0x17, 0x60, 0xbb, 0x1f, 0xd7, 0x53, + 0x4a, 0x9f, 0x42, 0x29, 0x5a, 0xfc, 0x09, 0x92, 0x6d, 0xf2, 0x81, 0x2c, 0x4f, 0xb6, 0xd1, 0x5b, + 0x90, 0x25, 0xb3, 0xf4, 0x70, 0xca, 0xec, 0xb5, 0x21, 0x93, 0x0c, 0x15, 0x8f, 0x18, 0xb7, 0xf4, + 0x25, 0x64, 0xa9, 0x03, 0x20, 0xdf, 0xa6, 0x65, 0x1c, 0x0e, 0xfd, 0x48, 0x1b, 0x7d, 0x0a, 0xa0, + 0xba, 0xae, 0xad, 0x77, 0x46, 0x81, 0xe2, 0x9d, 0xf9, 0x0e, 0xa4, 0xe6, 0xf1, 0xd5, 0x6f, 0x72, + 0x4f, 0xb2, 0x15, 0x88, 0x86, 0xbc, 0x49, 0x48, 0xa1, 0x74, 0x0c, 0xa5, 0xa8, 0xac, 0x07, 0x56, + 0xd8, 0x1c, 0xa2, 0x60, 0x85, 0x61, 0x4f, 0x0e, 0x56, 0x7c, 0xa8, 0x93, 0x66, 0x25, 0x3b, 0xda, + 0x91, 0x1e, 0x24, 0xa1, 0xd0, 0xbe, 0xe2, 0x47, 0x2b, 0xa6, 0x5a, 0x14, 0x88, 0xa6, 0xc2, 0xb5, + 0x11, 0x56, 0x7e, 0x4a, 0xfb, 0x45, 0xad, 0xf7, 0xfd, 0xcb, 0x93, 0x59, 0x35, 0xa7, 0xf4, 0xaa, + 0x7b, 0xdc, 0x61, 0xbc, 0x07, 0x82, 0xef, 0xfe, 0x09, 0x86, 0x56, 0x35, 0xcd, 0xc6, 0x8e, 0xc3, + 0xaf, 0xb0, 0xd7, 0xa5, 0xc5, 0x47, 0xf3, 0x3e, 0xaf, 0xbe, 0xa4, 0x65, 0xd6, 0x91, 0x34, 0x28, + 0x4f, 0xc5, 0x0e, 0xf4, 0x1e, 0xe4, 0xad, 0x51, 0x47, 0xf1, 0xcc, 0x33, 0xf5, 0x2c, 0xe6, 0xa1, + 0xb3, 0x51, 0x67, 0xa0, 0x77, 0xef, 0xe0, 0x89, 0x37, 0x19, 0x6b, 0xd4, 0xb9, 0xc3, 0xac, 0xc8, + 0xbe, 0x92, 0x0a, 0x7f, 0x65, 0x0c, 0x05, 0xef, 0x50, 0xa0, 0x9f, 0x83, 0xe0, 0x87, 0x25, 0xbf, + 0x26, 0x1d, 0x1b, 0xcf, 0xb8, 0xfa, 0x40, 0x84, 0x40, 0x7d, 0x47, 0xef, 0x19, 0x58, 0x53, 0x02, + 0x14, 0x4f, 0xbf, 0x56, 0x90, 0xcb, 0x6c, 0xe0, 0xc8, 0x83, 0xf0, 0xd2, 0x7f, 0x92, 0x50, 0xf0, + 0x6a, 0x8f, 0xe8, 0x8d, 0xd0, 0xb9, 0x2b, 0xcd, 0x29, 0x7d, 0x78, 0x8c, 0x41, 0xfd, 0x30, 0x3a, + 0xd7, 0xd4, 0xf5, 0xe7, 0x1a, 0x57, 0x08, 0xf6, 0x4a, 0xf2, 0x99, 0x6b, 0x97, 0xe4, 0x5f, 0x03, + 0xe4, 0x9a, 0xae, 0x3a, 0x20, 0xa9, 0xa1, 0x6e, 0xf4, 0x14, 0x66, 0x6c, 0x06, 0x6b, 0x2a, 0x74, + 0xe4, 0x9c, 0x0e, 0x9c, 0x52, 0xbb, 0xff, 0x2e, 0x09, 0x05, 0x3f, 0x3e, 0x5d, 0xb7, 0x1c, 0x78, + 0x03, 0x72, 0xdc, 0x05, 0xb3, 0x7a, 0x20, 0xef, 0xf9, 0x95, 0xe9, 0x4c, 0xa8, 0x32, 0x2d, 0x42, + 0x61, 0x88, 0x5d, 0x95, 0x7a, 0x1e, 0x96, 0x48, 0xf9, 0xfd, 0xdb, 0xef, 0xc2, 0x5a, 0xa8, 0x32, + 0x4b, 0x6e, 0xde, 0x71, 0xf3, 0xa3, 0x4a, 0x42, 0xcc, 0x3f, 0xf8, 0xea, 0x56, 0xfa, 0x18, 0xdf, + 0x27, 0x67, 0x56, 0x6e, 0x36, 0x5a, 0xcd, 0xc6, 0x9d, 0x4a, 0x52, 0x5c, 0x7b, 0xf0, 0xd5, 0xad, + 0xbc, 0x8c, 0x69, 0xd9, 0xe5, 0x76, 0x0b, 0xd6, 0xc3, 0xbb, 0x12, 0xf5, 0xe2, 0x08, 0x4a, 0x1f, + 0xdc, 0x3d, 0x3d, 0x3a, 0x6c, 0xd4, 0xda, 0x4d, 0xe5, 0xfc, 0xa4, 0xdd, 0xac, 0x24, 0xd1, 0xd3, + 0xb0, 0x79, 0x74, 0xf8, 0xcb, 0x56, 0x5b, 0x69, 0x1c, 0x1d, 0x36, 0x8f, 0xdb, 0x4a, 0xad, 0xdd, + 0xae, 0x35, 0xee, 0x54, 0x52, 0xfb, 0xff, 0x06, 0x28, 0xd7, 0xea, 0x8d, 0x43, 0x12, 0x81, 0xf4, + 0xae, 0x4a, 0xb3, 0xdc, 0x06, 0x64, 0x68, 0x1e, 0xbb, 0xf0, 0x85, 0x59, 0x5c, 0x5c, 0x90, 0x43, + 0x07, 0x90, 0xa5, 0x29, 0x2e, 0x5a, 0xfc, 0xe4, 0x2c, 0x2e, 0xa9, 0xd0, 0x91, 0xc9, 0xd0, 0xeb, + 0xb1, 0xf0, 0x0d, 0x5a, 0x5c, 0x5c, 0xb0, 0x43, 0x32, 0x08, 0x01, 0x8e, 0x5e, 0xfe, 0x26, 0x2b, + 0xae, 0xe0, 0x6c, 0xd0, 0x11, 0xe4, 0xbd, 0xac, 0x66, 0xd9, 0x2b, 0xb1, 0xb8, 0xb4, 0xa2, 0x46, + 0xcc, 0xc5, 0xb2, 0xcf, 0xc5, 0x4f, 0xde, 0xe2, 0x92, 0xf2, 0x20, 0x3a, 0x84, 0x1c, 0xc7, 0x86, + 0x4b, 0x5e, 0x7e, 0xc5, 0x65, 0x15, 0x32, 0x62, 0xb4, 0x20, 0xaf, 0x5f, 0xfe, 0x90, 0x2f, 0xae, + 0x50, 0xf9, 0x44, 0x77, 0x01, 0x42, 0xb9, 0xe6, 0x0a, 0x2f, 0xf4, 0xe2, 0x2a, 0x15, 0x4d, 0x74, + 0x02, 0x05, 0x3f, 0x3f, 0x58, 0xfa, 0x5e, 0x2e, 0x2e, 0x2f, 0x2d, 0xa2, 0x7b, 0x50, 0x8c, 0xe2, + 0xe2, 0xd5, 0x5e, 0xc1, 0xc5, 0x15, 0x6b, 0x86, 0x44, 0x7f, 0x14, 0x24, 0xaf, 0xf6, 0x2a, 0x2e, + 0xae, 0x58, 0x42, 0x44, 0x9f, 0xc3, 0xc6, 0x2c, 0x88, 0x5d, 0xfd, 0x91, 0x5c, 0xbc, 0x46, 0x51, + 0x11, 0x0d, 0x01, 0xcd, 0x01, 0xbf, 0xd7, 0x78, 0x33, 0x17, 0xaf, 0x53, 0x63, 0x24, 0x47, 0x28, + 0x84, 0x28, 0x57, 0x78, 0x43, 0x17, 0x57, 0x29, 0x35, 0x22, 0x0b, 0x36, 0xe7, 0x41, 0xc9, 0xeb, + 0x3c, 0xa9, 0x8b, 0xd7, 0xaa, 0x40, 0xd6, 0x9b, 0x5f, 0x3f, 0xda, 0x4e, 0x7e, 0xfb, 0x68, 0x3b, + 0xf9, 0xcf, 0x47, 0xdb, 0xc9, 0x87, 0x8f, 0xb7, 0x13, 0xdf, 0x3e, 0xde, 0x4e, 0xfc, 0xfd, 0xf1, + 0x76, 0xe2, 0x37, 0xaf, 0xf6, 0x74, 0xb7, 0x3f, 0xea, 0xec, 0x76, 0xcd, 0xe1, 0x5e, 0xf8, 0xaf, + 0xa2, 0x79, 0x7f, 0x3a, 0x75, 0x72, 0x34, 0x3a, 0xbe, 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xec, 0x81, 0x6a, 0xf0, 0x09, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4995,7 +4995,7 @@ func (m *RequestVerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, err var l int _ = l { - size, err := m.Extension.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7099,7 +7099,7 @@ func (m *RequestVerifyVoteExtension) Size() (n int) { } var l int _ = l - l = m.Extension.Size() + l = m.VoteExtension.Size() n += 1 + l + sovTypes(uint64(l)) return n } @@ -10176,7 +10176,7 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Extension", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10203,7 +10203,7 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Extension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/internal/consensus/state.go b/internal/consensus/state.go index a8bc304fc00..3792300777b 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -1424,7 +1424,7 @@ func (cs *State) enterPrecommit(height int64, round int32) { logger.Error("failed publishing event relock", "err", err) } - cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) + cs.signAddVote(tmproto.PrecommitType, blockID.Hash, blockID.PartSetHeader) return } @@ -2039,6 +2039,13 @@ func (cs *State) addVote(vote *types.Vote, peerID types.NodeID) (added bool, err return } + // Verify VoteExtension if precommit + if vote.Type == tmproto.PrecommitType { + if err = cs.blockExec.VerifyVoteExtension(vote.VoteExtension); err != nil { + return + } + } + height := cs.Height added, err = cs.Votes.AddVote(vote, peerID) if !added { @@ -2210,16 +2217,16 @@ func (cs *State) signVote( timeout = time.Second } - // If the signedMessage type is for precommit, add VoteExtension - switch msgType { - case tmproto.PrecommitType: - ext, err := cs.blockExec.VoteExtension(cs.Height, cs.Round) - if err != nil { - return nil, err - } - vote.VoteExtension = ext - default: - } + // If the signedMessage type is for precommit, add VoteExtension + switch msgType { + case tmproto.PrecommitType: + ext, err := cs.blockExec.ExtendVote(cs.Height, cs.Round) + if err != nil { + return nil, err + } + vote.VoteExtension = ext + default: + } ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() @@ -2227,7 +2234,6 @@ func (cs *State) signVote( err := cs.privValidator.SignVote(ctx, cs.state.ChainID, v) vote.Signature = v.Signature - return vote, err } @@ -2257,7 +2263,7 @@ func (cs *State) voteTime() time.Time { // sign the vote and publish on internalMsgQueue func (cs *State) signAddVote( - msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { + msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { if cs.privValidator == nil { // the node does not have a key return nil } diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index dec05569f9f..0a55a648df8 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -127,7 +127,7 @@ message RequestExtendVote { // Verify the vote extension message RequestVerifyVoteExtension { - tendermint.types.VoteExtension extension = 1 [(gogoproto.nullable) = false]; + tendermint.types.VoteExtension vote_extension = 1 [(gogoproto.nullable) = false]; } //---------------------------------------- diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index a198754a4a0..44172778c97 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -225,13 +225,13 @@ func (m *CanonicalProposal) GetChainID() string { } type CanonicalVote struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` - Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` - BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` - Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - VoteExtension *CanonicalVoteExtension `protobuf:"bytes,7,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` + Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` + BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + VoteExtension *SignedVoteExtension `protobuf:"bytes,7,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *CanonicalVote) Reset() { *m = CanonicalVote{} } @@ -309,104 +309,57 @@ func (m *CanonicalVote) GetChainID() string { return "" } -func (m *CanonicalVote) GetVoteExtension() *CanonicalVoteExtension { +func (m *CanonicalVote) GetVoteExtension() *SignedVoteExtension { if m != nil { return m.VoteExtension } return nil } -type CanonicalVoteExtension struct { - AppDataSigned []byte `protobuf:"bytes,1,opt,name=app_data_signed,json=appDataSigned,proto3" json:"app_data_signed,omitempty"` -} - -func (m *CanonicalVoteExtension) Reset() { *m = CanonicalVoteExtension{} } -func (m *CanonicalVoteExtension) String() string { return proto.CompactTextString(m) } -func (*CanonicalVoteExtension) ProtoMessage() {} -func (*CanonicalVoteExtension) Descriptor() ([]byte, []int) { - return fileDescriptor_8d1a1a84ff7267ed, []int{4} -} -func (m *CanonicalVoteExtension) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CanonicalVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_CanonicalVoteExtension.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 *CanonicalVoteExtension) XXX_Merge(src proto.Message) { - xxx_messageInfo_CanonicalVoteExtension.Merge(m, src) -} -func (m *CanonicalVoteExtension) XXX_Size() int { - return m.Size() -} -func (m *CanonicalVoteExtension) XXX_DiscardUnknown() { - xxx_messageInfo_CanonicalVoteExtension.DiscardUnknown(m) -} - -var xxx_messageInfo_CanonicalVoteExtension proto.InternalMessageInfo - -func (m *CanonicalVoteExtension) GetAppDataSigned() []byte { - if m != nil { - return m.AppDataSigned - } - return nil -} - func init() { proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.types.CanonicalBlockID") proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.types.CanonicalPartSetHeader") proto.RegisterType((*CanonicalProposal)(nil), "tendermint.types.CanonicalProposal") proto.RegisterType((*CanonicalVote)(nil), "tendermint.types.CanonicalVote") - proto.RegisterType((*CanonicalVoteExtension)(nil), "tendermint.types.CanonicalVoteExtension") } func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 546 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x8d, 0xd3, 0x34, 0x1f, 0xdb, 0xa6, 0x0d, 0xab, 0xaa, 0xb2, 0x22, 0x64, 0x5b, 0x3e, 0x54, - 0xe6, 0x62, 0x4b, 0xed, 0x81, 0x2b, 0x72, 0x8b, 0x44, 0x10, 0xa8, 0x65, 0x5b, 0xf5, 0xc0, 0xc5, - 0xda, 0xd8, 0x8b, 0x6d, 0xe1, 0x78, 0x57, 0xf6, 0xa6, 0xa2, 0x17, 0x7e, 0x43, 0x7f, 0x56, 0x8f, - 0x3d, 0xc2, 0x25, 0x20, 0xe7, 0x67, 0x70, 0x41, 0xbb, 0x76, 0x62, 0xd3, 0x42, 0x2f, 0x20, 0x2e, - 0xd6, 0xbc, 0x99, 0xe7, 0x99, 0xa7, 0x37, 0xda, 0x01, 0x06, 0x27, 0x69, 0x40, 0xb2, 0x59, 0x9c, - 0x72, 0x87, 0x5f, 0x33, 0x92, 0x3b, 0x3e, 0x4e, 0x69, 0x1a, 0xfb, 0x38, 0xb1, 0x59, 0x46, 0x39, - 0x85, 0xa3, 0x9a, 0x61, 0x4b, 0xc6, 0x78, 0x2f, 0xa4, 0x21, 0x95, 0x45, 0x47, 0x44, 0x25, 0x6f, - 0xfc, 0xf4, 0x41, 0x27, 0xf9, 0xad, 0xaa, 0x7a, 0x48, 0x69, 0x98, 0x10, 0x47, 0xa2, 0xe9, 0xfc, - 0x83, 0xc3, 0xe3, 0x19, 0xc9, 0x39, 0x9e, 0xb1, 0x92, 0x60, 0x7e, 0x06, 0xa3, 0xe3, 0xd5, 0x64, - 0x37, 0xa1, 0xfe, 0xc7, 0xc9, 0x09, 0x84, 0xa0, 0x13, 0xe1, 0x3c, 0x52, 0x15, 0x43, 0xb1, 0xb6, - 0x91, 0x8c, 0xe1, 0x25, 0xd8, 0x65, 0x38, 0xe3, 0x5e, 0x4e, 0xb8, 0x17, 0x11, 0x1c, 0x90, 0x4c, - 0x6d, 0x1b, 0x8a, 0xb5, 0x75, 0x68, 0xd9, 0xf7, 0x85, 0xda, 0xeb, 0x86, 0x67, 0x38, 0xe3, 0xe7, - 0x84, 0xbf, 0x92, 0x7c, 0xb7, 0x73, 0xbb, 0xd0, 0x5b, 0x68, 0xc8, 0x9a, 0x49, 0xd3, 0x05, 0xfb, - 0xbf, 0xa7, 0xc3, 0x3d, 0xb0, 0xc9, 0x29, 0xc7, 0x89, 0x94, 0x31, 0x44, 0x25, 0x58, 0x6b, 0x6b, - 0xd7, 0xda, 0xcc, 0xaf, 0x6d, 0xf0, 0xa4, 0x6e, 0x92, 0x51, 0x46, 0x73, 0x9c, 0xc0, 0x23, 0xd0, - 0x11, 0x72, 0xe4, 0xef, 0x3b, 0x87, 0xfa, 0x43, 0x99, 0xe7, 0x71, 0x98, 0x92, 0xe0, 0x6d, 0x1e, - 0x5e, 0x5c, 0x33, 0x82, 0x24, 0x19, 0xee, 0x83, 0x6e, 0x44, 0xe2, 0x30, 0xe2, 0x72, 0xc0, 0x08, - 0x55, 0x48, 0x88, 0xc9, 0xe8, 0x3c, 0x0d, 0xd4, 0x0d, 0x99, 0x2e, 0x01, 0x7c, 0x06, 0x06, 0x8c, - 0x26, 0x5e, 0x59, 0xe9, 0x18, 0x8a, 0xb5, 0xe1, 0x6e, 0x17, 0x0b, 0xbd, 0x7f, 0x76, 0xfa, 0x06, - 0x89, 0x1c, 0xea, 0x33, 0x9a, 0xc8, 0x08, 0xbe, 0x06, 0xfd, 0xa9, 0xb0, 0xd7, 0x8b, 0x03, 0x75, - 0x53, 0x1a, 0x67, 0x3e, 0x62, 0x5c, 0xb5, 0x09, 0x77, 0xab, 0x58, 0xe8, 0xbd, 0x0a, 0xa0, 0x9e, - 0x6c, 0x30, 0x09, 0xa0, 0x0b, 0x06, 0xeb, 0x35, 0xaa, 0x5d, 0xd9, 0x6c, 0x6c, 0x97, 0x8b, 0xb6, - 0x57, 0x8b, 0xb6, 0x2f, 0x56, 0x0c, 0xb7, 0x2f, 0x7c, 0xbf, 0xf9, 0xa6, 0x2b, 0xa8, 0xfe, 0x0d, - 0x1e, 0x80, 0xbe, 0x1f, 0xe1, 0x38, 0x15, 0x7a, 0x7a, 0x86, 0x62, 0x0d, 0xca, 0x59, 0xc7, 0x22, - 0x27, 0x66, 0xc9, 0xe2, 0x24, 0x30, 0x7f, 0xb4, 0xc1, 0x70, 0x2d, 0xeb, 0x92, 0x72, 0xf2, 0x3f, - 0x7c, 0x6d, 0x9a, 0xd5, 0xf9, 0x97, 0x66, 0x6d, 0xfe, 0xbd, 0x59, 0xdd, 0x3f, 0x9b, 0x05, 0x4f, - 0xc1, 0xce, 0x15, 0xe5, 0xc4, 0x23, 0x9f, 0x38, 0x49, 0xf3, 0x98, 0xa6, 0xd2, 0xda, 0xc7, 0xdf, - 0x88, 0xf0, 0xf4, 0xe5, 0x8a, 0x8f, 0x86, 0x57, 0x4d, 0x68, 0xbe, 0x68, 0xbc, 0x8e, 0x5f, 0x88, - 0xf0, 0x00, 0xec, 0x62, 0xc6, 0xbc, 0x00, 0x73, 0xec, 0xe5, 0xd2, 0xf0, 0xea, 0xb9, 0x0e, 0x31, - 0x63, 0x27, 0x98, 0xe3, 0x72, 0x0b, 0xee, 0xbb, 0xdb, 0x42, 0x53, 0xee, 0x0a, 0x4d, 0xf9, 0x5e, - 0x68, 0xca, 0xcd, 0x52, 0x6b, 0xdd, 0x2d, 0xb5, 0xd6, 0x97, 0xa5, 0xd6, 0x7a, 0xff, 0x3c, 0x8c, - 0x79, 0x34, 0x9f, 0xda, 0x3e, 0x9d, 0x39, 0xcd, 0x1b, 0x52, 0x87, 0xe5, 0xad, 0xb9, 0x7f, 0x5f, - 0xa6, 0x5d, 0x99, 0x3f, 0xfa, 0x19, 0x00, 0x00, 0xff, 0xff, 0x83, 0xae, 0x83, 0xd7, 0xc4, 0x04, - 0x00, 0x00, + // 519 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0xe3, 0xd4, 0x4d, 0x9c, 0x4b, 0x53, 0xc2, 0xa9, 0xaa, 0xac, 0x08, 0xd9, 0x96, 0x25, + 0x90, 0x59, 0x6c, 0x29, 0x1d, 0xd8, 0x5d, 0x90, 0x08, 0x2a, 0xa2, 0x5c, 0xab, 0x0e, 0x2c, 0xd6, + 0xc5, 0x3e, 0x6c, 0x0b, 0xc7, 0x77, 0xb2, 0x2f, 0x15, 0x5d, 0xf8, 0x0c, 0xfd, 0x58, 0x1d, 0x3b, + 0xc2, 0x12, 0x90, 0xf3, 0x25, 0x18, 0xd1, 0x9d, 0x93, 0x38, 0x6a, 0x29, 0x0b, 0x88, 0x25, 0x7a, + 0xff, 0x3c, 0x7e, 0xdf, 0x47, 0xbf, 0x57, 0x39, 0x60, 0x71, 0x92, 0x47, 0xa4, 0x98, 0xa5, 0x39, + 0xf7, 0xf8, 0x15, 0x23, 0xa5, 0x17, 0xe2, 0x9c, 0xe6, 0x69, 0x88, 0x33, 0x97, 0x15, 0x94, 0x53, + 0x38, 0x6c, 0x14, 0xae, 0x54, 0x8c, 0x0e, 0x62, 0x1a, 0x53, 0xd9, 0xf4, 0x44, 0x54, 0xeb, 0x46, + 0x4f, 0xee, 0x4d, 0x92, 0xbf, 0xab, 0xae, 0x19, 0x53, 0x1a, 0x67, 0xc4, 0x93, 0xd9, 0x74, 0xfe, + 0xd1, 0xe3, 0xe9, 0x8c, 0x94, 0x1c, 0xcf, 0x58, 0x2d, 0xb0, 0xbf, 0x80, 0xe1, 0xf1, 0x7a, 0xb3, + 0x9f, 0xd1, 0xf0, 0xd3, 0xe4, 0x25, 0x84, 0x40, 0x4d, 0x70, 0x99, 0xe8, 0x8a, 0xa5, 0x38, 0x7b, + 0x48, 0xc6, 0xf0, 0x02, 0x3c, 0x62, 0xb8, 0xe0, 0x41, 0x49, 0x78, 0x90, 0x10, 0x1c, 0x91, 0x42, + 0x6f, 0x5b, 0x8a, 0xd3, 0x1f, 0x3b, 0xee, 0x5d, 0xa3, 0xee, 0x66, 0xe0, 0x29, 0x2e, 0xf8, 0x19, + 0xe1, 0xaf, 0xa5, 0xde, 0x57, 0x6f, 0x16, 0x66, 0x0b, 0x0d, 0xd8, 0x76, 0xd1, 0xf6, 0xc1, 0xe1, + 0xef, 0xe5, 0xf0, 0x00, 0xec, 0x72, 0xca, 0x71, 0x26, 0x6d, 0x0c, 0x50, 0x9d, 0x6c, 0xbc, 0xb5, + 0x1b, 0x6f, 0xf6, 0xb7, 0x36, 0x78, 0xdc, 0x0c, 0x29, 0x28, 0xa3, 0x25, 0xce, 0xe0, 0x11, 0x50, + 0x85, 0x1d, 0xf9, 0xf9, 0xfe, 0xd8, 0xbc, 0x6f, 0xf3, 0x2c, 0x8d, 0x73, 0x12, 0xbd, 0x2d, 0xe3, + 0xf3, 0x2b, 0x46, 0x90, 0x14, 0xc3, 0x43, 0xd0, 0x49, 0x48, 0x1a, 0x27, 0x5c, 0x2e, 0x18, 0xa2, + 0x55, 0x26, 0xcc, 0x14, 0x74, 0x9e, 0x47, 0xfa, 0x8e, 0x2c, 0xd7, 0x09, 0x7c, 0x0e, 0x7a, 0x8c, + 0x66, 0x41, 0xdd, 0x51, 0x2d, 0xc5, 0xd9, 0xf1, 0xf7, 0xaa, 0x85, 0xa9, 0x9d, 0xbe, 0x3b, 0x41, + 0xa2, 0x86, 0x34, 0x46, 0x33, 0x19, 0xc1, 0x37, 0x40, 0x9b, 0x0a, 0xbc, 0x41, 0x1a, 0xe9, 0xbb, + 0x12, 0x9c, 0xfd, 0x07, 0x70, 0xab, 0x4b, 0xf8, 0xfd, 0x6a, 0x61, 0x76, 0x57, 0x09, 0xea, 0xca, + 0x01, 0x93, 0x08, 0xfa, 0xa0, 0xb7, 0x39, 0xa3, 0xde, 0x91, 0xc3, 0x46, 0x6e, 0x7d, 0x68, 0x77, + 0x7d, 0x68, 0xf7, 0x7c, 0xad, 0xf0, 0x35, 0xc1, 0xfd, 0xfa, 0xbb, 0xa9, 0xa0, 0xe6, 0x33, 0xf8, + 0x0c, 0x68, 0x61, 0x82, 0xd3, 0x5c, 0xf8, 0xe9, 0x5a, 0x8a, 0xd3, 0xab, 0x77, 0x1d, 0x8b, 0x9a, + 0xd8, 0x25, 0x9b, 0x93, 0xc8, 0xfe, 0xd9, 0x06, 0x83, 0x8d, 0xad, 0x0b, 0xca, 0xc9, 0xff, 0xe0, + 0xba, 0x0d, 0x4b, 0xfd, 0x97, 0xb0, 0x76, 0xff, 0x1e, 0x56, 0xe7, 0x61, 0x58, 0xf0, 0x04, 0xec, + 0x5f, 0x52, 0x4e, 0x02, 0xf2, 0x99, 0x93, 0xbc, 0x4c, 0x69, 0x2e, 0xd1, 0xf6, 0xc7, 0x4f, 0x1f, + 0x82, 0x24, 0x80, 0xbe, 0x5a, 0x8b, 0xd1, 0xe0, 0x72, 0x3b, 0xf5, 0xdf, 0xdf, 0x54, 0x86, 0x72, + 0x5b, 0x19, 0xca, 0x8f, 0xca, 0x50, 0xae, 0x97, 0x46, 0xeb, 0x76, 0x69, 0xb4, 0xbe, 0x2e, 0x8d, + 0xd6, 0x87, 0x17, 0x71, 0xca, 0x93, 0xf9, 0xd4, 0x0d, 0xe9, 0xcc, 0xdb, 0xfe, 0xfb, 0x37, 0x61, + 0xfd, 0x4c, 0xdc, 0x7d, 0x1a, 0xa6, 0x1d, 0x59, 0x3f, 0xfa, 0x15, 0x00, 0x00, 0xff, 0xff, 0x38, + 0xac, 0x55, 0xfe, 0x7f, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -635,36 +588,6 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *CanonicalVoteExtension) 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 *CanonicalVoteExtension) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *CanonicalVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.AppDataSigned) > 0 { - i -= len(m.AppDataSigned) - copy(dAtA[i:], m.AppDataSigned) - i = encodeVarintCanonical(dAtA, i, uint64(len(m.AppDataSigned))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func encodeVarintCanonical(dAtA []byte, offset int, v uint64) int { offset -= sovCanonical(v) base := offset @@ -770,19 +693,6 @@ func (m *CanonicalVote) Size() (n int) { return n } -func (m *CanonicalVoteExtension) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.AppDataSigned) - if l > 0 { - n += 1 + l + sovCanonical(uint64(l)) - } - return n -} - func sovCanonical(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1417,7 +1327,7 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VoteExtension == nil { - m.VoteExtension = &CanonicalVoteExtension{} + m.VoteExtension = &SignedVoteExtension{} } if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1444,90 +1354,6 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { } return nil } -func (m *CanonicalVoteExtension) 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 ErrIntOverflowCanonical - } - 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: CanonicalVoteExtension: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CanonicalVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AppDataSigned", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCanonical - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthCanonical - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthCanonical - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AppDataSigned = append(m.AppDataSigned[:0], dAtA[iNdEx:postIndex]...) - if m.AppDataSigned == nil { - m.AppDataSigned = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCanonical(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCanonical - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipCanonical(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index e997704e43b..f447677b850 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -34,9 +34,5 @@ message CanonicalVote { CanonicalBlockID block_id = 4 [(gogoproto.customname) = "BlockID"]; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 6 [(gogoproto.customname) = "ChainID"]; - CanonicalVoteExtension vote_extension = 7; -} - -message CanonicalVoteExtension { - bytes app_data_signed = 1; + SignedVoteExtension vote_extension = 7; } diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index f9cc202f07c..4cd15bd0601 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -625,19 +625,64 @@ func (m *VoteExtension) GetAppDataSelfAuthenticating() []byte { return nil } +type SignedVoteExtension struct { + AppDataSigned []byte `protobuf:"bytes,1,opt,name=app_data_signed,json=appDataSigned,proto3" json:"app_data_signed,omitempty"` +} + +func (m *SignedVoteExtension) Reset() { *m = SignedVoteExtension{} } +func (m *SignedVoteExtension) String() string { return proto.CompactTextString(m) } +func (*SignedVoteExtension) ProtoMessage() {} +func (*SignedVoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{7} +} +func (m *SignedVoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SignedVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SignedVoteExtension.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 *SignedVoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_SignedVoteExtension.Merge(m, src) +} +func (m *SignedVoteExtension) XXX_Size() int { + return m.Size() +} +func (m *SignedVoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_SignedVoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_SignedVoteExtension proto.InternalMessageInfo + +func (m *SignedVoteExtension) GetAppDataSigned() []byte { + if m != nil { + return m.AppDataSigned + } + return nil +} + // Commit contains the evidence that a block was committed by a set of validators. type Commit struct { - Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` - Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` - BlockID BlockID `protobuf:"bytes,3,opt,name=block_id,json=blockId,proto3" json:"block_id"` - Signatures []CommitSig `protobuf:"bytes,4,rep,name=signatures,proto3" json:"signatures"` + Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` + BlockID BlockID `protobuf:"bytes,3,opt,name=block_id,json=blockId,proto3" json:"block_id"` + Signatures []CommitSig `protobuf:"bytes,4,rep,name=signatures,proto3" json:"signatures"` + VoteExtensions []*SignedVoteExtension `protobuf:"bytes,5,rep,name=vote_extensions,json=voteExtensions,proto3" json:"vote_extensions,omitempty"` } func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{7} + return fileDescriptor_d3a6e55e2345de56, []int{8} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -694,6 +739,13 @@ func (m *Commit) GetSignatures() []CommitSig { return nil } +func (m *Commit) GetVoteExtensions() []*SignedVoteExtension { + if m != nil { + return m.VoteExtensions + } + return nil +} + // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` @@ -706,7 +758,7 @@ func (m *CommitSig) Reset() { *m = CommitSig{} } func (m *CommitSig) String() string { return proto.CompactTextString(m) } func (*CommitSig) ProtoMessage() {} func (*CommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{8} + return fileDescriptor_d3a6e55e2345de56, []int{9} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -777,7 +829,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{9} + return fileDescriptor_d3a6e55e2345de56, []int{10} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -864,7 +916,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{10} + return fileDescriptor_d3a6e55e2345de56, []int{11} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -916,7 +968,7 @@ func (m *LightBlock) Reset() { *m = LightBlock{} } func (m *LightBlock) String() string { return proto.CompactTextString(m) } func (*LightBlock) ProtoMessage() {} func (*LightBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{11} + return fileDescriptor_d3a6e55e2345de56, []int{12} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -970,7 +1022,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{12} + return fileDescriptor_d3a6e55e2345de56, []int{13} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1038,7 +1090,7 @@ func (m *TxProof) Reset() { *m = TxProof{} } func (m *TxProof) String() string { return proto.CompactTextString(m) } func (*TxProof) ProtoMessage() {} func (*TxProof) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{13} + return fileDescriptor_d3a6e55e2345de56, []int{14} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1098,6 +1150,7 @@ func init() { proto.RegisterType((*Data)(nil), "tendermint.types.Data") proto.RegisterType((*Vote)(nil), "tendermint.types.Vote") proto.RegisterType((*VoteExtension)(nil), "tendermint.types.VoteExtension") + proto.RegisterType((*SignedVoteExtension)(nil), "tendermint.types.SignedVoteExtension") proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig") proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal") @@ -1110,95 +1163,97 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1397 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4d, 0x6f, 0xdb, 0x46, - 0x13, 0x36, 0x2d, 0xda, 0x92, 0x46, 0xa2, 0x2d, 0x2f, 0x9c, 0x44, 0x56, 0x62, 0x59, 0xd0, 0x8b, - 0x37, 0xaf, 0x93, 0xb7, 0x90, 0x53, 0xa7, 0xe8, 0xc7, 0xa1, 0x28, 0x24, 0x59, 0x49, 0x84, 0xd8, - 0xb2, 0x4a, 0x29, 0x29, 0xda, 0x0b, 0x41, 0x49, 0x6b, 0x8a, 0x0d, 0x45, 0x12, 0xe4, 0xca, 0x95, - 0xf3, 0x0b, 0x0a, 0x9f, 0x72, 0xea, 0xcd, 0xa7, 0xf6, 0xd0, 0x63, 0x81, 0xfe, 0x81, 0xa2, 0xa7, - 0x1c, 0x73, 0x6b, 0x2f, 0x4d, 0x0b, 0x07, 0xe8, 0xef, 0x28, 0xf6, 0x83, 0x14, 0x69, 0x59, 0x6d, - 0x10, 0x04, 0xbd, 0x08, 0xdc, 0x99, 0x67, 0x76, 0x67, 0x9f, 0x79, 0x76, 0x76, 0x05, 0x37, 0x08, - 0xb6, 0x07, 0xd8, 0x1b, 0x99, 0x36, 0xd9, 0x21, 0x27, 0x2e, 0xf6, 0xf9, 0x6f, 0xc5, 0xf5, 0x1c, - 0xe2, 0xa0, 0xdc, 0xd4, 0x5b, 0x61, 0xf6, 0xc2, 0xba, 0xe1, 0x18, 0x0e, 0x73, 0xee, 0xd0, 0x2f, - 0x8e, 0x2b, 0x6c, 0x19, 0x8e, 0x63, 0x58, 0x78, 0x87, 0x8d, 0x7a, 0xe3, 0xa3, 0x1d, 0x62, 0x8e, - 0xb0, 0x4f, 0xf4, 0x91, 0x2b, 0x00, 0x9b, 0x91, 0x65, 0xfa, 0xde, 0x89, 0x4b, 0x1c, 0x8a, 0x75, - 0x8e, 0x84, 0xbb, 0x18, 0x71, 0x1f, 0x63, 0xcf, 0x37, 0x1d, 0x3b, 0x9a, 0x47, 0xa1, 0x34, 0x93, - 0xe5, 0xb1, 0x6e, 0x99, 0x03, 0x9d, 0x38, 0x1e, 0x47, 0x94, 0x3f, 0x02, 0xa5, 0xad, 0x7b, 0xa4, - 0x83, 0xc9, 0x03, 0xac, 0x0f, 0xb0, 0x87, 0xd6, 0x61, 0x89, 0x38, 0x44, 0xb7, 0xf2, 0x52, 0x49, - 0xda, 0x56, 0x54, 0x3e, 0x40, 0x08, 0xe4, 0xa1, 0xee, 0x0f, 0xf3, 0x8b, 0x25, 0x69, 0x3b, 0xab, - 0xb2, 0xef, 0xf2, 0x10, 0x64, 0x1a, 0x4a, 0x23, 0x4c, 0x7b, 0x80, 0x27, 0x41, 0x04, 0x1b, 0x50, - 0x6b, 0xef, 0x84, 0x60, 0x5f, 0x84, 0xf0, 0x01, 0x7a, 0x0f, 0x96, 0x58, 0xfe, 0xf9, 0x44, 0x49, - 0xda, 0xce, 0xec, 0xe6, 0x2b, 0x11, 0xa2, 0xf8, 0xfe, 0x2a, 0x6d, 0xea, 0xaf, 0xc9, 0xcf, 0x5f, - 0x6e, 0x2d, 0xa8, 0x1c, 0x5c, 0xb6, 0x20, 0x59, 0xb3, 0x9c, 0xfe, 0x93, 0xe6, 0x5e, 0x98, 0x88, - 0x34, 0x4d, 0x04, 0x1d, 0xc0, 0xaa, 0xab, 0x7b, 0x44, 0xf3, 0x31, 0xd1, 0x86, 0x6c, 0x17, 0x6c, - 0xd1, 0xcc, 0xee, 0x56, 0xe5, 0x62, 0x1d, 0x2a, 0xb1, 0xcd, 0x8a, 0x55, 0x14, 0x37, 0x6a, 0x2c, - 0xff, 0x29, 0xc3, 0xb2, 0x20, 0xe3, 0x63, 0x48, 0x0a, 0x5a, 0xd9, 0x82, 0x99, 0xdd, 0xcd, 0xe8, - 0x8c, 0xc2, 0x55, 0xa9, 0x3b, 0xb6, 0x8f, 0x6d, 0x7f, 0xec, 0x8b, 0xf9, 0x82, 0x18, 0x74, 0x13, - 0x52, 0xfd, 0xa1, 0x6e, 0xda, 0x9a, 0x39, 0x60, 0x19, 0xa5, 0x6b, 0x99, 0xf3, 0x97, 0x5b, 0xc9, - 0x3a, 0xb5, 0x35, 0xf7, 0xd4, 0x24, 0x73, 0x36, 0x07, 0xe8, 0x2a, 0x2c, 0x0f, 0xb1, 0x69, 0x0c, - 0x09, 0xa3, 0x25, 0xa1, 0x8a, 0x11, 0xfa, 0x10, 0x64, 0x2a, 0x88, 0xbc, 0xcc, 0xd6, 0x2e, 0x54, - 0xb8, 0x5a, 0x2a, 0x81, 0x5a, 0x2a, 0xdd, 0x40, 0x2d, 0xb5, 0x14, 0x5d, 0xf8, 0xd9, 0xef, 0x5b, - 0x92, 0xca, 0x22, 0x50, 0x1d, 0x14, 0x4b, 0xf7, 0x89, 0xd6, 0xa3, 0xb4, 0xd1, 0xe5, 0x97, 0xd8, - 0x14, 0x1b, 0xb3, 0x84, 0x08, 0x62, 0x45, 0xea, 0x19, 0x1a, 0xc5, 0x4d, 0x03, 0xb4, 0x0d, 0x39, - 0x36, 0x49, 0xdf, 0x19, 0x8d, 0x4c, 0xa2, 0x31, 0xde, 0x97, 0x19, 0xef, 0x2b, 0xd4, 0x5e, 0x67, - 0xe6, 0x07, 0xb4, 0x02, 0xd7, 0x21, 0x3d, 0xd0, 0x89, 0xce, 0x21, 0x49, 0x06, 0x49, 0x51, 0x03, - 0x73, 0xfe, 0x0f, 0x56, 0x43, 0xd5, 0xf9, 0x1c, 0x92, 0xe2, 0xb3, 0x4c, 0xcd, 0x0c, 0x78, 0x07, - 0xd6, 0x6d, 0x3c, 0x21, 0xda, 0x45, 0x74, 0x9a, 0xa1, 0x11, 0xf5, 0x3d, 0x8e, 0x47, 0xfc, 0x17, - 0x56, 0xfa, 0x01, 0xf9, 0x1c, 0x0b, 0x0c, 0xab, 0x84, 0x56, 0x06, 0xdb, 0x80, 0x94, 0xee, 0xba, - 0x1c, 0x90, 0x61, 0x80, 0xa4, 0xee, 0xba, 0xcc, 0x75, 0x1b, 0xd6, 0xd8, 0x1e, 0x3d, 0xec, 0x8f, - 0x2d, 0x22, 0x26, 0xc9, 0x32, 0xcc, 0x2a, 0x75, 0xa8, 0xdc, 0xce, 0xb0, 0xff, 0x01, 0x05, 0x1f, - 0x9b, 0x03, 0x6c, 0xf7, 0x31, 0xc7, 0x29, 0x0c, 0x97, 0x0d, 0x8c, 0x0c, 0x74, 0x0b, 0x72, 0xae, - 0xe7, 0xb8, 0x8e, 0x8f, 0x3d, 0x4d, 0x1f, 0x0c, 0x3c, 0xec, 0xfb, 0xf9, 0x15, 0x3e, 0x5f, 0x60, - 0xaf, 0x72, 0x73, 0x39, 0x0f, 0xf2, 0x9e, 0x4e, 0x74, 0x94, 0x83, 0x04, 0x99, 0xf8, 0x79, 0xa9, - 0x94, 0xd8, 0xce, 0xaa, 0xf4, 0xb3, 0xfc, 0x43, 0x02, 0xe4, 0xc7, 0x0e, 0xc1, 0xe8, 0x2e, 0xc8, - 0xb4, 0x4c, 0x4c, 0x7d, 0x2b, 0x97, 0xe9, 0xb9, 0x63, 0x1a, 0x36, 0x1e, 0x1c, 0xf8, 0x46, 0xf7, - 0xc4, 0xc5, 0x2a, 0x03, 0x47, 0xe4, 0xb4, 0x18, 0x93, 0xd3, 0x3a, 0x2c, 0x79, 0xce, 0xd8, 0x1e, - 0x30, 0x95, 0x2d, 0xa9, 0x7c, 0x80, 0x1a, 0x90, 0x0a, 0x55, 0x22, 0xff, 0x93, 0x4a, 0x56, 0xa9, - 0x4a, 0xa8, 0x86, 0x85, 0x41, 0x4d, 0xf6, 0x84, 0x58, 0x6a, 0x90, 0x0e, 0x9b, 0x97, 0x50, 0xdb, - 0xeb, 0x09, 0x76, 0x1a, 0x86, 0xfe, 0x0f, 0x6b, 0x61, 0xed, 0x43, 0xf2, 0xb8, 0xe2, 0x72, 0xa1, - 0x43, 0xb0, 0x17, 0x93, 0x95, 0xc6, 0x1b, 0x50, 0x92, 0xed, 0x6b, 0x2a, 0xab, 0x26, 0xeb, 0x44, - 0x37, 0x20, 0xed, 0x9b, 0x86, 0xad, 0x93, 0xb1, 0x87, 0x85, 0xf2, 0xa6, 0x06, 0x74, 0x0f, 0x56, - 0x8e, 0x1d, 0x82, 0x35, 0x3c, 0x21, 0xd8, 0x66, 0x27, 0x3d, 0x3d, 0xaf, 0x77, 0xd0, 0x8a, 0x34, - 0x02, 0x98, 0xaa, 0x1c, 0x47, 0x87, 0xe5, 0x09, 0x28, 0x31, 0x3f, 0xba, 0x09, 0xab, 0x54, 0x74, - 0xec, 0x5c, 0xf8, 0xac, 0x4a, 0xa2, 0x69, 0x29, 0xba, 0xeb, 0xd2, 0xba, 0xf3, 0xd2, 0xa1, 0x4f, - 0xe0, 0xc6, 0x14, 0x87, 0xad, 0x23, 0x4d, 0x1f, 0x93, 0x21, 0xb6, 0x89, 0xd9, 0xd7, 0x89, 0x69, - 0x1b, 0xa2, 0x7f, 0x6e, 0x04, 0x41, 0xd8, 0x3a, 0xaa, 0xc6, 0x00, 0xe5, 0x9f, 0x24, 0x58, 0xe6, - 0x67, 0x31, 0x52, 0x79, 0xe9, 0xf2, 0xca, 0x2f, 0xce, 0xab, 0x7c, 0xe2, 0xcd, 0x2b, 0x5f, 0x05, - 0x08, 0xe9, 0xf4, 0xf3, 0x72, 0x29, 0xb1, 0x9d, 0xd9, 0xbd, 0x3e, 0x3b, 0x11, 0x4f, 0xb1, 0x63, - 0x1a, 0xa2, 0xd5, 0x44, 0x82, 0xca, 0xbf, 0x49, 0x90, 0x0e, 0xfd, 0xa8, 0x0a, 0x4a, 0x90, 0x97, - 0x76, 0x64, 0xe9, 0x86, 0x50, 0xff, 0xe6, 0xdc, 0xe4, 0xee, 0x59, 0xba, 0xa1, 0x66, 0x44, 0x3e, - 0x74, 0x70, 0xb9, 0x92, 0x16, 0xe7, 0x28, 0x29, 0x26, 0xdd, 0xc4, 0x9b, 0x49, 0x37, 0x26, 0x32, - 0xf9, 0x82, 0xc8, 0xca, 0x3f, 0x2e, 0x42, 0xaa, 0xcd, 0x4e, 0xbf, 0x6e, 0xfd, 0x1b, 0x67, 0xfa, - 0x3a, 0xa4, 0x5d, 0xc7, 0xd2, 0xb8, 0x47, 0x66, 0x9e, 0x94, 0xeb, 0x58, 0xea, 0x4c, 0xd9, 0x97, - 0xde, 0xd2, 0x81, 0x5f, 0x7e, 0x0b, 0xac, 0x25, 0x2f, 0xb2, 0xe6, 0x41, 0x96, 0x53, 0x21, 0x6e, - 0xe3, 0x3b, 0x94, 0x03, 0x76, 0xbd, 0x4b, 0xb3, 0xaf, 0x07, 0x9e, 0x36, 0x47, 0xaa, 0x02, 0x47, - 0x23, 0xf8, 0xe5, 0x25, 0x1e, 0x04, 0xf9, 0x79, 0xb2, 0x54, 0x05, 0xae, 0xfc, 0x8d, 0x04, 0xb0, - 0x4f, 0x99, 0x65, 0xfb, 0xa5, 0xf7, 0x28, 0x3f, 0xbb, 0x5a, 0x6c, 0xe5, 0xe2, 0xbc, 0xa2, 0x89, - 0xf5, 0xb3, 0x7e, 0x34, 0xef, 0x3a, 0x28, 0x53, 0x31, 0xfa, 0x38, 0x48, 0xe6, 0x92, 0x49, 0xc2, - 0xeb, 0xad, 0x83, 0x89, 0x9a, 0x3d, 0x8e, 0x8c, 0xca, 0x3f, 0x4b, 0x90, 0x66, 0x39, 0x1d, 0x60, - 0xa2, 0xc7, 0x6a, 0x28, 0xbd, 0x79, 0x0d, 0x37, 0x01, 0xf8, 0x34, 0xbe, 0xf9, 0x14, 0x0b, 0x65, - 0xa5, 0x99, 0xa5, 0x63, 0x3e, 0xc5, 0xe8, 0xfd, 0x90, 0xf0, 0xc4, 0xdf, 0x13, 0x2e, 0x8e, 0x74, - 0x40, 0xfb, 0x35, 0x48, 0xda, 0xe3, 0x91, 0x46, 0x2f, 0x35, 0x99, 0xab, 0xd5, 0x1e, 0x8f, 0xba, - 0x13, 0xbf, 0xfc, 0x25, 0x24, 0xbb, 0x13, 0xf6, 0xc0, 0xa3, 0x12, 0xf5, 0x1c, 0x47, 0xbc, 0x2a, - 0x78, 0x63, 0x4c, 0x51, 0x03, 0xbb, 0x44, 0x11, 0xc8, 0xb4, 0x1f, 0x06, 0xcf, 0x4d, 0xfa, 0x8d, - 0x2a, 0xaf, 0xf9, 0x74, 0x14, 0x8f, 0xc6, 0xdb, 0xbf, 0x48, 0x90, 0x89, 0xf4, 0x07, 0xf4, 0x2e, - 0x5c, 0xa9, 0xed, 0x1f, 0xd6, 0x1f, 0x6a, 0xcd, 0x3d, 0xed, 0xde, 0x7e, 0xf5, 0xbe, 0xf6, 0xa8, - 0xf5, 0xb0, 0x75, 0xf8, 0x59, 0x2b, 0xb7, 0x50, 0xb8, 0x7a, 0x7a, 0x56, 0x42, 0x11, 0xec, 0x23, - 0xfb, 0x89, 0xed, 0x7c, 0x65, 0xa3, 0x1d, 0x58, 0x8f, 0x87, 0x54, 0x6b, 0x9d, 0x46, 0xab, 0x9b, - 0x93, 0x0a, 0x57, 0x4e, 0xcf, 0x4a, 0x6b, 0x91, 0x88, 0x6a, 0xcf, 0xc7, 0x36, 0x99, 0x0d, 0xa8, - 0x1f, 0x1e, 0x1c, 0x34, 0xbb, 0xb9, 0xc5, 0x99, 0x00, 0xd1, 0xb0, 0x6f, 0xc1, 0x5a, 0x3c, 0xa0, - 0xd5, 0xdc, 0xcf, 0x25, 0x0a, 0xe8, 0xf4, 0xac, 0xb4, 0x12, 0x41, 0xb7, 0x4c, 0xab, 0x90, 0xfa, - 0xfa, 0xdb, 0xe2, 0xc2, 0xf7, 0xdf, 0x15, 0x25, 0xba, 0x33, 0x25, 0xd6, 0x23, 0xd0, 0x3b, 0x70, - 0xad, 0xd3, 0xbc, 0xdf, 0x6a, 0xec, 0x69, 0x07, 0x9d, 0xfb, 0x5a, 0xf7, 0xf3, 0x76, 0x23, 0xb2, - 0xbb, 0xd5, 0xd3, 0xb3, 0x52, 0x46, 0x6c, 0x69, 0x1e, 0xba, 0xad, 0x36, 0x1e, 0x1f, 0x76, 0x1b, - 0x39, 0x89, 0xa3, 0xdb, 0x1e, 0xa6, 0xb7, 0x1b, 0x43, 0xdf, 0x81, 0x8d, 0x4b, 0xd0, 0xe1, 0xc6, - 0xd6, 0x4e, 0xcf, 0x4a, 0x4a, 0xdb, 0xc3, 0xfc, 0xfc, 0xb0, 0x88, 0x0a, 0xe4, 0x67, 0x23, 0x0e, - 0xdb, 0x87, 0x9d, 0xea, 0x7e, 0xae, 0x54, 0xc8, 0x9d, 0x9e, 0x95, 0xb2, 0x41, 0x33, 0xa4, 0xf8, - 0xe9, 0xce, 0x6a, 0x9f, 0x3e, 0x3f, 0x2f, 0x4a, 0x2f, 0xce, 0x8b, 0xd2, 0x1f, 0xe7, 0x45, 0xe9, - 0xd9, 0xab, 0xe2, 0xc2, 0x8b, 0x57, 0xc5, 0x85, 0x5f, 0x5f, 0x15, 0x17, 0xbe, 0xf8, 0xc0, 0x30, - 0xc9, 0x70, 0xdc, 0xab, 0xf4, 0x9d, 0xd1, 0x4e, 0xf4, 0x4f, 0xcd, 0xf4, 0x93, 0xff, 0xb9, 0xba, - 0xf8, 0x87, 0xa7, 0xb7, 0xcc, 0xec, 0x77, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xbb, 0xc5, - 0x14, 0xb1, 0x0d, 0x00, 0x00, + // 1425 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4d, 0x6f, 0x1a, 0x57, + 0x17, 0xf6, 0x98, 0xb1, 0x81, 0x03, 0x63, 0xf0, 0x7d, 0x9d, 0x04, 0x93, 0x18, 0xa3, 0x79, 0x95, + 0xbc, 0x4e, 0xde, 0x0a, 0xa7, 0x4e, 0xd5, 0x8f, 0x45, 0x54, 0x01, 0x26, 0x09, 0x8a, 0x8d, 0xe9, + 0x40, 0x52, 0xb5, 0x9b, 0xd1, 0x00, 0xd7, 0x30, 0xcd, 0x30, 0x33, 0x9a, 0xb9, 0xb8, 0x38, 0xbf, + 0xa0, 0xf2, 0x2a, 0xab, 0xee, 0xbc, 0x6a, 0x17, 0x5d, 0x56, 0xea, 0x3f, 0xe8, 0x2a, 0xcb, 0xec, + 0xda, 0x4d, 0xd3, 0xca, 0x91, 0xfa, 0x3b, 0xaa, 0xfb, 0x31, 0x30, 0x63, 0x4c, 0x1b, 0x59, 0x51, + 0x37, 0x68, 0xee, 0x39, 0xcf, 0x39, 0xf7, 0x7c, 0x3c, 0xf7, 0xdc, 0x0b, 0xdc, 0x20, 0xd8, 0xee, + 0x61, 0x6f, 0x68, 0xda, 0x64, 0x9b, 0x1c, 0xbb, 0xd8, 0xe7, 0xbf, 0x25, 0xd7, 0x73, 0x88, 0x83, + 0xb2, 0x53, 0x6d, 0x89, 0xc9, 0xf3, 0x6b, 0x7d, 0xa7, 0xef, 0x30, 0xe5, 0x36, 0xfd, 0xe2, 0xb8, + 0xfc, 0x66, 0xdf, 0x71, 0xfa, 0x16, 0xde, 0x66, 0xab, 0xce, 0xe8, 0x70, 0x9b, 0x98, 0x43, 0xec, + 0x13, 0x63, 0xe8, 0x0a, 0xc0, 0x46, 0x68, 0x9b, 0xae, 0x77, 0xec, 0x12, 0x87, 0x62, 0x9d, 0x43, + 0xa1, 0x2e, 0x84, 0xd4, 0x47, 0xd8, 0xf3, 0x4d, 0xc7, 0x0e, 0xc7, 0x91, 0x2f, 0xce, 0x44, 0x79, + 0x64, 0x58, 0x66, 0xcf, 0x20, 0x8e, 0xc7, 0x11, 0xea, 0x27, 0xa0, 0x34, 0x0d, 0x8f, 0xb4, 0x30, + 0x79, 0x84, 0x8d, 0x1e, 0xf6, 0xd0, 0x1a, 0x2c, 0x11, 0x87, 0x18, 0x56, 0x4e, 0x2a, 0x4a, 0x5b, + 0x8a, 0xc6, 0x17, 0x08, 0x81, 0x3c, 0x30, 0xfc, 0x41, 0x6e, 0xb1, 0x28, 0x6d, 0xa5, 0x35, 0xf6, + 0xad, 0x0e, 0x40, 0xa6, 0xa6, 0xd4, 0xc2, 0xb4, 0x7b, 0x78, 0x1c, 0x58, 0xb0, 0x05, 0x95, 0x76, + 0x8e, 0x09, 0xf6, 0x85, 0x09, 0x5f, 0xa0, 0x0f, 0x60, 0x89, 0xc5, 0x9f, 0x8b, 0x15, 0xa5, 0xad, + 0xd4, 0x4e, 0xae, 0x14, 0x2a, 0x14, 0xcf, 0xaf, 0xd4, 0xa4, 0xfa, 0x8a, 0xfc, 0xf2, 0xf5, 0xe6, + 0x82, 0xc6, 0xc1, 0xaa, 0x05, 0xf1, 0x8a, 0xe5, 0x74, 0x9f, 0xd5, 0x77, 0x27, 0x81, 0x48, 0xd3, + 0x40, 0xd0, 0x3e, 0x64, 0x5c, 0xc3, 0x23, 0xba, 0x8f, 0x89, 0x3e, 0x60, 0x59, 0xb0, 0x4d, 0x53, + 0x3b, 0x9b, 0xa5, 0xf3, 0x7d, 0x28, 0x45, 0x92, 0x15, 0xbb, 0x28, 0x6e, 0x58, 0xa8, 0xfe, 0x29, + 0xc3, 0xb2, 0x28, 0xc6, 0x7d, 0x88, 0x8b, 0xb2, 0xb2, 0x0d, 0x53, 0x3b, 0x1b, 0x61, 0x8f, 0x42, + 0x55, 0xaa, 0x3a, 0xb6, 0x8f, 0x6d, 0x7f, 0xe4, 0x0b, 0x7f, 0x81, 0x0d, 0xba, 0x05, 0x89, 0xee, + 0xc0, 0x30, 0x6d, 0xdd, 0xec, 0xb1, 0x88, 0x92, 0x95, 0xd4, 0xd9, 0xeb, 0xcd, 0x78, 0x95, 0xca, + 0xea, 0xbb, 0x5a, 0x9c, 0x29, 0xeb, 0x3d, 0x74, 0x15, 0x96, 0x07, 0xd8, 0xec, 0x0f, 0x08, 0x2b, + 0x4b, 0x4c, 0x13, 0x2b, 0xf4, 0x31, 0xc8, 0x94, 0x10, 0x39, 0x99, 0xed, 0x9d, 0x2f, 0x71, 0xb6, + 0x94, 0x02, 0xb6, 0x94, 0xda, 0x01, 0x5b, 0x2a, 0x09, 0xba, 0xf1, 0x8b, 0xdf, 0x37, 0x25, 0x8d, + 0x59, 0xa0, 0x2a, 0x28, 0x96, 0xe1, 0x13, 0xbd, 0x43, 0xcb, 0x46, 0xb7, 0x5f, 0x62, 0x2e, 0xd6, + 0x67, 0x0b, 0x22, 0x0a, 0x2b, 0x42, 0x4f, 0x51, 0x2b, 0x2e, 0xea, 0xa1, 0x2d, 0xc8, 0x32, 0x27, + 0x5d, 0x67, 0x38, 0x34, 0x89, 0xce, 0xea, 0xbe, 0xcc, 0xea, 0xbe, 0x42, 0xe5, 0x55, 0x26, 0x7e, + 0x44, 0x3b, 0x70, 0x1d, 0x92, 0x3d, 0x83, 0x18, 0x1c, 0x12, 0x67, 0x90, 0x04, 0x15, 0x30, 0xe5, + 0xff, 0x20, 0x33, 0x61, 0x9d, 0xcf, 0x21, 0x09, 0xee, 0x65, 0x2a, 0x66, 0xc0, 0xbb, 0xb0, 0x66, + 0xe3, 0x31, 0xd1, 0xcf, 0xa3, 0x93, 0x0c, 0x8d, 0xa8, 0xee, 0x69, 0xd4, 0xe2, 0x26, 0xac, 0x74, + 0x83, 0xe2, 0x73, 0x2c, 0x30, 0xac, 0x32, 0x91, 0x32, 0xd8, 0x3a, 0x24, 0x0c, 0xd7, 0xe5, 0x80, + 0x14, 0x03, 0xc4, 0x0d, 0xd7, 0x65, 0xaa, 0x3b, 0xb0, 0xca, 0x72, 0xf4, 0xb0, 0x3f, 0xb2, 0x88, + 0x70, 0x92, 0x66, 0x98, 0x0c, 0x55, 0x68, 0x5c, 0xce, 0xb0, 0xff, 0x05, 0x05, 0x1f, 0x99, 0x3d, + 0x6c, 0x77, 0x31, 0xc7, 0x29, 0x0c, 0x97, 0x0e, 0x84, 0x0c, 0x74, 0x1b, 0xb2, 0xae, 0xe7, 0xb8, + 0x8e, 0x8f, 0x3d, 0xdd, 0xe8, 0xf5, 0x3c, 0xec, 0xfb, 0xb9, 0x15, 0xee, 0x2f, 0x90, 0x97, 0xb9, + 0x58, 0xcd, 0x81, 0xbc, 0x6b, 0x10, 0x03, 0x65, 0x21, 0x46, 0xc6, 0x7e, 0x4e, 0x2a, 0xc6, 0xb6, + 0xd2, 0x1a, 0xfd, 0x54, 0x7f, 0x8c, 0x81, 0xfc, 0xd4, 0x21, 0x18, 0xdd, 0x03, 0x99, 0xb6, 0x89, + 0xb1, 0x6f, 0xe5, 0x22, 0x3e, 0xb7, 0xcc, 0xbe, 0x8d, 0x7b, 0xfb, 0x7e, 0xbf, 0x7d, 0xec, 0x62, + 0x8d, 0x81, 0x43, 0x74, 0x5a, 0x8c, 0xd0, 0x69, 0x0d, 0x96, 0x3c, 0x67, 0x64, 0xf7, 0x18, 0xcb, + 0x96, 0x34, 0xbe, 0x40, 0x35, 0x48, 0x4c, 0x58, 0x22, 0xff, 0x13, 0x4b, 0x32, 0x94, 0x25, 0x94, + 0xc3, 0x42, 0xa0, 0xc5, 0x3b, 0x82, 0x2c, 0x15, 0x48, 0x4e, 0x86, 0x97, 0x60, 0xdb, 0xdb, 0x11, + 0x76, 0x6a, 0x86, 0xfe, 0x0f, 0xab, 0x93, 0xde, 0x4f, 0x8a, 0xc7, 0x19, 0x97, 0x9d, 0x28, 0x44, + 0xf5, 0x22, 0xb4, 0xd2, 0xf9, 0x00, 0x8a, 0xb3, 0xbc, 0xa6, 0xb4, 0xaa, 0xb3, 0x49, 0x74, 0x03, + 0x92, 0xbe, 0xd9, 0xb7, 0x0d, 0x32, 0xf2, 0xb0, 0x60, 0xde, 0x54, 0x80, 0x1e, 0xc0, 0xca, 0x91, + 0x43, 0xb0, 0x8e, 0xc7, 0x04, 0xdb, 0xec, 0xa4, 0x27, 0xe7, 0xcd, 0x0e, 0xda, 0x91, 0x5a, 0x00, + 0xd3, 0x94, 0xa3, 0xf0, 0x52, 0x1d, 0x83, 0x12, 0xd1, 0xa3, 0x5b, 0x90, 0xa1, 0xa4, 0x63, 0xe7, + 0xc2, 0x67, 0x5d, 0x12, 0x43, 0x4b, 0x31, 0x5c, 0x97, 0xf6, 0x9d, 0xb7, 0x0e, 0x7d, 0x0a, 0x37, + 0xa6, 0x38, 0x6c, 0x1d, 0xea, 0xc6, 0x88, 0x0c, 0xb0, 0x4d, 0xcc, 0xae, 0x41, 0x4c, 0xbb, 0x2f, + 0xe6, 0xe7, 0x7a, 0x60, 0x84, 0xad, 0xc3, 0x72, 0x04, 0xa0, 0xde, 0x87, 0xff, 0x70, 0x57, 0x97, + 0xda, 0x5f, 0x7d, 0xb1, 0x08, 0xcb, 0xfc, 0x28, 0x87, 0x88, 0x23, 0x5d, 0x4c, 0x9c, 0xc5, 0x79, + 0xc4, 0x89, 0x5d, 0x9e, 0x38, 0x65, 0x80, 0x49, 0x37, 0xfc, 0x9c, 0x5c, 0x8c, 0x6d, 0xa5, 0x76, + 0xae, 0xcf, 0x3a, 0xe2, 0x21, 0xb6, 0xcc, 0xbe, 0x98, 0x54, 0x21, 0x23, 0xd4, 0x80, 0x4c, 0xb4, + 0x87, 0x7e, 0x6e, 0x89, 0xf9, 0xb9, 0x39, 0xef, 0xc0, 0x44, 0x5b, 0xb9, 0x12, 0x69, 0xa5, 0xaf, + 0xfe, 0x26, 0x41, 0x72, 0xb2, 0x1f, 0x2a, 0x83, 0x12, 0xe4, 0xa9, 0x1f, 0x5a, 0x46, 0x5f, 0x1c, + 0xc6, 0x8d, 0xb9, 0xc9, 0x3e, 0xb0, 0x8c, 0xbe, 0x96, 0x12, 0xf9, 0xd1, 0xc5, 0xc5, 0xc4, 0x5e, + 0x9c, 0x43, 0xec, 0xc8, 0x49, 0x8a, 0x5d, 0xee, 0x24, 0x45, 0x38, 0x2f, 0x9f, 0xe3, 0xbc, 0xfa, + 0xd3, 0x22, 0x24, 0x9a, 0x6c, 0x18, 0x19, 0xd6, 0xbf, 0x31, 0x62, 0xae, 0x43, 0xd2, 0x75, 0x2c, + 0x9d, 0x6b, 0x64, 0xa6, 0x49, 0xb8, 0x8e, 0xa5, 0xcd, 0xd0, 0x68, 0xe9, 0x1d, 0xcd, 0x9f, 0xe5, + 0x77, 0x50, 0xb5, 0xf8, 0xf9, 0xaa, 0x79, 0x90, 0xe6, 0xa5, 0x10, 0x8f, 0x83, 0xbb, 0xb4, 0x06, + 0xec, 0xb5, 0x21, 0xcd, 0x3e, 0x66, 0x78, 0xd8, 0x1c, 0xa9, 0x09, 0x1c, 0xb5, 0xe0, 0x77, 0xa9, + 0x78, 0x9f, 0xe4, 0xe6, 0xd1, 0x5c, 0x13, 0x38, 0xf5, 0x5b, 0x09, 0x60, 0x8f, 0x56, 0x96, 0xe5, + 0x4b, 0xaf, 0x75, 0x7e, 0x94, 0xf5, 0xc8, 0xce, 0x85, 0x79, 0x4d, 0x13, 0xfb, 0xa7, 0xfd, 0x70, + 0xdc, 0x55, 0x50, 0xa6, 0x64, 0xf4, 0x71, 0x10, 0xcc, 0x05, 0x4e, 0x26, 0xb7, 0x6d, 0x0b, 0x13, + 0x2d, 0x7d, 0x14, 0x5a, 0xa9, 0x3f, 0x4b, 0x90, 0x64, 0x31, 0xed, 0x63, 0x62, 0x44, 0x7a, 0x28, + 0x5d, 0xbe, 0x87, 0x1b, 0x00, 0xdc, 0x8d, 0x6f, 0x3e, 0xc7, 0x82, 0x59, 0x49, 0x26, 0x69, 0x99, + 0xcf, 0x31, 0xfa, 0x70, 0x52, 0xf0, 0xd8, 0xdf, 0x17, 0x5c, 0x8c, 0x88, 0xa0, 0xec, 0xd7, 0x20, + 0x6e, 0x8f, 0x86, 0x3a, 0xbd, 0x63, 0x65, 0xce, 0x56, 0x7b, 0x34, 0x6c, 0x8f, 0x7d, 0xf5, 0x2b, + 0x88, 0xb7, 0xc7, 0xec, 0xbd, 0x49, 0x29, 0xea, 0x39, 0x8e, 0x78, 0xe4, 0xf0, 0x39, 0x99, 0xa0, + 0x02, 0x76, 0xa7, 0x23, 0x90, 0xe9, 0x18, 0x0d, 0x5e, 0xbf, 0xf4, 0x1b, 0x95, 0xde, 0xf2, 0x25, + 0x2b, 0xde, 0xb0, 0x77, 0x7e, 0x91, 0x20, 0x15, 0x9a, 0x0f, 0xe8, 0x7d, 0xb8, 0x52, 0xd9, 0x3b, + 0xa8, 0x3e, 0xd6, 0xeb, 0xbb, 0xfa, 0x83, 0xbd, 0xf2, 0x43, 0xfd, 0x49, 0xe3, 0x71, 0xe3, 0xe0, + 0xf3, 0x46, 0x76, 0x21, 0x7f, 0xf5, 0xe4, 0xb4, 0x88, 0x42, 0xd8, 0x27, 0xf6, 0x33, 0xdb, 0xf9, + 0xda, 0x46, 0xdb, 0xb0, 0x16, 0x35, 0x29, 0x57, 0x5a, 0xb5, 0x46, 0x3b, 0x2b, 0xe5, 0xaf, 0x9c, + 0x9c, 0x16, 0x57, 0x43, 0x16, 0xe5, 0x8e, 0x8f, 0x6d, 0x32, 0x6b, 0x50, 0x3d, 0xd8, 0xdf, 0xaf, + 0xb7, 0xb3, 0x8b, 0x33, 0x06, 0xe2, 0x02, 0xb8, 0x0d, 0xab, 0x51, 0x83, 0x46, 0x7d, 0x2f, 0x1b, + 0xcb, 0xa3, 0x93, 0xd3, 0xe2, 0x4a, 0x08, 0xdd, 0x30, 0xad, 0x7c, 0xe2, 0x9b, 0xef, 0x0a, 0x0b, + 0x3f, 0x7c, 0x5f, 0x90, 0x68, 0x66, 0x4a, 0x64, 0x46, 0xa0, 0xf7, 0xe0, 0x5a, 0xab, 0xfe, 0xb0, + 0x51, 0xdb, 0xd5, 0xf7, 0x5b, 0x0f, 0xf5, 0xf6, 0x17, 0xcd, 0x5a, 0x28, 0xbb, 0xcc, 0xc9, 0x69, + 0x31, 0x25, 0x52, 0x9a, 0x87, 0x6e, 0x6a, 0xb5, 0xa7, 0x07, 0xed, 0x5a, 0x56, 0xe2, 0xe8, 0xa6, + 0x87, 0xe9, 0x84, 0x66, 0xe8, 0xbb, 0xb0, 0x7e, 0x01, 0x7a, 0x92, 0xd8, 0xea, 0xc9, 0x69, 0x51, + 0x69, 0x7a, 0x98, 0x9f, 0x1f, 0x66, 0x51, 0x82, 0xdc, 0xac, 0xc5, 0x41, 0xf3, 0xa0, 0x55, 0xde, + 0xcb, 0x16, 0xf3, 0xd9, 0x93, 0xd3, 0x62, 0x3a, 0x18, 0x86, 0x14, 0x3f, 0xcd, 0xac, 0xf2, 0xd9, + 0xcb, 0xb3, 0x82, 0xf4, 0xea, 0xac, 0x20, 0xfd, 0x71, 0x56, 0x90, 0x5e, 0xbc, 0x29, 0x2c, 0xbc, + 0x7a, 0x53, 0x58, 0xf8, 0xf5, 0x4d, 0x61, 0xe1, 0xcb, 0x8f, 0xfa, 0x26, 0x19, 0x8c, 0x3a, 0xa5, + 0xae, 0x33, 0xdc, 0x0e, 0xff, 0xc7, 0x9a, 0x7e, 0xf2, 0xff, 0x7a, 0xe7, 0xff, 0x7f, 0x75, 0x96, + 0x99, 0xfc, 0xde, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x79, 0x25, 0x0d, 0x40, 0x0e, 0x00, + 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1603,6 +1658,36 @@ func (m *VoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *SignedVoteExtension) 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 *SignedVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SignedVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.AppDataSigned) > 0 { + i -= len(m.AppDataSigned) + copy(dAtA[i:], m.AppDataSigned) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppDataSigned))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Commit) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1623,6 +1708,20 @@ func (m *Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.VoteExtensions) > 0 { + for iNdEx := len(m.VoteExtensions) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VoteExtensions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } if len(m.Signatures) > 0 { for iNdEx := len(m.Signatures) - 1; iNdEx >= 0; iNdEx-- { { @@ -2161,6 +2260,19 @@ func (m *VoteExtension) Size() (n int) { return n } +func (m *SignedVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.AppDataSigned) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func (m *Commit) Size() (n int) { if m == nil { return 0 @@ -2181,6 +2293,12 @@ func (m *Commit) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } + if len(m.VoteExtensions) > 0 { + for _, e := range m.VoteExtensions { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } return n } @@ -3673,6 +3791,90 @@ func (m *VoteExtension) Unmarshal(dAtA []byte) error { } return nil } +func (m *SignedVoteExtension) 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: SignedVoteExtension: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SignedVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppDataSigned", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AppDataSigned = append(m.AppDataSigned[:0], dAtA[iNdEx:postIndex]...) + if m.AppDataSigned == nil { + m.AppDataSigned = []byte{} + } + 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 *Commit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3807,6 +4009,40 @@ func (m *Commit) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtensions", 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 + } + m.VoteExtensions = append(m.VoteExtensions, &SignedVoteExtension{}) + if err := m.VoteExtensions[len(m.VoteExtensions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 8c3666cfb66..751c0c29587 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -110,12 +110,17 @@ message VoteExtension { bytes app_data_self_authenticating = 2; } +message SignedVoteExtension { + bytes app_data_signed = 1; +} + // Commit contains the evidence that a block was committed by a set of validators. message Commit { int64 height = 1; int32 round = 2; BlockID block_id = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"]; repeated CommitSig signatures = 4 [(gogoproto.nullable) = false]; + repeated SignedVoteExtension vote_extensions = 5; } // CommitSig is a part of the Vote included in a Commit. diff --git a/state/execution.go b/state/execution.go index a01662306a8..d4b9766cfac 100644 --- a/state/execution.go +++ b/state/execution.go @@ -236,19 +236,37 @@ func (blockExec *BlockExecutor) ApplyBlock( return state, nil } -func (blockExec *BlockExecutor) VoteExtension(height int64, round int32) (types.VoteExtension, error) { - ctx := context.Background() - req := abci.RequestVoteExtension{ - Height: uint64(height), - Round: uint64(round), - } - - resp, err := blockExec.proxyApp.VoteExtensionSync(ctx, req) - if err != nil { - return types.VoteExtension{}, err - } - - return types.VoteExtensionFromProto(resp.VoteExtension), nil +func (blockExec *BlockExecutor) ExtendVote(height int64, round int32) (types.VoteExtension, error) { + ctx := context.Background() + req := abci.RequestExtendVote{ + Height: uint64(height), + Round: uint64(round), + } + + resp, err := blockExec.proxyApp.ExtendVoteSync(ctx, req) + if err != nil { + return types.VoteExtension{}, err + } + + return types.VoteExtensionFromProto(resp.VoteExtension), nil +} + +func (blockExec *BlockExecutor) VerifyVoteExtension(ext types.VoteExtension) error { + ctx := context.Background() + req := abci.RequestVerifyVoteExtension{ + VoteExtension: *ext.ToProto(), + } + + resp, err := blockExec.proxyApp.VerifyVoteExtensionSync(ctx, req) + if err != nil { + return err + } + + if resp.IsErr() { + return types.ErrVoteInvalidExtension + } + + return nil } // Commit locks the mempool, runs the ABCI Commit message, and updates the diff --git a/types/canonical.go b/types/canonical.go index 30bf4932f8d..3fd545919a6 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -51,11 +51,11 @@ func CanonicalizeProposal(chainID string, proposal *tmproto.Proposal) tmproto.Ca } } -func CanonicalizeVoteExtension(ext *tmproto.VoteExtension) *tmproto.CanonicalVoteExtension { +func GetSignedVoteExtension(ext *tmproto.VoteExtension) *tmproto.SignedVoteExtension { if ext == nil { return nil } - return &tmproto.CanonicalVoteExtension{ + return &tmproto.SignedVoteExtension{ AppDataSigned: ext.AppDataSigned, } } @@ -70,7 +70,7 @@ func CanonicalizeVote(chainID string, vote *tmproto.Vote) tmproto.CanonicalVote BlockID: CanonicalizeBlockID(vote.BlockID), Timestamp: vote.Timestamp, ChainID: chainID, - VoteExtension: CanonicalizeVoteExtension(vote.VoteExtension), + VoteExtension: GetSignedVoteExtension(vote.VoteExtension), } } diff --git a/types/vote.go b/types/vote.go index bb72c114585..f29b976a635 100644 --- a/types/vote.go +++ b/types/vote.go @@ -24,6 +24,7 @@ var ( ErrVoteInvalidBlockHash = errors.New("invalid block hash") ErrVoteNonDeterministicSignature = errors.New("non-deterministic signature") ErrVoteNil = errors.New("nil vote") + ErrVoteInvalidExtension = errors.New("invalid vote extension") ) type ErrVoteConflictingVotes struct { From d01e50a6a19710525874afe307b03476d1952253 Mon Sep 17 00:00:00 2001 From: mconcat Date: Thu, 15 Jul 2021 13:46:00 +0900 Subject: [PATCH 05/23] modify CommitSig --- types/block.go | 20 +++++++++++++------- types/vote.go | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/types/block.go b/types/block.go index 2f444be7486..f4ab10c98e4 100644 --- a/types/block.go +++ b/types/block.go @@ -602,19 +602,21 @@ const ( // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { - BlockIDFlag BlockIDFlag `json:"block_id_flag"` - ValidatorAddress Address `json:"validator_address"` - Timestamp time.Time `json:"timestamp"` - Signature []byte `json:"signature"` + BlockIDFlag BlockIDFlag `json:"block_id_flag"` + ValidatorAddress Address `json:"validator_address"` + Timestamp time.Time `json:"timestamp"` + Signature []byte `json:"signature"` + VoteExtension VoteExtensionSigned `json:"vote_extension"` } // NewCommitSigForBlock returns new CommitSig with BlockIDFlagCommit. -func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time) CommitSig { +func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time, ext VoteExtensionSigned) CommitSig { return CommitSig{ BlockIDFlag: BlockIDFlagCommit, ValidatorAddress: valAddr, Timestamp: ts, Signature: signature, + VoteExtension: ext, } } @@ -647,12 +649,14 @@ func (cs CommitSig) Absent() bool { // 1. first 6 bytes of signature // 2. first 6 bytes of validator address // 3. block ID flag -// 4. timestamp +// 4. first 6 bytes of the vote extension +// 5. timestamp func (cs CommitSig) String() string { - return fmt.Sprintf("CommitSig{%X by %X on %v @ %s}", + return fmt.Sprintf("CommitSig{%X by %X on %v with %X @ %s}", tmbytes.Fingerprint(cs.Signature), tmbytes.Fingerprint(cs.ValidatorAddress), cs.BlockIDFlag, + tmbytes.Fingerprint(cs.VoteExtension.BytesPacked()), CanonicalTime(cs.Timestamp)) } @@ -801,6 +805,8 @@ func (commit *Commit) GetVote(valIdx int32) *Vote { ValidatorAddress: commitSig.ValidatorAddress, ValidatorIndex: valIdx, Signature: commitSig.Signature, + // XXX: check if self-authenticating is needed + VoteExtension: commitSig.VoteExtension.FromSigned(), } } diff --git a/types/vote.go b/types/vote.go index f29b976a635..7f4d51d746f 100644 --- a/types/vote.go +++ b/types/vote.go @@ -46,11 +46,40 @@ func NewConflictingVoteError(vote1, vote2 *Vote) *ErrVoteConflictingVotes { // Address is hex bytes. type Address = crypto.Address +type VoteExtensionSigned struct { + AppDataSigned []byte `json:"app_data_signed"` +} + +func (ext VoteExtensionSigned) BytesPacked() []byte { + res := make([]byte, len(ext.AppDataSigned)) + copy(res, ext.AppDataSigned) + return res +} + +func (ext VoteExtensionSigned) FromSigned() VoteExtension { + return VoteExtension{ + AppDataSigned: ext.AppDataSigned, + } +} + type VoteExtension struct { AppDataSigned []byte `json:"app_data_signed"` AppDataSelfAuthenticating []byte `json:"app_data_self_authenticating"` } +func (ext VoteExtension) ToSigned() VoteExtensionSigned { + return VoteExtensionSigned{ + AppDataSigned: ext.AppDataSigned, + } +} + +func (ext VoteExtension) BytesPacked() []byte { + res := make([]byte, len(ext.AppDataSigned)+len(ext.AppDataSelfAuthenticating)) + copy(res[:len(ext.AppDataSigned)], ext.AppDataSigned) + copy(res[len(ext.AppDataSigned):], ext.AppDataSelfAuthenticating) + return res +} + // Vote represents a prevote, precommit, or commit vote from validators for // consensus. type Vote struct { @@ -86,6 +115,7 @@ func (vote *Vote) CommitSig() CommitSig { ValidatorAddress: vote.ValidatorAddress, Timestamp: vote.Timestamp, Signature: vote.Signature, + VoteExtension: vote.VoteExtension.ToSigned(), } } @@ -124,6 +154,7 @@ func (vote *Vote) Copy() *Vote { // 7. first 6 bytes of block hash // 8. first 6 bytes of signature // 9. timestamp +// 10. first 6 bytes of vote extension func (vote *Vote) String() string { if vote == nil { return nilVoteStr @@ -149,6 +180,7 @@ func (vote *Vote) String() string { tmbytes.Fingerprint(vote.BlockID.Hash), tmbytes.Fingerprint(vote.Signature), CanonicalTime(vote.Timestamp), + tmbytes.Fingerprint(vote.VoteExtension.BytesPacked()), ) } @@ -206,6 +238,8 @@ func (vote *Vote) ValidateBasic() error { return fmt.Errorf("signature is too big (max: %d)", MaxSignatureSize) } + // XXX: add length verification for vote extension? + return nil } From 2dcf9afc83ba83f8a1327debbd8810f900bfc693 Mon Sep 17 00:00:00 2001 From: mconcat Date: Sat, 17 Jul 2021 02:21:44 +0900 Subject: [PATCH 06/23] fix test --- internal/consensus/state.go | 2 +- state/execution_test.go | 8 ++++++-- types/vote.go | 8 ++++---- types/vote_test.go | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 6dd76e9a38c..82bfa24a76b 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -2230,7 +2230,7 @@ func (cs *State) signVote( // If the signedMessage type is for precommit, add VoteExtension switch msgType { case tmproto.PrecommitType: - ext, err := cs.blockExec.VoteExtension(cs.Height, cs.Round) + ext, err := cs.blockExec.ExtendVote(cs.Height, cs.Round) if err != nil { return nil, err } diff --git a/state/execution_test.go b/state/execution_test.go index 8e0ec563ad0..c0e36d9b3cc 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -77,11 +77,15 @@ func TestBeginBlockValidators(t *testing.T) { commitSig0 = types.NewCommitSigForBlock( []byte("Signature1"), state.Validators.Validators[0].Address, - now) + now, + types.VoteExtensionSigned{}, + ) commitSig1 = types.NewCommitSigForBlock( []byte("Signature2"), state.Validators.Validators[1].Address, - now) + now, + types.VoteExtensionSigned{}, + ) absentSig = types.NewCommitSigAbsent() ) diff --git a/types/vote.go b/types/vote.go index 7f4d51d746f..3a4bf51cf95 100644 --- a/types/vote.go +++ b/types/vote.go @@ -153,8 +153,8 @@ func (vote *Vote) Copy() *Vote { // 6. type string // 7. first 6 bytes of block hash // 8. first 6 bytes of signature -// 9. timestamp -// 10. first 6 bytes of vote extension +// 9. first 6 bytes of vote extension +// 10. timestamp func (vote *Vote) String() string { if vote == nil { return nilVoteStr @@ -170,7 +170,7 @@ func (vote *Vote) String() string { panic("Unknown vote type") } - return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X @ %s}", + return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X %X @ %s}", vote.ValidatorIndex, tmbytes.Fingerprint(vote.ValidatorAddress), vote.Height, @@ -179,8 +179,8 @@ func (vote *Vote) String() string { typeString, tmbytes.Fingerprint(vote.BlockID.Hash), tmbytes.Fingerprint(vote.Signature), - CanonicalTime(vote.Timestamp), tmbytes.Fingerprint(vote.VoteExtension.BytesPacked()), + CanonicalTime(vote.Timestamp), ) } diff --git a/types/vote_test.go b/types/vote_test.go index 01b75121abf..63853f16a39 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -247,13 +247,13 @@ func TestVoteVerify(t *testing.T) { func TestVoteString(t *testing.T) { str := examplePrecommit().String() - expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests + expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str) } str2 := examplePrevote().String() - expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests + expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str2 != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str2) } From fc5767d74946f3564aee14736995e1a4ed7e6930 Mon Sep 17 00:00:00 2001 From: mconcat Date: Wed, 21 Jul 2021 00:08:10 +0900 Subject: [PATCH 07/23] Apply suggestions from code review --- proto/tendermint/types/types.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index aa7f80a6030..377e38fbeb4 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -120,7 +120,6 @@ message Commit { int32 round = 2; BlockID block_id = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"]; repeated CommitSig signatures = 4 [(gogoproto.nullable) = false]; - repeated VoteExtensionSigned vote_extensions = 5; } // CommitSig is a part of the Vote included in a Commit. From d52863de85fe00d7d7a9748b672c646da8732db9 Mon Sep 17 00:00:00 2001 From: mconcat Date: Wed, 21 Jul 2021 16:54:17 +0900 Subject: [PATCH 08/23] fix test --- state/execution.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/state/execution.go b/state/execution.go index d4b9766cfac..2b77d62262a 100644 --- a/state/execution.go +++ b/state/execution.go @@ -253,9 +253,14 @@ func (blockExec *BlockExecutor) ExtendVote(height int64, round int32) (types.Vot func (blockExec *BlockExecutor) VerifyVoteExtension(ext types.VoteExtension) error { ctx := context.Background() - req := abci.RequestVerifyVoteExtension{ - VoteExtension: *ext.ToProto(), - } + pext := ext.ToProto() + + var req abci.RequestVerifyVoteExtension + if pext != nil { + req = abci.RequestVerifyVoteExtension{ + VoteExtension: *pext, + } + } resp, err := blockExec.proxyApp.VerifyVoteExtensionSync(ctx, req) if err != nil { From a9708f08beb0625da94dfd87239a34883541fff8 Mon Sep 17 00:00:00 2001 From: mconcat Date: Mon, 2 Aug 2021 19:04:08 +0900 Subject: [PATCH 09/23] VoteExtensionSigned => VoteExtensionToSigned --- abci/client/mocks/client.go | 94 +++++++- proto/tendermint/types/canonical.pb.go | 74 +++--- proto/tendermint/types/canonical.proto | 2 +- proto/tendermint/types/types.pb.go | 303 ++++++++++--------------- proto/tendermint/types/types.proto | 4 +- state/execution_test.go | 4 +- types/block.go | 4 +- types/canonical.go | 4 +- types/vote.go | 10 +- 9 files changed, 264 insertions(+), 235 deletions(-) diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 0cae177efe7..6c7cd17e957 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery 2.7.4. DO NOT EDIT. +// Code generated by mockery 2.9.0. DO NOT EDIT. package mocks @@ -355,6 +355,52 @@ func (_m *Client) Error() error { return r0 } +// ExtendVoteAsync provides a mock function with given fields: _a0, _a1 +func (_m *Client) ExtendVoteAsync(_a0 context.Context, _a1 types.RequestExtendVote) (*abcicli.ReqRes, error) { + ret := _m.Called(_a0, _a1) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(context.Context, types.RequestExtendVote) *abcicli.ReqRes); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestExtendVote) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// ExtendVoteSync provides a mock function with given fields: _a0, _a1 +func (_m *Client) ExtendVoteSync(_a0 context.Context, _a1 types.RequestExtendVote) (*types.ResponseExtendVote, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponseExtendVote + if rf, ok := ret.Get(0).(func(context.Context, types.RequestExtendVote) *types.ResponseExtendVote); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseExtendVote) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestExtendVote) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // FlushAsync provides a mock function with given fields: _a0 func (_m *Client) FlushAsync(_a0 context.Context) (*abcicli.ReqRes, error) { ret := _m.Called(_a0) @@ -797,6 +843,52 @@ func (_m *Client) String() string { return r0 } +// VerifyVoteExtensionAsync provides a mock function with given fields: _a0, _a1 +func (_m *Client) VerifyVoteExtensionAsync(_a0 context.Context, _a1 types.RequestVerifyVoteExtension) (*abcicli.ReqRes, error) { + ret := _m.Called(_a0, _a1) + + var r0 *abcicli.ReqRes + if rf, ok := ret.Get(0).(func(context.Context, types.RequestVerifyVoteExtension) *abcicli.ReqRes); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*abcicli.ReqRes) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestVerifyVoteExtension) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// VerifyVoteExtensionSync provides a mock function with given fields: _a0, _a1 +func (_m *Client) VerifyVoteExtensionSync(_a0 context.Context, _a1 types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + ret := _m.Called(_a0, _a1) + + var r0 *types.ResponseVerifyVoteExtension + if rf, ok := ret.Get(0).(func(context.Context, types.RequestVerifyVoteExtension) *types.ResponseVerifyVoteExtension); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*types.ResponseVerifyVoteExtension) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(context.Context, types.RequestVerifyVoteExtension) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Wait provides a mock function with given fields: func (_m *Client) Wait() { _m.Called() diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index ec5b7b9e2ac..0cd7386f7bf 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -231,7 +231,7 @@ type CanonicalVote struct { BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - VoteExtension *VoteExtensionSigned `protobuf:"bytes,7,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` + VoteExtension *VoteExtensionToSign `protobuf:"bytes,7,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *CanonicalVote) Reset() { *m = CanonicalVote{} } @@ -309,7 +309,7 @@ func (m *CanonicalVote) GetChainID() string { return "" } -func (m *CanonicalVote) GetVoteExtension() *VoteExtensionSigned { +func (m *CanonicalVote) GetVoteExtension() *VoteExtensionToSign { if m != nil { return m.VoteExtension } @@ -326,40 +326,40 @@ func init() { func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 521 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xc7, 0xe3, 0x34, 0x2f, 0xce, 0xa5, 0x29, 0xe1, 0x54, 0x55, 0x56, 0x84, 0x6c, 0xcb, 0x12, - 0xc8, 0x2c, 0xb6, 0x94, 0x0e, 0xec, 0x2e, 0x48, 0x04, 0x15, 0x51, 0xae, 0x55, 0x07, 0x16, 0xeb, - 0x62, 0x1f, 0xb6, 0x85, 0xe3, 0xb3, 0xec, 0x4b, 0x45, 0x17, 0x3e, 0x43, 0x3f, 0x56, 0xc7, 0x8e, - 0xb0, 0x04, 0xe4, 0x7c, 0x09, 0x46, 0x74, 0x77, 0x49, 0x1c, 0x35, 0xc0, 0x02, 0xea, 0x12, 0x3d, - 0x2f, 0x7f, 0x3f, 0xcf, 0x5f, 0xbf, 0x47, 0x39, 0x60, 0x32, 0x92, 0x85, 0xa4, 0x98, 0x25, 0x19, - 0x73, 0xd9, 0x75, 0x4e, 0x4a, 0x37, 0xc0, 0x19, 0xcd, 0x92, 0x00, 0xa7, 0x4e, 0x5e, 0x50, 0x46, - 0xe1, 0xb0, 0x56, 0x38, 0x42, 0x31, 0x3a, 0x8c, 0x68, 0x44, 0x45, 0xd3, 0xe5, 0x91, 0xd4, 0x8d, - 0x9e, 0xec, 0x4c, 0x12, 0xbf, 0xab, 0xae, 0x11, 0x51, 0x1a, 0xa5, 0xc4, 0x15, 0xd9, 0x74, 0xfe, - 0xd1, 0x65, 0xc9, 0x8c, 0x94, 0x0c, 0xcf, 0x72, 0x29, 0xb0, 0xbe, 0x80, 0xe1, 0xc9, 0x7a, 0xb3, - 0x97, 0xd2, 0xe0, 0xd3, 0xe4, 0x25, 0x84, 0xa0, 0x15, 0xe3, 0x32, 0xd6, 0x14, 0x53, 0xb1, 0xf7, - 0x91, 0x88, 0xe1, 0x25, 0x78, 0x94, 0xe3, 0x82, 0xf9, 0x25, 0x61, 0x7e, 0x4c, 0x70, 0x48, 0x0a, - 0xad, 0x69, 0x2a, 0x76, 0x7f, 0x6c, 0x3b, 0xf7, 0x8d, 0x3a, 0x9b, 0x81, 0x67, 0xb8, 0x60, 0xe7, - 0x84, 0xbd, 0x16, 0x7a, 0xaf, 0x75, 0xbb, 0x30, 0x1a, 0x68, 0x90, 0x6f, 0x17, 0x2d, 0x0f, 0x1c, - 0xfd, 0x5e, 0x0e, 0x0f, 0x41, 0x9b, 0x51, 0x86, 0x53, 0x61, 0x63, 0x80, 0x64, 0xb2, 0xf1, 0xd6, - 0xac, 0xbd, 0x59, 0xdf, 0x9a, 0xe0, 0x71, 0x3d, 0xa4, 0xa0, 0x39, 0x2d, 0x71, 0x0a, 0x8f, 0x41, - 0x8b, 0xdb, 0x11, 0x9f, 0x1f, 0x8c, 0x8d, 0x5d, 0x9b, 0xe7, 0x49, 0x94, 0x91, 0xf0, 0x6d, 0x19, - 0x5d, 0x5c, 0xe7, 0x04, 0x09, 0x31, 0x3c, 0x02, 0x9d, 0x98, 0x24, 0x51, 0xcc, 0xc4, 0x82, 0x21, - 0x5a, 0x65, 0xdc, 0x4c, 0x41, 0xe7, 0x59, 0xa8, 0xed, 0x89, 0xb2, 0x4c, 0xe0, 0x73, 0xd0, 0xcb, - 0x69, 0xea, 0xcb, 0x4e, 0xcb, 0x54, 0xec, 0x3d, 0x6f, 0xbf, 0x5a, 0x18, 0xea, 0xd9, 0xbb, 0x53, - 0xc4, 0x6b, 0x48, 0xcd, 0x69, 0x2a, 0x22, 0xf8, 0x06, 0xa8, 0x53, 0x8e, 0xd7, 0x4f, 0x42, 0xad, - 0x2d, 0xc0, 0x59, 0x7f, 0x01, 0xb7, 0xba, 0x84, 0xd7, 0xaf, 0x16, 0x46, 0x77, 0x95, 0xa0, 0xae, - 0x18, 0x30, 0x09, 0xa1, 0x07, 0x7a, 0x9b, 0x33, 0x6a, 0x1d, 0x31, 0x6c, 0xe4, 0xc8, 0x43, 0x3b, - 0xeb, 0x43, 0x3b, 0x17, 0x6b, 0x85, 0xa7, 0x72, 0xee, 0x37, 0xdf, 0x0d, 0x05, 0xd5, 0x9f, 0xc1, - 0x67, 0x40, 0x0d, 0x62, 0x9c, 0x64, 0xdc, 0x4f, 0xd7, 0x54, 0xec, 0x9e, 0xdc, 0x75, 0xc2, 0x6b, - 0x7c, 0x97, 0x68, 0x4e, 0x42, 0xeb, 0x67, 0x13, 0x0c, 0x36, 0xb6, 0x2e, 0x29, 0x23, 0x0f, 0xc1, - 0x75, 0x1b, 0x56, 0xeb, 0x7f, 0xc2, 0x6a, 0xff, 0x3b, 0xac, 0xce, 0x9f, 0x61, 0xc1, 0x53, 0x70, - 0x70, 0x45, 0x19, 0xf1, 0xc9, 0x67, 0x46, 0xb2, 0x32, 0xa1, 0x99, 0x40, 0xdb, 0x1f, 0x3f, 0xdd, - 0x75, 0xcf, 0x51, 0xbe, 0x5a, 0xcb, 0x24, 0x31, 0x34, 0xb8, 0xda, 0x2e, 0x7a, 0xef, 0x6f, 0x2b, - 0x5d, 0xb9, 0xab, 0x74, 0xe5, 0x47, 0xa5, 0x2b, 0x37, 0x4b, 0xbd, 0x71, 0xb7, 0xd4, 0x1b, 0x5f, - 0x97, 0x7a, 0xe3, 0xc3, 0x8b, 0x28, 0x61, 0xf1, 0x7c, 0xea, 0x04, 0x74, 0xe6, 0x6e, 0xff, 0xfd, - 0xeb, 0x50, 0x3e, 0x13, 0xf7, 0x9f, 0x86, 0x69, 0x47, 0xd4, 0x8f, 0x7f, 0x05, 0x00, 0x00, 0xff, - 0xff, 0x61, 0x68, 0xc9, 0xbe, 0x7f, 0x04, 0x00, 0x00, + // 522 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0xe3, 0xd4, 0x49, 0x9c, 0x4b, 0x53, 0xc2, 0xa9, 0xaa, 0xac, 0x08, 0xd9, 0x96, 0x25, + 0x90, 0x59, 0x6c, 0x29, 0x1d, 0xd8, 0x5d, 0x90, 0x08, 0x2a, 0xa2, 0x5c, 0xa3, 0x0e, 0x2c, 0xd6, + 0xc5, 0x3e, 0x6c, 0x0b, 0xc7, 0x67, 0xd9, 0x97, 0x8a, 0x2e, 0x7c, 0x86, 0x7e, 0xac, 0x8e, 0x1d, + 0x61, 0x09, 0xc8, 0xf9, 0x12, 0x8c, 0xe8, 0xce, 0x49, 0x1c, 0x25, 0xc0, 0x02, 0xea, 0x12, 0xbd, + 0x7f, 0x1e, 0xbf, 0xef, 0xa3, 0xdf, 0xab, 0x1c, 0x30, 0x18, 0x49, 0x03, 0x92, 0xcf, 0xe2, 0x94, + 0x39, 0xec, 0x26, 0x23, 0x85, 0xe3, 0xe3, 0x94, 0xa6, 0xb1, 0x8f, 0x13, 0x3b, 0xcb, 0x29, 0xa3, + 0x70, 0x50, 0x2b, 0x6c, 0xa1, 0x18, 0x1e, 0x87, 0x34, 0xa4, 0xa2, 0xe9, 0xf0, 0xa8, 0xd2, 0x0d, + 0x9f, 0xec, 0x4d, 0x12, 0xbf, 0xab, 0xae, 0x1e, 0x52, 0x1a, 0x26, 0xc4, 0x11, 0xd9, 0x74, 0xfe, + 0xd1, 0x61, 0xf1, 0x8c, 0x14, 0x0c, 0xcf, 0xb2, 0x4a, 0x60, 0x7e, 0x01, 0x83, 0xb3, 0xf5, 0x66, + 0x37, 0xa1, 0xfe, 0xa7, 0xf1, 0x4b, 0x08, 0x81, 0x1c, 0xe1, 0x22, 0x52, 0x25, 0x43, 0xb2, 0x0e, + 0x91, 0x88, 0xe1, 0x15, 0x78, 0x94, 0xe1, 0x9c, 0x79, 0x05, 0x61, 0x5e, 0x44, 0x70, 0x40, 0x72, + 0xb5, 0x69, 0x48, 0x56, 0x6f, 0x64, 0xd9, 0xbb, 0x46, 0xed, 0xcd, 0xc0, 0x0b, 0x9c, 0xb3, 0x4b, + 0xc2, 0x5e, 0x0b, 0xbd, 0x2b, 0xdf, 0x2d, 0xf4, 0x06, 0xea, 0x67, 0xdb, 0x45, 0xd3, 0x05, 0x27, + 0xbf, 0x97, 0xc3, 0x63, 0xd0, 0x62, 0x94, 0xe1, 0x44, 0xd8, 0xe8, 0xa3, 0x2a, 0xd9, 0x78, 0x6b, + 0xd6, 0xde, 0xcc, 0x6f, 0x4d, 0xf0, 0xb8, 0x1e, 0x92, 0xd3, 0x8c, 0x16, 0x38, 0x81, 0xa7, 0x40, + 0xe6, 0x76, 0xc4, 0xe7, 0x47, 0x23, 0x7d, 0xdf, 0xe6, 0x65, 0x1c, 0xa6, 0x24, 0x78, 0x5b, 0x84, + 0x93, 0x9b, 0x8c, 0x20, 0x21, 0x86, 0x27, 0xa0, 0x1d, 0x91, 0x38, 0x8c, 0x98, 0x58, 0x30, 0x40, + 0xab, 0x8c, 0x9b, 0xc9, 0xe9, 0x3c, 0x0d, 0xd4, 0x03, 0x51, 0xae, 0x12, 0xf8, 0x1c, 0x74, 0x33, + 0x9a, 0x78, 0x55, 0x47, 0x36, 0x24, 0xeb, 0xc0, 0x3d, 0x2c, 0x17, 0xba, 0x72, 0xf1, 0xee, 0x1c, + 0xf1, 0x1a, 0x52, 0x32, 0x9a, 0x88, 0x08, 0xbe, 0x01, 0xca, 0x94, 0xe3, 0xf5, 0xe2, 0x40, 0x6d, + 0x09, 0x70, 0xe6, 0x5f, 0xc0, 0xad, 0x2e, 0xe1, 0xf6, 0xca, 0x85, 0xde, 0x59, 0x25, 0xa8, 0x23, + 0x06, 0x8c, 0x03, 0xe8, 0x82, 0xee, 0xe6, 0x8c, 0x6a, 0x5b, 0x0c, 0x1b, 0xda, 0xd5, 0xa1, 0xed, + 0xf5, 0xa1, 0xed, 0xc9, 0x5a, 0xe1, 0x2a, 0x9c, 0xfb, 0xed, 0x77, 0x5d, 0x42, 0xf5, 0x67, 0xf0, + 0x19, 0x50, 0xfc, 0x08, 0xc7, 0x29, 0xf7, 0xd3, 0x31, 0x24, 0xab, 0x5b, 0xed, 0x3a, 0xe3, 0x35, + 0xbe, 0x4b, 0x34, 0xc7, 0x81, 0xf9, 0xb3, 0x09, 0xfa, 0x1b, 0x5b, 0x57, 0x94, 0x91, 0x87, 0xe0, + 0xba, 0x0d, 0x4b, 0xfe, 0x9f, 0xb0, 0x5a, 0xff, 0x0e, 0xab, 0xfd, 0x67, 0x58, 0xf0, 0x1c, 0x1c, + 0x5d, 0x53, 0x46, 0x3c, 0xf2, 0x99, 0x91, 0xb4, 0x88, 0x69, 0x2a, 0xd0, 0xf6, 0x46, 0x4f, 0xf7, + 0xdd, 0x73, 0x94, 0xaf, 0xd6, 0xb2, 0x09, 0xe5, 0xcc, 0x50, 0xff, 0x7a, 0xbb, 0xe8, 0xbe, 0xbf, + 0x2b, 0x35, 0xe9, 0xbe, 0xd4, 0xa4, 0x1f, 0xa5, 0x26, 0xdd, 0x2e, 0xb5, 0xc6, 0xfd, 0x52, 0x6b, + 0x7c, 0x5d, 0x6a, 0x8d, 0x0f, 0x2f, 0xc2, 0x98, 0x45, 0xf3, 0xa9, 0xed, 0xd3, 0x99, 0xb3, 0xfd, + 0xf7, 0xaf, 0xc3, 0xea, 0x99, 0xd8, 0x7d, 0x1a, 0xa6, 0x6d, 0x51, 0x3f, 0xfd, 0x15, 0x00, 0x00, + 0xff, 0xff, 0x4e, 0x61, 0xcb, 0xc4, 0x7f, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -1327,7 +1327,7 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VoteExtension == nil { - m.VoteExtension = &VoteExtensionSigned{} + m.VoteExtension = &VoteExtensionToSign{} } if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index deeed985bb9..b7a66d4d2f8 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -34,5 +34,5 @@ message CanonicalVote { CanonicalBlockID block_id = 4 [(gogoproto.customname) = "BlockID"]; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 6 [(gogoproto.customname) = "ChainID"]; - VoteExtensionSigned vote_extension = 7; + VoteExtensionToSign vote_extension = 7; } diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 35391ca8223..1d9b081b491 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -625,22 +625,22 @@ func (m *VoteExtension) GetAppDataSelfAuthenticating() []byte { return nil } -type VoteExtensionSigned struct { +type VoteExtensionToSign struct { AppDataSigned []byte `protobuf:"bytes,1,opt,name=app_data_signed,json=appDataSigned,proto3" json:"app_data_signed,omitempty"` } -func (m *VoteExtensionSigned) Reset() { *m = VoteExtensionSigned{} } -func (m *VoteExtensionSigned) String() string { return proto.CompactTextString(m) } -func (*VoteExtensionSigned) ProtoMessage() {} -func (*VoteExtensionSigned) Descriptor() ([]byte, []int) { +func (m *VoteExtensionToSign) Reset() { *m = VoteExtensionToSign{} } +func (m *VoteExtensionToSign) String() string { return proto.CompactTextString(m) } +func (*VoteExtensionToSign) ProtoMessage() {} +func (*VoteExtensionToSign) Descriptor() ([]byte, []int) { return fileDescriptor_d3a6e55e2345de56, []int{7} } -func (m *VoteExtensionSigned) XXX_Unmarshal(b []byte) error { +func (m *VoteExtensionToSign) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *VoteExtensionSigned) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *VoteExtensionToSign) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_VoteExtensionSigned.Marshal(b, m, deterministic) + return xxx_messageInfo_VoteExtensionToSign.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -650,19 +650,19 @@ func (m *VoteExtensionSigned) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *VoteExtensionSigned) XXX_Merge(src proto.Message) { - xxx_messageInfo_VoteExtensionSigned.Merge(m, src) +func (m *VoteExtensionToSign) XXX_Merge(src proto.Message) { + xxx_messageInfo_VoteExtensionToSign.Merge(m, src) } -func (m *VoteExtensionSigned) XXX_Size() int { +func (m *VoteExtensionToSign) XXX_Size() int { return m.Size() } -func (m *VoteExtensionSigned) XXX_DiscardUnknown() { - xxx_messageInfo_VoteExtensionSigned.DiscardUnknown(m) +func (m *VoteExtensionToSign) XXX_DiscardUnknown() { + xxx_messageInfo_VoteExtensionToSign.DiscardUnknown(m) } -var xxx_messageInfo_VoteExtensionSigned proto.InternalMessageInfo +var xxx_messageInfo_VoteExtensionToSign proto.InternalMessageInfo -func (m *VoteExtensionSigned) GetAppDataSigned() []byte { +func (m *VoteExtensionToSign) GetAppDataSigned() []byte { if m != nil { return m.AppDataSigned } @@ -671,11 +671,10 @@ func (m *VoteExtensionSigned) GetAppDataSigned() []byte { // Commit contains the evidence that a block was committed by a set of validators. type Commit struct { - Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` - Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` - BlockID BlockID `protobuf:"bytes,3,opt,name=block_id,json=blockId,proto3" json:"block_id"` - Signatures []CommitSig `protobuf:"bytes,4,rep,name=signatures,proto3" json:"signatures"` - VoteExtensions []*VoteExtensionSigned `protobuf:"bytes,5,rep,name=vote_extensions,json=voteExtensions,proto3" json:"vote_extensions,omitempty"` + Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` + BlockID BlockID `protobuf:"bytes,3,opt,name=block_id,json=blockId,proto3" json:"block_id"` + Signatures []CommitSig `protobuf:"bytes,4,rep,name=signatures,proto3" json:"signatures"` } func (m *Commit) Reset() { *m = Commit{} } @@ -739,20 +738,13 @@ func (m *Commit) GetSignatures() []CommitSig { return nil } -func (m *Commit) GetVoteExtensions() []*VoteExtensionSigned { - if m != nil { - return m.VoteExtensions - } - return nil -} - // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` - VoteExtension *VoteExtensionSigned `protobuf:"bytes,5,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` + VoteExtension *VoteExtensionToSign `protobuf:"bytes,5,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *CommitSig) Reset() { *m = CommitSig{} } @@ -816,7 +808,7 @@ func (m *CommitSig) GetSignature() []byte { return nil } -func (m *CommitSig) GetVoteExtension() *VoteExtensionSigned { +func (m *CommitSig) GetVoteExtension() *VoteExtensionToSign { if m != nil { return m.VoteExtension } @@ -1158,7 +1150,7 @@ func init() { proto.RegisterType((*Data)(nil), "tendermint.types.Data") proto.RegisterType((*Vote)(nil), "tendermint.types.Vote") proto.RegisterType((*VoteExtension)(nil), "tendermint.types.VoteExtension") - proto.RegisterType((*VoteExtensionSigned)(nil), "tendermint.types.VoteExtensionSigned") + proto.RegisterType((*VoteExtensionToSign)(nil), "tendermint.types.VoteExtensionToSign") proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig") proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal") @@ -1171,97 +1163,96 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1440 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1a, 0xd7, - 0x16, 0xf7, 0xc0, 0xd8, 0xc0, 0x81, 0xb1, 0xf1, 0x7d, 0x4e, 0x82, 0x49, 0x8c, 0xd1, 0x3c, 0x25, - 0xcf, 0xc9, 0x7b, 0xc2, 0x79, 0x4e, 0xd5, 0x3f, 0x8b, 0xa8, 0x02, 0x4c, 0x12, 0x14, 0x1b, 0xd3, - 0x81, 0xa4, 0x6a, 0x37, 0xa3, 0x01, 0xae, 0x61, 0x9a, 0x61, 0x66, 0x34, 0x73, 0x71, 0x71, 0x3e, - 0x41, 0xe5, 0x55, 0x56, 0xdd, 0x79, 0xd5, 0x2e, 0x2a, 0x75, 0x53, 0xa9, 0xdf, 0xa0, 0xab, 0x2c, - 0xb3, 0x6b, 0x57, 0x69, 0xe5, 0x48, 0xfd, 0x1c, 0xd5, 0xfd, 0x33, 0x30, 0x63, 0x4c, 0x63, 0x45, - 0x51, 0x37, 0xe8, 0xde, 0x73, 0x7e, 0xe7, 0x9e, 0x7f, 0xbf, 0x7b, 0xe6, 0x02, 0x37, 0x08, 0xb6, - 0x7b, 0xd8, 0x1b, 0x9a, 0x36, 0xd9, 0x26, 0xc7, 0x2e, 0xf6, 0xf9, 0x6f, 0xc9, 0xf5, 0x1c, 0xe2, - 0xa0, 0xec, 0x54, 0x5b, 0x62, 0xf2, 0xfc, 0x5a, 0xdf, 0xe9, 0x3b, 0x4c, 0xb9, 0x4d, 0x57, 0x1c, - 0x97, 0xdf, 0xec, 0x3b, 0x4e, 0xdf, 0xc2, 0xdb, 0x6c, 0xd7, 0x19, 0x1d, 0x6e, 0x13, 0x73, 0x88, - 0x7d, 0x62, 0x0c, 0x5d, 0x01, 0xd8, 0x08, 0xb9, 0xe9, 0x7a, 0xc7, 0x2e, 0x71, 0x28, 0xd6, 0x39, - 0x14, 0xea, 0x42, 0x48, 0x7d, 0x84, 0x3d, 0xdf, 0x74, 0xec, 0x70, 0x1c, 0xf9, 0xe2, 0x4c, 0x94, - 0x47, 0x86, 0x65, 0xf6, 0x0c, 0xe2, 0x78, 0x1c, 0xa1, 0x7e, 0x02, 0x4a, 0xd3, 0xf0, 0x48, 0x0b, - 0x93, 0x47, 0xd8, 0xe8, 0x61, 0x0f, 0xad, 0xc1, 0x22, 0x71, 0x88, 0x61, 0xe5, 0xa4, 0xa2, 0xb4, - 0xa5, 0x68, 0x7c, 0x83, 0x10, 0xc8, 0x03, 0xc3, 0x1f, 0xe4, 0x62, 0x45, 0x69, 0x2b, 0xa3, 0xb1, - 0xb5, 0x3a, 0x00, 0x99, 0x9a, 0x52, 0x0b, 0xd3, 0xee, 0xe1, 0x71, 0x60, 0xc1, 0x36, 0x54, 0xda, - 0x39, 0x26, 0xd8, 0x17, 0x26, 0x7c, 0x83, 0x3e, 0x80, 0x45, 0x16, 0x7f, 0x2e, 0x5e, 0x94, 0xb6, - 0xd2, 0x3b, 0xb9, 0x52, 0xa8, 0x50, 0x3c, 0xbf, 0x52, 0x93, 0xea, 0x2b, 0xf2, 0xcb, 0xd7, 0x9b, - 0x0b, 0x1a, 0x07, 0xab, 0x16, 0x24, 0x2a, 0x96, 0xd3, 0x7d, 0x56, 0xdf, 0x9d, 0x04, 0x22, 0x4d, - 0x03, 0x41, 0xfb, 0xb0, 0xe2, 0x1a, 0x1e, 0xd1, 0x7d, 0x4c, 0xf4, 0x01, 0xcb, 0x82, 0x39, 0x4d, - 0xef, 0x6c, 0x96, 0xce, 0xf7, 0xa1, 0x14, 0x49, 0x56, 0x78, 0x51, 0xdc, 0xb0, 0x50, 0xfd, 0x53, - 0x86, 0x25, 0x51, 0x8c, 0xfb, 0x90, 0x10, 0x65, 0x65, 0x0e, 0xd3, 0x3b, 0x1b, 0xe1, 0x13, 0x85, - 0xaa, 0x54, 0x75, 0x6c, 0x1f, 0xdb, 0xfe, 0xc8, 0x17, 0xe7, 0x05, 0x36, 0xe8, 0x16, 0x24, 0xbb, - 0x03, 0xc3, 0xb4, 0x75, 0xb3, 0xc7, 0x22, 0x4a, 0x55, 0xd2, 0x67, 0xaf, 0x37, 0x13, 0x55, 0x2a, - 0xab, 0xef, 0x6a, 0x09, 0xa6, 0xac, 0xf7, 0xd0, 0x55, 0x58, 0x1a, 0x60, 0xb3, 0x3f, 0x20, 0xac, - 0x2c, 0x71, 0x4d, 0xec, 0xd0, 0xc7, 0x20, 0x53, 0x42, 0xe4, 0x64, 0xe6, 0x3b, 0x5f, 0xe2, 0x6c, - 0x29, 0x05, 0x6c, 0x29, 0xb5, 0x03, 0xb6, 0x54, 0x92, 0xd4, 0xf1, 0x8b, 0xdf, 0x37, 0x25, 0x8d, - 0x59, 0xa0, 0x2a, 0x28, 0x96, 0xe1, 0x13, 0xbd, 0x43, 0xcb, 0x46, 0xdd, 0x2f, 0xb2, 0x23, 0xd6, - 0x67, 0x0b, 0x22, 0x0a, 0x2b, 0x42, 0x4f, 0x53, 0x2b, 0x2e, 0xea, 0xa1, 0x2d, 0xc8, 0xb2, 0x43, - 0xba, 0xce, 0x70, 0x68, 0x12, 0x9d, 0xd5, 0x7d, 0x89, 0xd5, 0x7d, 0x99, 0xca, 0xab, 0x4c, 0xfc, - 0x88, 0x76, 0xe0, 0x3a, 0xa4, 0x7a, 0x06, 0x31, 0x38, 0x24, 0xc1, 0x20, 0x49, 0x2a, 0x60, 0xca, - 0xff, 0xc0, 0xca, 0x84, 0x75, 0x3e, 0x87, 0x24, 0xf9, 0x29, 0x53, 0x31, 0x03, 0xde, 0x85, 0x35, - 0x1b, 0x8f, 0x89, 0x7e, 0x1e, 0x9d, 0x62, 0x68, 0x44, 0x75, 0x4f, 0xa3, 0x16, 0x37, 0x61, 0xb9, - 0x1b, 0x14, 0x9f, 0x63, 0x81, 0x61, 0x95, 0x89, 0x94, 0xc1, 0xd6, 0x21, 0x69, 0xb8, 0x2e, 0x07, - 0xa4, 0x19, 0x20, 0x61, 0xb8, 0x2e, 0x53, 0xdd, 0x81, 0x55, 0x96, 0xa3, 0x87, 0xfd, 0x91, 0x45, - 0xc4, 0x21, 0x19, 0x86, 0x59, 0xa1, 0x0a, 0x8d, 0xcb, 0x19, 0xf6, 0xdf, 0xa0, 0xe0, 0x23, 0xb3, - 0x87, 0xed, 0x2e, 0xe6, 0x38, 0x85, 0xe1, 0x32, 0x81, 0x90, 0x81, 0x6e, 0x43, 0xd6, 0xf5, 0x1c, - 0xd7, 0xf1, 0xb1, 0xa7, 0x1b, 0xbd, 0x9e, 0x87, 0x7d, 0x3f, 0xb7, 0xcc, 0xcf, 0x0b, 0xe4, 0x65, - 0x2e, 0x56, 0x73, 0x20, 0xef, 0x1a, 0xc4, 0x40, 0x59, 0x88, 0x93, 0xb1, 0x9f, 0x93, 0x8a, 0xf1, - 0xad, 0x8c, 0x46, 0x97, 0xea, 0x4f, 0x71, 0x90, 0x9f, 0x3a, 0x04, 0xa3, 0x7b, 0x20, 0xd3, 0x36, - 0x31, 0xf6, 0x2d, 0x5f, 0xc4, 0xe7, 0x96, 0xd9, 0xb7, 0x71, 0x6f, 0xdf, 0xef, 0xb7, 0x8f, 0x5d, - 0xac, 0x31, 0x70, 0x88, 0x4e, 0xb1, 0x08, 0x9d, 0xd6, 0x60, 0xd1, 0x73, 0x46, 0x76, 0x8f, 0xb1, - 0x6c, 0x51, 0xe3, 0x1b, 0x54, 0x83, 0xe4, 0x84, 0x25, 0xf2, 0xdb, 0x58, 0xb2, 0x42, 0x59, 0x42, - 0x39, 0x2c, 0x04, 0x5a, 0xa2, 0x23, 0xc8, 0x52, 0x81, 0xd4, 0x64, 0x78, 0x09, 0xb6, 0x5d, 0x8e, - 0xb0, 0x53, 0x33, 0xf4, 0x5f, 0x58, 0x9d, 0xf4, 0x7e, 0x52, 0x3c, 0xce, 0xb8, 0xec, 0x44, 0x21, - 0xaa, 0x17, 0xa1, 0x95, 0xce, 0x07, 0x50, 0x82, 0xe5, 0x35, 0xa5, 0x55, 0x9d, 0x4d, 0xa2, 0x1b, - 0x90, 0xf2, 0xcd, 0xbe, 0x6d, 0x90, 0x91, 0x87, 0x05, 0xf3, 0xa6, 0x02, 0xf4, 0x00, 0x96, 0x8f, - 0x1c, 0x82, 0x75, 0x3c, 0x26, 0xd8, 0x66, 0x37, 0x3d, 0x35, 0x6f, 0x76, 0xd0, 0x8e, 0xd4, 0x02, - 0x98, 0xa6, 0x1c, 0x85, 0xb7, 0xea, 0x18, 0x94, 0x88, 0x1e, 0xdd, 0x82, 0x15, 0x4a, 0x3a, 0x76, - 0x2f, 0x7c, 0xd6, 0x25, 0x31, 0xb4, 0x14, 0xc3, 0x75, 0x69, 0xdf, 0x79, 0xeb, 0xd0, 0xa7, 0x70, - 0x63, 0x8a, 0xc3, 0xd6, 0xa1, 0x6e, 0x8c, 0xc8, 0x00, 0xdb, 0xc4, 0xec, 0x1a, 0xc4, 0xb4, 0xfb, - 0x62, 0x7e, 0xae, 0x07, 0x46, 0xd8, 0x3a, 0x2c, 0x47, 0x00, 0xea, 0x7d, 0xf8, 0x57, 0xc4, 0xb3, - 0x38, 0xf7, 0x92, 0xfe, 0xd5, 0x17, 0x31, 0x58, 0xe2, 0x57, 0x39, 0x44, 0x1c, 0xe9, 0x62, 0xe2, - 0xc4, 0xe6, 0x11, 0x27, 0xfe, 0xee, 0xc4, 0x29, 0x03, 0x4c, 0xba, 0xe1, 0xe7, 0xe4, 0x62, 0x7c, - 0x2b, 0xbd, 0x73, 0x7d, 0xf6, 0x20, 0x1e, 0x62, 0xcb, 0xec, 0x8b, 0x49, 0x15, 0x32, 0x42, 0x0d, - 0x58, 0x89, 0xf6, 0xd0, 0xcf, 0x2d, 0xb2, 0x73, 0x6e, 0xbe, 0xa5, 0x89, 0xbc, 0x04, 0xda, 0x72, - 0xa4, 0x95, 0xbe, 0xfa, 0x63, 0x0c, 0x52, 0x13, 0x7f, 0xa8, 0x0c, 0x4a, 0x90, 0xa7, 0x7e, 0x68, - 0x19, 0x7d, 0x71, 0x19, 0x37, 0xe6, 0x26, 0xfb, 0xc0, 0x32, 0xfa, 0x5a, 0x5a, 0xe4, 0x47, 0x37, - 0x17, 0x13, 0x3b, 0x36, 0x87, 0xd8, 0x91, 0x9b, 0x14, 0x7f, 0xb7, 0x9b, 0x14, 0xe1, 0xbc, 0x7c, - 0x9e, 0xf3, 0x7b, 0x33, 0x9c, 0xe7, 0x17, 0xf6, 0x92, 0xe5, 0x3a, 0xc7, 0xfc, 0x9f, 0x63, 0x90, - 0x6c, 0xb2, 0xd1, 0x66, 0x58, 0xff, 0xc4, 0xc0, 0xba, 0x0e, 0x29, 0xd7, 0xb1, 0x74, 0xae, 0x91, - 0x99, 0x26, 0xe9, 0x3a, 0x96, 0x36, 0x43, 0xca, 0xc5, 0xf7, 0x34, 0xcd, 0x96, 0xde, 0x43, 0x0f, - 0x12, 0xe7, 0x7a, 0xa0, 0x7a, 0x90, 0xe1, 0xa5, 0x10, 0x4f, 0x8d, 0xbb, 0xb4, 0x06, 0xec, 0xed, - 0x22, 0xcd, 0x3e, 0x8d, 0x78, 0xd8, 0x1c, 0xa9, 0x09, 0x1c, 0xb5, 0xe0, 0x5f, 0x66, 0xf1, 0xda, - 0xc9, 0xcd, 0xbb, 0x34, 0x9a, 0xc0, 0xa9, 0xdf, 0x4a, 0x00, 0x7b, 0xb4, 0xb2, 0x2c, 0x5f, 0xfa, - 0x48, 0xe0, 0x83, 0x41, 0x8f, 0x78, 0x2e, 0xcc, 0x6b, 0x9a, 0xf0, 0x9f, 0xf1, 0xc3, 0x71, 0x57, - 0x41, 0x99, 0x52, 0xdb, 0xc7, 0x41, 0x30, 0x17, 0x1c, 0x32, 0xf9, 0x76, 0xb7, 0x30, 0xd1, 0x32, - 0x47, 0xa1, 0x9d, 0xfa, 0x8b, 0x04, 0x29, 0x16, 0xd3, 0x3e, 0x26, 0x46, 0xa4, 0x87, 0xd2, 0xbb, - 0xf7, 0x70, 0x03, 0x80, 0x1f, 0xe3, 0x9b, 0xcf, 0xb1, 0x60, 0x56, 0x8a, 0x49, 0x5a, 0xe6, 0x73, - 0x8c, 0x3e, 0x9c, 0x14, 0x3c, 0xfe, 0xf7, 0x05, 0x17, 0x03, 0x27, 0x28, 0xfb, 0x35, 0x48, 0xd8, - 0xa3, 0xa1, 0x4e, 0xbf, 0xd8, 0x32, 0x67, 0xab, 0x3d, 0x1a, 0xb6, 0xc7, 0xbe, 0xfa, 0x15, 0x24, - 0xda, 0x63, 0xf6, 0x7a, 0xa5, 0x14, 0xf5, 0x1c, 0x47, 0x3c, 0x99, 0xf8, 0xd4, 0x4d, 0x52, 0x01, - 0x7b, 0x21, 0x20, 0x90, 0xe9, 0x50, 0x0e, 0xde, 0xd2, 0x74, 0x8d, 0x4a, 0x97, 0x7c, 0x17, 0x8b, - 0x17, 0xf1, 0x9d, 0x5f, 0x25, 0x48, 0x87, 0xa6, 0x0d, 0xfa, 0x3f, 0x5c, 0xa9, 0xec, 0x1d, 0x54, - 0x1f, 0xeb, 0xf5, 0x5d, 0xfd, 0xc1, 0x5e, 0xf9, 0xa1, 0xfe, 0xa4, 0xf1, 0xb8, 0x71, 0xf0, 0x79, - 0x23, 0xbb, 0x90, 0xbf, 0x7a, 0x72, 0x5a, 0x44, 0x21, 0xec, 0x13, 0xfb, 0x99, 0xed, 0x7c, 0x6d, - 0xa3, 0x6d, 0x58, 0x8b, 0x9a, 0x94, 0x2b, 0xad, 0x5a, 0xa3, 0x9d, 0x95, 0xf2, 0x57, 0x4e, 0x4e, - 0x8b, 0xab, 0x21, 0x8b, 0x72, 0xc7, 0xc7, 0x36, 0x99, 0x35, 0xa8, 0x1e, 0xec, 0xef, 0xd7, 0xdb, - 0xd9, 0xd8, 0x8c, 0x81, 0xf8, 0x9c, 0xdc, 0x86, 0xd5, 0xa8, 0x41, 0xa3, 0xbe, 0x97, 0x8d, 0xe7, - 0xd1, 0xc9, 0x69, 0x71, 0x39, 0x84, 0x6e, 0x98, 0x56, 0x3e, 0xf9, 0xcd, 0x77, 0x85, 0x85, 0x1f, - 0xbe, 0x2f, 0x48, 0x34, 0x33, 0x25, 0x32, 0x23, 0xd0, 0xff, 0xe0, 0x5a, 0xab, 0xfe, 0xb0, 0x51, - 0xdb, 0xd5, 0xf7, 0x5b, 0x0f, 0xf5, 0xf6, 0x17, 0xcd, 0x5a, 0x28, 0xbb, 0x95, 0x93, 0xd3, 0x62, - 0x5a, 0xa4, 0x34, 0x0f, 0xdd, 0xd4, 0x6a, 0x4f, 0x0f, 0xda, 0xb5, 0xac, 0xc4, 0xd1, 0x4d, 0x0f, - 0xd3, 0x01, 0xc6, 0xd0, 0x77, 0x61, 0xfd, 0x02, 0xf4, 0x24, 0xb1, 0xd5, 0x93, 0xd3, 0xa2, 0xd2, - 0xf4, 0x30, 0xbf, 0x3f, 0xcc, 0xa2, 0x04, 0xb9, 0x59, 0x8b, 0x83, 0xe6, 0x41, 0xab, 0xbc, 0x97, - 0x2d, 0xe6, 0xb3, 0x27, 0xa7, 0xc5, 0x4c, 0x30, 0x0c, 0x29, 0x7e, 0x9a, 0x59, 0xe5, 0xb3, 0x97, - 0x67, 0x05, 0xe9, 0xd5, 0x59, 0x41, 0xfa, 0xe3, 0xac, 0x20, 0xbd, 0x78, 0x53, 0x58, 0x78, 0xf5, - 0xa6, 0xb0, 0xf0, 0xdb, 0x9b, 0xc2, 0xc2, 0x97, 0x1f, 0xf5, 0x4d, 0x32, 0x18, 0x75, 0x4a, 0x5d, - 0x67, 0xb8, 0x1d, 0xfe, 0xc7, 0x36, 0x5d, 0xf2, 0x7f, 0x8e, 0xe7, 0xff, 0xcd, 0x75, 0x96, 0x98, - 0xfc, 0xde, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x6e, 0x8d, 0x60, 0x8e, 0x0e, 0x00, 0x00, + // 1423 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4d, 0x6f, 0x1a, 0x57, + 0x17, 0xf6, 0xc0, 0xd8, 0xc0, 0x81, 0xb1, 0xf1, 0x7d, 0x9d, 0x04, 0x93, 0x18, 0xa3, 0x79, 0x95, + 0xbc, 0x4e, 0xde, 0x0a, 0xa7, 0x4e, 0xd5, 0x8f, 0x45, 0x54, 0x01, 0x26, 0x09, 0x8a, 0x8d, 0xe9, + 0x40, 0x52, 0xb5, 0x9b, 0xd1, 0x00, 0xd7, 0x30, 0xcd, 0x30, 0x33, 0x9a, 0xb9, 0xb8, 0x38, 0xbf, + 0xa0, 0xf2, 0x2a, 0xab, 0xee, 0xbc, 0x6a, 0x17, 0x95, 0xba, 0xa9, 0xd4, 0x3f, 0x50, 0x75, 0x95, + 0x65, 0x76, 0xed, 0x2a, 0xad, 0x1c, 0xa9, 0xbf, 0xa3, 0xba, 0x1f, 0x03, 0x33, 0xc6, 0x34, 0x51, + 0x14, 0x75, 0x83, 0xe6, 0x9e, 0xf3, 0x9c, 0x7b, 0xbe, 0x9e, 0x7b, 0xee, 0x05, 0xae, 0x11, 0x6c, + 0xf7, 0xb0, 0x37, 0x34, 0x6d, 0xb2, 0x4d, 0x8e, 0x5d, 0xec, 0xf3, 0xdf, 0x92, 0xeb, 0x39, 0xc4, + 0x41, 0xd9, 0xa9, 0xb6, 0xc4, 0xe4, 0xf9, 0xb5, 0xbe, 0xd3, 0x77, 0x98, 0x72, 0x9b, 0x7e, 0x71, + 0x5c, 0x7e, 0xb3, 0xef, 0x38, 0x7d, 0x0b, 0x6f, 0xb3, 0x55, 0x67, 0x74, 0xb8, 0x4d, 0xcc, 0x21, + 0xf6, 0x89, 0x31, 0x74, 0x05, 0x60, 0x23, 0xe4, 0xa6, 0xeb, 0x1d, 0xbb, 0xc4, 0xa1, 0x58, 0xe7, + 0x50, 0xa8, 0x0b, 0x21, 0xf5, 0x11, 0xf6, 0x7c, 0xd3, 0xb1, 0xc3, 0x71, 0xe4, 0x8b, 0x33, 0x51, + 0x1e, 0x19, 0x96, 0xd9, 0x33, 0x88, 0xe3, 0x71, 0x84, 0xfa, 0x09, 0x28, 0x4d, 0xc3, 0x23, 0x2d, + 0x4c, 0x1e, 0x60, 0xa3, 0x87, 0x3d, 0xb4, 0x06, 0x8b, 0xc4, 0x21, 0x86, 0x95, 0x93, 0x8a, 0xd2, + 0x96, 0xa2, 0xf1, 0x05, 0x42, 0x20, 0x0f, 0x0c, 0x7f, 0x90, 0x8b, 0x15, 0xa5, 0xad, 0x8c, 0xc6, + 0xbe, 0xd5, 0x01, 0xc8, 0xd4, 0x94, 0x5a, 0x98, 0x76, 0x0f, 0x8f, 0x03, 0x0b, 0xb6, 0xa0, 0xd2, + 0xce, 0x31, 0xc1, 0xbe, 0x30, 0xe1, 0x0b, 0xf4, 0x01, 0x2c, 0xb2, 0xf8, 0x73, 0xf1, 0xa2, 0xb4, + 0x95, 0xde, 0xc9, 0x95, 0x42, 0x85, 0xe2, 0xf9, 0x95, 0x9a, 0x54, 0x5f, 0x91, 0x9f, 0xbf, 0xdc, + 0x5c, 0xd0, 0x38, 0x58, 0xb5, 0x20, 0x51, 0xb1, 0x9c, 0xee, 0x93, 0xfa, 0xee, 0x24, 0x10, 0x69, + 0x1a, 0x08, 0xda, 0x87, 0x15, 0xd7, 0xf0, 0x88, 0xee, 0x63, 0xa2, 0x0f, 0x58, 0x16, 0xcc, 0x69, + 0x7a, 0x67, 0xb3, 0x74, 0xbe, 0x0f, 0xa5, 0x48, 0xb2, 0xc2, 0x8b, 0xe2, 0x86, 0x85, 0xea, 0x5f, + 0x32, 0x2c, 0x89, 0x62, 0xdc, 0x85, 0x84, 0x28, 0x2b, 0x73, 0x98, 0xde, 0xd9, 0x08, 0xef, 0x28, + 0x54, 0xa5, 0xaa, 0x63, 0xfb, 0xd8, 0xf6, 0x47, 0xbe, 0xd8, 0x2f, 0xb0, 0x41, 0x37, 0x20, 0xd9, + 0x1d, 0x18, 0xa6, 0xad, 0x9b, 0x3d, 0x16, 0x51, 0xaa, 0x92, 0x3e, 0x7b, 0xb9, 0x99, 0xa8, 0x52, + 0x59, 0x7d, 0x57, 0x4b, 0x30, 0x65, 0xbd, 0x87, 0x2e, 0xc3, 0xd2, 0x00, 0x9b, 0xfd, 0x01, 0x61, + 0x65, 0x89, 0x6b, 0x62, 0x85, 0x3e, 0x06, 0x99, 0x12, 0x22, 0x27, 0x33, 0xdf, 0xf9, 0x12, 0x67, + 0x4b, 0x29, 0x60, 0x4b, 0xa9, 0x1d, 0xb0, 0xa5, 0x92, 0xa4, 0x8e, 0x9f, 0xfd, 0xb1, 0x29, 0x69, + 0xcc, 0x02, 0x55, 0x41, 0xb1, 0x0c, 0x9f, 0xe8, 0x1d, 0x5a, 0x36, 0xea, 0x7e, 0x91, 0x6d, 0xb1, + 0x3e, 0x5b, 0x10, 0x51, 0x58, 0x11, 0x7a, 0x9a, 0x5a, 0x71, 0x51, 0x0f, 0x6d, 0x41, 0x96, 0x6d, + 0xd2, 0x75, 0x86, 0x43, 0x93, 0xe8, 0xac, 0xee, 0x4b, 0xac, 0xee, 0xcb, 0x54, 0x5e, 0x65, 0xe2, + 0x07, 0xb4, 0x03, 0x57, 0x21, 0xd5, 0x33, 0x88, 0xc1, 0x21, 0x09, 0x06, 0x49, 0x52, 0x01, 0x53, + 0xfe, 0x0f, 0x56, 0x26, 0xac, 0xf3, 0x39, 0x24, 0xc9, 0x77, 0x99, 0x8a, 0x19, 0xf0, 0x36, 0xac, + 0xd9, 0x78, 0x4c, 0xf4, 0xf3, 0xe8, 0x14, 0x43, 0x23, 0xaa, 0x7b, 0x1c, 0xb5, 0xb8, 0x0e, 0xcb, + 0xdd, 0xa0, 0xf8, 0x1c, 0x0b, 0x0c, 0xab, 0x4c, 0xa4, 0x0c, 0xb6, 0x0e, 0x49, 0xc3, 0x75, 0x39, + 0x20, 0xcd, 0x00, 0x09, 0xc3, 0x75, 0x99, 0xea, 0x16, 0xac, 0xb2, 0x1c, 0x3d, 0xec, 0x8f, 0x2c, + 0x22, 0x36, 0xc9, 0x30, 0xcc, 0x0a, 0x55, 0x68, 0x5c, 0xce, 0xb0, 0xff, 0x05, 0x05, 0x1f, 0x99, + 0x3d, 0x6c, 0x77, 0x31, 0xc7, 0x29, 0x0c, 0x97, 0x09, 0x84, 0x0c, 0x74, 0x13, 0xb2, 0xae, 0xe7, + 0xb8, 0x8e, 0x8f, 0x3d, 0xdd, 0xe8, 0xf5, 0x3c, 0xec, 0xfb, 0xb9, 0x65, 0xbe, 0x5f, 0x20, 0x2f, + 0x73, 0xb1, 0x9a, 0x03, 0x79, 0xd7, 0x20, 0x06, 0xca, 0x42, 0x9c, 0x8c, 0xfd, 0x9c, 0x54, 0x8c, + 0x6f, 0x65, 0x34, 0xfa, 0xa9, 0xfe, 0x14, 0x07, 0xf9, 0xb1, 0x43, 0x30, 0xba, 0x03, 0x32, 0x6d, + 0x13, 0x63, 0xdf, 0xf2, 0x45, 0x7c, 0x6e, 0x99, 0x7d, 0x1b, 0xf7, 0xf6, 0xfd, 0x7e, 0xfb, 0xd8, + 0xc5, 0x1a, 0x03, 0x87, 0xe8, 0x14, 0x8b, 0xd0, 0x69, 0x0d, 0x16, 0x3d, 0x67, 0x64, 0xf7, 0x18, + 0xcb, 0x16, 0x35, 0xbe, 0x40, 0x35, 0x48, 0x4e, 0x58, 0x22, 0xbf, 0x8e, 0x25, 0x2b, 0x94, 0x25, + 0x94, 0xc3, 0x42, 0xa0, 0x25, 0x3a, 0x82, 0x2c, 0x15, 0x48, 0x4d, 0x86, 0x97, 0x60, 0xdb, 0x9b, + 0x11, 0x76, 0x6a, 0x86, 0xfe, 0x0f, 0xab, 0x93, 0xde, 0x4f, 0x8a, 0xc7, 0x19, 0x97, 0x9d, 0x28, + 0x44, 0xf5, 0x22, 0xb4, 0xd2, 0xf9, 0x00, 0x4a, 0xb0, 0xbc, 0xa6, 0xb4, 0xaa, 0xb3, 0x49, 0x74, + 0x0d, 0x52, 0xbe, 0xd9, 0xb7, 0x0d, 0x32, 0xf2, 0xb0, 0x60, 0xde, 0x54, 0x80, 0xee, 0xc1, 0xf2, + 0x91, 0x43, 0xb0, 0x8e, 0xc7, 0x04, 0xdb, 0xec, 0xa4, 0xa7, 0xe6, 0xcd, 0x0e, 0xda, 0x91, 0x5a, + 0x00, 0xd3, 0x94, 0xa3, 0xf0, 0x52, 0x1d, 0x83, 0x12, 0xd1, 0xa3, 0x1b, 0xb0, 0x42, 0x49, 0xc7, + 0xce, 0x85, 0xcf, 0xba, 0x24, 0x86, 0x96, 0x62, 0xb8, 0x2e, 0xed, 0x3b, 0x6f, 0x1d, 0xfa, 0x14, + 0xae, 0x4d, 0x71, 0xd8, 0x3a, 0xd4, 0x8d, 0x11, 0x19, 0x60, 0x9b, 0x98, 0x5d, 0x83, 0x98, 0x76, + 0x5f, 0xcc, 0xcf, 0xf5, 0xc0, 0x08, 0x5b, 0x87, 0xe5, 0x08, 0x40, 0xbd, 0x0b, 0xff, 0x89, 0x78, + 0x6e, 0x3b, 0x74, 0xe7, 0x37, 0xf5, 0xaf, 0xfe, 0x22, 0xc1, 0x12, 0x3f, 0xca, 0x21, 0xe2, 0x48, + 0x17, 0x13, 0x27, 0x36, 0x8f, 0x38, 0xf1, 0xb7, 0x27, 0x4e, 0x19, 0x60, 0xd2, 0x0d, 0x3f, 0x27, + 0x17, 0xe3, 0x5b, 0xe9, 0x9d, 0xab, 0xb3, 0x1b, 0xf1, 0x10, 0x5b, 0x66, 0x5f, 0x4c, 0xaa, 0x90, + 0x91, 0xfa, 0x63, 0x0c, 0x52, 0x13, 0x3d, 0x2a, 0x83, 0x12, 0xc4, 0xa5, 0x1f, 0x5a, 0x46, 0x5f, + 0x1c, 0x9e, 0x8d, 0xb9, 0xc1, 0xdd, 0xb3, 0x8c, 0xbe, 0x96, 0x16, 0xf1, 0xd0, 0xc5, 0xc5, 0x44, + 0x8c, 0xcd, 0x21, 0x62, 0x84, 0xf9, 0xf1, 0xb7, 0x63, 0x7e, 0x84, 0xa3, 0xf2, 0x79, 0x8e, 0xee, + 0xcd, 0x70, 0x94, 0x1f, 0xb0, 0xeb, 0xaf, 0xe1, 0x28, 0x67, 0xc2, 0x79, 0xa6, 0xfe, 0x1c, 0x83, + 0x64, 0x93, 0x8d, 0x22, 0xc3, 0xfa, 0x37, 0x06, 0xcc, 0x55, 0x48, 0xb9, 0x8e, 0xa5, 0x73, 0x8d, + 0xcc, 0x34, 0x49, 0xd7, 0xb1, 0xb4, 0x19, 0x12, 0x2d, 0xbe, 0xa3, 0xe9, 0xb3, 0xf4, 0x0e, 0x7a, + 0x90, 0x38, 0xd7, 0x03, 0xd5, 0x83, 0x0c, 0x2f, 0x85, 0x78, 0x1a, 0xdc, 0xa6, 0x35, 0x60, 0x6f, + 0x0d, 0x69, 0xf6, 0x29, 0xc3, 0xc3, 0xe6, 0x48, 0x4d, 0xe0, 0xa8, 0x05, 0xbf, 0x49, 0xc5, 0xeb, + 0x24, 0x37, 0x8f, 0xe4, 0x9a, 0xc0, 0xa9, 0xdf, 0x4a, 0x00, 0x7b, 0xb4, 0xb2, 0x2c, 0x5f, 0x7a, + 0xa9, 0xf3, 0x83, 0xac, 0x47, 0x3c, 0x17, 0xe6, 0x35, 0x4d, 0xf8, 0xcf, 0xf8, 0xe1, 0xb8, 0xab, + 0xa0, 0x4c, 0xa9, 0xed, 0xe3, 0x20, 0x98, 0x0b, 0x36, 0x99, 0xdc, 0xb5, 0x2d, 0x4c, 0xb4, 0xcc, + 0x51, 0x68, 0xa5, 0xfe, 0x2a, 0x41, 0x8a, 0xc5, 0xb4, 0x8f, 0x89, 0x11, 0xe9, 0xa1, 0xf4, 0xf6, + 0x3d, 0xdc, 0x00, 0xe0, 0xdb, 0xf8, 0xe6, 0x53, 0x2c, 0x98, 0x95, 0x62, 0x92, 0x96, 0xf9, 0x14, + 0xa3, 0x0f, 0x27, 0x05, 0x8f, 0xff, 0x73, 0xc1, 0xc5, 0x80, 0x08, 0xca, 0x7e, 0x05, 0x12, 0xf6, + 0x68, 0xa8, 0xd3, 0x1b, 0x56, 0xe6, 0x6c, 0xb5, 0x47, 0xc3, 0xf6, 0xd8, 0x57, 0xbf, 0x82, 0x44, + 0x7b, 0xcc, 0x5e, 0x9b, 0x94, 0xa2, 0x9e, 0xe3, 0x88, 0x27, 0x0e, 0x9f, 0x92, 0x49, 0x2a, 0x60, + 0x37, 0x3a, 0x02, 0x99, 0x0e, 0xd1, 0xe0, 0xed, 0x4b, 0xbf, 0x51, 0xe9, 0x0d, 0xdf, 0xb1, 0xe2, + 0x05, 0x7b, 0xeb, 0x37, 0x09, 0xd2, 0xa1, 0x69, 0x83, 0xde, 0x87, 0x4b, 0x95, 0xbd, 0x83, 0xea, + 0x43, 0xbd, 0xbe, 0xab, 0xdf, 0xdb, 0x2b, 0xdf, 0xd7, 0x1f, 0x35, 0x1e, 0x36, 0x0e, 0x3e, 0x6f, + 0x64, 0x17, 0xf2, 0x97, 0x4f, 0x4e, 0x8b, 0x28, 0x84, 0x7d, 0x64, 0x3f, 0xb1, 0x9d, 0xaf, 0x6d, + 0xb4, 0x0d, 0x6b, 0x51, 0x93, 0x72, 0xa5, 0x55, 0x6b, 0xb4, 0xb3, 0x52, 0xfe, 0xd2, 0xc9, 0x69, + 0x71, 0x35, 0x64, 0x51, 0xee, 0xf8, 0xd8, 0x26, 0xb3, 0x06, 0xd5, 0x83, 0xfd, 0xfd, 0x7a, 0x3b, + 0x1b, 0x9b, 0x31, 0x10, 0xe3, 0xff, 0x26, 0xac, 0x46, 0x0d, 0x1a, 0xf5, 0xbd, 0x6c, 0x3c, 0x8f, + 0x4e, 0x4e, 0x8b, 0xcb, 0x21, 0x74, 0xc3, 0xb4, 0xf2, 0xc9, 0x6f, 0xbe, 0x2b, 0x2c, 0xfc, 0xf0, + 0x7d, 0x41, 0xa2, 0x99, 0x29, 0x91, 0x19, 0x81, 0xde, 0x83, 0x2b, 0xad, 0xfa, 0xfd, 0x46, 0x6d, + 0x57, 0xdf, 0x6f, 0xdd, 0xd7, 0xdb, 0x5f, 0x34, 0x6b, 0xa1, 0xec, 0x56, 0x4e, 0x4e, 0x8b, 0x69, + 0x91, 0xd2, 0x3c, 0x74, 0x53, 0xab, 0x3d, 0x3e, 0x68, 0xd7, 0xb2, 0x12, 0x47, 0x37, 0x3d, 0x4c, + 0x07, 0x18, 0x43, 0xdf, 0x86, 0xf5, 0x0b, 0xd0, 0x93, 0xc4, 0x56, 0x4f, 0x4e, 0x8b, 0x4a, 0xd3, + 0xc3, 0xfc, 0xfc, 0x30, 0x8b, 0x12, 0xe4, 0x66, 0x2d, 0x0e, 0x9a, 0x07, 0xad, 0xf2, 0x5e, 0xb6, + 0x98, 0xcf, 0x9e, 0x9c, 0x16, 0x33, 0xc1, 0x30, 0xa4, 0xf8, 0x69, 0x66, 0x95, 0xcf, 0x9e, 0x9f, + 0x15, 0xa4, 0x17, 0x67, 0x05, 0xe9, 0xcf, 0xb3, 0x82, 0xf4, 0xec, 0x55, 0x61, 0xe1, 0xc5, 0xab, + 0xc2, 0xc2, 0xef, 0xaf, 0x0a, 0x0b, 0x5f, 0x7e, 0xd4, 0x37, 0xc9, 0x60, 0xd4, 0x29, 0x75, 0x9d, + 0xe1, 0x76, 0xf8, 0x1f, 0xd6, 0xf4, 0x93, 0xff, 0xd3, 0x3b, 0xff, 0xef, 0xab, 0xb3, 0xc4, 0xe4, + 0x77, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x5b, 0x4d, 0xa1, 0x3e, 0x0e, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1666,7 +1657,7 @@ func (m *VoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *VoteExtensionSigned) Marshal() (dAtA []byte, err error) { +func (m *VoteExtensionToSign) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1676,12 +1667,12 @@ func (m *VoteExtensionSigned) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *VoteExtensionSigned) MarshalTo(dAtA []byte) (int, error) { +func (m *VoteExtensionToSign) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *VoteExtensionSigned) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *VoteExtensionToSign) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1716,20 +1707,6 @@ func (m *Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.VoteExtensions) > 0 { - for iNdEx := len(m.VoteExtensions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.VoteExtensions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - } if len(m.Signatures) > 0 { for iNdEx := len(m.Signatures) - 1; iNdEx >= 0; iNdEx-- { { @@ -2280,7 +2257,7 @@ func (m *VoteExtension) Size() (n int) { return n } -func (m *VoteExtensionSigned) Size() (n int) { +func (m *VoteExtensionToSign) Size() (n int) { if m == nil { return 0 } @@ -2313,12 +2290,6 @@ func (m *Commit) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } - if len(m.VoteExtensions) > 0 { - for _, e := range m.VoteExtensions { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } return n } @@ -3815,7 +3786,7 @@ func (m *VoteExtension) Unmarshal(dAtA []byte) error { } return nil } -func (m *VoteExtensionSigned) Unmarshal(dAtA []byte) error { +func (m *VoteExtensionToSign) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3838,10 +3809,10 @@ func (m *VoteExtensionSigned) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: VoteExtensionSigned: wiretype end group for non-group") + return fmt.Errorf("proto: VoteExtensionToSign: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: VoteExtensionSigned: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: VoteExtensionToSign: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4033,40 +4004,6 @@ func (m *Commit) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VoteExtensions", 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 - } - m.VoteExtensions = append(m.VoteExtensions, &VoteExtensionSigned{}) - if err := m.VoteExtensions[len(m.VoteExtensions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -4267,7 +4204,7 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VoteExtension == nil { - m.VoteExtension = &VoteExtensionSigned{} + m.VoteExtension = &VoteExtensionToSign{} } if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 377e38fbeb4..0449ce320a5 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -110,7 +110,7 @@ message VoteExtension { bytes app_data_self_authenticating = 2; } -message VoteExtensionSigned { +message VoteExtensionToSign { bytes app_data_signed = 1; } @@ -129,7 +129,7 @@ message CommitSig { google.protobuf.Timestamp timestamp = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; bytes signature = 4; - VoteExtensionSigned vote_extension = 5; + VoteExtensionToSign vote_extension = 5; } message Proposal { diff --git a/state/execution_test.go b/state/execution_test.go index c0e36d9b3cc..c71e463e19d 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -78,13 +78,13 @@ func TestBeginBlockValidators(t *testing.T) { []byte("Signature1"), state.Validators.Validators[0].Address, now, - types.VoteExtensionSigned{}, + types.VoteExtensionToSign{}, ) commitSig1 = types.NewCommitSigForBlock( []byte("Signature2"), state.Validators.Validators[1].Address, now, - types.VoteExtensionSigned{}, + types.VoteExtensionToSign{}, ) absentSig = types.NewCommitSigAbsent() ) diff --git a/types/block.go b/types/block.go index f4ab10c98e4..2c93048539c 100644 --- a/types/block.go +++ b/types/block.go @@ -606,11 +606,11 @@ type CommitSig struct { ValidatorAddress Address `json:"validator_address"` Timestamp time.Time `json:"timestamp"` Signature []byte `json:"signature"` - VoteExtension VoteExtensionSigned `json:"vote_extension"` + VoteExtension VoteExtensionToSign `json:"vote_extension"` } // NewCommitSigForBlock returns new CommitSig with BlockIDFlagCommit. -func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time, ext VoteExtensionSigned) CommitSig { +func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time, ext VoteExtensionToSign) CommitSig { return CommitSig{ BlockIDFlag: BlockIDFlagCommit, ValidatorAddress: valAddr, diff --git a/types/canonical.go b/types/canonical.go index 21c77abc836..dfe0ab29941 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -51,11 +51,11 @@ func CanonicalizeProposal(chainID string, proposal *tmproto.Proposal) tmproto.Ca } } -func GetSignedVoteExtension(ext *tmproto.VoteExtension) *tmproto.VoteExtensionSigned { +func GetSignedVoteExtension(ext *tmproto.VoteExtension) *tmproto.VoteExtensionToSign { if ext == nil { return nil } - return &tmproto.VoteExtensionSigned{ + return &tmproto.VoteExtensionToSign{ AppDataSigned: ext.AppDataSigned, } } diff --git a/types/vote.go b/types/vote.go index 3a4bf51cf95..d1a9364c367 100644 --- a/types/vote.go +++ b/types/vote.go @@ -46,17 +46,17 @@ func NewConflictingVoteError(vote1, vote2 *Vote) *ErrVoteConflictingVotes { // Address is hex bytes. type Address = crypto.Address -type VoteExtensionSigned struct { +type VoteExtensionToSign struct { AppDataSigned []byte `json:"app_data_signed"` } -func (ext VoteExtensionSigned) BytesPacked() []byte { +func (ext VoteExtensionToSign) BytesPacked() []byte { res := make([]byte, len(ext.AppDataSigned)) copy(res, ext.AppDataSigned) return res } -func (ext VoteExtensionSigned) FromSigned() VoteExtension { +func (ext VoteExtensionToSign) FromSigned() VoteExtension { return VoteExtension{ AppDataSigned: ext.AppDataSigned, } @@ -67,8 +67,8 @@ type VoteExtension struct { AppDataSelfAuthenticating []byte `json:"app_data_self_authenticating"` } -func (ext VoteExtension) ToSigned() VoteExtensionSigned { - return VoteExtensionSigned{ +func (ext VoteExtension) ToSigned() VoteExtensionToSign { + return VoteExtensionToSign{ AppDataSigned: ext.AppDataSigned, } } From 185fe06acd71253a0bd39be93adb8b818cf7105b Mon Sep 17 00:00:00 2001 From: mconcat Date: Mon, 9 Aug 2021 20:58:03 +0900 Subject: [PATCH 10/23] add example VoteExtension --- abci/example/kvstore/persistent_kvstore.go | 5 +- abci/types/application.go | 2 +- abci/types/result.go | 28 +- abci/types/types.pb.go | 598 +++++++++------------ internal/consensus/state.go | 2 +- proto/tendermint/abci/types.proto | 15 +- state/execution.go | 11 +- 7 files changed, 284 insertions(+), 377 deletions(-) diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 508fa006fff..e897b312468 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -172,12 +172,13 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( func (app *PersistentKVStoreApplication) ExtendVote( req types.RequestExtendVote) types.ResponseExtendVote { - return types.ResponseExtendVote{} + return types.RespondExtendVote(req.Vote.ValidatorAddress, nil) } func (app *PersistentKVStoreApplication) VerifyVoteExtension( req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { - return types.ResponseVerifyVoteExtension{} + ok := bytes.Equal(req.Vote.ValidatorAddress, req.Vote.VoteExtension.AppDataToSign) + return types.RespondVerifyVoteExtension(ok) } //--------------------------------------------- diff --git a/abci/types/application.go b/abci/types/application.go index ba1c4df57af..5a9c07a29f6 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -65,7 +65,7 @@ func (BaseApplication) ExtendVote(req RequestExtendVote) ResponseExtendVote { } func (BaseApplication) VerifyVoteExtension(req RequestVerifyVoteExtension) ResponseVerifyVoteExtension { - return ResponseVerifyVoteExtension{Code: CodeTypeOK} + return ResponseVerifyVoteExtension{} } func (BaseApplication) Query(req RequestQuery) ResponseQuery { diff --git a/abci/types/result.go b/abci/types/result.go index a1fa168ecce..9d6e8c7614e 100644 --- a/abci/types/result.go +++ b/abci/types/result.go @@ -5,6 +5,8 @@ import ( "encoding/json" "github.com/gogo/protobuf/jsonpb" + + types "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( @@ -43,12 +45,12 @@ func (r ResponseQuery) IsErr() bool { // IsOK returns true if Code is OK func (r ResponseVerifyVoteExtension) IsOK() bool { - return r.Code == CodeTypeOK + return r.Result <= ResponseVerifyVoteExtension_ACCEPT } // IsErr returns true if Code is something other than OK. func (r ResponseVerifyVoteExtension) IsErr() bool { - return r.Code != CodeTypeOK + return r.Result > ResponseVerifyVoteExtension_ACCEPT } //--------------------------------------------------------------------------- @@ -128,3 +130,25 @@ var _ jsonRoundTripper = (*ResponseDeliverTx)(nil) var _ jsonRoundTripper = (*ResponseCheckTx)(nil) var _ jsonRoundTripper = (*EventAttribute)(nil) + +// ----------------------------------------------- +// construct Result data + +func RespondExtendVote(app_data_to_sign, app_data_self_authenticating []byte) ResponseExtendVote { + return ResponseExtendVote { + VoteExtension: &types.VoteExtension { + AppDataToSign: app_data_to_sign, + AppDataSelfAuthenticating: app_data_self_authenticating, + }, + } +} + +func RespondVerifyVoteExtension(ok bool) ResponseVerifyVoteExtension { + result := ResponseVerifyVoteExtension_REJECT + if ok { + result = ResponseVerifyVoteExtension_ACCEPT + } + return ResponseVerifyVoteExtension { + Result: result, + } +} diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 3d66e362ca4..f58e1b21c68 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -160,6 +160,37 @@ func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { return fileDescriptor_252557cfdd89a31a, []int{32, 0} } +type ResponseVerifyVoteExtension_Result int32 + +const ( + ResponseVerifyVoteExtension_UNKNOWN ResponseVerifyVoteExtension_Result = 0 + ResponseVerifyVoteExtension_ACCEPT ResponseVerifyVoteExtension_Result = 1 + ResponseVerifyVoteExtension_SLASH ResponseVerifyVoteExtension_Result = 2 + ResponseVerifyVoteExtension_REJECT ResponseVerifyVoteExtension_Result = 3 +) + +var ResponseVerifyVoteExtension_Result_name = map[int32]string{ + 0: "UNKNOWN", + 1: "ACCEPT", + 2: "SLASH", + 3: "REJECT", +} + +var ResponseVerifyVoteExtension_Result_value = map[string]int32{ + "UNKNOWN": 0, + "ACCEPT": 1, + "SLASH": 2, + "REJECT": 3, +} + +func (x ResponseVerifyVoteExtension_Result) String() string { + return proto.EnumName(ResponseVerifyVoteExtension_Result_name, int32(x)) +} + +func (ResponseVerifyVoteExtension_Result) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{34, 0} +} + type Request struct { // Types that are valid to be assigned to Value: // *Request_Echo @@ -1230,7 +1261,7 @@ func (m *RequestExtendVote) GetVote() *types1.Vote { // Verify the vote extension type RequestVerifyVoteExtension struct { - VoteExtension types1.VoteExtension `protobuf:"bytes,1,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension"` + Vote *types1.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` } func (m *RequestVerifyVoteExtension) Reset() { *m = RequestVerifyVoteExtension{} } @@ -1266,11 +1297,11 @@ func (m *RequestVerifyVoteExtension) XXX_DiscardUnknown() { var xxx_messageInfo_RequestVerifyVoteExtension proto.InternalMessageInfo -func (m *RequestVerifyVoteExtension) GetVoteExtension() types1.VoteExtension { +func (m *RequestVerifyVoteExtension) GetVote() *types1.Vote { if m != nil { - return m.VoteExtension + return m.Vote } - return types1.VoteExtension{} + return nil } type Response struct { @@ -2534,11 +2565,7 @@ func (m *ResponseExtendVote) GetVoteExtension() *types1.VoteExtension { } type ResponseVerifyVoteExtension struct { - // XXX - Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` - Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` + Result ResponseVerifyVoteExtension_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseVerifyVoteExtension_Result" json:"result,omitempty"` } func (m *ResponseVerifyVoteExtension) Reset() { *m = ResponseVerifyVoteExtension{} } @@ -2574,32 +2601,11 @@ func (m *ResponseVerifyVoteExtension) XXX_DiscardUnknown() { var xxx_messageInfo_ResponseVerifyVoteExtension proto.InternalMessageInfo -func (m *ResponseVerifyVoteExtension) GetCode() uint32 { - if m != nil { - return m.Code - } - return 0 -} - -func (m *ResponseVerifyVoteExtension) GetData() []byte { - if m != nil { - return m.Data - } - return nil -} - -func (m *ResponseVerifyVoteExtension) GetLog() string { - if m != nil { - return m.Log - } - return "" -} - -func (m *ResponseVerifyVoteExtension) GetInfo() string { +func (m *ResponseVerifyVoteExtension) GetResult() ResponseVerifyVoteExtension_Result { if m != nil { - return m.Info + return m.Result } - return "" + return ResponseVerifyVoteExtension_UNKNOWN } type LastCommitInfo struct { @@ -3164,6 +3170,7 @@ func init() { proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_value) proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterEnum("tendermint.abci.ResponseVerifyVoteExtension_Result", ResponseVerifyVoteExtension_Result_name, ResponseVerifyVoteExtension_Result_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") @@ -3213,181 +3220,182 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2780 bytes of a gzipped FileDescriptorProto + // 2795 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x77, 0x23, 0xc5, - 0x11, 0xd7, 0xa7, 0xa5, 0x29, 0x5b, 0x1f, 0x6e, 0x2f, 0x8b, 0x18, 0x16, 0x7b, 0x19, 0x1e, 0x04, - 0x16, 0xb0, 0x83, 0x79, 0x10, 0x78, 0x24, 0x01, 0x4b, 0xc8, 0x91, 0x59, 0xc7, 0x76, 0xda, 0xda, - 0xe5, 0x91, 0xc0, 0x0e, 0x23, 0x4d, 0x5b, 0x1a, 0x2c, 0xcd, 0x0c, 0x33, 0x23, 0x61, 0x71, 0xcc, - 0x4b, 0x2e, 0xbc, 0x1c, 0x38, 0xe6, 0xc2, 0xdf, 0x91, 0x9c, 0x72, 0xca, 0x81, 0x03, 0x07, 0x8e, - 0x39, 0x91, 0x3c, 0xb8, 0xe5, 0x1f, 0x20, 0x97, 0xbc, 0x97, 0xd7, 0x1f, 0xf3, 0x25, 0x69, 0x24, - 0x79, 0xe1, 0x96, 0x5b, 0x77, 0x75, 0x55, 0x4d, 0x77, 0x75, 0x77, 0xd5, 0xaf, 0xaa, 0x07, 0x1e, - 0xf7, 0x88, 0xa9, 0x13, 0x67, 0x68, 0x98, 0xde, 0x9e, 0xd6, 0xe9, 0x1a, 0x7b, 0xde, 0xc4, 0x26, - 0xee, 0xae, 0xed, 0x58, 0x9e, 0x85, 0x2a, 0xe1, 0xe0, 0x2e, 0x1d, 0x94, 0x9f, 0x88, 0x70, 0x77, - 0x9d, 0x89, 0xed, 0x59, 0x7b, 0xb6, 0x63, 0x59, 0x17, 0x9c, 0x5f, 0xbe, 0x15, 0x19, 0x66, 0x7a, - 0xa2, 0xda, 0x62, 0xa3, 0x42, 0xf8, 0x92, 0x4c, 0xfc, 0xd1, 0x27, 0x66, 0x64, 0x6d, 0xcd, 0xd1, - 0x86, 0xfe, 0xf0, 0x4e, 0xcf, 0xb2, 0x7a, 0x03, 0xb2, 0xc7, 0x7a, 0x9d, 0xd1, 0xc5, 0x9e, 0x67, - 0x0c, 0x89, 0xeb, 0x69, 0x43, 0x5b, 0x30, 0xdc, 0xe8, 0x59, 0x3d, 0x8b, 0x35, 0xf7, 0x68, 0x8b, - 0x53, 0x95, 0xef, 0x8b, 0x50, 0xc0, 0xe4, 0xe3, 0x11, 0x71, 0x3d, 0xb4, 0x0f, 0x39, 0xd2, 0xed, - 0x5b, 0xb5, 0xf4, 0xed, 0xf4, 0xb3, 0xeb, 0xfb, 0xb7, 0x76, 0xa7, 0x16, 0xb7, 0x2b, 0xf8, 0x9a, - 0xdd, 0xbe, 0xd5, 0x4a, 0x61, 0xc6, 0x8b, 0x5e, 0x81, 0xfc, 0xc5, 0x60, 0xe4, 0xf6, 0x6b, 0x19, - 0x26, 0xf4, 0x44, 0x92, 0xd0, 0x21, 0x65, 0x6a, 0xa5, 0x30, 0xe7, 0xa6, 0x9f, 0x32, 0xcc, 0x0b, - 0xab, 0x96, 0x5d, 0xfc, 0xa9, 0x23, 0xf3, 0x82, 0x7d, 0x8a, 0xf2, 0xa2, 0x3a, 0x80, 0x61, 0x1a, - 0x9e, 0xda, 0xed, 0x6b, 0x86, 0x59, 0xcb, 0x31, 0xc9, 0x27, 0x93, 0x25, 0x0d, 0xaf, 0x41, 0x19, - 0x5b, 0x29, 0x2c, 0x19, 0x7e, 0x87, 0x4e, 0xf7, 0xe3, 0x11, 0x71, 0x26, 0xb5, 0xfc, 0xe2, 0xe9, - 0xfe, 0x86, 0x32, 0xd1, 0xe9, 0x32, 0x6e, 0xd4, 0x84, 0xf5, 0x0e, 0xe9, 0x19, 0xa6, 0xda, 0x19, - 0x58, 0xdd, 0xcb, 0xda, 0x1a, 0x13, 0x56, 0x92, 0x84, 0xeb, 0x94, 0xb5, 0x4e, 0x39, 0x5b, 0x29, - 0x0c, 0x9d, 0xa0, 0x87, 0x7e, 0x0e, 0xc5, 0x6e, 0x9f, 0x74, 0x2f, 0x55, 0xef, 0xaa, 0x56, 0x60, - 0x3a, 0x76, 0x92, 0x74, 0x34, 0x28, 0x5f, 0xfb, 0xaa, 0x95, 0xc2, 0x85, 0x2e, 0x6f, 0xd2, 0xf5, - 0xeb, 0x64, 0x60, 0x8c, 0x89, 0x43, 0xe5, 0x8b, 0x8b, 0xd7, 0xff, 0x36, 0xe7, 0x64, 0x1a, 0x24, - 0xdd, 0xef, 0xa0, 0x37, 0x41, 0x22, 0xa6, 0x2e, 0x96, 0x21, 0x31, 0x15, 0xb7, 0x13, 0xf7, 0xd9, - 0xd4, 0xfd, 0x45, 0x14, 0x89, 0x68, 0xa3, 0xd7, 0x60, 0xad, 0x6b, 0x0d, 0x87, 0x86, 0x57, 0x03, - 0x26, 0xbd, 0x9d, 0xb8, 0x00, 0xc6, 0xd5, 0x4a, 0x61, 0xc1, 0x8f, 0x4e, 0xa0, 0x3c, 0x30, 0x5c, - 0x4f, 0x75, 0x4d, 0xcd, 0x76, 0xfb, 0x96, 0xe7, 0xd6, 0xd6, 0x99, 0x86, 0xa7, 0x93, 0x34, 0x1c, - 0x1b, 0xae, 0x77, 0xee, 0x33, 0xb7, 0x52, 0xb8, 0x34, 0x88, 0x12, 0xa8, 0x3e, 0xeb, 0xe2, 0x82, - 0x38, 0x81, 0xc2, 0xda, 0xc6, 0x62, 0x7d, 0xa7, 0x94, 0xdb, 0x97, 0xa7, 0xfa, 0xac, 0x28, 0x01, - 0xfd, 0x0e, 0xb6, 0x06, 0x96, 0xa6, 0x07, 0xea, 0xd4, 0x6e, 0x7f, 0x64, 0x5e, 0xd6, 0x4a, 0x4c, - 0xe9, 0x73, 0x89, 0x93, 0xb4, 0x34, 0xdd, 0x57, 0xd1, 0xa0, 0x02, 0xad, 0x14, 0xde, 0x1c, 0x4c, - 0x13, 0xd1, 0x03, 0xb8, 0xa1, 0xd9, 0xf6, 0x60, 0x32, 0xad, 0xbd, 0xcc, 0xb4, 0xdf, 0x49, 0xd2, - 0x7e, 0x40, 0x65, 0xa6, 0xd5, 0x23, 0x6d, 0x86, 0x4a, 0x0f, 0x28, 0xb9, 0xa2, 0x4a, 0xd4, 0xb1, - 0xe5, 0x91, 0x5a, 0x65, 0xf1, 0x01, 0x6d, 0x32, 0xd6, 0xfb, 0x96, 0x47, 0xe8, 0x01, 0x25, 0x41, - 0x0f, 0x69, 0xf0, 0xc8, 0x98, 0x38, 0xc6, 0xc5, 0x84, 0xa9, 0x51, 0xd9, 0x88, 0x6b, 0x58, 0x66, - 0xad, 0xca, 0x14, 0x3e, 0x9f, 0xa4, 0xf0, 0x3e, 0x13, 0xa2, 0x2a, 0x9a, 0xbe, 0x48, 0x2b, 0x85, - 0xb7, 0xc6, 0xb3, 0xe4, 0x7a, 0x01, 0xf2, 0x63, 0x6d, 0x30, 0x22, 0xca, 0x4f, 0x60, 0x3d, 0xe2, - 0x50, 0x50, 0x0d, 0x0a, 0x43, 0xe2, 0xba, 0x5a, 0x8f, 0x30, 0xff, 0x23, 0x61, 0xbf, 0xab, 0x94, - 0x61, 0x23, 0xea, 0x44, 0x94, 0xcf, 0xd3, 0x81, 0x24, 0xf5, 0x0f, 0x54, 0x72, 0x4c, 0x1c, 0x36, - 0x4d, 0x21, 0x29, 0xba, 0xe8, 0x29, 0x28, 0xb1, 0x93, 0xae, 0xfa, 0xe3, 0xd4, 0x49, 0xe5, 0xf0, - 0x06, 0x23, 0xde, 0x17, 0x4c, 0x3b, 0xb0, 0x6e, 0xef, 0xdb, 0x01, 0x4b, 0x96, 0xb1, 0x80, 0xbd, - 0x6f, 0xfb, 0x0c, 0x4f, 0xc2, 0x06, 0x5d, 0x6b, 0xc0, 0x91, 0x63, 0x1f, 0x59, 0xa7, 0x34, 0xc1, - 0xa2, 0x7c, 0x95, 0x81, 0xea, 0xb4, 0xe3, 0x41, 0xaf, 0x41, 0x8e, 0xfa, 0x60, 0xe1, 0x4e, 0xe5, - 0x5d, 0xee, 0xa0, 0x77, 0x7d, 0x07, 0xbd, 0xdb, 0xf6, 0x1d, 0x74, 0xbd, 0xf8, 0xe5, 0x37, 0x3b, - 0xa9, 0xcf, 0xff, 0xb9, 0x93, 0xc6, 0x4c, 0x02, 0x3d, 0x46, 0xfd, 0x84, 0x66, 0x98, 0xaa, 0xa1, - 0xb3, 0x29, 0x4b, 0xd4, 0x09, 0x68, 0x86, 0x79, 0xa4, 0xa3, 0x63, 0xa8, 0x76, 0x2d, 0xd3, 0x25, - 0xa6, 0x3b, 0x72, 0x55, 0x1e, 0x00, 0x84, 0x13, 0x8d, 0xb9, 0x02, 0x1e, 0x56, 0x1a, 0x3e, 0xe7, - 0x19, 0x63, 0xc4, 0x95, 0x6e, 0x9c, 0x80, 0x0e, 0x01, 0xc6, 0xda, 0xc0, 0xd0, 0x35, 0xcf, 0x72, - 0xdc, 0x5a, 0xee, 0x76, 0x76, 0xae, 0x3f, 0xb8, 0xef, 0xb3, 0xdc, 0xb3, 0x75, 0xcd, 0x23, 0xf5, - 0x1c, 0x9d, 0x2e, 0x8e, 0x48, 0xa2, 0x67, 0xa0, 0xa2, 0xd9, 0xb6, 0xea, 0x7a, 0x9a, 0x47, 0xd4, - 0xce, 0xc4, 0x23, 0x2e, 0x73, 0xb0, 0x1b, 0xb8, 0xa4, 0xd9, 0xf6, 0x39, 0xa5, 0xd6, 0x29, 0x11, - 0x3d, 0x0d, 0x65, 0xea, 0x8b, 0x0d, 0x6d, 0xa0, 0xf6, 0x89, 0xd1, 0xeb, 0x7b, 0xcc, 0x95, 0x66, - 0x71, 0x49, 0x50, 0x5b, 0x8c, 0xa8, 0xe8, 0xc1, 0x8e, 0x33, 0x3f, 0x8c, 0x10, 0xe4, 0x74, 0xcd, - 0xd3, 0x98, 0x25, 0x37, 0x30, 0x6b, 0x53, 0x9a, 0xad, 0x79, 0x7d, 0x61, 0x1f, 0xd6, 0x46, 0x37, - 0x61, 0x4d, 0xa8, 0xcd, 0x32, 0xb5, 0xa2, 0x87, 0x6e, 0x40, 0xde, 0x76, 0xac, 0x31, 0x61, 0x5b, - 0x57, 0xc4, 0xbc, 0xa3, 0xfc, 0x21, 0x03, 0x9b, 0x33, 0x1e, 0x9b, 0xea, 0xed, 0x6b, 0x6e, 0xdf, - 0xff, 0x16, 0x6d, 0xa3, 0x57, 0xa9, 0x5e, 0x4d, 0x27, 0x8e, 0x88, 0x72, 0xb5, 0x59, 0x53, 0xb7, - 0xd8, 0xb8, 0x30, 0x8d, 0xe0, 0x46, 0xa7, 0x50, 0x1d, 0x68, 0xae, 0xa7, 0x72, 0x0f, 0xa8, 0x46, - 0x22, 0xde, 0xac, 0xdf, 0x3f, 0xd6, 0x7c, 0x9f, 0x49, 0x0f, 0xb5, 0x50, 0x54, 0x1e, 0xc4, 0xa8, - 0x08, 0xc3, 0x8d, 0xce, 0xe4, 0x53, 0xcd, 0xf4, 0x0c, 0x93, 0xa8, 0x33, 0x3b, 0xf7, 0xd8, 0x8c, - 0xd2, 0xe6, 0xd8, 0xd0, 0x89, 0xd9, 0xf5, 0xb7, 0x6c, 0x2b, 0x10, 0x0e, 0xb6, 0xd4, 0x55, 0x30, - 0x94, 0xe3, 0x31, 0x07, 0x95, 0x21, 0xe3, 0x5d, 0x09, 0x03, 0x64, 0xbc, 0x2b, 0xf4, 0x53, 0xc8, - 0xd1, 0x45, 0xb2, 0xc5, 0x97, 0xe7, 0x04, 0x6b, 0x21, 0xd7, 0x9e, 0xd8, 0x04, 0x33, 0x4e, 0x45, - 0x09, 0xae, 0x43, 0x10, 0x87, 0xa6, 0xb5, 0x2a, 0xcf, 0x41, 0x65, 0x2a, 0xd0, 0x44, 0xf6, 0x2f, - 0x1d, 0xdd, 0x3f, 0xa5, 0x02, 0xa5, 0x58, 0x54, 0x51, 0x6e, 0xc2, 0x8d, 0x79, 0x41, 0x42, 0xe9, - 0x07, 0xf4, 0x98, 0xb3, 0x47, 0xaf, 0x40, 0x31, 0x88, 0x12, 0xfc, 0x3a, 0xce, 0xda, 0xca, 0x67, - 0xc6, 0x01, 0x2b, 0xbd, 0x87, 0xf4, 0x58, 0xb3, 0xf3, 0x90, 0x61, 0x13, 0x2f, 0x68, 0xb6, 0xdd, - 0xd2, 0xdc, 0xbe, 0xf2, 0x21, 0xd4, 0x92, 0x22, 0xc0, 0xd4, 0x32, 0x72, 0xc1, 0x31, 0xbc, 0x09, - 0x6b, 0x17, 0x96, 0x33, 0xd4, 0x3c, 0xa6, 0xac, 0x84, 0x45, 0x8f, 0x1e, 0x4f, 0x1e, 0x0d, 0xb2, - 0x8c, 0xcc, 0x3b, 0x8a, 0x0a, 0x8f, 0x25, 0x46, 0x01, 0x2a, 0x62, 0x98, 0x3a, 0xe1, 0xf6, 0x2c, - 0x61, 0xde, 0x09, 0x15, 0xf1, 0xc9, 0xf2, 0x0e, 0xfd, 0xac, 0xcb, 0xd6, 0xca, 0xf4, 0x4b, 0x58, - 0xf4, 0x94, 0x37, 0x83, 0xe3, 0x1f, 0xc6, 0x03, 0x74, 0x07, 0x72, 0x2c, 0x82, 0x70, 0x2b, 0xdd, - 0x9c, 0x3d, 0xe8, 0x94, 0x0b, 0x33, 0x1e, 0xe5, 0x23, 0x90, 0x93, 0xfd, 0x3f, 0x3a, 0x86, 0xf2, - 0x54, 0x10, 0x49, 0xcf, 0x1e, 0xfd, 0x50, 0x67, 0x18, 0x21, 0xf8, 0x59, 0x2d, 0x8d, 0xa3, 0x44, - 0xe5, 0x2b, 0x09, 0x8a, 0x98, 0xb8, 0x36, 0x75, 0x60, 0xa8, 0x0e, 0x12, 0xb9, 0xea, 0x12, 0xdb, - 0x0b, 0xb5, 0xce, 0x8b, 0x75, 0x9c, 0xbb, 0xe9, 0x73, 0x52, 0x24, 0x14, 0x88, 0xa1, 0x97, 0x05, - 0xd8, 0x4d, 0xc6, 0xad, 0x42, 0x3c, 0x8a, 0x76, 0x5f, 0xf5, 0xd1, 0x6e, 0x36, 0x11, 0xfc, 0x70, - 0xa9, 0x29, 0xb8, 0xfb, 0xb2, 0x80, 0xbb, 0xb9, 0x25, 0x1f, 0x8b, 0xe1, 0xdd, 0x46, 0x0c, 0xef, - 0xe6, 0x97, 0x2c, 0x33, 0x01, 0xf0, 0xbe, 0xea, 0x03, 0xde, 0xb5, 0x25, 0x33, 0x9e, 0x42, 0xbc, - 0x87, 0x71, 0xc4, 0xcb, 0xd1, 0xea, 0x53, 0x89, 0xd2, 0x89, 0x90, 0xf7, 0x17, 0x11, 0xc8, 0x5b, - 0x4c, 0xc4, 0x9b, 0x5c, 0xc9, 0x1c, 0xcc, 0xdb, 0x88, 0x61, 0x5e, 0x69, 0x89, 0x0d, 0x12, 0x40, - 0xef, 0x5b, 0x51, 0xd0, 0x0b, 0x89, 0xb8, 0x59, 0xec, 0xf7, 0x3c, 0xd4, 0xfb, 0x7a, 0x80, 0x7a, - 0xd7, 0x13, 0x61, 0xbb, 0x58, 0xc3, 0x34, 0xec, 0x3d, 0x9d, 0x81, 0xbd, 0x1c, 0xa6, 0x3e, 0x93, - 0xa8, 0x62, 0x09, 0xee, 0x3d, 0x9d, 0xc1, 0xbd, 0xa5, 0x25, 0x0a, 0x97, 0x00, 0xdf, 0xf7, 0xe7, - 0x03, 0xdf, 0x64, 0x68, 0x2a, 0xa6, 0xb9, 0x1a, 0xf2, 0x55, 0x13, 0x90, 0x6f, 0x25, 0x11, 0x51, - 0x72, 0xf5, 0x2b, 0x43, 0xdf, 0xc3, 0x38, 0xf4, 0xad, 0x2e, 0x39, 0xa9, 0x89, 0xd8, 0xb7, 0x93, - 0x84, 0x7d, 0x37, 0x99, 0xc6, 0x17, 0x12, 0x35, 0x3e, 0x0c, 0xf8, 0x7d, 0x8e, 0xfa, 0xde, 0x29, - 0xff, 0x44, 0xdd, 0x37, 0x71, 0x1c, 0xcb, 0x11, 0x30, 0x96, 0x77, 0x94, 0x67, 0x29, 0x18, 0x0a, - 0x7d, 0xd1, 0x02, 0xa0, 0xcc, 0xc2, 0x64, 0xc4, 0xff, 0x28, 0x7f, 0x4d, 0x87, 0xb2, 0x0c, 0x3f, - 0x44, 0x81, 0x94, 0x24, 0x80, 0x54, 0x04, 0x3e, 0x67, 0xe2, 0xf0, 0x79, 0x07, 0xd6, 0x69, 0xf8, - 0x9b, 0x42, 0xc6, 0x9a, 0x1d, 0x20, 0xe3, 0x3b, 0xb0, 0xc9, 0xf0, 0x0d, 0x07, 0xd9, 0x22, 0xe6, - 0xe5, 0x58, 0xe8, 0xae, 0xd0, 0x01, 0x7e, 0x91, 0x78, 0xf0, 0x7b, 0x11, 0xb6, 0x22, 0xbc, 0x41, - 0x58, 0xe5, 0x30, 0xb1, 0x1a, 0x70, 0x1f, 0x88, 0xf8, 0xfa, 0xf7, 0x74, 0x68, 0xa1, 0x10, 0x52, - 0xcf, 0x43, 0xbf, 0xe9, 0x1f, 0x09, 0xfd, 0x66, 0x1e, 0x1a, 0xfd, 0x46, 0x61, 0x42, 0x36, 0x0e, - 0x13, 0xbe, 0x4f, 0x87, 0x7b, 0x12, 0x60, 0xd9, 0xae, 0xa5, 0x13, 0x11, 0xb8, 0x59, 0x1b, 0x55, - 0x21, 0x3b, 0xb0, 0x7a, 0x22, 0x3c, 0xd3, 0x26, 0xe5, 0x0a, 0x02, 0x86, 0x24, 0xe2, 0x41, 0x10, - 0xf3, 0xf3, 0xcc, 0xc2, 0x22, 0xe6, 0x57, 0x21, 0x7b, 0x49, 0xb8, 0x7b, 0xdf, 0xc0, 0xb4, 0x49, - 0xf9, 0xd8, 0x21, 0x63, 0x4e, 0x7b, 0x03, 0xf3, 0x0e, 0x7a, 0x0d, 0x24, 0x56, 0x89, 0x52, 0x2d, - 0xdb, 0x15, 0x9e, 0xf8, 0xf1, 0xe8, 0x5a, 0x79, 0xc1, 0x69, 0xf7, 0x8c, 0xf2, 0x9c, 0xda, 0x2e, - 0x2e, 0xda, 0xa2, 0x15, 0x81, 0x33, 0x52, 0x0c, 0x55, 0xdf, 0x02, 0x89, 0xce, 0xde, 0xb5, 0xb5, - 0x2e, 0x61, 0x6e, 0x55, 0xc2, 0x21, 0x41, 0x79, 0x00, 0x68, 0x36, 0x38, 0xa0, 0x16, 0xac, 0x91, - 0x31, 0x31, 0x3d, 0xba, 0x6d, 0xd9, 0x69, 0x80, 0x21, 0x20, 0x2b, 0x31, 0xbd, 0x7a, 0x8d, 0x1a, - 0xf9, 0xdf, 0xdf, 0xec, 0x54, 0x39, 0xf7, 0x0b, 0xd6, 0xd0, 0xf0, 0xc8, 0xd0, 0xf6, 0x26, 0x58, - 0xc8, 0x2b, 0x7f, 0xc9, 0x50, 0xfc, 0x18, 0x0b, 0x1c, 0x73, 0x6d, 0xeb, 0x1f, 0xf9, 0x4c, 0x24, - 0x77, 0x58, 0xcd, 0xde, 0xdb, 0x00, 0x3d, 0xcd, 0x55, 0x3f, 0xd1, 0x4c, 0x8f, 0xe8, 0xc2, 0xe8, - 0x11, 0x0a, 0x92, 0xa1, 0x48, 0x7b, 0x23, 0x97, 0xe8, 0x22, 0x8d, 0x09, 0xfa, 0x91, 0x75, 0x16, - 0x7e, 0xd8, 0x3a, 0xe3, 0x56, 0x2e, 0x4e, 0x59, 0x39, 0x82, 0xed, 0xa4, 0x28, 0xb6, 0xa3, 0x73, - 0xb3, 0x1d, 0xc3, 0x72, 0x0c, 0x6f, 0xc2, 0xb6, 0x26, 0x8b, 0x83, 0xbe, 0xf2, 0xc7, 0x4c, 0x78, - 0xb5, 0x42, 0x78, 0xfe, 0x7f, 0x67, 0x3b, 0xe5, 0x4f, 0x2c, 0x69, 0x8f, 0x47, 0x7d, 0x74, 0x0e, - 0x9b, 0xc1, 0xcd, 0x56, 0x47, 0xec, 0xc6, 0xfb, 0x67, 0x75, 0x55, 0xd7, 0x50, 0x1d, 0xc7, 0xc9, - 0x2e, 0x7a, 0x0f, 0x1e, 0x9d, 0x72, 0x5b, 0x81, 0xea, 0xcc, 0xaa, 0xde, 0xeb, 0x91, 0xb8, 0xf7, - 0xf2, 0x55, 0x87, 0xc6, 0xca, 0xfe, 0xc0, 0x0b, 0x75, 0x44, 0xf3, 0xc0, 0x28, 0x88, 0x99, 0xbb, - 0xfd, 0x4f, 0x41, 0xc9, 0x21, 0x9e, 0x66, 0x98, 0x6a, 0x2c, 0xd3, 0xde, 0xe0, 0x44, 0x91, 0xbf, - 0x9f, 0xc1, 0x23, 0x73, 0xc1, 0x0c, 0xfa, 0x19, 0x48, 0x21, 0x0e, 0x4a, 0x27, 0x24, 0xad, 0x41, - 0x22, 0x16, 0xf2, 0x2a, 0x7f, 0x4b, 0x87, 0x2a, 0xe3, 0xa9, 0x5d, 0x13, 0xd6, 0x1c, 0xe2, 0x8e, - 0x06, 0x3c, 0xd9, 0x2a, 0xef, 0xbf, 0xb8, 0x1a, 0x0c, 0xa2, 0xd4, 0xd1, 0xc0, 0xc3, 0x42, 0x58, - 0x79, 0x00, 0x6b, 0x9c, 0x82, 0xd6, 0xa1, 0x70, 0xef, 0xe4, 0xee, 0xc9, 0xe9, 0xbb, 0x27, 0xd5, - 0x14, 0x02, 0x58, 0x3b, 0x68, 0x34, 0x9a, 0x67, 0xed, 0x6a, 0x1a, 0x49, 0x90, 0x3f, 0xa8, 0x9f, - 0xe2, 0x76, 0x35, 0x43, 0xc9, 0xb8, 0xf9, 0x4e, 0xb3, 0xd1, 0xae, 0x66, 0xd1, 0x26, 0x94, 0x78, - 0x5b, 0x3d, 0x3c, 0xc5, 0xbf, 0x3e, 0x68, 0x57, 0x73, 0x11, 0xd2, 0x79, 0xf3, 0xe4, 0xed, 0x26, - 0xae, 0xe6, 0x95, 0x97, 0x68, 0x36, 0x97, 0x00, 0x9c, 0xc2, 0xbc, 0x2d, 0x1d, 0xc9, 0xdb, 0x94, - 0x3f, 0x67, 0x68, 0x7e, 0x95, 0x84, 0x86, 0xd0, 0x3b, 0x53, 0x0b, 0xdf, 0xbf, 0x06, 0x94, 0x9a, - 0x5a, 0x3d, 0x7a, 0x1a, 0xca, 0x0e, 0xb9, 0x20, 0x5e, 0xb7, 0xcf, 0xd1, 0x19, 0x8f, 0x86, 0x25, - 0x5c, 0x12, 0x54, 0x26, 0xe4, 0x72, 0xb6, 0x8f, 0x48, 0xd7, 0x53, 0xb9, 0x9b, 0xe1, 0x87, 0x4e, - 0xa2, 0x6c, 0x94, 0x7a, 0xce, 0x89, 0xca, 0x87, 0xd7, 0xb2, 0xa5, 0x04, 0x79, 0xdc, 0x6c, 0xe3, - 0xf7, 0xaa, 0x59, 0x84, 0xa0, 0xcc, 0x9a, 0xea, 0xf9, 0xc9, 0xc1, 0xd9, 0x79, 0xeb, 0x94, 0xda, - 0x72, 0x0b, 0x2a, 0xbe, 0x2d, 0x7d, 0x62, 0x5e, 0x79, 0x3f, 0x0c, 0x2e, 0x91, 0xdc, 0xf5, 0xf0, - 0x21, 0x33, 0xce, 0xe9, 0x5c, 0xf3, 0x12, 0x1e, 0x5f, 0x80, 0xed, 0x7e, 0x5c, 0x4f, 0xa9, 0x7c, - 0x00, 0xe5, 0x78, 0xe9, 0x87, 0x9e, 0x06, 0xc7, 0x1a, 0x99, 0x3a, 0xfb, 0x40, 0x1e, 0xf3, 0x0e, - 0x7a, 0x05, 0xf2, 0x74, 0x96, 0x3e, 0x4e, 0x99, 0xbd, 0x36, 0x74, 0x92, 0x91, 0xd2, 0x11, 0xe7, - 0x56, 0x3e, 0x85, 0x3c, 0x73, 0x00, 0xf4, 0xdb, 0xac, 0x88, 0x23, 0xa0, 0x1f, 0x6d, 0xa3, 0x0f, - 0x00, 0x34, 0xcf, 0x73, 0x8c, 0xce, 0x28, 0x54, 0xbc, 0x33, 0xdf, 0x81, 0x1c, 0xf8, 0x7c, 0xf5, - 0x5b, 0xc2, 0x93, 0xdc, 0x08, 0x45, 0x23, 0xde, 0x24, 0xa2, 0x50, 0x39, 0x81, 0x72, 0x5c, 0xd6, - 0x07, 0x2b, 0x7c, 0x0e, 0x71, 0xb0, 0xc2, 0xb1, 0xa7, 0x00, 0x2b, 0x01, 0xd4, 0xc9, 0xf2, 0x82, - 0x1d, 0xeb, 0x28, 0x9f, 0xa5, 0xa1, 0xd8, 0xbe, 0x12, 0x47, 0x2b, 0xa1, 0x56, 0x14, 0x8a, 0x66, - 0xa2, 0x95, 0x11, 0x5e, 0x7c, 0xca, 0x06, 0x25, 0xad, 0xb7, 0x82, 0xcb, 0x93, 0x5b, 0x35, 0xa7, - 0xf4, 0x6b, 0x7b, 0xc2, 0x61, 0xbc, 0x01, 0x52, 0xe0, 0xfe, 0x29, 0x86, 0xd6, 0x74, 0xdd, 0x21, - 0xae, 0x2b, 0xae, 0xb0, 0xdf, 0x65, 0xa5, 0x47, 0xeb, 0x13, 0x51, 0x7b, 0xc9, 0x62, 0xde, 0x51, - 0x74, 0xa8, 0x4c, 0xc5, 0x0e, 0xf4, 0x06, 0x14, 0xec, 0x51, 0x47, 0xf5, 0xcd, 0x33, 0xf5, 0x28, - 0xe6, 0xa3, 0xb3, 0x51, 0x67, 0x60, 0x74, 0xef, 0x92, 0x89, 0x3f, 0x19, 0x7b, 0xd4, 0xb9, 0xcb, - 0xad, 0xc8, 0xbf, 0x92, 0x89, 0x7e, 0x65, 0x0c, 0x45, 0xff, 0x50, 0xa0, 0x5f, 0x82, 0x14, 0x84, - 0xa5, 0xa0, 0x22, 0x9d, 0x18, 0xcf, 0x84, 0xfa, 0x50, 0x84, 0x42, 0x7d, 0xd7, 0xe8, 0x99, 0x44, - 0x57, 0x43, 0x14, 0xcf, 0xbe, 0x56, 0xc4, 0x15, 0x3e, 0x70, 0xec, 0x43, 0x78, 0xe5, 0xbf, 0x69, - 0x28, 0xfa, 0x95, 0x47, 0xf4, 0x52, 0xe4, 0xdc, 0x95, 0xe7, 0x94, 0x3e, 0x7c, 0xc6, 0xb0, 0x7a, - 0x18, 0x9f, 0x6b, 0xe6, 0xfa, 0x73, 0x4d, 0x2a, 0x03, 0xfb, 0x05, 0xf9, 0xdc, 0xb5, 0x0b, 0xf2, - 0x2f, 0x00, 0xf2, 0x2c, 0x4f, 0x1b, 0xd0, 0xd4, 0xd0, 0x30, 0x7b, 0x2a, 0x37, 0x36, 0x87, 0x35, - 0x55, 0x36, 0x72, 0x9f, 0x0d, 0x9c, 0x31, 0xbb, 0xff, 0x3e, 0x0d, 0xc5, 0x20, 0x3e, 0x5d, 0xb7, - 0x18, 0x78, 0x13, 0xd6, 0x84, 0x0b, 0xe6, 0xd5, 0x40, 0xd1, 0x0b, 0xea, 0xd2, 0xb9, 0x48, 0x5d, - 0x5a, 0x86, 0xe2, 0x90, 0x78, 0x1a, 0xf3, 0x3c, 0x3c, 0x91, 0x0a, 0xfa, 0x77, 0x5e, 0x87, 0xf5, - 0x48, 0x5d, 0x96, 0xde, 0xbc, 0x93, 0xe6, 0xbb, 0xd5, 0x94, 0x5c, 0xf8, 0xec, 0x8b, 0xdb, 0xd9, - 0x13, 0xf2, 0x09, 0x3d, 0xb3, 0xb8, 0xd9, 0x68, 0x35, 0x1b, 0x77, 0xab, 0x69, 0x79, 0xfd, 0xb3, - 0x2f, 0x6e, 0x17, 0x30, 0x61, 0x65, 0x97, 0x3b, 0x2d, 0xd8, 0x88, 0xee, 0x4a, 0xdc, 0x8b, 0x23, - 0x28, 0xbf, 0x7d, 0xef, 0xec, 0xf8, 0xa8, 0x71, 0xd0, 0x6e, 0xaa, 0xf7, 0x4f, 0xdb, 0xcd, 0x6a, - 0x1a, 0x3d, 0x0a, 0x5b, 0xc7, 0x47, 0xbf, 0x6a, 0xb5, 0xd5, 0xc6, 0xf1, 0x51, 0xf3, 0xa4, 0xad, - 0x1e, 0xb4, 0xdb, 0x07, 0x8d, 0xbb, 0xd5, 0xcc, 0xfe, 0x7f, 0x00, 0x2a, 0x07, 0xf5, 0xc6, 0x11, - 0x8d, 0x40, 0x46, 0x57, 0x63, 0x59, 0x6e, 0x03, 0x72, 0x2c, 0x8f, 0x5d, 0xf8, 0xbe, 0x2c, 0x2f, - 0x2e, 0xc8, 0xa1, 0x43, 0xc8, 0xb3, 0x14, 0x17, 0x2d, 0x7e, 0x70, 0x96, 0x97, 0x54, 0xe8, 0xe8, - 0x64, 0xd8, 0xf5, 0x58, 0xf8, 0x02, 0x2d, 0x2f, 0x2e, 0xd8, 0x21, 0x0c, 0x52, 0x88, 0xa3, 0x97, - 0xbf, 0xc8, 0xca, 0x2b, 0x38, 0x1b, 0x74, 0x0c, 0x05, 0x3f, 0xab, 0x59, 0xf6, 0x46, 0x2c, 0x2f, - 0xad, 0xa8, 0x51, 0x73, 0xf1, 0xec, 0x73, 0xf1, 0x83, 0xb7, 0xbc, 0xa4, 0x3c, 0x88, 0x8e, 0x60, - 0x4d, 0x60, 0xc3, 0x25, 0xef, 0xbe, 0xf2, 0xb2, 0x0a, 0x19, 0x35, 0x5a, 0x98, 0xd7, 0x2f, 0x7f, - 0xc6, 0x97, 0x57, 0xa8, 0x7c, 0xa2, 0x7b, 0x00, 0x91, 0x5c, 0x73, 0x85, 0xf7, 0x79, 0x79, 0x95, - 0x8a, 0x26, 0x3a, 0x85, 0x62, 0x90, 0x1f, 0x2c, 0x7d, 0x2d, 0x97, 0x97, 0x97, 0x16, 0xd1, 0x03, - 0x28, 0xc5, 0x71, 0xf1, 0x6a, 0x6f, 0xe0, 0xf2, 0x8a, 0x35, 0x43, 0xaa, 0x3f, 0x0e, 0x92, 0x57, - 0x7b, 0x13, 0x97, 0x57, 0x2c, 0x21, 0xa2, 0x8f, 0x60, 0x73, 0x16, 0xc4, 0xae, 0xfe, 0x44, 0x2e, - 0x5f, 0xa3, 0xa8, 0x88, 0x86, 0x80, 0xe6, 0x80, 0xdf, 0x6b, 0xbc, 0x98, 0xcb, 0xd7, 0xa9, 0x31, - 0xd2, 0x23, 0x14, 0x41, 0x94, 0x2b, 0xbc, 0xa0, 0xcb, 0xab, 0x94, 0x1a, 0x91, 0x0d, 0x5b, 0xf3, - 0xa0, 0xe4, 0x75, 0x1e, 0xd4, 0xe5, 0x6b, 0x55, 0x20, 0xeb, 0xcd, 0x2f, 0xbf, 0xdd, 0x4e, 0x7f, - 0xfd, 0xed, 0x76, 0xfa, 0x5f, 0xdf, 0x6e, 0xa7, 0x3f, 0xff, 0x6e, 0x3b, 0xf5, 0xf5, 0x77, 0xdb, - 0xa9, 0x7f, 0x7c, 0xb7, 0x9d, 0xfa, 0xed, 0xf3, 0x3d, 0xc3, 0xeb, 0x8f, 0x3a, 0xbb, 0x5d, 0x6b, - 0xb8, 0x17, 0xfd, 0xa7, 0x68, 0xde, 0x7f, 0x4e, 0x9d, 0x35, 0x16, 0x1d, 0x5f, 0xfe, 0x5f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x04, 0xfd, 0x7b, 0xc6, 0x07, 0x25, 0x00, 0x00, + 0x11, 0xd7, 0xa7, 0xad, 0x29, 0x5b, 0xb2, 0xdc, 0x5e, 0x16, 0x31, 0x2c, 0xf6, 0x32, 0x3c, 0x08, + 0x2c, 0x60, 0x07, 0xef, 0x83, 0x2c, 0x8f, 0x24, 0x20, 0x09, 0x39, 0x32, 0xeb, 0xd8, 0x4e, 0x5b, + 0xbb, 0x3c, 0x12, 0xd8, 0x61, 0xa4, 0x69, 0x4b, 0xc3, 0x4a, 0x33, 0xc3, 0xcc, 0x48, 0x58, 0x1c, + 0xf3, 0x92, 0x0b, 0x2f, 0x07, 0x8e, 0xb9, 0x70, 0xcb, 0xff, 0x90, 0x9c, 0x72, 0xca, 0x81, 0x03, + 0x07, 0x8e, 0x39, 0x91, 0x3c, 0xf6, 0x96, 0x7f, 0x80, 0x5c, 0xf2, 0x5e, 0x5e, 0x7f, 0xcc, 0x97, + 0xa4, 0xd1, 0x07, 0xe4, 0x96, 0x5b, 0x57, 0x75, 0x55, 0xa9, 0xbb, 0xba, 0xa7, 0xea, 0x57, 0xd5, + 0x82, 0x27, 0x3d, 0x62, 0xea, 0xc4, 0x19, 0x18, 0xa6, 0x77, 0xa0, 0xb5, 0x3b, 0xc6, 0x81, 0x37, + 0xb6, 0x89, 0xbb, 0x6f, 0x3b, 0x96, 0x67, 0xa1, 0xad, 0x70, 0x72, 0x9f, 0x4e, 0xca, 0x4f, 0x45, + 0xa4, 0x3b, 0xce, 0xd8, 0xf6, 0xac, 0x03, 0xdb, 0xb1, 0xac, 0x4b, 0x2e, 0x2f, 0xdf, 0x88, 0x4c, + 0x33, 0x3b, 0x51, 0x6b, 0xb1, 0x59, 0xa1, 0xfc, 0x90, 0x8c, 0xfd, 0xd9, 0xa7, 0xa6, 0x74, 0x6d, + 0xcd, 0xd1, 0x06, 0xfe, 0xf4, 0x5e, 0xd7, 0xb2, 0xba, 0x7d, 0x72, 0xc0, 0xa8, 0xf6, 0xf0, 0xf2, + 0xc0, 0x33, 0x06, 0xc4, 0xf5, 0xb4, 0x81, 0x2d, 0x04, 0xae, 0x75, 0xad, 0xae, 0xc5, 0x86, 0x07, + 0x74, 0xc4, 0xb9, 0xca, 0x77, 0x05, 0x58, 0xc7, 0xe4, 0xe3, 0x21, 0x71, 0x3d, 0x74, 0x08, 0x39, + 0xd2, 0xe9, 0x59, 0x95, 0xf4, 0xcd, 0xf4, 0xf3, 0x1b, 0x87, 0x37, 0xf6, 0x27, 0x36, 0xb7, 0x2f, + 0xe4, 0x1a, 0x9d, 0x9e, 0xd5, 0x4c, 0x61, 0x26, 0x8b, 0x5e, 0x85, 0xfc, 0x65, 0x7f, 0xe8, 0xf6, + 0x2a, 0x19, 0xa6, 0xf4, 0x54, 0x92, 0xd2, 0x11, 0x15, 0x6a, 0xa6, 0x30, 0x97, 0xa6, 0x3f, 0x65, + 0x98, 0x97, 0x56, 0x25, 0x3b, 0xff, 0xa7, 0x8e, 0xcd, 0x4b, 0xf6, 0x53, 0x54, 0x16, 0xd5, 0x00, + 0x0c, 0xd3, 0xf0, 0xd4, 0x4e, 0x4f, 0x33, 0xcc, 0x4a, 0x8e, 0x69, 0x3e, 0x9d, 0xac, 0x69, 0x78, + 0x75, 0x2a, 0xd8, 0x4c, 0x61, 0xc9, 0xf0, 0x09, 0xba, 0xdc, 0x8f, 0x87, 0xc4, 0x19, 0x57, 0xf2, + 0xf3, 0x97, 0xfb, 0x2b, 0x2a, 0x44, 0x97, 0xcb, 0xa4, 0x51, 0x03, 0x36, 0xda, 0xa4, 0x6b, 0x98, + 0x6a, 0xbb, 0x6f, 0x75, 0x1e, 0x56, 0xd6, 0x98, 0xb2, 0x92, 0xa4, 0x5c, 0xa3, 0xa2, 0x35, 0x2a, + 0xd9, 0x4c, 0x61, 0x68, 0x07, 0x14, 0xfa, 0x29, 0x14, 0x3a, 0x3d, 0xd2, 0x79, 0xa8, 0x7a, 0x57, + 0x95, 0x75, 0x66, 0x63, 0x2f, 0xc9, 0x46, 0x9d, 0xca, 0xb5, 0xae, 0x9a, 0x29, 0xbc, 0xde, 0xe1, + 0x43, 0xba, 0x7f, 0x9d, 0xf4, 0x8d, 0x11, 0x71, 0xa8, 0x7e, 0x61, 0xfe, 0xfe, 0xdf, 0xe6, 0x92, + 0xcc, 0x82, 0xa4, 0xfb, 0x04, 0x7a, 0x13, 0x24, 0x62, 0xea, 0x62, 0x1b, 0x12, 0x33, 0x71, 0x33, + 0xf1, 0x9c, 0x4d, 0xdd, 0xdf, 0x44, 0x81, 0x88, 0x31, 0xba, 0x03, 0x6b, 0x1d, 0x6b, 0x30, 0x30, + 0xbc, 0x0a, 0x30, 0xed, 0xdd, 0xc4, 0x0d, 0x30, 0xa9, 0x66, 0x0a, 0x0b, 0x79, 0x74, 0x0a, 0xa5, + 0xbe, 0xe1, 0x7a, 0xaa, 0x6b, 0x6a, 0xb6, 0xdb, 0xb3, 0x3c, 0xb7, 0xb2, 0xc1, 0x2c, 0x3c, 0x9b, + 0x64, 0xe1, 0xc4, 0x70, 0xbd, 0x0b, 0x5f, 0xb8, 0x99, 0xc2, 0xc5, 0x7e, 0x94, 0x41, 0xed, 0x59, + 0x97, 0x97, 0xc4, 0x09, 0x0c, 0x56, 0x36, 0xe7, 0xdb, 0x3b, 0xa3, 0xd2, 0xbe, 0x3e, 0xb5, 0x67, + 0x45, 0x19, 0xe8, 0x37, 0xb0, 0xd3, 0xb7, 0x34, 0x3d, 0x30, 0xa7, 0x76, 0x7a, 0x43, 0xf3, 0x61, + 0xa5, 0xc8, 0x8c, 0xbe, 0x90, 0xb8, 0x48, 0x4b, 0xd3, 0x7d, 0x13, 0x75, 0xaa, 0xd0, 0x4c, 0xe1, + 0xed, 0xfe, 0x24, 0x13, 0x3d, 0x80, 0x6b, 0x9a, 0x6d, 0xf7, 0xc7, 0x93, 0xd6, 0x4b, 0xcc, 0xfa, + 0xad, 0x24, 0xeb, 0x55, 0xaa, 0x33, 0x69, 0x1e, 0x69, 0x53, 0x5c, 0x7a, 0x41, 0xc9, 0x15, 0x35, + 0xa2, 0x8e, 0x2c, 0x8f, 0x54, 0xb6, 0xe6, 0x5f, 0xd0, 0x06, 0x13, 0xbd, 0x6f, 0x79, 0x84, 0x5e, + 0x50, 0x12, 0x50, 0x48, 0x83, 0xc7, 0x46, 0xc4, 0x31, 0x2e, 0xc7, 0xcc, 0x8c, 0xca, 0x66, 0x5c, + 0xc3, 0x32, 0x2b, 0x65, 0x66, 0xf0, 0xc5, 0x24, 0x83, 0xf7, 0x99, 0x12, 0x35, 0xd1, 0xf0, 0x55, + 0x9a, 0x29, 0xbc, 0x33, 0x9a, 0x66, 0xd7, 0xd6, 0x21, 0x3f, 0xd2, 0xfa, 0x43, 0xa2, 0xfc, 0x08, + 0x36, 0x22, 0x01, 0x05, 0x55, 0x60, 0x7d, 0x40, 0x5c, 0x57, 0xeb, 0x12, 0x16, 0x7f, 0x24, 0xec, + 0x93, 0x4a, 0x09, 0x36, 0xa3, 0x41, 0x44, 0xf9, 0x3c, 0x1d, 0x68, 0xd2, 0xf8, 0x40, 0x35, 0x47, + 0xc4, 0x61, 0xcb, 0x14, 0x9a, 0x82, 0x44, 0xcf, 0x40, 0x91, 0xdd, 0x74, 0xd5, 0x9f, 0xa7, 0x41, + 0x2a, 0x87, 0x37, 0x19, 0xf3, 0xbe, 0x10, 0xda, 0x83, 0x0d, 0xfb, 0xd0, 0x0e, 0x44, 0xb2, 0x4c, + 0x04, 0xec, 0x43, 0xdb, 0x17, 0x78, 0x1a, 0x36, 0xe9, 0x5e, 0x03, 0x89, 0x1c, 0xfb, 0x91, 0x0d, + 0xca, 0x13, 0x22, 0xca, 0x57, 0x19, 0x28, 0x4f, 0x06, 0x1e, 0x74, 0x07, 0x72, 0x34, 0x06, 0x8b, + 0x70, 0x2a, 0xef, 0xf3, 0x00, 0xbd, 0xef, 0x07, 0xe8, 0xfd, 0x96, 0x1f, 0xa0, 0x6b, 0x85, 0x2f, + 0xbf, 0xd9, 0x4b, 0x7d, 0xfe, 0x8f, 0xbd, 0x34, 0x66, 0x1a, 0xe8, 0x09, 0x1a, 0x27, 0x34, 0xc3, + 0x54, 0x0d, 0x9d, 0x2d, 0x59, 0xa2, 0x41, 0x40, 0x33, 0xcc, 0x63, 0x1d, 0x9d, 0x40, 0xb9, 0x63, + 0x99, 0x2e, 0x31, 0xdd, 0xa1, 0xab, 0xf2, 0x04, 0x20, 0x82, 0x68, 0x2c, 0x14, 0xf0, 0xb4, 0x52, + 0xf7, 0x25, 0xcf, 0x99, 0x20, 0xde, 0xea, 0xc4, 0x19, 0xe8, 0x08, 0x60, 0xa4, 0xf5, 0x0d, 0x5d, + 0xf3, 0x2c, 0xc7, 0xad, 0xe4, 0x6e, 0x66, 0x67, 0xc6, 0x83, 0xfb, 0xbe, 0xc8, 0x3d, 0x5b, 0xd7, + 0x3c, 0x52, 0xcb, 0xd1, 0xe5, 0xe2, 0x88, 0x26, 0x7a, 0x0e, 0xb6, 0x34, 0xdb, 0x56, 0x5d, 0x4f, + 0xf3, 0x88, 0xda, 0x1e, 0x7b, 0xc4, 0x65, 0x01, 0x76, 0x13, 0x17, 0x35, 0xdb, 0xbe, 0xa0, 0xdc, + 0x1a, 0x65, 0xa2, 0x67, 0xa1, 0x44, 0x63, 0xb1, 0xa1, 0xf5, 0xd5, 0x1e, 0x31, 0xba, 0x3d, 0x8f, + 0x85, 0xd2, 0x2c, 0x2e, 0x0a, 0x6e, 0x93, 0x31, 0x15, 0x3d, 0x38, 0x71, 0x16, 0x87, 0x11, 0x82, + 0x9c, 0xae, 0x79, 0x1a, 0xf3, 0xe4, 0x26, 0x66, 0x63, 0xca, 0xb3, 0x35, 0xaf, 0x27, 0xfc, 0xc3, + 0xc6, 0xe8, 0x3a, 0xac, 0x09, 0xb3, 0x59, 0x66, 0x56, 0x50, 0xe8, 0x1a, 0xe4, 0x6d, 0xc7, 0x1a, + 0x11, 0x76, 0x74, 0x05, 0xcc, 0x09, 0xe5, 0x77, 0x19, 0xd8, 0x9e, 0x8a, 0xd8, 0xd4, 0x6e, 0x4f, + 0x73, 0x7b, 0xfe, 0x6f, 0xd1, 0x31, 0x7a, 0x8d, 0xda, 0xd5, 0x74, 0xe2, 0x88, 0x2c, 0x57, 0x99, + 0x76, 0x75, 0x93, 0xcd, 0x0b, 0xd7, 0x08, 0x69, 0x74, 0x06, 0xe5, 0xbe, 0xe6, 0x7a, 0x2a, 0x8f, + 0x80, 0x6a, 0x24, 0xe3, 0x4d, 0xc7, 0xfd, 0x13, 0xcd, 0x8f, 0x99, 0xf4, 0x52, 0x0b, 0x43, 0xa5, + 0x7e, 0x8c, 0x8b, 0x30, 0x5c, 0x6b, 0x8f, 0x3f, 0xd5, 0x4c, 0xcf, 0x30, 0x89, 0x3a, 0x75, 0x72, + 0x4f, 0x4c, 0x19, 0x6d, 0x8c, 0x0c, 0x9d, 0x98, 0x1d, 0xff, 0xc8, 0x76, 0x02, 0xe5, 0xe0, 0x48, + 0x5d, 0x05, 0x43, 0x29, 0x9e, 0x73, 0x50, 0x09, 0x32, 0xde, 0x95, 0x70, 0x40, 0xc6, 0xbb, 0x42, + 0x3f, 0x86, 0x1c, 0xdd, 0x24, 0xdb, 0x7c, 0x69, 0x46, 0xb2, 0x16, 0x7a, 0xad, 0xb1, 0x4d, 0x30, + 0x93, 0x54, 0x94, 0xe0, 0x73, 0x08, 0xf2, 0xd0, 0xa4, 0x55, 0xe5, 0x05, 0xd8, 0x9a, 0x48, 0x34, + 0x91, 0xf3, 0x4b, 0x47, 0xcf, 0x4f, 0xd9, 0x82, 0x62, 0x2c, 0xab, 0x28, 0xd7, 0xe1, 0xda, 0xac, + 0x24, 0xa1, 0xf4, 0x02, 0x7e, 0x2c, 0xd8, 0xa3, 0x57, 0xa1, 0x10, 0x64, 0x09, 0xfe, 0x39, 0x4e, + 0xfb, 0xca, 0x17, 0xc6, 0x81, 0x28, 0xfd, 0x0e, 0xe9, 0xb5, 0x66, 0xf7, 0x21, 0xc3, 0x16, 0xbe, + 0xae, 0xd9, 0x76, 0x53, 0x73, 0x7b, 0xca, 0x87, 0x50, 0x49, 0xca, 0x00, 0x13, 0xdb, 0xc8, 0x05, + 0xd7, 0xf0, 0x3a, 0xac, 0x5d, 0x5a, 0xce, 0x40, 0xf3, 0x98, 0xb1, 0x22, 0x16, 0x14, 0xbd, 0x9e, + 0x3c, 0x1b, 0x64, 0x19, 0x9b, 0x13, 0x8a, 0x0a, 0x4f, 0x24, 0x66, 0x01, 0xaa, 0x62, 0x98, 0x3a, + 0xe1, 0xfe, 0x2c, 0x62, 0x4e, 0x84, 0x86, 0xf8, 0x62, 0x39, 0x41, 0x7f, 0xd6, 0x65, 0x7b, 0x65, + 0xf6, 0x25, 0x2c, 0x28, 0xe5, 0xcd, 0xe0, 0xfa, 0x87, 0xf9, 0x00, 0xdd, 0x82, 0x1c, 0xcb, 0x20, + 0xdc, 0x4b, 0xd7, 0xa7, 0x2f, 0x3a, 0x95, 0xc2, 0x4c, 0x46, 0x69, 0x82, 0x9c, 0x1c, 0xff, 0x57, + 0xb2, 0xf4, 0x95, 0x04, 0x05, 0x4c, 0x5c, 0x9b, 0x86, 0x27, 0x54, 0x03, 0x89, 0x5c, 0x75, 0x88, + 0xed, 0xf9, 0x11, 0x7d, 0x76, 0x26, 0xe3, 0xd2, 0x0d, 0x5f, 0x92, 0xe2, 0x9c, 0x40, 0x0d, 0xdd, + 0x16, 0x50, 0x36, 0x19, 0x95, 0x0a, 0xf5, 0x28, 0x96, 0x7d, 0xcd, 0xc7, 0xb2, 0xd9, 0x44, 0x68, + 0xc3, 0xb5, 0x26, 0xc0, 0xec, 0x6d, 0x01, 0x66, 0x73, 0x0b, 0x7e, 0x2c, 0x86, 0x66, 0xeb, 0x31, + 0x34, 0x9b, 0x5f, 0xb0, 0xcd, 0x04, 0x38, 0xfb, 0x9a, 0x0f, 0x67, 0xd7, 0x16, 0xac, 0x78, 0x02, + 0xcf, 0x1e, 0xc5, 0xf1, 0x2c, 0xc7, 0xa2, 0xcf, 0x24, 0x6a, 0x27, 0x02, 0xda, 0x9f, 0x45, 0x00, + 0x6d, 0x21, 0x11, 0x4d, 0x72, 0x23, 0x33, 0x10, 0x6d, 0x3d, 0x86, 0x68, 0xa5, 0x05, 0x3e, 0x48, + 0x80, 0xb4, 0x6f, 0x45, 0x21, 0x2d, 0x24, 0xa2, 0x62, 0x71, 0xde, 0xb3, 0x30, 0xed, 0xeb, 0x01, + 0xa6, 0xdd, 0x48, 0x04, 0xe5, 0x62, 0x0f, 0x93, 0xa0, 0xf6, 0x6c, 0x0a, 0xd4, 0x72, 0x10, 0xfa, + 0x5c, 0xa2, 0x89, 0x05, 0xa8, 0xf6, 0x6c, 0x0a, 0xd5, 0x16, 0x17, 0x18, 0x5c, 0x00, 0x6b, 0xdf, + 0x9f, 0x0d, 0x6b, 0x93, 0x81, 0xa7, 0x58, 0xe6, 0x72, 0xb8, 0x56, 0x4d, 0xc0, 0xb5, 0x5b, 0x89, + 0x78, 0x91, 0x9b, 0x5f, 0x1a, 0xd8, 0x1e, 0xc5, 0x81, 0x6d, 0x79, 0xc1, 0x4d, 0x4d, 0x44, 0xb6, + 0xed, 0x24, 0x64, 0xbb, 0xcd, 0x2c, 0xbe, 0x94, 0x68, 0xf1, 0xfb, 0x40, 0xdb, 0x17, 0x68, 0x64, + 0x9d, 0x88, 0x4f, 0x34, 0x38, 0x13, 0xc7, 0xb1, 0x1c, 0x01, 0x52, 0x39, 0xa1, 0x3c, 0x4f, 0xa1, + 0x4e, 0x18, 0x8b, 0xe6, 0xc0, 0x60, 0x96, 0x04, 0x23, 0xf1, 0x47, 0xf9, 0x4b, 0x3a, 0xd4, 0x65, + 0xe8, 0x20, 0x0a, 0x93, 0x24, 0x01, 0x93, 0x22, 0xe0, 0x38, 0x13, 0x07, 0xc7, 0x7b, 0xb0, 0x41, + 0x93, 0xdb, 0x04, 0xee, 0xd5, 0xec, 0x00, 0xf7, 0xde, 0x82, 0x6d, 0x86, 0x5e, 0x38, 0x84, 0x16, + 0x19, 0x2d, 0xc7, 0x12, 0xf3, 0x16, 0x9d, 0xe0, 0x1f, 0x12, 0x4f, 0x6d, 0x2f, 0xc3, 0x4e, 0x44, + 0x36, 0x48, 0x9a, 0x1c, 0x04, 0x96, 0x03, 0xe9, 0xaa, 0xc8, 0x9e, 0x7f, 0x4b, 0x87, 0x1e, 0x0a, + 0x01, 0xf3, 0x2c, 0x6c, 0x9b, 0xfe, 0x1f, 0x61, 0xdb, 0xcc, 0xf7, 0xc6, 0xb6, 0x51, 0x10, 0x90, + 0x8d, 0x83, 0x80, 0xef, 0xd2, 0xe1, 0x99, 0x04, 0x48, 0xb5, 0x63, 0xe9, 0x44, 0xa4, 0x65, 0x36, + 0x46, 0x65, 0xc8, 0xf6, 0xad, 0xae, 0x48, 0xbe, 0x74, 0x48, 0xa5, 0x82, 0x84, 0x21, 0x89, 0x7c, + 0x10, 0x64, 0xf4, 0x3c, 0xf3, 0xb0, 0xc8, 0xe8, 0x65, 0xc8, 0x3e, 0x24, 0x3c, 0xbc, 0x6f, 0x62, + 0x3a, 0xa4, 0x72, 0xec, 0x92, 0xb1, 0xa0, 0xbd, 0x89, 0x39, 0x81, 0xee, 0x80, 0xc4, 0xfa, 0x4c, + 0xaa, 0x65, 0xbb, 0x22, 0x12, 0x3f, 0x19, 0xdd, 0x2b, 0x6f, 0x27, 0xed, 0x9f, 0x53, 0x99, 0x33, + 0xdb, 0xc5, 0x05, 0x5b, 0x8c, 0x22, 0x60, 0x45, 0x8a, 0x61, 0xe6, 0x1b, 0x20, 0xd1, 0xd5, 0xbb, + 0xb6, 0xd6, 0x21, 0x2c, 0xac, 0x4a, 0x38, 0x64, 0x28, 0x0f, 0x00, 0x4d, 0x27, 0x07, 0xd4, 0x84, + 0x35, 0x32, 0x22, 0xa6, 0x47, 0x8f, 0x2d, 0x3b, 0x99, 0xf4, 0x05, 0x20, 0x25, 0xa6, 0x57, 0xab, + 0x50, 0x27, 0xff, 0xeb, 0x9b, 0xbd, 0x32, 0x97, 0x7e, 0xc9, 0x1a, 0x18, 0x1e, 0x19, 0xd8, 0xde, + 0x18, 0x0b, 0x7d, 0xe5, 0xcf, 0x19, 0x8a, 0x0e, 0x63, 0x89, 0x63, 0xa6, 0x6f, 0xfd, 0x2b, 0x9f, + 0x89, 0x54, 0x06, 0xcb, 0xf9, 0x7b, 0x17, 0xa0, 0xab, 0xb9, 0xea, 0x27, 0x9a, 0xe9, 0x11, 0x5d, + 0x38, 0x3d, 0xc2, 0x41, 0x32, 0x14, 0x28, 0x35, 0x74, 0x89, 0x2e, 0x8a, 0x94, 0x80, 0x8e, 0xec, + 0x73, 0xfd, 0x87, 0xed, 0x33, 0xee, 0xe5, 0xc2, 0x84, 0x97, 0x23, 0xc8, 0x4d, 0x8a, 0x22, 0x37, + 0xba, 0x36, 0xdb, 0x31, 0x2c, 0xc7, 0xf0, 0xc6, 0xec, 0x68, 0xb2, 0x38, 0xa0, 0x95, 0xdf, 0x67, + 0xc2, 0x4f, 0x2b, 0x04, 0xdf, 0xff, 0x77, 0xbe, 0x53, 0xfe, 0xc0, 0x4a, 0xf2, 0x78, 0xd6, 0x47, + 0x17, 0xb0, 0x1d, 0x7c, 0xd9, 0xea, 0x90, 0x7d, 0xf1, 0xfe, 0x5d, 0x5d, 0x36, 0x34, 0x94, 0x47, + 0x71, 0xb6, 0x8b, 0xde, 0x83, 0xc7, 0x27, 0xc2, 0x56, 0x60, 0x3a, 0xb3, 0x6c, 0xf4, 0x7a, 0x2c, + 0x1e, 0xbd, 0x7c, 0xd3, 0xa1, 0xb3, 0xb2, 0x3f, 0xf0, 0x83, 0x3a, 0xa6, 0x55, 0x5e, 0x14, 0xc4, + 0xcc, 0x3c, 0xfe, 0x67, 0xa0, 0xe8, 0x10, 0x4f, 0x33, 0x4c, 0x35, 0x56, 0x47, 0x6f, 0x72, 0xa6, + 0xa8, 0xce, 0xcf, 0xe1, 0xb1, 0x99, 0x60, 0x06, 0xfd, 0x04, 0xa4, 0x10, 0x07, 0xa5, 0x13, 0x4a, + 0xd2, 0xa0, 0xcc, 0x0a, 0x65, 0x95, 0xbf, 0xa6, 0x43, 0x93, 0xf1, 0xc2, 0xad, 0x01, 0x6b, 0x0e, + 0x71, 0x87, 0x7d, 0x5e, 0x4a, 0x95, 0x0e, 0x5f, 0x5e, 0x0e, 0x06, 0x51, 0xee, 0xb0, 0xef, 0x61, + 0xa1, 0xac, 0x3c, 0x80, 0x35, 0xce, 0x41, 0x1b, 0xb0, 0x7e, 0xef, 0xf4, 0xee, 0xe9, 0xd9, 0xbb, + 0xa7, 0xe5, 0x14, 0x02, 0x58, 0xab, 0xd6, 0xeb, 0x8d, 0xf3, 0x56, 0x39, 0x8d, 0x24, 0xc8, 0x57, + 0x6b, 0x67, 0xb8, 0x55, 0xce, 0x50, 0x36, 0x6e, 0xbc, 0xd3, 0xa8, 0xb7, 0xca, 0x59, 0xb4, 0x0d, + 0x45, 0x3e, 0x56, 0x8f, 0xce, 0xf0, 0x2f, 0xab, 0xad, 0x72, 0x2e, 0xc2, 0xba, 0x68, 0x9c, 0xbe, + 0xdd, 0xc0, 0xe5, 0xbc, 0xf2, 0x0a, 0xad, 0xd5, 0x12, 0x80, 0x53, 0x58, 0x95, 0xa5, 0x23, 0x55, + 0x99, 0xf2, 0xc7, 0x0c, 0xad, 0x9e, 0x92, 0xd0, 0x10, 0x7a, 0x67, 0x62, 0xe3, 0x87, 0x2b, 0x40, + 0xa9, 0x89, 0xdd, 0xa3, 0x67, 0xa1, 0xe4, 0x90, 0x4b, 0xe2, 0x75, 0x7a, 0x1c, 0x9d, 0xf1, 0x6c, + 0x58, 0xc4, 0x45, 0xc1, 0x65, 0x4a, 0x2e, 0x17, 0xfb, 0x88, 0x74, 0x3c, 0x95, 0x87, 0x19, 0x7e, + 0xe9, 0x24, 0x2a, 0x46, 0xb9, 0x17, 0x9c, 0xa9, 0x7c, 0xb8, 0x92, 0x2f, 0x25, 0xc8, 0xe3, 0x46, + 0x0b, 0xbf, 0x57, 0xce, 0x22, 0x04, 0x25, 0x36, 0x54, 0x2f, 0x4e, 0xab, 0xe7, 0x17, 0xcd, 0x33, + 0xea, 0xcb, 0x1d, 0xd8, 0xf2, 0x7d, 0xe9, 0x33, 0xf3, 0xca, 0xfb, 0x61, 0x72, 0x89, 0x54, 0xa6, + 0x47, 0x50, 0x9a, 0x80, 0x6e, 0xe9, 0x69, 0xb4, 0x1e, 0x56, 0x96, 0x01, 0x2c, 0xc3, 0xc5, 0x51, + 0x94, 0x54, 0xfe, 0x94, 0x86, 0x27, 0xe7, 0x80, 0x3b, 0x74, 0x77, 0xc2, 0xf3, 0xb7, 0x57, 0x81, + 0x86, 0x93, 0x17, 0xef, 0xce, 0x52, 0xce, 0xba, 0x38, 0xa9, 0x5e, 0x34, 0xe3, 0x17, 0x4f, 0xf9, + 0x00, 0x4a, 0xf1, 0x96, 0x10, 0xbd, 0x47, 0x8e, 0x35, 0x34, 0x75, 0xb6, 0xae, 0x3c, 0xe6, 0x04, + 0x7a, 0x15, 0xf2, 0x74, 0x7f, 0x3e, 0xc2, 0x99, 0xfe, 0xe0, 0xe8, 0xfa, 0x22, 0x2d, 0x25, 0x2e, + 0xad, 0x7c, 0x0a, 0x79, 0x16, 0x3a, 0x68, 0x18, 0x60, 0xcd, 0x1d, 0x01, 0x1a, 0xe9, 0x18, 0x7d, + 0x00, 0xa0, 0x79, 0x9e, 0x63, 0xb4, 0x87, 0xa1, 0xe1, 0xbd, 0xd9, 0xa1, 0xa7, 0xea, 0xcb, 0xd5, + 0x6e, 0x88, 0x18, 0x74, 0x2d, 0x54, 0x8d, 0xc4, 0xa1, 0x88, 0x41, 0xe5, 0x14, 0x4a, 0x71, 0x5d, + 0x1f, 0xe6, 0xf0, 0x35, 0xc4, 0x61, 0x0e, 0x47, 0xad, 0x02, 0xe6, 0x04, 0x20, 0x29, 0xcb, 0x1b, + 0x79, 0x8c, 0x50, 0x3e, 0x4b, 0x43, 0xa1, 0x75, 0x25, 0xfc, 0x9c, 0xd0, 0x43, 0x0a, 0x55, 0x33, + 0xd1, 0x8e, 0x09, 0x6f, 0x4a, 0x65, 0x83, 0x56, 0xd7, 0x5b, 0xc1, 0xe1, 0xe7, 0x96, 0xad, 0x46, + 0xfd, 0x9e, 0x9f, 0x38, 0xf1, 0x37, 0x40, 0x0a, 0x12, 0x07, 0x45, 0xdf, 0x9a, 0xae, 0x3b, 0xc4, + 0x75, 0xc5, 0xc7, 0xef, 0x93, 0xac, 0x25, 0x69, 0x7d, 0x22, 0x7a, 0x32, 0x59, 0xcc, 0x09, 0x45, + 0x87, 0xad, 0x89, 0xac, 0x83, 0xde, 0x80, 0x75, 0x7b, 0xd8, 0x56, 0x7d, 0xf7, 0x4c, 0x3c, 0x96, + 0xf9, 0xb8, 0x6e, 0xd8, 0xee, 0x1b, 0x9d, 0xbb, 0x64, 0xec, 0x2f, 0xc6, 0x1e, 0xb6, 0xef, 0x72, + 0x2f, 0xf2, 0x5f, 0xc9, 0x44, 0x7f, 0x65, 0x04, 0x05, 0xff, 0x52, 0xa0, 0x9f, 0x83, 0x14, 0x24, + 0xb4, 0xa0, 0x53, 0x9d, 0x98, 0x09, 0x85, 0xf9, 0x50, 0x85, 0x16, 0x09, 0xae, 0xd1, 0x35, 0x89, + 0xae, 0x86, 0xf8, 0x9f, 0xfd, 0x5a, 0x01, 0x6f, 0xf1, 0x89, 0x13, 0x1f, 0xfc, 0x2b, 0xff, 0x49, + 0x43, 0xc1, 0xef, 0x48, 0xa2, 0x57, 0x22, 0xf7, 0xae, 0x34, 0xa3, 0x69, 0xe2, 0x0b, 0x86, 0x5d, + 0xc5, 0xf8, 0x5a, 0x33, 0xab, 0xaf, 0x35, 0xa9, 0x3d, 0xec, 0x37, 0xea, 0x73, 0x2b, 0x37, 0xea, + 0x5f, 0x02, 0xe4, 0x59, 0x9e, 0xd6, 0xa7, 0x45, 0xa5, 0x61, 0x76, 0x55, 0xee, 0x6c, 0x0e, 0x88, + 0xca, 0x6c, 0xe6, 0x3e, 0x9b, 0x38, 0x67, 0x7e, 0xff, 0x6d, 0x1a, 0x0a, 0x41, 0x66, 0x5b, 0xb5, + 0x49, 0x78, 0x1d, 0xd6, 0x44, 0xf0, 0xe6, 0x5d, 0x42, 0x41, 0x05, 0xfd, 0xea, 0x5c, 0xa4, 0x5f, + 0x2d, 0x43, 0x61, 0x40, 0x3c, 0x8d, 0xa5, 0x77, 0x5e, 0x82, 0x05, 0xf4, 0xad, 0xd7, 0x61, 0x23, + 0xd2, 0xaf, 0xa5, 0x5f, 0xde, 0x69, 0xe3, 0xdd, 0x72, 0x4a, 0x5e, 0xff, 0xec, 0x8b, 0x9b, 0xd9, + 0x53, 0xf2, 0x09, 0xbd, 0xb3, 0xb8, 0x51, 0x6f, 0x36, 0xea, 0x77, 0xcb, 0x69, 0x79, 0xe3, 0xb3, + 0x2f, 0x6e, 0xae, 0x63, 0xc2, 0x1a, 0x36, 0xb7, 0x9a, 0xb0, 0x19, 0x3d, 0x95, 0x78, 0x48, 0x43, + 0x50, 0x7a, 0xfb, 0xde, 0xf9, 0xc9, 0x71, 0xbd, 0xda, 0x6a, 0xa8, 0xf7, 0xcf, 0x5a, 0x8d, 0x72, + 0x1a, 0x3d, 0x0e, 0x3b, 0x27, 0xc7, 0xbf, 0x68, 0xb6, 0xd4, 0xfa, 0xc9, 0x71, 0xe3, 0xb4, 0xa5, + 0x56, 0x5b, 0xad, 0x6a, 0xfd, 0x6e, 0x39, 0x73, 0xf8, 0x6f, 0x80, 0xad, 0x6a, 0xad, 0x7e, 0x4c, + 0x73, 0x97, 0xd1, 0xd1, 0x58, 0x7d, 0x5c, 0x87, 0x1c, 0xab, 0x80, 0xe7, 0xbe, 0x3b, 0xcb, 0xf3, + 0x5b, 0x79, 0xe8, 0x08, 0xf2, 0xac, 0x38, 0x46, 0xf3, 0x1f, 0xa2, 0xe5, 0x05, 0xbd, 0x3d, 0xba, + 0x18, 0xf6, 0x79, 0xcc, 0x7d, 0x99, 0x96, 0xe7, 0xb7, 0xfa, 0x10, 0x06, 0x29, 0x44, 0xe0, 0x8b, + 0x5f, 0x6a, 0xe5, 0x25, 0x82, 0x0d, 0x3a, 0x81, 0x75, 0xbf, 0x1e, 0x5a, 0xf4, 0x76, 0x2c, 0x2f, + 0xec, 0xc5, 0x51, 0x77, 0xf1, 0xba, 0x75, 0xfe, 0x43, 0xb8, 0xbc, 0xa0, 0xb1, 0x88, 0x8e, 0x61, + 0x4d, 0xa0, 0xca, 0x05, 0xef, 0xc1, 0xf2, 0xa2, 0xde, 0x1a, 0x75, 0x5a, 0xd8, 0x11, 0x58, 0xfc, + 0xbc, 0x2f, 0x2f, 0xd1, 0x33, 0x45, 0xf7, 0x00, 0x22, 0x55, 0xea, 0x12, 0xef, 0xf6, 0xf2, 0x32, + 0xbd, 0x50, 0x74, 0x06, 0x85, 0xa0, 0xb2, 0x58, 0xf8, 0x8a, 0x2e, 0x2f, 0x6e, 0x4a, 0xa2, 0x07, + 0x50, 0x8c, 0x23, 0xea, 0xe5, 0xde, 0xc6, 0xe5, 0x25, 0xbb, 0x8d, 0xd4, 0x7e, 0x1c, 0x5e, 0x2f, + 0xf7, 0x56, 0x2e, 0x2f, 0xd9, 0x7c, 0x44, 0x1f, 0xc1, 0xf6, 0x34, 0xfc, 0x5d, 0xfe, 0xe9, 0x5c, + 0x5e, 0xa1, 0x1d, 0x89, 0x06, 0x80, 0x66, 0xc0, 0xe6, 0x15, 0x5e, 0xd2, 0xe5, 0x55, 0xba, 0x93, + 0xf4, 0x0a, 0x45, 0xb0, 0xe8, 0x12, 0x2f, 0xeb, 0xf2, 0x32, 0x4d, 0x4a, 0x64, 0xc3, 0xce, 0x2c, + 0x0c, 0xba, 0xca, 0x43, 0xbb, 0xbc, 0x52, 0xef, 0xb2, 0xd6, 0xf8, 0xf2, 0xdb, 0xdd, 0xf4, 0xd7, + 0xdf, 0xee, 0xa6, 0xff, 0xf9, 0xed, 0x6e, 0xfa, 0xf3, 0x47, 0xbb, 0xa9, 0xaf, 0x1f, 0xed, 0xa6, + 0xfe, 0xfe, 0x68, 0x37, 0xf5, 0xeb, 0x17, 0xbb, 0x86, 0xd7, 0x1b, 0xb6, 0xf7, 0x3b, 0xd6, 0xe0, + 0x20, 0xfa, 0x5f, 0xa3, 0x59, 0xff, 0x7f, 0x6a, 0xaf, 0xb1, 0xec, 0x78, 0xfb, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x02, 0xf7, 0xc1, 0xc5, 0x1f, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4988,16 +4996,18 @@ func (m *RequestVerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l - { - size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Vote != nil { + { + size, err := m.Vote.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -6184,29 +6194,8 @@ func (m *ResponseVerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, er _ = i var l int _ = l - if len(m.Info) > 0 { - i -= len(m.Info) - copy(dAtA[i:], m.Info) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Info))) - i-- - dAtA[i] = 0x22 - } - if len(m.Log) > 0 { - i -= len(m.Log) - copy(dAtA[i:], m.Log) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Log))) - i-- - dAtA[i] = 0x1a - } - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0x12 - } - if m.Code != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Code)) + if m.Result != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Result)) i-- dAtA[i] = 0x8 } @@ -7091,8 +7080,10 @@ func (m *RequestVerifyVoteExtension) Size() (n int) { } var l int _ = l - l = m.VoteExtension.Size() - n += 1 + l + sovTypes(uint64(l)) + if m.Vote != nil { + l = m.Vote.Size() + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -7666,20 +7657,8 @@ func (m *ResponseVerifyVoteExtension) Size() (n int) { } var l int _ = l - if m.Code != 0 { - n += 1 + sovTypes(uint64(m.Code)) - } - l = len(m.Data) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - l = len(m.Log) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - l = len(m.Info) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) + if m.Result != 0 { + n += 1 + sovTypes(uint64(m.Result)) } return n } @@ -10166,7 +10145,7 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Vote", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10193,7 +10172,10 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Vote == nil { + m.Vote = &types1.Vote{} + } + if err := m.Vote.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -13189,94 +13171,9 @@ func (m *ResponseVerifyVoteExtension) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) - } - m.Code = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Code |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) - if m.Data == nil { - m.Data = []byte{} - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Log", 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.Log = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Info", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) } - var stringLen uint64 + m.Result = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -13286,24 +13183,11 @@ func (m *ResponseVerifyVoteExtension) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Result |= ResponseVerifyVoteExtension_Result(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.Info = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 1326d77006f..d9ac59327fd 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -2041,7 +2041,7 @@ func (cs *State) addVote(vote *types.Vote, peerID types.NodeID) (added bool, err // Verify VoteExtension if precommit if vote.Type == tmproto.PrecommitType { - if err = cs.blockExec.VerifyVoteExtension(vote.VoteExtension); err != nil { + if err = cs.blockExec.VerifyVoteExtension(vote); err != nil { return } } diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 543dd0fba55..b1b7b26d78a 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -126,7 +126,7 @@ message RequestExtendVote { // Verify the vote extension message RequestVerifyVoteExtension { - tendermint.types.VoteExtension vote_extension = 1 [(gogoproto.nullable) = false]; + types.Vote vote = 1; } //---------------------------------------- @@ -277,11 +277,14 @@ message ResponseExtendVote { } message ResponseVerifyVoteExtension { - // XXX - uint32 code = 1; - bytes data = 2; - string log = 3; // nondeterministic - string info = 4; // nondeterministic + Result result = 1; + + enum Result { + UNKNOWN = 0; // Unknown result, treat as ACCEPT by default + ACCEPT = 1; // Vote extension verified, include the vote + SLASH = 2; // Vote extension verification aborted, continue but slash validator + REJECT = 3; // Vote extension invalidated + } } //---------------------------------------- diff --git a/state/execution.go b/state/execution.go index 64a133af4ff..4162f07416c 100644 --- a/state/execution.go +++ b/state/execution.go @@ -250,15 +250,10 @@ func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) (types.VoteExtensio return types.VoteExtensionFromProto(resp.VoteExtension), nil } -func (blockExec *BlockExecutor) VerifyVoteExtension(ext types.VoteExtension) error { +func (blockExec *BlockExecutor) VerifyVoteExtension(vote *types.Vote) error { ctx := context.Background() - pext := ext.ToProto() - - var req abci.RequestVerifyVoteExtension - if pext != nil { - req = abci.RequestVerifyVoteExtension{ - VoteExtension: *pext, - } + req := abci.RequestVerifyVoteExtension{ + Vote: vote.ToProto(), } resp, err := blockExec.proxyApp.VerifyVoteExtensionSync(ctx, req) From ae4a96c1cb95b9e06e8b2f277b79e91689b33964 Mon Sep 17 00:00:00 2001 From: mconcat Date: Fri, 13 Aug 2021 16:40:00 +0900 Subject: [PATCH 11/23] fix vote --- internal/consensus/state.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index e3d47248c35..f90562beca5 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -2205,7 +2205,6 @@ func (cs *State) signVote( BlockID: types.BlockID{Hash: hash, PartSetHeader: header}, } - v := vote.ToProto() // If the signedMessageType is for precommit, // use our local precommit Timeout as the max wait time for getting a singed commit. The same goes for prevote. @@ -2226,7 +2225,9 @@ func (cs *State) signVote( timeout = time.Second } - ctx, cancel := context.WithTimeout(context.TODO(), timeout) + v := vote.ToProto() + + ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() err := cs.privValidator.SignVote(ctx, cs.state.ChainID, v) From 68dd6c6eb9cdfdb7ac53593dbd3c797a84a8c2cd Mon Sep 17 00:00:00 2001 From: mconcat Date: Tue, 24 Aug 2021 04:24:25 +0900 Subject: [PATCH 12/23] abci: Vote Extension 1 (#6646) * add proto, add boilerplates * add canonical * fix tests * add vote signing test * Update internal/consensus/msgs_test.go * modify state execution in progress * add extension signing * VoteExtension -> ExtendVote * apply review * update data structures * Add comments * Apply suggestions from code review Co-authored-by: Aleksandr Bezobchuk * *Signed -> *ToSign * add Vote to RequestExtendVote * apply reviews * Apply suggestions from code review Co-authored-by: Dev Ojha Co-authored-by: Aleksandr Bezobchuk * fix typo, modify proto Co-authored-by: Aleksandr Bezobchuk Co-authored-by: Dev Ojha --- abci/client/client.go | 4 + abci/client/grpc_client.go | 71 +- abci/client/local_client.go | 63 +- abci/client/socket_client.go | 40 + abci/example/kvstore/README.md | 6 +- abci/example/kvstore/persistent_kvstore.go | 10 + abci/server/socket_server.go | 6 + abci/types/application.go | 22 + abci/types/messages.go | 24 + abci/types/types.pb.go | 1713 ++++++++++++++++---- internal/consensus/msgs_test.go | 8 +- internal/consensus/state.go | 13 +- privval/msgs_test.go | 8 +- proto/tendermint/abci/types.proto | 93 +- proto/tendermint/types/canonical.pb.go | 148 +- proto/tendermint/types/canonical.proto | 1 + proto/tendermint/types/types.pb.go | 762 +++++++-- proto/tendermint/types/types.proto | 14 + proxy/app_conn.go | 11 + state/execution.go | 16 +- state/execution_test.go | 8 +- types/block.go | 19 +- types/canonical.go | 22 +- types/vote.go | 100 +- types/vote_test.go | 31 +- 25 files changed, 2697 insertions(+), 516 deletions(-) diff --git a/abci/client/client.go b/abci/client/client.go index bb72d748b3c..d7d0868f8b4 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -46,6 +46,8 @@ type Client interface { OfferSnapshotAsync(context.Context, types.RequestOfferSnapshot) (*ReqRes, error) LoadSnapshotChunkAsync(context.Context, types.RequestLoadSnapshotChunk) (*ReqRes, error) ApplySnapshotChunkAsync(context.Context, types.RequestApplySnapshotChunk) (*ReqRes, error) + ExtendVoteAsync(context.Context, types.RequestExtendVote) (*ReqRes, error) + VerifyVoteExtensionAsync(context.Context, types.RequestVerifyVoteExtension) (*ReqRes, error) PrepareProposalAsync(context.Context, types.RequestPrepareProposal) (*ReqRes, error) // Synchronous requests @@ -63,6 +65,8 @@ type Client interface { OfferSnapshotSync(context.Context, types.RequestOfferSnapshot) (*types.ResponseOfferSnapshot, error) LoadSnapshotChunkSync(context.Context, types.RequestLoadSnapshotChunk) (*types.ResponseLoadSnapshotChunk, error) ApplySnapshotChunkSync(context.Context, types.RequestApplySnapshotChunk) (*types.ResponseApplySnapshotChunk, error) + ExtendVoteSync(context.Context, types.RequestExtendVote) (*types.ResponseExtendVote, error) + VerifyVoteExtensionSync(context.Context, types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) PrepareProposalSync(context.Context, types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) } diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index 1739911013c..b681b3e5fdf 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -314,20 +314,59 @@ func (cli *grpcClient) ApplySnapshotChunkAsync( ) } -func (cli *grpcClient) PrepareProposalAsync( +// NOTE: call is synchronous, use ctx to break early if needed +func (cli *grpcClient) ExtendVoteAsync( ctx context.Context, - params types.RequestPrepareProposal, + params types.RequestExtendVote, ) (*ReqRes, error) { - - req := types.ToRequestPrepareProposal(params) - res, err := cli.client.PrepareProposal(ctx, req.GetPrepareProposal(), grpc.WaitForReady(true)) + req := types.ToRequestExtendVote(params) + res, err := cli.client.ExtendVote(ctx, req.GetExtendVote(), grpc.WaitForReady(true)) if err != nil { return nil, err } return cli.finishAsyncCall( ctx, req, + &types.Response{Value: &types.Response_ExtendVote{ExtendVote: res}}, + ) +} + +// NOTE: call is synchronous, use ctx to break early if needed +func (cli *grpcClient) VerifyVoteExtensionAsync( + ctx context.Context, + params types.RequestVerifyVoteExtension, +) (*ReqRes, error) { + req := types.ToRequestVerifyVoteExtension(params) + res, err := cli.client.VerifyVoteExtension(ctx, req.GetVerifyVoteExtension(), grpc.WaitForReady(true)) + if err != nil { + return nil, err + } + return cli.finishAsyncCall( + ctx, + req, &types.Response{ + Value: &types.Response_VerifyVoteExtension{ + VerifyVoteExtension: res, + }, + }, + ) +} + +func (cli *grpcClient) PrepareProposalAsync( + ctx context.Context, + params types.RequestPrepareProposal, +) (*ReqRes, error) { + + req := types.ToRequestPrepareProposal(params) + res, err := cli.client.PrepareProposal(ctx, req.GetPrepareProposal(), grpc.WaitForReady(true)) + if err != nil { + return nil, err + } + + return cli.finishAsyncCall( + ctx, + req, + &types.Response{ Value: &types.Response_PrepareProposal{ PrepareProposal: res, }, @@ -526,6 +565,28 @@ func (cli *grpcClient) ApplySnapshotChunkSync( return cli.finishSyncCall(reqres).GetApplySnapshotChunk(), cli.Error() } +func (cli *grpcClient) ExtendVoteSync( + ctx context.Context, + params types.RequestExtendVote) (*types.ResponseExtendVote, error) { + + reqres, err := cli.ExtendVoteAsync(ctx, params) + if err != nil { + return nil, err + } + return cli.finishSyncCall(reqres).GetExtendVote(), cli.Error() +} + +func (cli *grpcClient) VerifyVoteExtensionSync( + ctx context.Context, + params types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + + reqres, err := cli.VerifyVoteExtensionAsync(ctx, params) + if err != nil { + return nil, err + } + return cli.finishSyncCall(reqres).GetVerifyVoteExtension(), cli.Error() +} + func (cli *grpcClient) PrepareProposalSync( ctx context.Context, params types.RequestPrepareProposal, diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 71e31c13fec..c2e13678a4f 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -204,18 +204,46 @@ func (app *localClient) ApplySnapshotChunkAsync( ), nil } -func (app *localClient) PrepareProposalAsync( +func (app *localClient) ExtendVoteAsync( ctx context.Context, - req types.RequestPrepareProposal, + req types.RequestExtendVote, ) (*ReqRes, error) { app.mtx.Lock() defer app.mtx.Unlock() - res := app.Application.PrepareProposal(req) + res := app.Application.ExtendVote(req) + return app.callback( + types.ToRequestExtendVote(req), + types.ToResponseExtendVote(res), + ), nil +} + +func (app *localClient) VerifyVoteExtensionAsync( + ctx context.Context, + req types.RequestVerifyVoteExtension, +) (*ReqRes, error) { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.VerifyVoteExtension(req) + return app.callback( + types.ToRequestVerifyVoteExtension(req), + types.ToResponseVerifyVoteExtension(res), + ), nil +} + +func (app *localClient) PrepareProposalAsync( + ctx context.Context, + req types.RequestPrepareProposal, +) (*ReqRes, error) { + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.PrepareProposal(req) return app.callback( types.ToRequestPrepareProposal(req), types.ToResponsePrepareProposal(res), - ), nil + ), nil } //------------------------------------------------------- @@ -360,14 +388,35 @@ func (app *localClient) ApplySnapshotChunkSync( return &res, nil } -func (app *localClient) PrepareProposalSync( +func (app *localClient) ExtendVoteSync( ctx context.Context, - req types.RequestPrepareProposal, -) (*types.ResponsePrepareProposal, error) { + req types.RequestExtendVote) (*types.ResponseExtendVote, error) { + + app.mtx.Lock() + defer app.mtx.Unlock() + + res := app.Application.ExtendVote(req) + return &res, nil +} + +func (app *localClient) VerifyVoteExtensionSync( + ctx context.Context, + req types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { app.mtx.Lock() defer app.mtx.Unlock() + res := app.Application.VerifyVoteExtension(req) + return &res, nil +} + +func (app *localClient) PrepareProposalSync( + ctx context.Context, + req types.RequestPrepareProposal, +) (*types.ResponsePrepareProposal, error) { + app.mtx.Lock() + defer app.mtx.Unlock() + res := app.Application.PrepareProposal(req) return &res, nil } diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 0a2efc5e9df..91e6b4b38e2 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -295,6 +295,20 @@ func (cli *socketClient) ApplySnapshotChunkAsync( return cli.queueRequestAsync(ctx, types.ToRequestApplySnapshotChunk(req)) } +func (cli *socketClient) ExtendVoteAsync( + ctx context.Context, + req types.RequestExtendVote, +) (*ReqRes, error) { + return cli.queueRequestAsync(ctx, types.ToRequestExtendVote(req)) +} + +func (cli *socketClient) VerifyVoteExtensionAsync( + ctx context.Context, + req types.RequestVerifyVoteExtension, +) (*ReqRes, error) { + return cli.queueRequestAsync(ctx, types.ToRequestVerifyVoteExtension(req)) +} + func (cli *socketClient) PrepareProposalAsync( ctx context.Context, req types.RequestPrepareProposal, @@ -472,6 +486,28 @@ func (cli *socketClient) ApplySnapshotChunkSync( return reqres.Response.GetApplySnapshotChunk(), nil } +func (cli *socketClient) ExtendVoteSync( + ctx context.Context, + req types.RequestExtendVote) (*types.ResponseExtendVote, error) { + + reqres, err := cli.queueRequestAndFlushSync(ctx, types.ToRequestExtendVote(req)) + if err != nil { + return nil, err + } + return reqres.Response.GetExtendVote(), nil +} + +func (cli *socketClient) VerifyVoteExtensionSync( + ctx context.Context, + req types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + + reqres, err := cli.queueRequestAndFlushSync(ctx, types.ToRequestVerifyVoteExtension(req)) + if err != nil { + return nil, err + } + return reqres.Response.GetVerifyVoteExtension(), nil +} + func (cli *socketClient) PrepareProposalSync( ctx context.Context, req types.RequestPrepareProposal, @@ -610,6 +646,10 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) { _, ok = res.Value.(*types.Response_ListSnapshots) case *types.Request_OfferSnapshot: _, ok = res.Value.(*types.Response_OfferSnapshot) + case *types.Request_ExtendVote: + _, ok = res.Value.(*types.Response_ExtendVote) + case *types.Request_VerifyVoteExtension: + _, ok = res.Value.(*types.Response_VerifyVoteExtension) case *types.Request_PrepareProposal: _, ok = res.Value.(*types.Response_PrepareProposal) } diff --git a/abci/example/kvstore/README.md b/abci/example/kvstore/README.md index edc2c47a535..a768342f8ba 100644 --- a/abci/example/kvstore/README.md +++ b/abci/example/kvstore/README.md @@ -4,7 +4,7 @@ There are two app's here: the KVStoreApplication and the PersistentKVStoreApplic ## KVStoreApplication -The KVStoreApplication is a simple merkle key-value store. +The KVStoreApplication is a simple merkle key-value store. Transactions of the form `key=value` are stored as key-value pairs in the tree. Transactions without an `=` sign set the value to the key. The app has no replay protection (other than what the mempool provides). @@ -12,7 +12,7 @@ The app has no replay protection (other than what the mempool provides). ## PersistentKVStoreApplication The PersistentKVStoreApplication wraps the KVStoreApplication -and provides two additional features: +and provides three additional features: 1) persistence of state across app restarts (using Tendermint's ABCI-Handshake mechanism) 2) validator set changes @@ -27,4 +27,4 @@ Validator set changes are effected using the following transaction format: where `pubkeyN` is a base64-encoded 32-byte ed25519 key and `powerN` is a new voting power for the validator with `pubkeyN` (possibly a new one). To remove a validator from the validator set, set power to `0`. -There is no sybil protection against new validators joining. +There is no sybil protection against new validators joining. diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index cc0d9928b30..c8f7a51bce1 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -170,6 +170,16 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( return types.ResponseApplySnapshotChunk{Result: types.ResponseApplySnapshotChunk_ABORT} } +func (app *PersistentKVStoreApplication) ExtendVote( + req types.RequestExtendVote) types.ResponseExtendVote { + return types.ResponseExtendVote{} +} + +func (app *PersistentKVStoreApplication) VerifyVoteExtension( + req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { + return types.ResponseVerifyVoteExtension{} +} + func (app *PersistentKVStoreApplication) PrepareProposal( req types.RequestPrepareProposal) types.ResponsePrepareProposal { if len(req.BlockData) >= 1 { diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index 33f486587dc..c43e0e92738 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -236,6 +236,12 @@ func (s *SocketServer) handleRequest(req *types.Request, responses chan<- *types case *types.Request_ApplySnapshotChunk: res := s.app.ApplySnapshotChunk(*r.ApplySnapshotChunk) responses <- types.ToResponseApplySnapshotChunk(res) + case *types.Request_ExtendVote: + res := s.app.ExtendVote(*r.ExtendVote) + responses <- types.ToResponseExtendVote(res) + case *types.Request_VerifyVoteExtension: + res := s.app.VerifyVoteExtension(*r.VerifyVoteExtension) + responses <- types.ToResponseVerifyVoteExtension(res) default: responses <- types.ToResponseException("Unknown request") } diff --git a/abci/types/application.go b/abci/types/application.go index 4a74c785266..ca1b47b83c7 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -23,6 +23,8 @@ type Application interface { DeliverTx(RequestDeliverTx) ResponseDeliverTx // Deliver a tx for full processing EndBlock(RequestEndBlock) ResponseEndBlock // Signals the end of a block, returns changes to the validator set Commit() ResponseCommit // Commit the state and return the application Merkle root hash + ExtendVote(RequestExtendVote) ResponseExtendVote // Create application specific vote extension + VerifyVoteExtension(RequestVerifyVoteExtension) ResponseVerifyVoteExtension // Verify application's vote extension data // State Sync Connection ListSnapshots(RequestListSnapshots) ResponseListSnapshots // List available snapshots @@ -59,6 +61,14 @@ func (BaseApplication) Commit() ResponseCommit { return ResponseCommit{} } +func (BaseApplication) ExtendVote(req RequestExtendVote) ResponseExtendVote { + return ResponseExtendVote{} +} + +func (BaseApplication) VerifyVoteExtension(req RequestVerifyVoteExtension) ResponseVerifyVoteExtension { + return ResponseVerifyVoteExtension{} +} + func (BaseApplication) Query(req RequestQuery) ResponseQuery { return ResponseQuery{Code: CodeTypeOK} } @@ -178,6 +188,18 @@ func (app *GRPCApplication) ApplySnapshotChunk( return &res, nil } +func (app *GRPCApplication) ExtendVote( + ctx context.Context, req *RequestExtendVote) (*ResponseExtendVote, error) { + res := app.app.ExtendVote(*req) + return &res, nil +} + +func (app *GRPCApplication) VerifyVoteExtension( + ctx context.Context, req *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) { + res := app.app.VerifyVoteExtension(*req) + return &res, nil +} + func (app *GRPCApplication) PrepareProposal( ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { res := app.app.PrepareProposal(*req) diff --git a/abci/types/messages.go b/abci/types/messages.go index 8c17baeb3a2..f82632982ee 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -110,6 +110,18 @@ func ToRequestApplySnapshotChunk(req RequestApplySnapshotChunk) *Request { } } +func ToRequestExtendVote(req RequestExtendVote) *Request { + return &Request{ + Value: &Request_ExtendVote{&req}, + } +} + +func ToRequestVerifyVoteExtension(req RequestVerifyVoteExtension) *Request { + return &Request{ + Value: &Request_VerifyVoteExtension{&req}, + } +} + func ToRequestPrepareProposal(req RequestPrepareProposal) *Request { return &Request{ Value: &Request_PrepareProposal{&req}, @@ -207,6 +219,18 @@ func ToResponseApplySnapshotChunk(res ResponseApplySnapshotChunk) *Response { } } +func ToResponseExtendVote(res ResponseExtendVote) *Response { + return &Response{ + Value: &Response_ExtendVote{&res}, + } +} + +func ToResponseVerifyVoteExtension(res ResponseVerifyVoteExtension) *Response { + return &Response{ + Value: &Response_VerifyVoteExtension{&res}, + } +} + func ToResponsePrepareProposal(res ResponsePrepareProposal) *Response { return &Response{ Value: &Response_PrepareProposal{&res}, diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 0dbe461fd8a..7a2424116b0 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -120,7 +120,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29, 0} + return fileDescriptor_252557cfdd89a31a, []int{31, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,38 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31, 0} + return fileDescriptor_252557cfdd89a31a, []int{33, 0} +} + +type ResponseVerifyVoteExtension_Result int32 + +const ( + ResponseVerifyVoteExtension_UNKNOWN ResponseVerifyVoteExtension_Result = 0 + ResponseVerifyVoteExtension_ACCEPT ResponseVerifyVoteExtension_Result = 1 + ResponseVerifyVoteExtension_SLASH ResponseVerifyVoteExtension_Result = 2 + ResponseVerifyVoteExtension_REJECT ResponseVerifyVoteExtension_Result = 3 +) + +var ResponseVerifyVoteExtension_Result_name = map[int32]string{ + 0: "UNKNOWN", + 1: "ACCEPT", + 2: "SLASH", + 3: "REJECT", +} + +var ResponseVerifyVoteExtension_Result_value = map[string]int32{ + "UNKNOWN": 0, + "ACCEPT": 1, + "SLASH": 2, + "REJECT": 3, +} + +func (x ResponseVerifyVoteExtension_Result) String() string { + return proto.EnumName(ResponseVerifyVoteExtension_Result_name, int32(x)) +} + +func (ResponseVerifyVoteExtension_Result) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{35, 0} } type Request struct { @@ -177,6 +208,8 @@ type Request struct { // *Request_LoadSnapshotChunk // *Request_ApplySnapshotChunk // *Request_PrepareProposal + // *Request_ExtendVote + // *Request_VerifyVoteExtension Value isRequest_Value `protobuf_oneof:"value"` } @@ -264,22 +297,30 @@ type Request_ApplySnapshotChunk struct { type Request_PrepareProposal struct { PrepareProposal *RequestPrepareProposal `protobuf:"bytes,15,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` } - -func (*Request_Echo) isRequest_Value() {} -func (*Request_Flush) isRequest_Value() {} -func (*Request_Info) isRequest_Value() {} -func (*Request_InitChain) isRequest_Value() {} -func (*Request_Query) isRequest_Value() {} -func (*Request_BeginBlock) isRequest_Value() {} -func (*Request_CheckTx) isRequest_Value() {} -func (*Request_DeliverTx) isRequest_Value() {} -func (*Request_EndBlock) isRequest_Value() {} -func (*Request_Commit) isRequest_Value() {} -func (*Request_ListSnapshots) isRequest_Value() {} -func (*Request_OfferSnapshot) isRequest_Value() {} -func (*Request_LoadSnapshotChunk) isRequest_Value() {} -func (*Request_ApplySnapshotChunk) isRequest_Value() {} -func (*Request_PrepareProposal) isRequest_Value() {} +type Request_ExtendVote struct { + ExtendVote *RequestExtendVote `protobuf:"bytes,16,opt,name=extend_vote,json=extendVote,proto3,oneof" json:"extend_vote,omitempty"` +} +type Request_VerifyVoteExtension struct { + VerifyVoteExtension *RequestVerifyVoteExtension `protobuf:"bytes,17,opt,name=verify_vote_extension,json=verifyVoteExtension,proto3,oneof" json:"verify_vote_extension,omitempty"` +} + +func (*Request_Echo) isRequest_Value() {} +func (*Request_Flush) isRequest_Value() {} +func (*Request_Info) isRequest_Value() {} +func (*Request_InitChain) isRequest_Value() {} +func (*Request_Query) isRequest_Value() {} +func (*Request_BeginBlock) isRequest_Value() {} +func (*Request_CheckTx) isRequest_Value() {} +func (*Request_DeliverTx) isRequest_Value() {} +func (*Request_EndBlock) isRequest_Value() {} +func (*Request_Commit) isRequest_Value() {} +func (*Request_ListSnapshots) isRequest_Value() {} +func (*Request_OfferSnapshot) isRequest_Value() {} +func (*Request_LoadSnapshotChunk) isRequest_Value() {} +func (*Request_ApplySnapshotChunk) isRequest_Value() {} +func (*Request_PrepareProposal) isRequest_Value() {} +func (*Request_ExtendVote) isRequest_Value() {} +func (*Request_VerifyVoteExtension) isRequest_Value() {} func (m *Request) GetValue() isRequest_Value { if m != nil { @@ -393,6 +434,20 @@ func (m *Request) GetPrepareProposal() *RequestPrepareProposal { return nil } +func (m *Request) GetExtendVote() *RequestExtendVote { + if x, ok := m.GetValue().(*Request_ExtendVote); ok { + return x.ExtendVote + } + return nil +} + +func (m *Request) GetVerifyVoteExtension() *RequestVerifyVoteExtension { + if x, ok := m.GetValue().(*Request_VerifyVoteExtension); ok { + return x.VerifyVoteExtension + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Request) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -411,6 +466,8 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_LoadSnapshotChunk)(nil), (*Request_ApplySnapshotChunk)(nil), (*Request_PrepareProposal)(nil), + (*Request_ExtendVote)(nil), + (*Request_VerifyVoteExtension)(nil), } } @@ -1170,19 +1227,110 @@ func (m *RequestApplySnapshotChunk) GetSender() string { return "" } +// Extends a vote with application-side injection +type RequestExtendVote struct { + Vote *types1.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` +} + +func (m *RequestExtendVote) Reset() { *m = RequestExtendVote{} } +func (m *RequestExtendVote) String() string { return proto.CompactTextString(m) } +func (*RequestExtendVote) ProtoMessage() {} +func (*RequestExtendVote) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{15} +} +func (m *RequestExtendVote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestExtendVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestExtendVote.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 *RequestExtendVote) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestExtendVote.Merge(m, src) +} +func (m *RequestExtendVote) XXX_Size() int { + return m.Size() +} +func (m *RequestExtendVote) XXX_DiscardUnknown() { + xxx_messageInfo_RequestExtendVote.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestExtendVote proto.InternalMessageInfo + +func (m *RequestExtendVote) GetVote() *types1.Vote { + if m != nil { + return m.Vote + } + return nil +} + +// Verify the vote extension +type RequestVerifyVoteExtension struct { + Vote *types1.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` +} + +func (m *RequestVerifyVoteExtension) Reset() { *m = RequestVerifyVoteExtension{} } +func (m *RequestVerifyVoteExtension) String() string { return proto.CompactTextString(m) } +func (*RequestVerifyVoteExtension) ProtoMessage() {} +func (*RequestVerifyVoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{16} +} +func (m *RequestVerifyVoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RequestVerifyVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RequestVerifyVoteExtension.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 *RequestVerifyVoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_RequestVerifyVoteExtension.Merge(m, src) +} +func (m *RequestVerifyVoteExtension) XXX_Size() int { + return m.Size() +} +func (m *RequestVerifyVoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_RequestVerifyVoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_RequestVerifyVoteExtension proto.InternalMessageInfo + +func (m *RequestVerifyVoteExtension) GetVote() *types1.Vote { + if m != nil { + return m.Vote + } + return nil +} + type RequestPrepareProposal struct { // block_data is an array of transactions that will be included in a block, // sent to the app for possible modifications. // applications can not exceed the size of the data passed to it. - BlockData [][]byte `protobuf:"bytes,1,rep,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` - BlockDataSize int64 `protobuf:"varint,2,opt,name=block_data_size,json=blockDataSize,proto3" json:"block_data_size,omitempty"` + BlockData [][]byte `protobuf:"bytes,1,rep,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` + // If an application decides to populate block_data with extra information, they can not exceed this value. + BlockDataSize int64 `protobuf:"varint,2,opt,name=block_data_size,json=blockDataSize,proto3" json:"block_data_size,omitempty"` } func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } func (m *RequestPrepareProposal) String() string { return proto.CompactTextString(m) } func (*RequestPrepareProposal) ProtoMessage() {} func (*RequestPrepareProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{15} + return fileDescriptor_252557cfdd89a31a, []int{17} } func (m *RequestPrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1243,6 +1391,8 @@ type Response struct { // *Response_LoadSnapshotChunk // *Response_ApplySnapshotChunk // *Response_PrepareProposal + // *Response_ExtendVote + // *Response_VerifyVoteExtension Value isResponse_Value `protobuf_oneof:"value"` } @@ -1250,7 +1400,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{16} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1333,23 +1483,31 @@ type Response_ApplySnapshotChunk struct { type Response_PrepareProposal struct { PrepareProposal *ResponsePrepareProposal `protobuf:"bytes,16,opt,name=prepare_proposal,json=prepareProposal,proto3,oneof" json:"prepare_proposal,omitempty"` } - -func (*Response_Exception) isResponse_Value() {} -func (*Response_Echo) isResponse_Value() {} -func (*Response_Flush) isResponse_Value() {} -func (*Response_Info) isResponse_Value() {} -func (*Response_InitChain) isResponse_Value() {} -func (*Response_Query) isResponse_Value() {} -func (*Response_BeginBlock) isResponse_Value() {} -func (*Response_CheckTx) isResponse_Value() {} -func (*Response_DeliverTx) isResponse_Value() {} -func (*Response_EndBlock) isResponse_Value() {} -func (*Response_Commit) isResponse_Value() {} -func (*Response_ListSnapshots) isResponse_Value() {} -func (*Response_OfferSnapshot) isResponse_Value() {} -func (*Response_LoadSnapshotChunk) isResponse_Value() {} -func (*Response_ApplySnapshotChunk) isResponse_Value() {} -func (*Response_PrepareProposal) isResponse_Value() {} +type Response_ExtendVote struct { + ExtendVote *ResponseExtendVote `protobuf:"bytes,17,opt,name=extend_vote,json=extendVote,proto3,oneof" json:"extend_vote,omitempty"` +} +type Response_VerifyVoteExtension struct { + VerifyVoteExtension *ResponseVerifyVoteExtension `protobuf:"bytes,18,opt,name=verify_vote_extension,json=verifyVoteExtension,proto3,oneof" json:"verify_vote_extension,omitempty"` +} + +func (*Response_Exception) isResponse_Value() {} +func (*Response_Echo) isResponse_Value() {} +func (*Response_Flush) isResponse_Value() {} +func (*Response_Info) isResponse_Value() {} +func (*Response_InitChain) isResponse_Value() {} +func (*Response_Query) isResponse_Value() {} +func (*Response_BeginBlock) isResponse_Value() {} +func (*Response_CheckTx) isResponse_Value() {} +func (*Response_DeliverTx) isResponse_Value() {} +func (*Response_EndBlock) isResponse_Value() {} +func (*Response_Commit) isResponse_Value() {} +func (*Response_ListSnapshots) isResponse_Value() {} +func (*Response_OfferSnapshot) isResponse_Value() {} +func (*Response_LoadSnapshotChunk) isResponse_Value() {} +func (*Response_ApplySnapshotChunk) isResponse_Value() {} +func (*Response_PrepareProposal) isResponse_Value() {} +func (*Response_ExtendVote) isResponse_Value() {} +func (*Response_VerifyVoteExtension) isResponse_Value() {} func (m *Response) GetValue() isResponse_Value { if m != nil { @@ -1470,6 +1628,20 @@ func (m *Response) GetPrepareProposal() *ResponsePrepareProposal { return nil } +func (m *Response) GetExtendVote() *ResponseExtendVote { + if x, ok := m.GetValue().(*Response_ExtendVote); ok { + return x.ExtendVote + } + return nil +} + +func (m *Response) GetVerifyVoteExtension() *ResponseVerifyVoteExtension { + if x, ok := m.GetValue().(*Response_VerifyVoteExtension); ok { + return x.VerifyVoteExtension + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*Response) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -1489,6 +1661,8 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_LoadSnapshotChunk)(nil), (*Response_ApplySnapshotChunk)(nil), (*Response_PrepareProposal)(nil), + (*Response_ExtendVote)(nil), + (*Response_VerifyVoteExtension)(nil), } } @@ -1501,7 +1675,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{17} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1545,7 +1719,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{18} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1588,7 +1762,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{19} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1630,7 +1804,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{20} + return fileDescriptor_252557cfdd89a31a, []int{22} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1704,7 +1878,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{21} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1771,7 +1945,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{22} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1871,7 +2045,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{23} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1927,7 +2101,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{24} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2048,7 +2222,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{25} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2143,7 +2317,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{26} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2203,7 +2377,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{27} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2254,7 +2428,7 @@ func (m *ResponseListSnapshots) Reset() { *m = ResponseListSnapshots{} } func (m *ResponseListSnapshots) String() string { return proto.CompactTextString(m) } func (*ResponseListSnapshots) ProtoMessage() {} func (*ResponseListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{28} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2298,7 +2472,7 @@ func (m *ResponseOfferSnapshot) Reset() { *m = ResponseOfferSnapshot{} } func (m *ResponseOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*ResponseOfferSnapshot) ProtoMessage() {} func (*ResponseOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2342,7 +2516,7 @@ func (m *ResponseLoadSnapshotChunk) Reset() { *m = ResponseLoadSnapshotC func (m *ResponseLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseLoadSnapshotChunk) ProtoMessage() {} func (*ResponseLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30} + return fileDescriptor_252557cfdd89a31a, []int{32} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2388,7 +2562,7 @@ func (m *ResponseApplySnapshotChunk) Reset() { *m = ResponseApplySnapsho func (m *ResponseApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseApplySnapshotChunk) ProtoMessage() {} func (*ResponseApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2438,6 +2612,94 @@ func (m *ResponseApplySnapshotChunk) GetRejectSenders() []string { return nil } +type ResponseExtendVote struct { + VoteExtension *types1.VoteExtension `protobuf:"bytes,1,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` +} + +func (m *ResponseExtendVote) Reset() { *m = ResponseExtendVote{} } +func (m *ResponseExtendVote) String() string { return proto.CompactTextString(m) } +func (*ResponseExtendVote) ProtoMessage() {} +func (*ResponseExtendVote) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{34} +} +func (m *ResponseExtendVote) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseExtendVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseExtendVote.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 *ResponseExtendVote) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseExtendVote.Merge(m, src) +} +func (m *ResponseExtendVote) XXX_Size() int { + return m.Size() +} +func (m *ResponseExtendVote) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseExtendVote.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseExtendVote proto.InternalMessageInfo + +func (m *ResponseExtendVote) GetVoteExtension() *types1.VoteExtension { + if m != nil { + return m.VoteExtension + } + return nil +} + +type ResponseVerifyVoteExtension struct { + Result ResponseVerifyVoteExtension_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseVerifyVoteExtension_Result" json:"result,omitempty"` +} + +func (m *ResponseVerifyVoteExtension) Reset() { *m = ResponseVerifyVoteExtension{} } +func (m *ResponseVerifyVoteExtension) String() string { return proto.CompactTextString(m) } +func (*ResponseVerifyVoteExtension) ProtoMessage() {} +func (*ResponseVerifyVoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{35} +} +func (m *ResponseVerifyVoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ResponseVerifyVoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ResponseVerifyVoteExtension.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 *ResponseVerifyVoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResponseVerifyVoteExtension.Merge(m, src) +} +func (m *ResponseVerifyVoteExtension) XXX_Size() int { + return m.Size() +} +func (m *ResponseVerifyVoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_ResponseVerifyVoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_ResponseVerifyVoteExtension proto.InternalMessageInfo + +func (m *ResponseVerifyVoteExtension) GetResult() ResponseVerifyVoteExtension_Result { + if m != nil { + return m.Result + } + return ResponseVerifyVoteExtension_UNKNOWN +} + type ResponsePrepareProposal struct { BlockData [][]byte `protobuf:"bytes,1,rep,name=block_data,json=blockData,proto3" json:"block_data,omitempty"` } @@ -2446,7 +2708,7 @@ func (m *ResponsePrepareProposal) Reset() { *m = ResponsePrepareProposal func (m *ResponsePrepareProposal) String() string { return proto.CompactTextString(m) } func (*ResponsePrepareProposal) ProtoMessage() {} func (*ResponsePrepareProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32} + return fileDescriptor_252557cfdd89a31a, []int{36} } func (m *ResponsePrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2491,7 +2753,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2546,7 +2808,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{34} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2600,7 +2862,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{35} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2664,7 +2926,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{36} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2732,7 +2994,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{37} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2785,7 +3047,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{38} + return fileDescriptor_252557cfdd89a31a, []int{42} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2838,7 +3100,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{39} + return fileDescriptor_252557cfdd89a31a, []int{43} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2899,7 +3161,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{40} + return fileDescriptor_252557cfdd89a31a, []int{44} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2975,7 +3237,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{41} + return fileDescriptor_252557cfdd89a31a, []int{45} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3044,6 +3306,7 @@ func init() { proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_value) proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterEnum("tendermint.abci.ResponseVerifyVoteExtension_Result", ResponseVerifyVoteExtension_Result_name, ResponseVerifyVoteExtension_Result_value) proto.RegisterType((*Request)(nil), "tendermint.abci.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") @@ -3059,6 +3322,8 @@ func init() { proto.RegisterType((*RequestOfferSnapshot)(nil), "tendermint.abci.RequestOfferSnapshot") proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "tendermint.abci.RequestLoadSnapshotChunk") proto.RegisterType((*RequestApplySnapshotChunk)(nil), "tendermint.abci.RequestApplySnapshotChunk") + proto.RegisterType((*RequestExtendVote)(nil), "tendermint.abci.RequestExtendVote") + proto.RegisterType((*RequestVerifyVoteExtension)(nil), "tendermint.abci.RequestVerifyVoteExtension") proto.RegisterType((*RequestPrepareProposal)(nil), "tendermint.abci.RequestPrepareProposal") proto.RegisterType((*Response)(nil), "tendermint.abci.Response") proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") @@ -3076,6 +3341,8 @@ func init() { proto.RegisterType((*ResponseOfferSnapshot)(nil), "tendermint.abci.ResponseOfferSnapshot") proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "tendermint.abci.ResponseLoadSnapshotChunk") proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.ResponseApplySnapshotChunk") + proto.RegisterType((*ResponseExtendVote)(nil), "tendermint.abci.ResponseExtendVote") + proto.RegisterType((*ResponseVerifyVoteExtension)(nil), "tendermint.abci.ResponseVerifyVoteExtension") proto.RegisterType((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") proto.RegisterType((*Event)(nil), "tendermint.abci.Event") @@ -3091,177 +3358,190 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2716 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x1b, 0xc7, - 0xf1, 0xc7, 0x1b, 0xd8, 0x06, 0xf1, 0xe0, 0x88, 0xa6, 0x61, 0x58, 0x22, 0xe5, 0x55, 0x49, 0x96, - 0x64, 0x9b, 0xfc, 0x9b, 0x2a, 0xe9, 0x2f, 0x97, 0xf3, 0x30, 0x01, 0x41, 0x01, 0x2d, 0x86, 0x64, - 0x86, 0x90, 0x5c, 0x4e, 0x62, 0xad, 0x17, 0xd8, 0x21, 0xb0, 0x16, 0xb0, 0xbb, 0xde, 0x5d, 0x50, - 0xa4, 0x8e, 0xa9, 0xe4, 0xa2, 0xca, 0x41, 0x97, 0x54, 0xe5, 0xe2, 0x53, 0x3e, 0x44, 0x72, 0xca, - 0x29, 0x07, 0x1f, 0x72, 0xf0, 0x31, 0x27, 0x27, 0x25, 0xdd, 0xf2, 0x05, 0x7c, 0x4a, 0x55, 0x6a, - 0x1e, 0xfb, 0x02, 0xb0, 0x04, 0x18, 0xe7, 0x96, 0xdb, 0x4c, 0x6f, 0x77, 0x63, 0xa6, 0x67, 0xe6, - 0xd7, 0xbf, 0xe9, 0x01, 0xbc, 0xe9, 0x12, 0x43, 0x23, 0xf6, 0x48, 0x37, 0xdc, 0x4d, 0xb5, 0xdb, - 0xd3, 0x37, 0xdd, 0x53, 0x8b, 0x38, 0x1b, 0x96, 0x6d, 0xba, 0x26, 0xaa, 0x04, 0x1f, 0x37, 0xe8, - 0xc7, 0xfa, 0xa5, 0x90, 0x76, 0xcf, 0x3e, 0xb5, 0x5c, 0x73, 0xd3, 0xb2, 0x4d, 0xf3, 0x88, 0xeb, - 0xd7, 0x2f, 0x86, 0x3e, 0x33, 0x3f, 0x61, 0x6f, 0x91, 0xaf, 0xc2, 0xf8, 0x09, 0x39, 0xf5, 0xbe, - 0x5e, 0x9a, 0xb2, 0xb5, 0x54, 0x5b, 0x1d, 0x79, 0x9f, 0xd7, 0xfb, 0xa6, 0xd9, 0x1f, 0x92, 0x4d, - 0xd6, 0xeb, 0x8e, 0x8f, 0x36, 0x5d, 0x7d, 0x44, 0x1c, 0x57, 0x1d, 0x59, 0x42, 0x61, 0xa5, 0x6f, - 0xf6, 0x4d, 0xd6, 0xdc, 0xa4, 0x2d, 0x2e, 0x95, 0xff, 0x50, 0x80, 0x3c, 0x26, 0x5f, 0x8e, 0x89, - 0xe3, 0xa2, 0x2d, 0xc8, 0x90, 0xde, 0xc0, 0xac, 0x25, 0x2f, 0x27, 0xaf, 0x17, 0xb7, 0x2e, 0x6e, - 0x4c, 0x4c, 0x6e, 0x43, 0xe8, 0xb5, 0x7a, 0x03, 0xb3, 0x9d, 0xc0, 0x4c, 0x17, 0xdd, 0x86, 0xec, - 0xd1, 0x70, 0xec, 0x0c, 0x6a, 0x29, 0x66, 0x74, 0x29, 0xce, 0xe8, 0x3e, 0x55, 0x6a, 0x27, 0x30, - 0xd7, 0xa6, 0x3f, 0xa5, 0x1b, 0x47, 0x66, 0x2d, 0x7d, 0xf6, 0x4f, 0xed, 0x18, 0x47, 0xec, 0xa7, - 0xa8, 0x2e, 0x6a, 0x00, 0xe8, 0x86, 0xee, 0x2a, 0xbd, 0x81, 0xaa, 0x1b, 0xb5, 0x0c, 0xb3, 0x7c, - 0x2b, 0xde, 0x52, 0x77, 0x9b, 0x54, 0xb1, 0x9d, 0xc0, 0x92, 0xee, 0x75, 0xe8, 0x70, 0xbf, 0x1c, - 0x13, 0xfb, 0xb4, 0x96, 0x3d, 0x7b, 0xb8, 0x3f, 0xa3, 0x4a, 0x74, 0xb8, 0x4c, 0x1b, 0xb5, 0xa0, - 0xd8, 0x25, 0x7d, 0xdd, 0x50, 0xba, 0x43, 0xb3, 0xf7, 0xa4, 0x96, 0x63, 0xc6, 0x72, 0x9c, 0x71, - 0x83, 0xaa, 0x36, 0xa8, 0x66, 0x3b, 0x81, 0xa1, 0xeb, 0xf7, 0xd0, 0x0f, 0xa0, 0xd0, 0x1b, 0x90, - 0xde, 0x13, 0xc5, 0x3d, 0xa9, 0xe5, 0x99, 0x8f, 0xf5, 0x38, 0x1f, 0x4d, 0xaa, 0xd7, 0x39, 0x69, - 0x27, 0x70, 0xbe, 0xc7, 0x9b, 0x74, 0xfe, 0x1a, 0x19, 0xea, 0xc7, 0xc4, 0xa6, 0xf6, 0x85, 0xb3, - 0xe7, 0x7f, 0x8f, 0x6b, 0x32, 0x0f, 0x92, 0xe6, 0x75, 0xd0, 0x8f, 0x41, 0x22, 0x86, 0x26, 0xa6, - 0x21, 0x31, 0x17, 0x97, 0x63, 0xd7, 0xd9, 0xd0, 0xbc, 0x49, 0x14, 0x88, 0x68, 0xa3, 0xbb, 0x90, - 0xeb, 0x99, 0xa3, 0x91, 0xee, 0xd6, 0x80, 0x59, 0xaf, 0xc5, 0x4e, 0x80, 0x69, 0xb5, 0x13, 0x58, - 0xe8, 0xa3, 0x3d, 0x28, 0x0f, 0x75, 0xc7, 0x55, 0x1c, 0x43, 0xb5, 0x9c, 0x81, 0xe9, 0x3a, 0xb5, - 0x22, 0xf3, 0x70, 0x35, 0xce, 0xc3, 0xae, 0xee, 0xb8, 0x87, 0x9e, 0x72, 0x3b, 0x81, 0x4b, 0xc3, - 0xb0, 0x80, 0xfa, 0x33, 0x8f, 0x8e, 0x88, 0xed, 0x3b, 0xac, 0x2d, 0x9d, 0xed, 0x6f, 0x9f, 0x6a, - 0x7b, 0xf6, 0xd4, 0x9f, 0x19, 0x16, 0xa0, 0x5f, 0xc0, 0x85, 0xa1, 0xa9, 0x6a, 0xbe, 0x3b, 0xa5, - 0x37, 0x18, 0x1b, 0x4f, 0x6a, 0x25, 0xe6, 0xf4, 0x46, 0xec, 0x20, 0x4d, 0x55, 0xf3, 0x5c, 0x34, - 0xa9, 0x41, 0x3b, 0x81, 0x97, 0x87, 0x93, 0x42, 0xf4, 0x18, 0x56, 0x54, 0xcb, 0x1a, 0x9e, 0x4e, - 0x7a, 0x2f, 0x33, 0xef, 0x37, 0xe3, 0xbc, 0x6f, 0x53, 0x9b, 0x49, 0xf7, 0x48, 0x9d, 0x92, 0xa2, - 0x0e, 0x54, 0x2d, 0x9b, 0x58, 0xaa, 0x4d, 0x14, 0xcb, 0x36, 0x2d, 0xd3, 0x51, 0x87, 0xb5, 0x0a, - 0xf3, 0xfd, 0x76, 0x9c, 0xef, 0x03, 0xae, 0x7f, 0x20, 0xd4, 0xdb, 0x09, 0x5c, 0xb1, 0xa2, 0xa2, - 0x46, 0x1e, 0xb2, 0xc7, 0xea, 0x70, 0x4c, 0xe4, 0xb7, 0xa1, 0x18, 0x3a, 0xfc, 0xa8, 0x06, 0xf9, - 0x11, 0x71, 0x1c, 0xb5, 0x4f, 0x18, 0x56, 0x48, 0xd8, 0xeb, 0xca, 0x65, 0x58, 0x0a, 0x1f, 0x78, - 0xf9, 0x45, 0xd2, 0xb7, 0xa4, 0x67, 0x99, 0x5a, 0x1e, 0x13, 0xdb, 0xd1, 0x4d, 0xc3, 0xb3, 0x14, - 0x5d, 0x74, 0x05, 0x4a, 0x6c, 0x57, 0x2a, 0xde, 0x77, 0x0a, 0x28, 0x19, 0xbc, 0xc4, 0x84, 0x8f, - 0x84, 0xd2, 0x3a, 0x14, 0xad, 0x2d, 0xcb, 0x57, 0x49, 0x33, 0x15, 0xb0, 0xb6, 0x2c, 0x4f, 0xe1, - 0x2d, 0x58, 0xa2, 0x73, 0xf4, 0x35, 0x32, 0xec, 0x47, 0x8a, 0x54, 0x26, 0x54, 0xe4, 0xbf, 0xa6, - 0xa0, 0x3a, 0x09, 0x12, 0xe8, 0x2e, 0x64, 0x28, 0x5e, 0x0a, 0xe8, 0xab, 0x6f, 0x70, 0x30, 0xdd, - 0xf0, 0xc0, 0x74, 0xa3, 0xe3, 0x81, 0x69, 0xa3, 0xf0, 0xf5, 0xb7, 0xeb, 0x89, 0x17, 0x7f, 0x5f, - 0x4f, 0x62, 0x66, 0x81, 0xde, 0xa0, 0x67, 0x5a, 0xd5, 0x0d, 0x45, 0xd7, 0xd8, 0x90, 0x25, 0x7a, - 0x60, 0x55, 0xdd, 0xd8, 0xd1, 0xd0, 0x2e, 0x54, 0x7b, 0xa6, 0xe1, 0x10, 0xc3, 0x19, 0x3b, 0x0a, - 0x07, 0x6b, 0x01, 0x78, 0x91, 0x63, 0xcb, 0x53, 0x40, 0xd3, 0xd3, 0x3c, 0x60, 0x8a, 0xb8, 0xd2, - 0x8b, 0x0a, 0xd0, 0x7d, 0x80, 0x63, 0x75, 0xa8, 0x6b, 0xaa, 0x6b, 0xda, 0x4e, 0x2d, 0x73, 0x39, - 0x3d, 0xf3, 0xec, 0x3e, 0xf2, 0x54, 0x1e, 0x5a, 0x9a, 0xea, 0x92, 0x46, 0x86, 0x0e, 0x17, 0x87, - 0x2c, 0xd1, 0x35, 0xa8, 0xa8, 0x96, 0xa5, 0x38, 0xae, 0xea, 0x12, 0xa5, 0x7b, 0xea, 0x12, 0x87, - 0x81, 0xe1, 0x12, 0x2e, 0xa9, 0x96, 0x75, 0x48, 0xa5, 0x0d, 0x2a, 0x44, 0x57, 0xa1, 0x4c, 0x71, - 0x53, 0x57, 0x87, 0xca, 0x80, 0xe8, 0xfd, 0x81, 0xcb, 0x60, 0x2f, 0x8d, 0x4b, 0x42, 0xda, 0x66, - 0x42, 0x59, 0xf3, 0x57, 0x9c, 0x61, 0x26, 0x42, 0x90, 0xd1, 0x54, 0x57, 0x65, 0x91, 0x5c, 0xc2, - 0xac, 0x4d, 0x65, 0x96, 0xea, 0x0e, 0x44, 0x7c, 0x58, 0x1b, 0xad, 0x42, 0x4e, 0xb8, 0x4d, 0x33, - 0xb7, 0xa2, 0x87, 0x56, 0x20, 0x6b, 0xd9, 0xe6, 0x31, 0x61, 0x4b, 0x57, 0xc0, 0xbc, 0x23, 0xff, - 0x3a, 0x05, 0xcb, 0x53, 0xe8, 0x4a, 0xfd, 0x0e, 0x54, 0x67, 0xe0, 0xfd, 0x16, 0x6d, 0xa3, 0x3b, - 0xd4, 0xaf, 0xaa, 0x11, 0x5b, 0x64, 0xa4, 0xda, 0x74, 0xa8, 0xdb, 0xec, 0xbb, 0x08, 0x8d, 0xd0, - 0x46, 0xfb, 0x50, 0x1d, 0xaa, 0x8e, 0xab, 0x70, 0xb4, 0x52, 0x42, 0xd9, 0x69, 0x1a, 0xa3, 0x77, - 0x55, 0x0f, 0xdf, 0xe8, 0xa6, 0x16, 0x8e, 0xca, 0xc3, 0x88, 0x14, 0x61, 0x58, 0xe9, 0x9e, 0x3e, - 0x53, 0x0d, 0x57, 0x37, 0x88, 0x32, 0xb5, 0x72, 0x6f, 0x4c, 0x39, 0x6d, 0x1d, 0xeb, 0x1a, 0x31, - 0x7a, 0xde, 0x92, 0x5d, 0xf0, 0x8d, 0xfd, 0x25, 0x75, 0x64, 0x0c, 0xe5, 0x68, 0x7e, 0x40, 0x65, - 0x48, 0xb9, 0x27, 0x22, 0x00, 0x29, 0xf7, 0x04, 0xfd, 0x1f, 0x64, 0xe8, 0x24, 0xd9, 0xe4, 0xcb, - 0x33, 0x12, 0xab, 0xb0, 0xeb, 0x9c, 0x5a, 0x04, 0x33, 0x4d, 0x59, 0xf6, 0x8f, 0x83, 0x9f, 0x33, - 0x26, 0xbd, 0xca, 0x37, 0xa0, 0x32, 0x91, 0x14, 0x42, 0xeb, 0x97, 0x0c, 0xaf, 0x9f, 0x5c, 0x81, - 0x52, 0x24, 0x03, 0xc8, 0xab, 0xb0, 0x32, 0x0b, 0xd0, 0xe5, 0x81, 0x2f, 0x8f, 0x00, 0x33, 0xba, - 0x0d, 0x05, 0x1f, 0xd1, 0xf9, 0x71, 0x9c, 0x8e, 0x95, 0xa7, 0x8c, 0x7d, 0x55, 0x7a, 0x0e, 0xe9, - 0xb6, 0x66, 0xfb, 0x21, 0xc5, 0x06, 0x9e, 0x57, 0x2d, 0xab, 0xad, 0x3a, 0x03, 0xf9, 0x73, 0xa8, - 0xc5, 0xa1, 0xf5, 0xc4, 0x34, 0x32, 0xfe, 0x36, 0x5c, 0x85, 0xdc, 0x91, 0x69, 0x8f, 0x54, 0x97, - 0x39, 0x2b, 0x61, 0xd1, 0xa3, 0xdb, 0x93, 0x23, 0x77, 0x9a, 0x89, 0x79, 0x47, 0x56, 0xe0, 0x8d, - 0x58, 0xc4, 0xa6, 0x26, 0xba, 0xa1, 0x11, 0x1e, 0xcf, 0x12, 0xe6, 0x9d, 0xc0, 0x11, 0x1f, 0x2c, - 0xef, 0xd0, 0x9f, 0x75, 0xd8, 0x5c, 0x99, 0x7f, 0x09, 0x8b, 0x9e, 0xac, 0xc0, 0xea, 0x6c, 0xd8, - 0x46, 0x97, 0x00, 0x38, 0x6e, 0x8a, 0x53, 0x97, 0xbe, 0xbe, 0x84, 0x25, 0x26, 0xb9, 0x47, 0x8f, - 0xde, 0x35, 0xa8, 0x04, 0x9f, 0x15, 0x47, 0x7f, 0xc6, 0xb7, 0x46, 0x1a, 0x97, 0x7c, 0x9d, 0x43, - 0xfd, 0x19, 0x91, 0xbf, 0x2b, 0x40, 0x01, 0x13, 0xc7, 0xa2, 0xa0, 0x83, 0x1a, 0x20, 0x91, 0x93, - 0x1e, 0xb1, 0x5c, 0x0f, 0xa7, 0x67, 0x93, 0x1d, 0xae, 0xdd, 0xf2, 0x34, 0x29, 0xd3, 0xf0, 0xcd, - 0xd0, 0x2d, 0x41, 0x26, 0xe3, 0x79, 0xa1, 0x30, 0x0f, 0xb3, 0xc9, 0x3b, 0x1e, 0x9b, 0x4c, 0xc7, - 0x92, 0x0b, 0x6e, 0x35, 0x41, 0x27, 0x6f, 0x09, 0x3a, 0x99, 0x99, 0xf3, 0x63, 0x11, 0x3e, 0xd9, - 0x8c, 0xf0, 0xc9, 0xec, 0x9c, 0x69, 0xc6, 0x10, 0xca, 0x3b, 0x1e, 0xa1, 0xcc, 0xcd, 0x19, 0xf1, - 0x04, 0xa3, 0xbc, 0x1f, 0x65, 0x94, 0x9c, 0x0d, 0x5e, 0x89, 0xb5, 0x8e, 0xa5, 0x94, 0x3f, 0x0c, - 0x51, 0xca, 0x42, 0x2c, 0x9f, 0xe3, 0x4e, 0x66, 0x70, 0xca, 0x66, 0x84, 0x53, 0x4a, 0x73, 0x62, - 0x10, 0x43, 0x2a, 0x3f, 0x0a, 0x93, 0x4a, 0x88, 0xe5, 0xa5, 0x62, 0xbd, 0x67, 0xb1, 0xca, 0x0f, - 0x7c, 0x56, 0x59, 0x8c, 0xa5, 0xc5, 0x62, 0x0e, 0x93, 0xb4, 0x72, 0x7f, 0x8a, 0x56, 0x72, 0x1a, - 0x78, 0x2d, 0xd6, 0xc5, 0x1c, 0x5e, 0xb9, 0x3f, 0xc5, 0x2b, 0x4b, 0x73, 0x1c, 0xce, 0x21, 0x96, - 0xbf, 0x9c, 0x4d, 0x2c, 0xe3, 0xa9, 0x9f, 0x18, 0xe6, 0x62, 0xcc, 0x52, 0x89, 0x61, 0x96, 0x9c, - 0xfd, 0xbd, 0x13, 0xeb, 0x7e, 0x61, 0x6a, 0xf9, 0x70, 0x06, 0xb5, 0xac, 0x32, 0xe7, 0xd7, 0x63, - 0x9d, 0x9f, 0x87, 0x5b, 0xde, 0xa0, 0x99, 0x7d, 0x02, 0x4a, 0x28, 0x3a, 0x12, 0xdb, 0x36, 0x6d, - 0xc1, 0x12, 0x79, 0x47, 0xbe, 0x4e, 0xb9, 0x46, 0x00, 0x1b, 0x67, 0xf0, 0x50, 0x96, 0x85, 0x42, - 0x50, 0x21, 0xff, 0x29, 0x19, 0xd8, 0xb2, 0xf4, 0x1c, 0xe6, 0x29, 0x92, 0xe0, 0x29, 0x21, 0x76, - 0x9a, 0x8a, 0xb2, 0xd3, 0x75, 0x28, 0xd2, 0xec, 0x32, 0x41, 0x3c, 0x55, 0xcb, 0x27, 0x9e, 0x37, - 0x61, 0x99, 0xd1, 0x07, 0x0e, 0xb6, 0x22, 0xa5, 0x64, 0x18, 0xd2, 0x56, 0xe8, 0x07, 0xbe, 0xe7, - 0x79, 0x6e, 0x79, 0x0f, 0x2e, 0x84, 0x74, 0xfd, 0xac, 0xc5, 0x59, 0x58, 0xd5, 0xd7, 0xde, 0x16, - 0xe9, 0xeb, 0x2f, 0xc9, 0x20, 0x42, 0x01, 0x63, 0x9d, 0x45, 0x2e, 0x93, 0xff, 0x25, 0x72, 0x99, - 0xfa, 0x8f, 0xc9, 0x65, 0x38, 0x0b, 0xa7, 0xa3, 0x59, 0xf8, 0xbb, 0x64, 0xb0, 0x26, 0x3e, 0x55, - 0xec, 0x99, 0x1a, 0x11, 0x79, 0x91, 0xb5, 0x51, 0x15, 0xd2, 0x43, 0xb3, 0x2f, 0xb2, 0x1f, 0x6d, - 0x52, 0x2d, 0x1f, 0xdb, 0x25, 0x01, 0xdd, 0x7e, 0x4a, 0xcd, 0xb2, 0x08, 0x8b, 0x94, 0x5a, 0x85, - 0xf4, 0x13, 0xc2, 0x91, 0x78, 0x09, 0xd3, 0x26, 0xd5, 0x63, 0x9b, 0x8c, 0xe1, 0xeb, 0x12, 0xe6, - 0x1d, 0x74, 0x17, 0x24, 0x56, 0x94, 0x51, 0x4c, 0xcb, 0x11, 0xa0, 0xf9, 0x66, 0x78, 0xae, 0xbc, - 0xf6, 0xb2, 0x71, 0x40, 0x75, 0xf6, 0x2d, 0x07, 0x17, 0x2c, 0xd1, 0x0a, 0xb1, 0x05, 0x29, 0x42, - 0x5a, 0x2f, 0x82, 0x44, 0x47, 0xef, 0x58, 0x6a, 0x8f, 0x30, 0x04, 0x94, 0x70, 0x20, 0x90, 0x1f, - 0x03, 0x9a, 0xc6, 0x71, 0xd4, 0x86, 0x1c, 0x39, 0x26, 0x86, 0xeb, 0xb0, 0xa4, 0x5d, 0xdc, 0x5a, - 0x9d, 0xc1, 0x08, 0x89, 0xe1, 0x36, 0x6a, 0x34, 0xc8, 0xff, 0xfc, 0x76, 0xbd, 0xca, 0xb5, 0xdf, - 0x35, 0x47, 0xba, 0x4b, 0x46, 0x96, 0x7b, 0x8a, 0x85, 0xbd, 0xfc, 0xc7, 0x14, 0xa5, 0x67, 0x11, - 0x8c, 0x9f, 0x19, 0x5b, 0x6f, 0xcb, 0xa7, 0x42, 0xd4, 0x7c, 0xb1, 0x78, 0xaf, 0x01, 0xf4, 0x55, - 0x47, 0x79, 0xaa, 0x1a, 0x2e, 0xd1, 0x44, 0xd0, 0x43, 0x12, 0x54, 0x87, 0x02, 0xed, 0x8d, 0x1d, - 0xa2, 0x89, 0x5b, 0x82, 0xdf, 0x0f, 0xcd, 0x33, 0xff, 0xfd, 0xe6, 0x19, 0x8d, 0x72, 0x61, 0x22, - 0xca, 0x21, 0xea, 0x24, 0x85, 0xa9, 0x13, 0x1d, 0x9b, 0x65, 0xeb, 0xa6, 0xad, 0xbb, 0xa7, 0x6c, - 0x69, 0xd2, 0xd8, 0xef, 0xcb, 0xbf, 0x49, 0x05, 0x47, 0x2b, 0x60, 0xbf, 0xff, 0x73, 0xb1, 0x93, - 0x7f, 0xcb, 0xee, 0xc4, 0xd1, 0x04, 0x8d, 0x0e, 0x61, 0xd9, 0x3f, 0xd9, 0xca, 0x98, 0x9d, 0x78, - 0x6f, 0xaf, 0x2e, 0x0a, 0x0d, 0xd5, 0xe3, 0xa8, 0xd8, 0x41, 0x9f, 0xc2, 0xeb, 0x13, 0xb0, 0xe5, - 0xbb, 0x4e, 0x2d, 0x8a, 0x5e, 0xaf, 0x45, 0xd1, 0xcb, 0x73, 0x1d, 0x04, 0x2b, 0xfd, 0x3d, 0x0f, - 0xd4, 0x0e, 0xbd, 0x66, 0x85, 0xf9, 0xc6, 0xcc, 0xe5, 0xbf, 0x02, 0x25, 0x9b, 0xb8, 0xf4, 0xea, - 0x1f, 0xb9, 0xc8, 0x2e, 0x71, 0xa1, 0xb8, 0x1e, 0x1f, 0xc0, 0x6b, 0x33, 0x79, 0x07, 0xfa, 0x7f, - 0x90, 0x02, 0xca, 0x92, 0x8c, 0xb9, 0x13, 0xfa, 0xf7, 0x9c, 0x40, 0x57, 0xfe, 0x73, 0x32, 0x70, - 0x19, 0xbd, 0x39, 0xb5, 0x20, 0x67, 0x13, 0x67, 0x3c, 0xe4, 0x77, 0x99, 0xf2, 0xd6, 0x7b, 0x8b, - 0x31, 0x16, 0x2a, 0x1d, 0x0f, 0x5d, 0x2c, 0x8c, 0xe5, 0xc7, 0x90, 0xe3, 0x12, 0x54, 0x84, 0xfc, - 0xc3, 0xbd, 0x07, 0x7b, 0xfb, 0x9f, 0xec, 0x55, 0x13, 0x08, 0x20, 0xb7, 0xdd, 0x6c, 0xb6, 0x0e, - 0x3a, 0xd5, 0x24, 0x92, 0x20, 0xbb, 0xdd, 0xd8, 0xc7, 0x9d, 0x6a, 0x8a, 0x8a, 0x71, 0xeb, 0xe3, - 0x56, 0xb3, 0x53, 0x4d, 0xa3, 0x65, 0x28, 0xf1, 0xb6, 0x72, 0x7f, 0x1f, 0xff, 0x74, 0xbb, 0x53, - 0xcd, 0x84, 0x44, 0x87, 0xad, 0xbd, 0x7b, 0x2d, 0x5c, 0xcd, 0xca, 0xef, 0xd3, 0xcb, 0x52, 0x0c, - 0xc7, 0x09, 0xae, 0x45, 0xc9, 0xd0, 0xb5, 0x48, 0xfe, 0x7d, 0x0a, 0xea, 0xf1, 0xc4, 0x05, 0x7d, - 0x3c, 0x31, 0xf1, 0xad, 0x73, 0xb0, 0x9e, 0x89, 0xd9, 0xa3, 0xab, 0x50, 0xb6, 0xc9, 0x11, 0x71, - 0x7b, 0x03, 0x4e, 0xa4, 0x78, 0x36, 0x2c, 0xe1, 0x92, 0x90, 0x32, 0x23, 0x87, 0xab, 0x7d, 0x41, - 0x7a, 0xae, 0xc2, 0x61, 0x86, 0x6f, 0x3a, 0x89, 0xaa, 0x51, 0xe9, 0x21, 0x17, 0xca, 0x9f, 0x9f, - 0x2b, 0x96, 0x12, 0x64, 0x71, 0xab, 0x83, 0x3f, 0xad, 0xa6, 0x11, 0x82, 0x32, 0x6b, 0x2a, 0x87, - 0x7b, 0xdb, 0x07, 0x87, 0xed, 0x7d, 0x1a, 0xcb, 0x0b, 0x50, 0xf1, 0x62, 0xe9, 0x09, 0xb3, 0xf2, - 0x5d, 0x78, 0x3d, 0x86, 0x75, 0xcd, 0xb9, 0x1a, 0xca, 0x9f, 0x41, 0x39, 0x5a, 0xc8, 0xa0, 0xc1, - 0xb7, 0xcd, 0xb1, 0xa1, 0xb1, 0x30, 0x66, 0x31, 0xef, 0xa0, 0xdb, 0x90, 0x3d, 0x36, 0xf9, 0x01, - 0x9d, 0xbd, 0x4b, 0x1f, 0x99, 0x2e, 0x09, 0x15, 0x42, 0xb8, 0xb6, 0xfc, 0x0c, 0xb2, 0xec, 0xbc, - 0xd1, 0xb3, 0xc3, 0x4a, 0x12, 0x82, 0x69, 0xd1, 0x36, 0xfa, 0x0c, 0x40, 0x75, 0x5d, 0x5b, 0xef, - 0x8e, 0x03, 0xc7, 0xeb, 0xb3, 0xcf, 0xeb, 0xb6, 0xa7, 0xd7, 0xb8, 0x28, 0x0e, 0xee, 0x4a, 0x60, - 0x1a, 0x3a, 0xbc, 0x21, 0x87, 0xf2, 0x1e, 0x94, 0xa3, 0xb6, 0x1e, 0x37, 0xe0, 0x63, 0x88, 0x72, - 0x03, 0x4e, 0xf5, 0x04, 0x37, 0xf0, 0x99, 0x45, 0x9a, 0x97, 0x9f, 0x58, 0x47, 0x7e, 0x9e, 0x84, - 0x42, 0xe7, 0x44, 0xac, 0x64, 0x4c, 0xe5, 0x23, 0x30, 0x4d, 0x85, 0xef, 0xf9, 0xbc, 0x94, 0x92, - 0xf6, 0x0b, 0x34, 0x1f, 0xf9, 0x7b, 0x35, 0xb3, 0xe8, 0x6d, 0xcb, 0xab, 0x54, 0x89, 0xf3, 0xf9, - 0x21, 0x48, 0x3e, 0xda, 0x52, 0xca, 0xaa, 0x6a, 0x9a, 0x4d, 0x1c, 0x47, 0x9c, 0x18, 0xaf, 0xcb, - 0x0a, 0x69, 0xe6, 0x53, 0x51, 0x49, 0x48, 0x63, 0xde, 0x91, 0x35, 0xa8, 0x4c, 0x40, 0x35, 0xfa, - 0x10, 0xf2, 0xd6, 0xb8, 0xab, 0x78, 0xe1, 0x99, 0x78, 0x8e, 0xf1, 0xc8, 0xd0, 0xb8, 0x3b, 0xd4, - 0x7b, 0x0f, 0xc8, 0xa9, 0x37, 0x18, 0x6b, 0xdc, 0x7d, 0xc0, 0xa3, 0xc8, 0x7f, 0x25, 0x15, 0xfe, - 0x95, 0x63, 0x28, 0x78, 0x9b, 0x02, 0xfd, 0x08, 0x24, 0x3f, 0x0b, 0xf8, 0xf5, 0xd5, 0xd8, 0xf4, - 0x21, 0xdc, 0x07, 0x26, 0x94, 0x59, 0x3b, 0x7a, 0xdf, 0x20, 0x9a, 0x12, 0x90, 0x66, 0xf6, 0x6b, - 0x05, 0x5c, 0xe1, 0x1f, 0x76, 0x3d, 0xc6, 0x2c, 0xff, 0x2b, 0x09, 0x05, 0xaf, 0x8e, 0x86, 0xde, - 0x0f, 0xed, 0xbb, 0xf2, 0x8c, 0xa2, 0x80, 0xa7, 0x18, 0xd4, 0xc2, 0xa2, 0x63, 0x4d, 0x9d, 0x7f, - 0xac, 0x71, 0x45, 0x4d, 0xaf, 0xbc, 0x9c, 0x39, 0x77, 0x79, 0xf9, 0x5d, 0x40, 0xae, 0xe9, 0xaa, - 0x43, 0xe5, 0xd8, 0x74, 0x75, 0xa3, 0xaf, 0xf0, 0x60, 0x73, 0x16, 0x51, 0x65, 0x5f, 0x1e, 0xb1, - 0x0f, 0x07, 0x2c, 0xee, 0xbf, 0x4a, 0x42, 0xc1, 0x4f, 0x07, 0xe7, 0x2d, 0x6d, 0xad, 0x42, 0x4e, - 0x20, 0x1e, 0xaf, 0x6d, 0x89, 0x9e, 0x5f, 0x65, 0xcd, 0x84, 0xaa, 0xac, 0x75, 0x28, 0x8c, 0x88, - 0xab, 0x32, 0x60, 0xe1, 0xf7, 0x16, 0xbf, 0x7f, 0xf3, 0x03, 0x28, 0x86, 0xaa, 0x8c, 0xf4, 0xe4, - 0xed, 0xb5, 0x3e, 0xa9, 0x26, 0xea, 0xf9, 0xe7, 0x5f, 0x5d, 0x4e, 0xef, 0x91, 0xa7, 0x74, 0xcf, - 0xe2, 0x56, 0xb3, 0xdd, 0x6a, 0x3e, 0xa8, 0x26, 0xeb, 0xc5, 0xe7, 0x5f, 0x5d, 0xce, 0x63, 0xc2, - 0x0a, 0x12, 0x37, 0xdb, 0xb0, 0x14, 0x5e, 0x95, 0x28, 0x68, 0x22, 0x28, 0xdf, 0x7b, 0x78, 0xb0, - 0xbb, 0xd3, 0xdc, 0xee, 0xb4, 0x94, 0x47, 0xfb, 0x9d, 0x56, 0x35, 0x89, 0x5e, 0x87, 0x0b, 0xbb, - 0x3b, 0x3f, 0x69, 0x77, 0x94, 0xe6, 0xee, 0x4e, 0x6b, 0xaf, 0xa3, 0x6c, 0x77, 0x3a, 0xdb, 0xcd, - 0x07, 0xd5, 0xd4, 0xd6, 0xef, 0x00, 0x2a, 0xdb, 0x8d, 0xe6, 0x0e, 0x05, 0x7c, 0xbd, 0xa7, 0xb2, - 0x4b, 0x65, 0x13, 0x32, 0xec, 0xda, 0x78, 0xe6, 0xcb, 0x66, 0xfd, 0xec, 0x52, 0x15, 0xba, 0x0f, - 0x59, 0x76, 0xa3, 0x44, 0x67, 0x3f, 0x75, 0xd6, 0xe7, 0xd4, 0xae, 0xe8, 0x60, 0xd8, 0xf1, 0x38, - 0xf3, 0xed, 0xb3, 0x7e, 0x76, 0x29, 0x0b, 0x61, 0x90, 0x02, 0xda, 0x3a, 0xff, 0x2d, 0xb0, 0xbe, - 0x00, 0xd8, 0xa0, 0x5d, 0xc8, 0x7b, 0x97, 0x88, 0x79, 0xaf, 0x93, 0xf5, 0xb9, 0xb5, 0x26, 0x1a, - 0x2e, 0x7e, 0xd9, 0x3b, 0xfb, 0xa9, 0xb5, 0x3e, 0xa7, 0x70, 0x86, 0x76, 0x20, 0x27, 0xa8, 0xd8, - 0x9c, 0x17, 0xc7, 0xfa, 0xbc, 0xda, 0x11, 0x0d, 0x5a, 0x70, 0x8d, 0x9e, 0xff, 0x80, 0x5c, 0x5f, - 0xa0, 0x26, 0x88, 0x1e, 0x02, 0x84, 0xae, 0x76, 0x0b, 0xbc, 0x0c, 0xd7, 0x17, 0xa9, 0xf5, 0xa1, - 0x7d, 0x28, 0xf8, 0x74, 0x7c, 0xee, 0x3b, 0x6d, 0x7d, 0x7e, 0xd1, 0x0d, 0x3d, 0x86, 0x52, 0x94, - 0x86, 0x2e, 0xf6, 0xfa, 0x5a, 0x5f, 0xb0, 0x9a, 0x46, 0xfd, 0x47, 0x39, 0xe9, 0x62, 0xaf, 0xb1, - 0xf5, 0x05, 0x8b, 0x6b, 0xe8, 0x0b, 0x58, 0x9e, 0xe6, 0x8c, 0x8b, 0x3f, 0xce, 0xd6, 0xcf, 0x51, - 0x6e, 0x43, 0x23, 0x40, 0x33, 0xb8, 0xe6, 0x39, 0xde, 0x6a, 0xeb, 0xe7, 0xa9, 0xbe, 0x21, 0x0d, - 0x2a, 0x93, 0x04, 0x6e, 0xd1, 0xb7, 0xdb, 0xfa, 0xc2, 0x95, 0xb8, 0x46, 0xeb, 0xeb, 0x97, 0x6b, - 0xc9, 0x6f, 0x5e, 0xae, 0x25, 0xff, 0xf1, 0x72, 0x2d, 0xf9, 0xe2, 0xd5, 0x5a, 0xe2, 0x9b, 0x57, - 0x6b, 0x89, 0xbf, 0xbd, 0x5a, 0x4b, 0xfc, 0xfc, 0x9d, 0xbe, 0xee, 0x0e, 0xc6, 0xdd, 0x8d, 0x9e, - 0x39, 0xda, 0x0c, 0xff, 0xd5, 0x64, 0xd6, 0xdf, 0x5f, 0xba, 0x39, 0x96, 0xba, 0x6e, 0xfd, 0x3b, - 0x00, 0x00, 0xff, 0xff, 0xeb, 0x38, 0xd3, 0x92, 0x1e, 0x23, 0x00, 0x00, + // 2926 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x73, 0x23, 0xd5, + 0x11, 0xd7, 0xa7, 0xad, 0x69, 0x59, 0x1f, 0x7e, 0x5e, 0x16, 0x31, 0xec, 0xda, 0xcb, 0x50, 0xc0, + 0xb2, 0x80, 0x1d, 0xbc, 0x05, 0x59, 0x8a, 0x24, 0x60, 0x69, 0xe5, 0xc8, 0xac, 0x63, 0x3b, 0xcf, + 0xda, 0xa5, 0x48, 0x60, 0x87, 0x91, 0xe6, 0xd9, 0x1a, 0x56, 0x9a, 0x19, 0x66, 0x46, 0xc2, 0xde, + 0x63, 0x2a, 0xb9, 0x50, 0x39, 0x70, 0xcc, 0x85, 0x53, 0xf2, 0x47, 0xe4, 0x94, 0x53, 0x0e, 0x1c, + 0x92, 0x2a, 0x8e, 0x39, 0xa4, 0x48, 0x8a, 0xbd, 0xe5, 0x1f, 0xc8, 0x29, 0x55, 0xa9, 0xf7, 0x31, + 0x5f, 0x92, 0x46, 0x1f, 0x90, 0x5b, 0x6e, 0xd3, 0xfd, 0xba, 0x7b, 0xde, 0xeb, 0xf7, 0xa6, 0xfb, + 0xd7, 0x3d, 0x0f, 0x9e, 0xf5, 0x88, 0xa9, 0x13, 0x67, 0x60, 0x98, 0xde, 0x8e, 0xd6, 0xe9, 0x1a, + 0x3b, 0xde, 0xa5, 0x4d, 0xdc, 0x6d, 0xdb, 0xb1, 0x3c, 0x0b, 0x55, 0xc2, 0xc1, 0x6d, 0x3a, 0x28, + 0x5f, 0x8f, 0x48, 0x77, 0x9d, 0x4b, 0xdb, 0xb3, 0x76, 0x6c, 0xc7, 0xb2, 0xce, 0xb8, 0xbc, 0x7c, + 0x2d, 0x32, 0xcc, 0xec, 0x44, 0xad, 0xc5, 0x46, 0x85, 0xf2, 0x23, 0x72, 0xe9, 0x8f, 0x5e, 0x9f, + 0xd0, 0xb5, 0x35, 0x47, 0x1b, 0xf8, 0xc3, 0x5b, 0xe7, 0x96, 0x75, 0xde, 0x27, 0x3b, 0x8c, 0xea, + 0x0c, 0xcf, 0x76, 0x3c, 0x63, 0x40, 0x5c, 0x4f, 0x1b, 0xd8, 0x42, 0xe0, 0xca, 0xb9, 0x75, 0x6e, + 0xb1, 0xc7, 0x1d, 0xfa, 0xc4, 0xb9, 0xca, 0x5f, 0x25, 0x58, 0xc5, 0xe4, 0xd3, 0x21, 0x71, 0x3d, + 0xb4, 0x0b, 0x39, 0xd2, 0xed, 0x59, 0xb5, 0xf4, 0x8d, 0xf4, 0xcd, 0xe2, 0xee, 0xb5, 0xed, 0xb1, + 0xc5, 0x6d, 0x0b, 0xb9, 0x66, 0xb7, 0x67, 0xb5, 0x52, 0x98, 0xc9, 0xa2, 0x37, 0x20, 0x7f, 0xd6, + 0x1f, 0xba, 0xbd, 0x5a, 0x86, 0x29, 0x5d, 0x4f, 0x52, 0xda, 0xa7, 0x42, 0xad, 0x14, 0xe6, 0xd2, + 0xf4, 0x55, 0x86, 0x79, 0x66, 0xd5, 0xb2, 0xb3, 0x5f, 0x75, 0x60, 0x9e, 0xb1, 0x57, 0x51, 0x59, + 0x54, 0x07, 0x30, 0x4c, 0xc3, 0x53, 0xbb, 0x3d, 0xcd, 0x30, 0x6b, 0x39, 0xa6, 0xf9, 0x5c, 0xb2, + 0xa6, 0xe1, 0x35, 0xa8, 0x60, 0x2b, 0x85, 0x25, 0xc3, 0x27, 0xe8, 0x74, 0x3f, 0x1d, 0x12, 0xe7, + 0xb2, 0x96, 0x9f, 0x3d, 0xdd, 0x9f, 0x53, 0x21, 0x3a, 0x5d, 0x26, 0x8d, 0x9a, 0x50, 0xec, 0x90, + 0x73, 0xc3, 0x54, 0x3b, 0x7d, 0xab, 0xfb, 0xa8, 0xb6, 0xc2, 0x94, 0x95, 0x24, 0xe5, 0x3a, 0x15, + 0xad, 0x53, 0xc9, 0x56, 0x0a, 0x43, 0x27, 0xa0, 0xd0, 0x8f, 0xa0, 0xd0, 0xed, 0x91, 0xee, 0x23, + 0xd5, 0xbb, 0xa8, 0xad, 0x32, 0x1b, 0x5b, 0x49, 0x36, 0x1a, 0x54, 0xae, 0x7d, 0xd1, 0x4a, 0xe1, + 0xd5, 0x2e, 0x7f, 0xa4, 0xeb, 0xd7, 0x49, 0xdf, 0x18, 0x11, 0x87, 0xea, 0x17, 0x66, 0xaf, 0xff, + 0x2e, 0x97, 0x64, 0x16, 0x24, 0xdd, 0x27, 0xd0, 0x3b, 0x20, 0x11, 0x53, 0x17, 0xcb, 0x90, 0x98, + 0x89, 0x1b, 0x89, 0xfb, 0x6c, 0xea, 0xfe, 0x22, 0x0a, 0x44, 0x3c, 0xa3, 0x3b, 0xb0, 0xd2, 0xb5, + 0x06, 0x03, 0xc3, 0xab, 0x01, 0xd3, 0xde, 0x4c, 0x5c, 0x00, 0x93, 0x6a, 0xa5, 0xb0, 0x90, 0x47, + 0x47, 0x50, 0xee, 0x1b, 0xae, 0xa7, 0xba, 0xa6, 0x66, 0xbb, 0x3d, 0xcb, 0x73, 0x6b, 0x45, 0x66, + 0xe1, 0x85, 0x24, 0x0b, 0x87, 0x86, 0xeb, 0x9d, 0xfa, 0xc2, 0xad, 0x14, 0x2e, 0xf5, 0xa3, 0x0c, + 0x6a, 0xcf, 0x3a, 0x3b, 0x23, 0x4e, 0x60, 0xb0, 0xb6, 0x36, 0xdb, 0xde, 0x31, 0x95, 0xf6, 0xf5, + 0xa9, 0x3d, 0x2b, 0xca, 0x40, 0xbf, 0x84, 0x8d, 0xbe, 0xa5, 0xe9, 0x81, 0x39, 0xb5, 0xdb, 0x1b, + 0x9a, 0x8f, 0x6a, 0x25, 0x66, 0xf4, 0xe5, 0xc4, 0x49, 0x5a, 0x9a, 0xee, 0x9b, 0x68, 0x50, 0x85, + 0x56, 0x0a, 0xaf, 0xf7, 0xc7, 0x99, 0xe8, 0x21, 0x5c, 0xd1, 0x6c, 0xbb, 0x7f, 0x39, 0x6e, 0xbd, + 0xcc, 0xac, 0xdf, 0x4a, 0xb2, 0xbe, 0x47, 0x75, 0xc6, 0xcd, 0x23, 0x6d, 0x82, 0x8b, 0xda, 0x50, + 0xb5, 0x1d, 0x62, 0x6b, 0x0e, 0x51, 0x6d, 0xc7, 0xb2, 0x2d, 0x57, 0xeb, 0xd7, 0x2a, 0xcc, 0xf6, + 0x4b, 0x49, 0xb6, 0x4f, 0xb8, 0xfc, 0x89, 0x10, 0x6f, 0xa5, 0x70, 0xc5, 0x8e, 0xb3, 0xe8, 0xb1, + 0x27, 0x17, 0x54, 0x5d, 0x1d, 0x59, 0x1e, 0xa9, 0x55, 0x67, 0x1f, 0xfb, 0x26, 0x13, 0x7d, 0x60, + 0x79, 0x84, 0x1e, 0x7b, 0x12, 0x50, 0x48, 0x83, 0xa7, 0x46, 0xc4, 0x31, 0xce, 0x2e, 0x99, 0x19, + 0x95, 0x8d, 0xb8, 0x86, 0x65, 0xd6, 0xd6, 0x99, 0xc1, 0x57, 0x92, 0x0c, 0x3e, 0x60, 0x4a, 0xd4, + 0x44, 0xd3, 0x57, 0x69, 0xa5, 0xf0, 0xc6, 0x68, 0x92, 0x5d, 0x5f, 0x85, 0xfc, 0x48, 0xeb, 0x0f, + 0x89, 0xf2, 0x12, 0x14, 0x23, 0x61, 0x0a, 0xd5, 0x60, 0x75, 0x40, 0x5c, 0x57, 0x3b, 0x27, 0x2c, + 0xaa, 0x49, 0xd8, 0x27, 0x95, 0x32, 0xac, 0x45, 0x43, 0x93, 0xf2, 0x45, 0x3a, 0xd0, 0xa4, 0x51, + 0x87, 0x6a, 0x8e, 0x88, 0xc3, 0xa6, 0x29, 0x34, 0x05, 0x89, 0x9e, 0x87, 0x12, 0xfb, 0x7e, 0x54, + 0x7f, 0x9c, 0x86, 0xbe, 0x1c, 0x5e, 0x63, 0xcc, 0x07, 0x42, 0x68, 0x0b, 0x8a, 0xf6, 0xae, 0x1d, + 0x88, 0x64, 0x99, 0x08, 0xd8, 0xbb, 0xb6, 0x2f, 0xf0, 0x1c, 0xac, 0xd1, 0xb5, 0x06, 0x12, 0x39, + 0xf6, 0x92, 0x22, 0xe5, 0x09, 0x11, 0xe5, 0x2f, 0x19, 0xa8, 0x8e, 0x87, 0x33, 0x74, 0x07, 0x72, + 0x34, 0xb2, 0x8b, 0x20, 0x2d, 0x6f, 0xf3, 0xb0, 0xbf, 0xed, 0x87, 0xfd, 0xed, 0xb6, 0x1f, 0xf6, + 0xeb, 0x85, 0xaf, 0xbe, 0xd9, 0x4a, 0x7d, 0xf1, 0x8f, 0xad, 0x34, 0x66, 0x1a, 0xe8, 0x19, 0x1a, + 0x7d, 0x34, 0xc3, 0x54, 0x0d, 0x9d, 0x4d, 0x59, 0xa2, 0xa1, 0x45, 0x33, 0xcc, 0x03, 0x1d, 0x1d, + 0x42, 0xb5, 0x6b, 0x99, 0x2e, 0x31, 0xdd, 0xa1, 0xab, 0xf2, 0xb4, 0x22, 0x42, 0x73, 0x2c, 0xc0, + 0xf0, 0x64, 0xd5, 0xf0, 0x25, 0x4f, 0x98, 0x20, 0xae, 0x74, 0xe3, 0x0c, 0xb4, 0x0f, 0x30, 0xd2, + 0xfa, 0x86, 0xae, 0x79, 0x96, 0xe3, 0xd6, 0x72, 0x37, 0xb2, 0x53, 0xa3, 0xcc, 0x03, 0x5f, 0xe4, + 0xbe, 0xad, 0x6b, 0x1e, 0xa9, 0xe7, 0xe8, 0x74, 0x71, 0x44, 0x13, 0xbd, 0x08, 0x15, 0xcd, 0xb6, + 0x55, 0xd7, 0xd3, 0x3c, 0xa2, 0x76, 0x2e, 0x3d, 0xe2, 0xb2, 0xb0, 0xbd, 0x86, 0x4b, 0x9a, 0x6d, + 0x9f, 0x52, 0x6e, 0x9d, 0x32, 0xd1, 0x0b, 0x50, 0xa6, 0x11, 0xde, 0xd0, 0xfa, 0x6a, 0x8f, 0x18, + 0xe7, 0x3d, 0x8f, 0x05, 0xe8, 0x2c, 0x2e, 0x09, 0x6e, 0x8b, 0x31, 0x15, 0x3d, 0xd8, 0x71, 0x16, + 0xdd, 0x11, 0x82, 0x9c, 0xae, 0x79, 0x1a, 0xf3, 0xe4, 0x1a, 0x66, 0xcf, 0x94, 0x67, 0x6b, 0x5e, + 0x4f, 0xf8, 0x87, 0x3d, 0xa3, 0xab, 0xb0, 0x22, 0xcc, 0x66, 0x99, 0x59, 0x41, 0xa1, 0x2b, 0x90, + 0xb7, 0x1d, 0x6b, 0x44, 0xd8, 0xd6, 0x15, 0x30, 0x27, 0x94, 0x5f, 0x67, 0x60, 0x7d, 0x22, 0x0f, + 0x50, 0xbb, 0x3d, 0xcd, 0xed, 0xf9, 0xef, 0xa2, 0xcf, 0xe8, 0x4d, 0x6a, 0x57, 0xd3, 0x89, 0x23, + 0x72, 0x67, 0x6d, 0xd2, 0xd5, 0x2d, 0x36, 0x2e, 0x5c, 0x23, 0xa4, 0xd1, 0x31, 0x54, 0xfb, 0x9a, + 0xeb, 0xa9, 0x3c, 0xae, 0xaa, 0x91, 0x3c, 0x3a, 0x99, 0x4d, 0x0e, 0x35, 0x3f, 0x12, 0xd3, 0x43, + 0x2d, 0x0c, 0x95, 0xfb, 0x31, 0x2e, 0xc2, 0x70, 0xa5, 0x73, 0xf9, 0x58, 0x33, 0x3d, 0xc3, 0x24, + 0xea, 0xc4, 0xce, 0x3d, 0x33, 0x61, 0xb4, 0x39, 0x32, 0x74, 0x62, 0x76, 0xfd, 0x2d, 0xdb, 0x08, + 0x94, 0x83, 0x2d, 0x75, 0x15, 0x0c, 0xe5, 0x78, 0x26, 0x43, 0x65, 0xc8, 0x78, 0x17, 0xc2, 0x01, + 0x19, 0xef, 0x02, 0xfd, 0x00, 0x72, 0x74, 0x91, 0x6c, 0xf1, 0xe5, 0x29, 0x10, 0x40, 0xe8, 0xb5, + 0x2f, 0x6d, 0x82, 0x99, 0xa4, 0xa2, 0x04, 0x9f, 0x43, 0x90, 0xdd, 0xc6, 0xad, 0x2a, 0x2f, 0x43, + 0x65, 0x2c, 0x7d, 0x45, 0xf6, 0x2f, 0x1d, 0xdd, 0x3f, 0xa5, 0x02, 0xa5, 0x58, 0xae, 0x52, 0xae, + 0xc2, 0x95, 0x69, 0xa9, 0x47, 0xe9, 0x05, 0xfc, 0x58, 0x0a, 0x41, 0x6f, 0x40, 0x21, 0xc8, 0x3d, + 0xfc, 0x73, 0x9c, 0xf4, 0x95, 0x2f, 0x8c, 0x03, 0x51, 0xfa, 0x1d, 0xd2, 0x63, 0xcd, 0xce, 0x43, + 0x86, 0x4d, 0x7c, 0x55, 0xb3, 0xed, 0x96, 0xe6, 0xf6, 0x94, 0x8f, 0xa1, 0x96, 0x94, 0x57, 0xc6, + 0x96, 0x91, 0x0b, 0x8e, 0xe1, 0x55, 0x58, 0x39, 0xb3, 0x9c, 0x81, 0xe6, 0x31, 0x63, 0x25, 0x2c, + 0x28, 0x7a, 0x3c, 0x79, 0x8e, 0xc9, 0x32, 0x36, 0x27, 0x14, 0x15, 0x9e, 0x49, 0xcc, 0x2d, 0x54, + 0xc5, 0x30, 0x75, 0xc2, 0xfd, 0x59, 0xc2, 0x9c, 0x08, 0x0d, 0xf1, 0xc9, 0x72, 0x82, 0xbe, 0xd6, + 0x65, 0x6b, 0x65, 0xf6, 0x25, 0x2c, 0x28, 0xe5, 0x9d, 0xe0, 0xf8, 0x87, 0xf9, 0x00, 0xdd, 0x82, + 0x1c, 0xcb, 0x20, 0xdc, 0x4b, 0x57, 0x27, 0x0f, 0x3a, 0x95, 0xc2, 0x4c, 0x46, 0x69, 0x81, 0x9c, + 0x1c, 0xff, 0x97, 0xb2, 0xa4, 0xc2, 0xd5, 0xe9, 0xb9, 0x0e, 0x5d, 0x07, 0xe0, 0x21, 0x5c, 0x04, + 0x80, 0xec, 0xcd, 0x35, 0x2c, 0x31, 0xce, 0x5d, 0x1a, 0x05, 0x5e, 0x84, 0x4a, 0x38, 0xac, 0xba, + 0xc6, 0x63, 0x7e, 0x4a, 0xb3, 0xb8, 0x14, 0xc8, 0x9c, 0x1a, 0x8f, 0x89, 0xf2, 0x7b, 0x80, 0x02, + 0x26, 0xae, 0x4d, 0xe3, 0x1f, 0xaa, 0x83, 0x44, 0x2e, 0xba, 0xc4, 0xf6, 0xfc, 0x94, 0x31, 0x3d, + 0x55, 0x72, 0xe9, 0xa6, 0x2f, 0x49, 0xe1, 0x59, 0xa0, 0x86, 0x6e, 0x0b, 0x04, 0x9e, 0x0c, 0xa6, + 0x85, 0x7a, 0x14, 0x82, 0xbf, 0xe9, 0x43, 0xf0, 0x6c, 0x22, 0x22, 0xe3, 0x5a, 0x63, 0x18, 0xfc, + 0xb6, 0xc0, 0xe0, 0xb9, 0x39, 0x2f, 0x8b, 0x81, 0xf0, 0x46, 0x0c, 0x84, 0xe7, 0xe7, 0x2c, 0x33, + 0x01, 0x85, 0xbf, 0xe9, 0xa3, 0xf0, 0x95, 0x39, 0x33, 0x1e, 0x83, 0xe1, 0xfb, 0x71, 0x18, 0xce, + 0x21, 0xf4, 0xf3, 0x89, 0xda, 0x89, 0x38, 0xfc, 0xc7, 0x11, 0x1c, 0x5e, 0x48, 0x04, 0xc1, 0xdc, + 0xc8, 0x14, 0x20, 0xde, 0x88, 0x01, 0x71, 0x69, 0x8e, 0x0f, 0x12, 0x90, 0xf8, 0xbb, 0x51, 0x24, + 0x0e, 0x89, 0x60, 0x5e, 0xec, 0xf7, 0x34, 0x28, 0xfe, 0x56, 0x00, 0xc5, 0x8b, 0x89, 0xb5, 0x84, + 0x58, 0xc3, 0x38, 0x16, 0x3f, 0x9e, 0xc0, 0xe2, 0x1c, 0x3b, 0xbf, 0x98, 0x68, 0x62, 0x0e, 0x18, + 0x3f, 0x9e, 0x00, 0xe3, 0xa5, 0x39, 0x06, 0xe7, 0xa0, 0xf1, 0x0f, 0xa7, 0xa3, 0xf1, 0x64, 0xbc, + 0x2c, 0xa6, 0xb9, 0x18, 0x1c, 0x57, 0x13, 0xe0, 0x78, 0x25, 0x11, 0x90, 0x72, 0xf3, 0x0b, 0xe3, + 0xf1, 0xfb, 0x53, 0xf0, 0x38, 0x87, 0xcf, 0x37, 0x13, 0x8d, 0x2f, 0x00, 0xc8, 0xf7, 0xe3, 0x80, + 0x7c, 0x7d, 0xce, 0x07, 0x90, 0x88, 0xc8, 0x3b, 0x49, 0x88, 0x1c, 0x31, 0x8b, 0xaf, 0x26, 0x5a, + 0xfc, 0x2e, 0x90, 0xfc, 0x65, 0x9a, 0x11, 0xc6, 0xc2, 0x1e, 0x4d, 0x2a, 0xc4, 0x71, 0x2c, 0x47, + 0x80, 0x6b, 0x4e, 0x28, 0x37, 0x29, 0x44, 0x0b, 0x43, 0xdc, 0x0c, 0xf8, 0xce, 0x92, 0x77, 0x24, + 0xac, 0x29, 0x7f, 0x4c, 0x87, 0xba, 0x0c, 0xd5, 0x44, 0xe1, 0x9d, 0x24, 0xe0, 0x5d, 0x04, 0xd4, + 0x67, 0xe2, 0xa0, 0x7e, 0x0b, 0x8a, 0x34, 0x29, 0x8f, 0xe1, 0x75, 0xcd, 0x0e, 0xf0, 0xfa, 0x2d, + 0x58, 0x67, 0xa8, 0x8b, 0x27, 0x06, 0x91, 0x89, 0x73, 0x2c, 0x2b, 0x54, 0xe8, 0x00, 0xff, 0x3e, + 0x79, 0x4a, 0x7e, 0x0d, 0x36, 0x22, 0xb2, 0x41, 0xb2, 0xe7, 0xe0, 0xb5, 0x1a, 0x48, 0xef, 0x89, + 0xac, 0xff, 0xe7, 0x74, 0xe8, 0xa1, 0x10, 0xe8, 0x4f, 0xc3, 0xe4, 0xe9, 0xff, 0x11, 0x26, 0xcf, + 0x7c, 0x67, 0x4c, 0x1e, 0x05, 0x2f, 0xd9, 0x38, 0x78, 0xf9, 0x77, 0x3a, 0xdc, 0x93, 0x00, 0x61, + 0x77, 0x2d, 0x9d, 0x08, 0x38, 0xc1, 0x9e, 0x51, 0x15, 0xb2, 0x7d, 0xeb, 0x5c, 0x80, 0x06, 0xfa, + 0x48, 0xa5, 0x82, 0x3c, 0x24, 0x89, 0x34, 0x13, 0x20, 0x91, 0x3c, 0xf3, 0xb0, 0x40, 0x22, 0x55, + 0xc8, 0x3e, 0x22, 0x3c, 0x6b, 0xac, 0x61, 0xfa, 0x48, 0xe5, 0xd8, 0x21, 0x63, 0xb9, 0x60, 0x0d, + 0x73, 0x02, 0xdd, 0x01, 0x89, 0x75, 0xdd, 0x54, 0xcb, 0x76, 0x45, 0x80, 0x7f, 0x36, 0xba, 0x56, + 0xde, 0x5c, 0xdb, 0x3e, 0xa1, 0x32, 0xc7, 0xb6, 0x8b, 0x0b, 0xb6, 0x78, 0x8a, 0x80, 0x2c, 0x29, + 0x86, 0xf5, 0xaf, 0x81, 0x44, 0x67, 0xef, 0xda, 0x5a, 0x97, 0xb0, 0x68, 0x2d, 0xe1, 0x90, 0xa1, + 0x3c, 0x04, 0x34, 0x99, 0x73, 0x50, 0x0b, 0x56, 0xc8, 0x88, 0x98, 0x9e, 0xcb, 0x00, 0xc6, 0x18, + 0x58, 0x11, 0x40, 0x9a, 0x98, 0x5e, 0xbd, 0x46, 0x9d, 0xfc, 0xaf, 0x6f, 0xb6, 0xaa, 0x5c, 0xfa, + 0x55, 0x6b, 0x60, 0x78, 0x64, 0x60, 0x7b, 0x97, 0x58, 0xe8, 0x2b, 0x7f, 0xcf, 0x50, 0x54, 0x1b, + 0xcb, 0x47, 0x53, 0x7d, 0xeb, 0x1f, 0xf9, 0x4c, 0xa4, 0xa2, 0x59, 0xcc, 0xdf, 0x9b, 0x00, 0xe7, + 0x9a, 0xab, 0x7e, 0xa6, 0x99, 0x1e, 0xd1, 0x85, 0xd3, 0x23, 0x1c, 0x24, 0x43, 0x81, 0x52, 0x43, + 0x97, 0xe8, 0xa2, 0xb8, 0x0a, 0xe8, 0xc8, 0x3a, 0x57, 0xbf, 0xdf, 0x3a, 0xe3, 0x5e, 0x2e, 0x8c, + 0x79, 0x39, 0x82, 0x38, 0xa5, 0x28, 0xe2, 0xa4, 0x73, 0xb3, 0x1d, 0xc3, 0x72, 0x0c, 0xef, 0x92, + 0x6d, 0x4d, 0x16, 0x07, 0x34, 0xad, 0xd5, 0x07, 0x64, 0x60, 0x5b, 0x56, 0x5f, 0xe5, 0xe1, 0xa6, + 0xc8, 0x54, 0xd7, 0x04, 0xb3, 0xc9, 0xa2, 0xce, 0x6f, 0x32, 0xe1, 0xf7, 0x17, 0x56, 0x16, 0xff, + 0x77, 0x0e, 0x56, 0x7e, 0xcb, 0xfa, 0x0d, 0x71, 0xc4, 0x81, 0x4e, 0x61, 0x3d, 0xf8, 0xfc, 0xd5, + 0x21, 0x0b, 0x0b, 0xfe, 0x81, 0x5e, 0x34, 0x7e, 0x54, 0x47, 0x71, 0xb6, 0x8b, 0x3e, 0x80, 0xa7, + 0xc7, 0x62, 0x5b, 0x60, 0x3a, 0xb3, 0x68, 0x88, 0x7b, 0x2a, 0x1e, 0xe2, 0x7c, 0xd3, 0xa1, 0xb3, + 0xb2, 0xdf, 0xf3, 0xab, 0x3b, 0xa0, 0x25, 0x6c, 0x14, 0x40, 0x4d, 0xdd, 0xfe, 0xe7, 0xa1, 0xe4, + 0x10, 0x4f, 0x33, 0x4c, 0x35, 0xd6, 0x24, 0x58, 0xe3, 0x4c, 0xd1, 0x7a, 0x38, 0x81, 0xa7, 0xa6, + 0x02, 0x29, 0xf4, 0x43, 0x90, 0x42, 0x0c, 0x96, 0x4e, 0xa8, 0xb7, 0x83, 0x1a, 0x32, 0x94, 0x55, + 0xfe, 0x94, 0x0e, 0x4d, 0xc6, 0xab, 0xd2, 0x26, 0xac, 0x38, 0xc4, 0x1d, 0xf6, 0x79, 0x9d, 0x58, + 0xde, 0x7d, 0x6d, 0x31, 0x08, 0x46, 0xb9, 0xc3, 0xbe, 0x87, 0x85, 0xb2, 0xf2, 0x10, 0x56, 0x38, + 0x07, 0x15, 0x61, 0xf5, 0xfe, 0xd1, 0xbd, 0xa3, 0xe3, 0xf7, 0x8f, 0xaa, 0x29, 0x04, 0xb0, 0xb2, + 0xd7, 0x68, 0x34, 0x4f, 0xda, 0xd5, 0x34, 0x92, 0x20, 0xbf, 0x57, 0x3f, 0xc6, 0xed, 0x6a, 0x86, + 0xb2, 0x71, 0xf3, 0xbd, 0x66, 0xa3, 0x5d, 0xcd, 0xa2, 0x75, 0x28, 0xf1, 0x67, 0x75, 0xff, 0x18, + 0xff, 0x6c, 0xaf, 0x5d, 0xcd, 0x45, 0x58, 0xa7, 0xcd, 0xa3, 0xbb, 0x4d, 0x5c, 0xcd, 0x2b, 0xaf, + 0xd3, 0x42, 0x34, 0x01, 0xb4, 0x85, 0x25, 0x67, 0x3a, 0x52, 0x72, 0x2a, 0xbf, 0xcb, 0xd0, 0xd2, + 0x30, 0x09, 0x89, 0xa1, 0xf7, 0xc6, 0x16, 0xbe, 0xbb, 0x04, 0x8c, 0x1b, 0x5b, 0x3d, 0x7a, 0x01, + 0xca, 0x0e, 0x39, 0x23, 0x5e, 0xb7, 0xc7, 0x91, 0x21, 0x4f, 0x99, 0x25, 0x5c, 0x12, 0x5c, 0xa6, + 0xe4, 0x72, 0xb1, 0x4f, 0x48, 0xd7, 0x53, 0x79, 0x2c, 0xe2, 0x87, 0x4e, 0xa2, 0x62, 0x94, 0x7b, + 0xca, 0x99, 0xca, 0xc7, 0x4b, 0xf9, 0x52, 0x82, 0x3c, 0x6e, 0xb6, 0xf1, 0x07, 0xd5, 0x2c, 0x42, + 0x50, 0x66, 0x8f, 0xea, 0xe9, 0xd1, 0xde, 0xc9, 0x69, 0xeb, 0x98, 0xfa, 0x72, 0x03, 0x2a, 0xbe, + 0x2f, 0x7d, 0x66, 0x5e, 0xf9, 0x30, 0xcc, 0x40, 0x91, 0xb2, 0x7b, 0x1f, 0xca, 0x63, 0xf8, 0x2e, + 0x3d, 0x59, 0x29, 0x84, 0x65, 0x73, 0x80, 0xdd, 0x70, 0x69, 0x14, 0x25, 0x95, 0x3f, 0xa4, 0xe1, + 0xd9, 0x19, 0x08, 0x10, 0xdd, 0x1b, 0xf3, 0xfc, 0xed, 0x65, 0xf0, 0xe3, 0xf8, 0xc1, 0xbb, 0xb3, + 0x90, 0xb3, 0x4e, 0x0f, 0xf7, 0x4e, 0x5b, 0xf1, 0x83, 0xa7, 0xdc, 0x81, 0xa7, 0x13, 0xb0, 0xf4, + 0x9c, 0x82, 0x5f, 0xf9, 0x08, 0xca, 0xf1, 0x4e, 0x19, 0x3d, 0x81, 0x8e, 0x35, 0x34, 0x75, 0xb6, + 0xa2, 0x3c, 0xe6, 0x04, 0x7a, 0x03, 0xf2, 0xd4, 0x33, 0x3e, 0x80, 0x9a, 0xfc, 0x54, 0xe9, 0xca, + 0x22, 0x9d, 0x36, 0x2e, 0xad, 0x3c, 0x86, 0x3c, 0x0b, 0x3a, 0x34, 0x80, 0xb0, 0x9e, 0x97, 0xc0, + 0xa4, 0xf4, 0x19, 0x7d, 0x04, 0xa0, 0x79, 0x9e, 0x63, 0x74, 0x86, 0xa1, 0xe1, 0xad, 0xe9, 0x41, + 0x6b, 0xcf, 0x97, 0xab, 0x5f, 0x13, 0xd1, 0xeb, 0x4a, 0xa8, 0x1a, 0x89, 0x60, 0x11, 0x83, 0xca, + 0x11, 0x94, 0xe3, 0xba, 0x3e, 0x8a, 0xe2, 0x73, 0x88, 0xa3, 0x28, 0x0e, 0x8a, 0x05, 0x8a, 0x0a, + 0x30, 0x58, 0x96, 0xf7, 0x37, 0x19, 0xa1, 0x7c, 0x9e, 0x86, 0x42, 0xfb, 0x42, 0xec, 0x50, 0x42, + 0x6b, 0x2d, 0x54, 0xcd, 0x44, 0x1b, 0x49, 0xbc, 0x57, 0x97, 0x0d, 0x3a, 0x80, 0xef, 0x06, 0xc7, + 0x26, 0xb7, 0x68, 0x0d, 0xed, 0xb7, 0x42, 0xc5, 0x59, 0x79, 0x1b, 0xa4, 0x20, 0xe5, 0x50, 0x70, + 0xaf, 0xe9, 0xba, 0x43, 0x5c, 0x57, 0x84, 0x0d, 0x9f, 0x64, 0x9d, 0x5a, 0xeb, 0x33, 0xd1, 0xaa, + 0xca, 0x62, 0x4e, 0x28, 0x3a, 0x54, 0xc6, 0xf2, 0x15, 0x7a, 0x1b, 0x56, 0xed, 0x61, 0x47, 0xf5, + 0xdd, 0x33, 0xf6, 0x67, 0xd2, 0x87, 0x8d, 0xc3, 0x4e, 0xdf, 0xe8, 0xde, 0x23, 0x97, 0xfe, 0x64, + 0xec, 0x61, 0xe7, 0x1e, 0xf7, 0x22, 0x7f, 0x4b, 0x26, 0xfa, 0x96, 0x11, 0x14, 0xfc, 0x43, 0x81, + 0x7e, 0x02, 0x52, 0x90, 0x0a, 0x83, 0x06, 0x7e, 0x62, 0x0e, 0x15, 0xe6, 0x43, 0x15, 0x5a, 0x83, + 0xb8, 0xc6, 0xb9, 0x49, 0x74, 0x35, 0x2c, 0x2f, 0xd8, 0xdb, 0x0a, 0xb8, 0xc2, 0x07, 0x0e, 0xfd, + 0xda, 0x42, 0xf9, 0x4f, 0x1a, 0x0a, 0x7e, 0xa3, 0x16, 0xbd, 0x1e, 0x39, 0x77, 0xe5, 0x29, 0xad, + 0x1e, 0x5f, 0x30, 0x6c, 0xb6, 0xc6, 0xe7, 0x9a, 0x59, 0x7e, 0xae, 0x49, 0x5d, 0x73, 0xff, 0xff, + 0x45, 0x6e, 0xe9, 0xff, 0x17, 0xaf, 0x02, 0xf2, 0x2c, 0x4f, 0xeb, 0xd3, 0x9a, 0xd5, 0x30, 0xcf, + 0x55, 0xee, 0x6c, 0x0e, 0xa5, 0xaa, 0x6c, 0xe4, 0x01, 0x1b, 0x38, 0x61, 0x7e, 0xff, 0x55, 0x1a, + 0x0a, 0x41, 0x4e, 0x5c, 0xb6, 0x77, 0x7a, 0x15, 0x56, 0x44, 0xd8, 0xe7, 0xcd, 0x53, 0x41, 0x05, + 0x6d, 0xfc, 0x5c, 0xa4, 0x8d, 0x2f, 0x43, 0x61, 0x40, 0x3c, 0x8d, 0x05, 0x16, 0x5e, 0xe1, 0x05, + 0xf4, 0xad, 0xb7, 0xa0, 0x18, 0x69, 0x63, 0xd3, 0x2f, 0xef, 0xa8, 0xf9, 0x7e, 0x35, 0x25, 0xaf, + 0x7e, 0xfe, 0xe5, 0x8d, 0xec, 0x11, 0xf9, 0x8c, 0x9e, 0x59, 0xdc, 0x6c, 0xb4, 0x9a, 0x8d, 0x7b, + 0xd5, 0xb4, 0x5c, 0xfc, 0xfc, 0xcb, 0x1b, 0xab, 0x98, 0xb0, 0x36, 0xd3, 0xad, 0x16, 0xac, 0x45, + 0x77, 0x25, 0x1e, 0x0c, 0x11, 0x94, 0xef, 0xde, 0x3f, 0x39, 0x3c, 0x68, 0xec, 0xb5, 0x9b, 0xea, + 0x83, 0xe3, 0x76, 0xb3, 0x9a, 0x46, 0x4f, 0xc3, 0xc6, 0xe1, 0xc1, 0x4f, 0x5b, 0x6d, 0xb5, 0x71, + 0x78, 0xd0, 0x3c, 0x6a, 0xab, 0x7b, 0xed, 0xf6, 0x5e, 0xe3, 0x5e, 0x35, 0xb3, 0xfb, 0x4d, 0x11, + 0x2a, 0x7b, 0xf5, 0xc6, 0x01, 0xcd, 0x7a, 0x46, 0x57, 0x63, 0xe5, 0x77, 0x03, 0x72, 0xac, 0xc0, + 0x9e, 0xf9, 0x93, 0x5f, 0x9e, 0xdd, 0x80, 0x44, 0xfb, 0x90, 0x67, 0xb5, 0x37, 0x9a, 0xfd, 0xd7, + 0x5f, 0x9e, 0xd3, 0x91, 0xa4, 0x93, 0x61, 0x9f, 0xc7, 0xcc, 0x6b, 0x00, 0xf2, 0xec, 0x06, 0x25, + 0xc2, 0x20, 0x85, 0xd8, 0x7d, 0xfe, 0x6f, 0x71, 0x79, 0x81, 0x60, 0x83, 0x0e, 0x61, 0xd5, 0x2f, + 0xb7, 0xe6, 0xfd, 0xa8, 0x97, 0xe7, 0x76, 0x10, 0xa9, 0xbb, 0x78, 0x59, 0x3c, 0xfb, 0xd6, 0x81, + 0x3c, 0xa7, 0x1d, 0x8a, 0x0e, 0x60, 0x45, 0xe0, 0xd1, 0x39, 0x3f, 0xdf, 0xe5, 0x79, 0x1d, 0x41, + 0xea, 0xb4, 0xb0, 0xe1, 0x30, 0xff, 0x2e, 0x85, 0xbc, 0x40, 0xa7, 0x17, 0xdd, 0x07, 0x88, 0x14, + 0xc1, 0x0b, 0x5c, 0x92, 0x90, 0x17, 0xe9, 0xe0, 0xa2, 0x63, 0x28, 0x04, 0x35, 0xc9, 0xdc, 0x2b, + 0x0b, 0xf2, 0xfc, 0x56, 0x2a, 0x7a, 0x08, 0xa5, 0x38, 0x16, 0x5f, 0xec, 0x22, 0x82, 0xbc, 0x60, + 0x8f, 0x94, 0xda, 0x8f, 0x03, 0xf3, 0xc5, 0x2e, 0x26, 0xc8, 0x0b, 0xb6, 0x4c, 0xd1, 0x27, 0xb0, + 0x3e, 0x09, 0x9c, 0x17, 0xbf, 0xa7, 0x20, 0x2f, 0xd1, 0x44, 0x45, 0x03, 0x40, 0x53, 0x00, 0xf7, + 0x12, 0xd7, 0x16, 0xe4, 0x65, 0x7a, 0xaa, 0xf4, 0x08, 0x45, 0x50, 0xec, 0x02, 0x17, 0x0e, 0xe4, + 0x45, 0x7a, 0xa0, 0xc8, 0x86, 0x8d, 0x69, 0xe8, 0x75, 0x99, 0xfb, 0x07, 0xf2, 0x52, 0xad, 0x51, + 0xa4, 0x43, 0x65, 0x1c, 0x89, 0x2e, 0x7a, 0x1f, 0x43, 0x5e, 0xb8, 0x51, 0x5c, 0x6f, 0x7e, 0xf5, + 0xed, 0x66, 0xfa, 0xeb, 0x6f, 0x37, 0xd3, 0xff, 0xfc, 0x76, 0x33, 0xfd, 0xc5, 0x93, 0xcd, 0xd4, + 0xd7, 0x4f, 0x36, 0x53, 0x7f, 0x7b, 0xb2, 0x99, 0xfa, 0xc5, 0x2b, 0xe7, 0x86, 0xd7, 0x1b, 0x76, + 0xb6, 0xbb, 0xd6, 0x60, 0x27, 0x7a, 0x7d, 0x6c, 0xda, 0x95, 0xb6, 0xce, 0x0a, 0xcb, 0xc1, 0xb7, + 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x91, 0xe7, 0x05, 0x4d, 0xf2, 0x26, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3290,6 +3570,8 @@ type ABCIApplicationClient interface { OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot, opts ...grpc.CallOption) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) + ExtendVote(ctx context.Context, in *RequestExtendVote, opts ...grpc.CallOption) (*ResponseExtendVote, error) + VerifyVoteExtension(ctx context.Context, in *RequestVerifyVoteExtension, opts ...grpc.CallOption) (*ResponseVerifyVoteExtension, error) PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) } @@ -3427,6 +3709,24 @@ func (c *aBCIApplicationClient) ApplySnapshotChunk(ctx context.Context, in *Requ return out, nil } +func (c *aBCIApplicationClient) ExtendVote(ctx context.Context, in *RequestExtendVote, opts ...grpc.CallOption) (*ResponseExtendVote, error) { + out := new(ResponseExtendVote) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ExtendVote", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *aBCIApplicationClient) VerifyVoteExtension(ctx context.Context, in *RequestVerifyVoteExtension, opts ...grpc.CallOption) (*ResponseVerifyVoteExtension, error) { + out := new(ResponseVerifyVoteExtension) + err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/VerifyVoteExtension", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *aBCIApplicationClient) PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) { out := new(ResponsePrepareProposal) err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/PrepareProposal", in, out, opts...) @@ -3452,6 +3752,8 @@ type ABCIApplicationServer interface { OfferSnapshot(context.Context, *RequestOfferSnapshot) (*ResponseOfferSnapshot, error) LoadSnapshotChunk(context.Context, *RequestLoadSnapshotChunk) (*ResponseLoadSnapshotChunk, error) ApplySnapshotChunk(context.Context, *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) + ExtendVote(context.Context, *RequestExtendVote) (*ResponseExtendVote, error) + VerifyVoteExtension(context.Context, *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) PrepareProposal(context.Context, *RequestPrepareProposal) (*ResponsePrepareProposal, error) } @@ -3501,6 +3803,12 @@ func (*UnimplementedABCIApplicationServer) LoadSnapshotChunk(ctx context.Context func (*UnimplementedABCIApplicationServer) ApplySnapshotChunk(ctx context.Context, req *RequestApplySnapshotChunk) (*ResponseApplySnapshotChunk, error) { return nil, status.Errorf(codes.Unimplemented, "method ApplySnapshotChunk not implemented") } +func (*UnimplementedABCIApplicationServer) ExtendVote(ctx context.Context, req *RequestExtendVote) (*ResponseExtendVote, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExtendVote not implemented") +} +func (*UnimplementedABCIApplicationServer) VerifyVoteExtension(ctx context.Context, req *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) { + return nil, status.Errorf(codes.Unimplemented, "method VerifyVoteExtension not implemented") +} func (*UnimplementedABCIApplicationServer) PrepareProposal(ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) { return nil, status.Errorf(codes.Unimplemented, "method PrepareProposal not implemented") } @@ -3761,6 +4069,42 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co return interceptor(ctx, in, info, handler) } +func _ABCIApplication_ExtendVote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestExtendVote) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).ExtendVote(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tendermint.abci.ABCIApplication/ExtendVote", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).ExtendVote(ctx, req.(*RequestExtendVote)) + } + return interceptor(ctx, in, info, handler) +} + +func _ABCIApplication_VerifyVoteExtension_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestVerifyVoteExtension) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ABCIApplicationServer).VerifyVoteExtension(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/tendermint.abci.ABCIApplication/VerifyVoteExtension", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ABCIApplicationServer).VerifyVoteExtension(ctx, req.(*RequestVerifyVoteExtension)) + } + return interceptor(ctx, in, info, handler) +} + func _ABCIApplication_PrepareProposal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestPrepareProposal) if err := dec(in); err != nil { @@ -3839,6 +4183,14 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ MethodName: "ApplySnapshotChunk", Handler: _ABCIApplication_ApplySnapshotChunk_Handler, }, + { + MethodName: "ExtendVote", + Handler: _ABCIApplication_ExtendVote_Handler, + }, + { + MethodName: "VerifyVoteExtension", + Handler: _ABCIApplication_VerifyVoteExtension_Handler, + }, { MethodName: "PrepareProposal", Handler: _ABCIApplication_PrepareProposal_Handler, @@ -4195,29 +4547,75 @@ func (m *Request_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) } return len(dAtA) - i, nil } -func (m *RequestEcho) 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 *RequestEcho) MarshalTo(dAtA []byte) (int, error) { +func (m *Request_ExtendVote) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Request_ExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Message) > 0 { - i -= len(m.Message) - copy(dAtA[i:], m.Message) + if m.ExtendVote != nil { + { + size, err := m.ExtendVote.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + return len(dAtA) - i, nil +} +func (m *Request_VerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Request_VerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.VerifyVoteExtension != nil { + { + size, err := m.VerifyVoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + return len(dAtA) - i, nil +} +func (m *RequestEcho) 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 *RequestEcho) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Message) > 0 { + i -= len(m.Message) + copy(dAtA[i:], m.Message) i = encodeVarintTypes(dAtA, i, uint64(len(m.Message))) i-- dAtA[i] = 0xa @@ -4360,12 +4758,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err17 != nil { - return 0, err17 + n19, err19 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err19 != nil { + return 0, err19 } - i -= n17 - i = encodeVarintTypes(dAtA, i, uint64(n17)) + i -= n19 + i = encodeVarintTypes(dAtA, i, uint64(n19)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -4748,6 +5146,76 @@ func (m *RequestApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } +func (m *RequestExtendVote) 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 *RequestExtendVote) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Vote != nil { + { + size, err := m.Vote.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 *RequestVerifyVoteExtension) 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 *RequestVerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequestVerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Vote != nil { + { + size, err := m.Vote.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 *RequestPrepareProposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5155,6 +5623,52 @@ func (m *Response_PrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error } return len(dAtA) - i, nil } +func (m *Response_ExtendVote) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_ExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.ExtendVote != nil { + { + size, err := m.ExtendVote.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + return len(dAtA) - i, nil +} +func (m *Response_VerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_VerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.VerifyVoteExtension != nil { + { + size, err := m.VerifyVoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + return len(dAtA) - i, nil +} func (m *ResponseException) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5872,20 +6386,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA41 := make([]byte, len(m.RefetchChunks)*10) - var j40 int + dAtA47 := make([]byte, len(m.RefetchChunks)*10) + var j46 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA41[j40] = uint8(uint64(num)&0x7f | 0x80) + dAtA47[j46] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j40++ + j46++ } - dAtA41[j40] = uint8(num) - j40++ + dAtA47[j46] = uint8(num) + j46++ } - i -= j40 - copy(dAtA[i:], dAtA41[:j40]) - i = encodeVarintTypes(dAtA, i, uint64(j40)) + i -= j46 + copy(dAtA[i:], dAtA47[:j46]) + i = encodeVarintTypes(dAtA, i, uint64(j46)) i-- dAtA[i] = 0x12 } @@ -5897,6 +6411,69 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } +func (m *ResponseExtendVote) 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 *ResponseExtendVote) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.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 *ResponseVerifyVoteExtension) 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 *ResponseVerifyVoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ResponseVerifyVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Result != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Result)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *ResponsePrepareProposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6253,12 +6830,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n45, err45 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err45 != nil { - return 0, err45 + 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 -= n45 - i = encodeVarintTypes(dAtA, i, uint64(n45)) + i -= n52 + i = encodeVarintTypes(dAtA, i, uint64(n52)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -6539,6 +7116,30 @@ func (m *Request_PrepareProposal) Size() (n int) { } return n } +func (m *Request_ExtendVote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ExtendVote != nil { + l = m.ExtendVote.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Request_VerifyVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.VerifyVoteExtension != nil { + l = m.VerifyVoteExtension.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} func (m *RequestEcho) Size() (n int) { if m == nil { return 0 @@ -6776,6 +7377,32 @@ func (m *RequestApplySnapshotChunk) Size() (n int) { return n } +func (m *RequestExtendVote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Vote != nil { + l = m.Vote.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *RequestVerifyVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Vote != nil { + l = m.Vote.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func (m *RequestPrepareProposal) Size() (n int) { if m == nil { return 0 @@ -6998,6 +7625,30 @@ func (m *Response_PrepareProposal) Size() (n int) { } return n } +func (m *Response_ExtendVote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ExtendVote != nil { + l = m.ExtendVote.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} +func (m *Response_VerifyVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.VerifyVoteExtension != nil { + l = m.VerifyVoteExtension.Size() + n += 2 + l + sovTypes(uint64(l)) + } + return n +} func (m *ResponseException) Size() (n int) { if m == nil { return 0 @@ -7337,6 +7988,31 @@ func (m *ResponseApplySnapshotChunk) Size() (n int) { return n } +func (m *ResponseExtendVote) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *ResponseVerifyVoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Result != 0 { + n += 1 + sovTypes(uint64(m.Result)) + } + return n +} + func (m *ResponsePrepareProposal) Size() (n int) { if m == nil { return 0 @@ -8082,6 +8758,76 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_PrepareProposal{v} iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExtendVote", 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 + } + v := &RequestExtendVote{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_ExtendVote{v} + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VerifyVoteExtension", 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 + } + v := &RequestVerifyVoteExtension{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Request_VerifyVoteExtension{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -9621,19 +10367,187 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { if postIndex < 0 { return ErrInvalidLengthTypes } - if postIndex > l { + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Chunk = append(m.Chunk[:0], dAtA[iNdEx:postIndex]...) + if m.Chunk == nil { + m.Chunk = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", 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.Sender = string(dAtA[iNdEx:postIndex]) + 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 *RequestExtendVote) 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: RequestExtendVote: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestExtendVote: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Vote", 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.Vote == nil { + m.Vote = &types1.Vote{} + } + if err := m.Vote.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 *RequestVerifyVoteExtension) 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 } - m.Chunk = append(m.Chunk[:0], dAtA[iNdEx:postIndex]...) - if m.Chunk == nil { - m.Chunk = []byte{} + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - iNdEx = postIndex - case 3: + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RequestVerifyVoteExtension: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestVerifyVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Vote", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -9643,23 +10557,27 @@ func (m *RequestApplySnapshotChunk) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Sender = string(dAtA[iNdEx:postIndex]) + if m.Vote == nil { + m.Vote = &types1.Vote{} + } + if err := m.Vote.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -10372,6 +11290,76 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_PrepareProposal{v} iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExtendVote", 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 + } + v := &ResponseExtendVote{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_ExtendVote{v} + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VerifyVoteExtension", 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 + } + v := &ResponseVerifyVoteExtension{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Value = &Response_VerifyVoteExtension{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -12634,6 +13622,161 @@ func (m *ResponseApplySnapshotChunk) Unmarshal(dAtA []byte) error { } return nil } +func (m *ResponseExtendVote) 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: ResponseExtendVote: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseExtendVote: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", 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.VoteExtension == nil { + m.VoteExtension = &types1.VoteExtension{} + } + if err := m.VoteExtension.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 *ResponseVerifyVoteExtension) 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: ResponseVerifyVoteExtension: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ResponseVerifyVoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType) + } + m.Result = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Result |= ResponseVerifyVoteExtension_Result(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 *ResponsePrepareProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/internal/consensus/msgs_test.go b/internal/consensus/msgs_test.go index c22ebf5c0f7..f5a0851760b 100644 --- a/internal/consensus/msgs_test.go +++ b/internal/consensus/msgs_test.go @@ -354,6 +354,11 @@ func TestConsMsgsVectors(t *testing.T) { } pbProposal := proposal.ToProto() + ext := types.VoteExtension{ + AppDataToSign: []byte("signed"), + AppDataSelfAuthenticating: []byte("auth"), + } + v := &types.Vote{ ValidatorAddress: []byte("add_more_exclamation"), ValidatorIndex: 1, @@ -362,6 +367,7 @@ func TestConsMsgsVectors(t *testing.T) { Timestamp: date, Type: tmproto.PrecommitType, BlockID: bi, + VoteExtension: ext, } vpb := v.ToProto() @@ -398,7 +404,7 @@ func TestConsMsgsVectors(t *testing.T) { "2a36080110011a3008011204746573741a26080110011a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d"}, {"Vote", &tmcons.Message{Sum: &tmcons.Message_Vote{ Vote: &tmcons.Vote{Vote: vpb}}}, - "32700a6e0802100122480a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d1224080112206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d2a0608c0b89fdc0532146164645f6d6f72655f6578636c616d6174696f6e3801"}, + "3280010a7e0802100122480a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d1224080112206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d2a0608c0b89fdc0532146164645f6d6f72655f6578636c616d6174696f6e38014a0e0a067369676e6564120461757468"}, {"HasVote", &tmcons.Message{Sum: &tmcons.Message_HasVote{ HasVote: &tmcons.HasVote{Height: 1, Round: 1, Type: tmproto.PrevoteType, Index: 1}}}, "3a080801100118012001"}, diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 4da989b401e..a3761fb2846 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -2218,6 +2218,12 @@ func (cs *State) signVote( switch msgType { case tmproto.PrecommitType: timeout = cs.config.TimeoutPrecommit + // if the signedMessage type is for a precommit, add VoteExtension + ext, err := cs.blockExec.ExtendVote(vote) + if err != nil { + return nil, err + } + vote.VoteExtension = ext case tmproto.PrevoteType: timeout = cs.config.TimeoutPrevote default: @@ -2231,6 +2237,7 @@ func (cs *State) signVote( vote.Signature = v.Signature vote.Timestamp = v.Timestamp + return vote, err } @@ -2259,7 +2266,11 @@ func (cs *State) voteTime() time.Time { } // sign the vote and publish on internalMsgQueue -func (cs *State) signAddVote(msgType tmproto.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote { +func (cs *State) signAddVote( + msgType tmproto.SignedMsgType, + hash []byte, + header types.PartSetHeader, +) *types.Vote { if cs.privValidator == nil { // the node does not have a key return nil } diff --git a/privval/msgs_test.go b/privval/msgs_test.go index bf532bd7b99..0c764830f2e 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -35,6 +35,10 @@ func exampleVote() *types.Vote { }, ValidatorAddress: crypto.AddressHash([]byte("validator_address")), ValidatorIndex: 56789, + VoteExtension: types.VoteExtension { + AppDataToSign: []byte("app_data_to_sign"), + AppDataSelfAuthenticating: []byte("app_data_self_authenticating"), + }, } } @@ -84,8 +88,8 @@ func TestPrivvalVectors(t *testing.T) { {"pubKey request", &privproto.PubKeyRequest{}, "0a00"}, {"pubKey response", &privproto.PubKeyResponse{PubKey: ppk, Error: nil}, "12240a220a20556a436f1218d30942efe798420f51dc9b6a311b929c578257457d05c5fcf230"}, {"pubKey response with error", &privproto.PubKeyResponse{PubKey: cryptoproto.PublicKey{}, Error: remoteError}, "12140a0012100801120c697427732061206572726f72"}, - {"Vote Request", &privproto.SignVoteRequest{Vote: votepb}, "1a760a74080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb03"}, - {"Vote Response", &privproto.SignedVoteResponse{Vote: *votepb, Error: nil}, "22760a74080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb03"}, + {"Vote Request", &privproto.SignVoteRequest{Vote: votepb}, "1aa8010aa501080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a2f0a0f6170705f646174615f7369676e6564121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, + {"Vote Response", &privproto.SignedVoteResponse{Vote: *votepb, Error: nil}, "22a8010aa501080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a2f0a0f6170705f646174615f7369676e6564121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, {"Vote Response with error", &privproto.SignedVoteResponse{Vote: tmproto.Vote{}, Error: remoteError}, "22250a11220212002a0b088092b8c398feffffff0112100801120c697427732061206572726f72"}, {"Proposal Request", &privproto.SignProposalRequest{Proposal: proposalpb}, "2a700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, {"Proposal Response", &privproto.SignedProposalResponse{Proposal: *proposalpb, Error: nil}, "32700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 0a15eb366cc..5e59dcf4f7b 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -21,21 +21,23 @@ import "gogoproto/gogo.proto"; message Request { oneof value { - RequestEcho echo = 1; - RequestFlush flush = 2; - RequestInfo info = 3; - RequestInitChain init_chain = 4; - RequestQuery query = 5; - RequestBeginBlock begin_block = 6; - RequestCheckTx check_tx = 7; - RequestDeliverTx deliver_tx = 8; - RequestEndBlock end_block = 9; - RequestCommit commit = 10; - RequestListSnapshots list_snapshots = 11; - RequestOfferSnapshot offer_snapshot = 12; - RequestLoadSnapshotChunk load_snapshot_chunk = 13; - RequestApplySnapshotChunk apply_snapshot_chunk = 14; - RequestPrepareProposal prepare_proposal = 15; + RequestEcho echo = 1; + RequestFlush flush = 2; + RequestInfo info = 3; + RequestInitChain init_chain = 4; + RequestQuery query = 5; + RequestBeginBlock begin_block = 6; + RequestCheckTx check_tx = 7; + RequestDeliverTx deliver_tx = 8; + RequestEndBlock end_block = 9; + RequestCommit commit = 10; + RequestListSnapshots list_snapshots = 11; + RequestOfferSnapshot offer_snapshot = 12; + RequestLoadSnapshotChunk load_snapshot_chunk = 13; + RequestApplySnapshotChunk apply_snapshot_chunk = 14; + RequestPrepareProposal prepare_proposal = 15; + RequestExtendVote extend_vote = 16; + RequestVerifyVoteExtension verify_vote_extension = 17; } } @@ -118,6 +120,16 @@ message RequestApplySnapshotChunk { string sender = 3; } +// Extends a vote with application-side injection +message RequestExtendVote { + types.Vote vote = 1; +} + +// Verify the vote extension +message RequestVerifyVoteExtension { + types.Vote vote = 1; +} + message RequestPrepareProposal { // block_data is an array of transactions that will be included in a block, // sent to the app for possible modifications. @@ -132,22 +144,24 @@ message RequestPrepareProposal { message Response { oneof value { - ResponseException exception = 1; - ResponseEcho echo = 2; - ResponseFlush flush = 3; - ResponseInfo info = 4; - ResponseInitChain init_chain = 5; - ResponseQuery query = 6; - ResponseBeginBlock begin_block = 7; - ResponseCheckTx check_tx = 8; - ResponseDeliverTx deliver_tx = 9; - ResponseEndBlock end_block = 10; - ResponseCommit commit = 11; - ResponseListSnapshots list_snapshots = 12; - ResponseOfferSnapshot offer_snapshot = 13; - ResponseLoadSnapshotChunk load_snapshot_chunk = 14; - ResponseApplySnapshotChunk apply_snapshot_chunk = 15; - ResponsePrepareProposal prepare_proposal = 16; + ResponseException exception = 1; + ResponseEcho echo = 2; + ResponseFlush flush = 3; + ResponseInfo info = 4; + ResponseInitChain init_chain = 5; + ResponseQuery query = 6; + ResponseBeginBlock begin_block = 7; + ResponseCheckTx check_tx = 8; + ResponseDeliverTx deliver_tx = 9; + ResponseEndBlock end_block = 10; + ResponseCommit commit = 11; + ResponseListSnapshots list_snapshots = 12; + ResponseOfferSnapshot offer_snapshot = 13; + ResponseLoadSnapshotChunk load_snapshot_chunk = 14; + ResponseApplySnapshotChunk apply_snapshot_chunk = 15; + ResponsePrepareProposal prepare_proposal = 16; + ResponseExtendVote extend_vote = 17; + ResponseVerifyVoteExtension verify_vote_extension = 18; } } @@ -273,6 +287,21 @@ message ResponseApplySnapshotChunk { } } +message ResponseExtendVote { + tendermint.types.VoteExtension vote_extension = 1; +} + +message ResponseVerifyVoteExtension { + Result result = 1; + + enum Result { + UNKNOWN = 0; // Unknown result, treat as ACCEPT by default + ACCEPT = 1; // Vote extension verified, include the vote + SLASH = 2; // Vote extension verification aborted, continue but slash validator + REJECT = 3; // Vote extension invalidated + } +} + message ResponsePrepareProposal { repeated bytes block_data = 1; } @@ -381,5 +410,7 @@ service ABCIApplication { rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot); rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk); rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk); + rpc ExtendVote(RequestExtendVote) returns (ResponseExtendVote); + rpc VerifyVoteExtension(RequestVerifyVoteExtension) returns (ResponseVerifyVoteExtension); rpc PrepareProposal(RequestPrepareProposal) returns (ResponsePrepareProposal); } diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 7098310430d..0cd7386f7bf 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -225,12 +225,13 @@ func (m *CanonicalProposal) GetChainID() string { } type CanonicalVote struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` - Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` - BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` - Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` + Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` + BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ChainID string `protobuf:"bytes,6,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + VoteExtension *VoteExtensionToSign `protobuf:"bytes,7,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *CanonicalVote) Reset() { *m = CanonicalVote{} } @@ -308,6 +309,13 @@ func (m *CanonicalVote) GetChainID() string { return "" } +func (m *CanonicalVote) GetVoteExtension() *VoteExtensionToSign { + if m != nil { + return m.VoteExtension + } + return nil +} + func init() { proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.types.CanonicalBlockID") proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.types.CanonicalPartSetHeader") @@ -318,38 +326,40 @@ 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, + // 522 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0xe3, 0xd4, 0x49, 0x9c, 0x4b, 0x53, 0xc2, 0xa9, 0xaa, 0xac, 0x08, 0xd9, 0x96, 0x25, + 0x90, 0x59, 0x6c, 0x29, 0x1d, 0xd8, 0x5d, 0x90, 0x08, 0x2a, 0xa2, 0x5c, 0xa3, 0x0e, 0x2c, 0xd6, + 0xc5, 0x3e, 0x6c, 0x0b, 0xc7, 0x67, 0xd9, 0x97, 0x8a, 0x2e, 0x7c, 0x86, 0x7e, 0xac, 0x8e, 0x1d, + 0x61, 0x09, 0xc8, 0xf9, 0x12, 0x8c, 0xe8, 0xce, 0x49, 0x1c, 0x25, 0xc0, 0x02, 0xea, 0x12, 0xbd, + 0x7f, 0x1e, 0xbf, 0xef, 0xa3, 0xdf, 0xab, 0x1c, 0x30, 0x18, 0x49, 0x03, 0x92, 0xcf, 0xe2, 0x94, + 0x39, 0xec, 0x26, 0x23, 0x85, 0xe3, 0xe3, 0x94, 0xa6, 0xb1, 0x8f, 0x13, 0x3b, 0xcb, 0x29, 0xa3, + 0x70, 0x50, 0x2b, 0x6c, 0xa1, 0x18, 0x1e, 0x87, 0x34, 0xa4, 0xa2, 0xe9, 0xf0, 0xa8, 0xd2, 0x0d, + 0x9f, 0xec, 0x4d, 0x12, 0xbf, 0xab, 0xae, 0x1e, 0x52, 0x1a, 0x26, 0xc4, 0x11, 0xd9, 0x74, 0xfe, + 0xd1, 0x61, 0xf1, 0x8c, 0x14, 0x0c, 0xcf, 0xb2, 0x4a, 0x60, 0x7e, 0x01, 0x83, 0xb3, 0xf5, 0x66, + 0x37, 0xa1, 0xfe, 0xa7, 0xf1, 0x4b, 0x08, 0x81, 0x1c, 0xe1, 0x22, 0x52, 0x25, 0x43, 0xb2, 0x0e, + 0x91, 0x88, 0xe1, 0x15, 0x78, 0x94, 0xe1, 0x9c, 0x79, 0x05, 0x61, 0x5e, 0x44, 0x70, 0x40, 0x72, + 0xb5, 0x69, 0x48, 0x56, 0x6f, 0x64, 0xd9, 0xbb, 0x46, 0xed, 0xcd, 0xc0, 0x0b, 0x9c, 0xb3, 0x4b, + 0xc2, 0x5e, 0x0b, 0xbd, 0x2b, 0xdf, 0x2d, 0xf4, 0x06, 0xea, 0x67, 0xdb, 0x45, 0xd3, 0x05, 0x27, + 0xbf, 0x97, 0xc3, 0x63, 0xd0, 0x62, 0x94, 0xe1, 0x44, 0xd8, 0xe8, 0xa3, 0x2a, 0xd9, 0x78, 0x6b, + 0xd6, 0xde, 0xcc, 0x6f, 0x4d, 0xf0, 0xb8, 0x1e, 0x92, 0xd3, 0x8c, 0x16, 0x38, 0x81, 0xa7, 0x40, + 0xe6, 0x76, 0xc4, 0xe7, 0x47, 0x23, 0x7d, 0xdf, 0xe6, 0x65, 0x1c, 0xa6, 0x24, 0x78, 0x5b, 0x84, + 0x93, 0x9b, 0x8c, 0x20, 0x21, 0x86, 0x27, 0xa0, 0x1d, 0x91, 0x38, 0x8c, 0x98, 0x58, 0x30, 0x40, + 0xab, 0x8c, 0x9b, 0xc9, 0xe9, 0x3c, 0x0d, 0xd4, 0x03, 0x51, 0xae, 0x12, 0xf8, 0x1c, 0x74, 0x33, + 0x9a, 0x78, 0x55, 0x47, 0x36, 0x24, 0xeb, 0xc0, 0x3d, 0x2c, 0x17, 0xba, 0x72, 0xf1, 0xee, 0x1c, + 0xf1, 0x1a, 0x52, 0x32, 0x9a, 0x88, 0x08, 0xbe, 0x01, 0xca, 0x94, 0xe3, 0xf5, 0xe2, 0x40, 0x6d, + 0x09, 0x70, 0xe6, 0x5f, 0xc0, 0xad, 0x2e, 0xe1, 0xf6, 0xca, 0x85, 0xde, 0x59, 0x25, 0xa8, 0x23, + 0x06, 0x8c, 0x03, 0xe8, 0x82, 0xee, 0xe6, 0x8c, 0x6a, 0x5b, 0x0c, 0x1b, 0xda, 0xd5, 0xa1, 0xed, + 0xf5, 0xa1, 0xed, 0xc9, 0x5a, 0xe1, 0x2a, 0x9c, 0xfb, 0xed, 0x77, 0x5d, 0x42, 0xf5, 0x67, 0xf0, + 0x19, 0x50, 0xfc, 0x08, 0xc7, 0x29, 0xf7, 0xd3, 0x31, 0x24, 0xab, 0x5b, 0xed, 0x3a, 0xe3, 0x35, + 0xbe, 0x4b, 0x34, 0xc7, 0x81, 0xf9, 0xb3, 0x09, 0xfa, 0x1b, 0x5b, 0x57, 0x94, 0x91, 0x87, 0xe0, + 0xba, 0x0d, 0x4b, 0xfe, 0x9f, 0xb0, 0x5a, 0xff, 0x0e, 0xab, 0xfd, 0x67, 0x58, 0xf0, 0x1c, 0x1c, + 0x5d, 0x53, 0x46, 0x3c, 0xf2, 0x99, 0x91, 0xb4, 0x88, 0x69, 0x2a, 0xd0, 0xf6, 0x46, 0x4f, 0xf7, + 0xdd, 0x73, 0x94, 0xaf, 0xd6, 0xb2, 0x09, 0xe5, 0xcc, 0x50, 0xff, 0x7a, 0xbb, 0xe8, 0xbe, 0xbf, + 0x2b, 0x35, 0xe9, 0xbe, 0xd4, 0xa4, 0x1f, 0xa5, 0x26, 0xdd, 0x2e, 0xb5, 0xc6, 0xfd, 0x52, 0x6b, + 0x7c, 0x5d, 0x6a, 0x8d, 0x0f, 0x2f, 0xc2, 0x98, 0x45, 0xf3, 0xa9, 0xed, 0xd3, 0x99, 0xb3, 0xfd, + 0xf7, 0xaf, 0xc3, 0xea, 0x99, 0xd8, 0x7d, 0x1a, 0xa6, 0x6d, 0x51, 0x3f, 0xfd, 0x15, 0x00, 0x00, + 0xff, 0xff, 0x4e, 0x61, 0xcb, 0xc4, 0x7f, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -519,6 +529,18 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCanonical(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + } if len(m.ChainID) > 0 { i -= len(m.ChainID) copy(dAtA[i:], m.ChainID) @@ -526,12 +548,12 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err4 != nil { - return 0, err4 + n5, err5 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err5 != nil { + return 0, err5 } - i -= n4 - i = encodeVarintCanonical(dAtA, i, uint64(n4)) + i -= n5 + i = encodeVarintCanonical(dAtA, i, uint64(n5)) i-- dAtA[i] = 0x2a if m.BlockID != nil { @@ -664,6 +686,10 @@ func (m *CanonicalVote) Size() (n int) { if l > 0 { n += 1 + l + sovCanonical(uint64(l)) } + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovCanonical(uint64(l)) + } return n } @@ -1271,6 +1297,42 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { } m.ChainID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCanonical + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCanonical + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCanonical + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.VoteExtension == nil { + m.VoteExtension = &VoteExtensionToSign{} + } + if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCanonical(dAtA[iNdEx:]) diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index e88fd6ffe31..b7a66d4d2f8 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -34,4 +34,5 @@ message CanonicalVote { CanonicalBlockID block_id = 4 [(gogoproto.customname) = "BlockID"]; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 6 [(gogoproto.customname) = "ChainID"]; + VoteExtensionToSign vote_extension = 7; } diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 73090558eae..634feb9d605 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -466,14 +466,15 @@ func (m *Data) GetTxs() [][]byte { // Vote represents a prevote, precommit, or commit vote from validators for // consensus. type Vote struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` - Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` - BlockID BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"` - Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - ValidatorAddress []byte `protobuf:"bytes,6,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - ValidatorIndex int32 `protobuf:"varint,7,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty"` - Signature []byte `protobuf:"bytes,8,opt,name=signature,proto3" json:"signature,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` + BlockID BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"` + Timestamp time.Time `protobuf:"bytes,5,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ValidatorAddress []byte `protobuf:"bytes,6,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + ValidatorIndex int32 `protobuf:"varint,7,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty"` + Signature []byte `protobuf:"bytes,8,opt,name=signature,proto3" json:"signature,omitempty"` + VoteExtension *VoteExtension `protobuf:"bytes,9,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *Vote) Reset() { *m = Vote{} } @@ -565,6 +566,112 @@ func (m *Vote) GetSignature() []byte { return nil } +func (m *Vote) GetVoteExtension() *VoteExtension { + if m != nil { + return m.VoteExtension + } + return nil +} + +// VoteExtension is app-defined additional information to the validator votes. +type VoteExtension struct { + AppDataToSign []byte `protobuf:"bytes,1,opt,name=app_data_to_sign,json=appDataToSign,proto3" json:"app_data_to_sign,omitempty"` + AppDataSelfAuthenticating []byte `protobuf:"bytes,2,opt,name=app_data_self_authenticating,json=appDataSelfAuthenticating,proto3" json:"app_data_self_authenticating,omitempty"` +} + +func (m *VoteExtension) Reset() { *m = VoteExtension{} } +func (m *VoteExtension) String() string { return proto.CompactTextString(m) } +func (*VoteExtension) ProtoMessage() {} +func (*VoteExtension) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{6} +} +func (m *VoteExtension) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *VoteExtension) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_VoteExtension.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 *VoteExtension) XXX_Merge(src proto.Message) { + xxx_messageInfo_VoteExtension.Merge(m, src) +} +func (m *VoteExtension) XXX_Size() int { + return m.Size() +} +func (m *VoteExtension) XXX_DiscardUnknown() { + xxx_messageInfo_VoteExtension.DiscardUnknown(m) +} + +var xxx_messageInfo_VoteExtension proto.InternalMessageInfo + +func (m *VoteExtension) GetAppDataToSign() []byte { + if m != nil { + return m.AppDataToSign + } + return nil +} + +func (m *VoteExtension) GetAppDataSelfAuthenticating() []byte { + if m != nil { + return m.AppDataSelfAuthenticating + } + return nil +} + +// VoteExtensionToSign is a subset of VoteExtension that is signed by the validators private key. +// VoteExtensionToSign is extracted from an existing VoteExtension. +type VoteExtensionToSign struct { + AppDataToSign []byte `protobuf:"bytes,1,opt,name=app_data_to_sign,json=appDataToSign,proto3" json:"app_data_to_sign,omitempty"` +} + +func (m *VoteExtensionToSign) Reset() { *m = VoteExtensionToSign{} } +func (m *VoteExtensionToSign) String() string { return proto.CompactTextString(m) } +func (*VoteExtensionToSign) ProtoMessage() {} +func (*VoteExtensionToSign) Descriptor() ([]byte, []int) { + return fileDescriptor_d3a6e55e2345de56, []int{7} +} +func (m *VoteExtensionToSign) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *VoteExtensionToSign) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_VoteExtensionToSign.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 *VoteExtensionToSign) XXX_Merge(src proto.Message) { + xxx_messageInfo_VoteExtensionToSign.Merge(m, src) +} +func (m *VoteExtensionToSign) XXX_Size() int { + return m.Size() +} +func (m *VoteExtensionToSign) XXX_DiscardUnknown() { + xxx_messageInfo_VoteExtensionToSign.DiscardUnknown(m) +} + +var xxx_messageInfo_VoteExtensionToSign proto.InternalMessageInfo + +func (m *VoteExtensionToSign) GetAppDataToSign() []byte { + if m != nil { + return m.AppDataToSign + } + return nil +} + // Commit contains the evidence that a block was committed by a set of validators. type Commit struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` @@ -577,7 +684,7 @@ func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{6} + return fileDescriptor_d3a6e55e2345de56, []int{8} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -636,17 +743,18 @@ func (m *Commit) GetSignatures() []CommitSig { // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { - BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` - ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` + VoteExtension *VoteExtensionToSign `protobuf:"bytes,5,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` } func (m *CommitSig) Reset() { *m = CommitSig{} } func (m *CommitSig) String() string { return proto.CompactTextString(m) } func (*CommitSig) ProtoMessage() {} func (*CommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{7} + return fileDescriptor_d3a6e55e2345de56, []int{9} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -703,6 +811,13 @@ func (m *CommitSig) GetSignature() []byte { return nil } +func (m *CommitSig) GetVoteExtension() *VoteExtensionToSign { + if m != nil { + return m.VoteExtension + } + return nil +} + type Proposal struct { Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` @@ -717,7 +832,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{8} + return fileDescriptor_d3a6e55e2345de56, []int{10} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -804,7 +919,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{9} + return fileDescriptor_d3a6e55e2345de56, []int{11} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -856,7 +971,7 @@ func (m *LightBlock) Reset() { *m = LightBlock{} } func (m *LightBlock) String() string { return proto.CompactTextString(m) } func (*LightBlock) ProtoMessage() {} func (*LightBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{10} + return fileDescriptor_d3a6e55e2345de56, []int{12} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -910,7 +1025,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{11} + return fileDescriptor_d3a6e55e2345de56, []int{13} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -978,7 +1093,7 @@ func (m *TxProof) Reset() { *m = TxProof{} } func (m *TxProof) String() string { return proto.CompactTextString(m) } func (*TxProof) ProtoMessage() {} func (*TxProof) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{12} + return fileDescriptor_d3a6e55e2345de56, []int{14} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1037,6 +1152,8 @@ func init() { proto.RegisterType((*Header)(nil), "tendermint.types.Header") proto.RegisterType((*Data)(nil), "tendermint.types.Data") proto.RegisterType((*Vote)(nil), "tendermint.types.Vote") + proto.RegisterType((*VoteExtension)(nil), "tendermint.types.VoteExtension") + proto.RegisterType((*VoteExtensionToSign)(nil), "tendermint.types.VoteExtensionToSign") proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig") proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal") @@ -1049,90 +1166,96 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1314 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xda, 0x9b, 0xd8, 0x7e, 0xb6, 0x13, 0x67, 0x95, 0xb6, 0xae, 0xdb, 0x38, 0x2b, 0x23, - 0x20, 0x2d, 0x68, 0x53, 0x52, 0xc4, 0x9f, 0x03, 0x07, 0xdb, 0x49, 0x5b, 0xab, 0x89, 0x63, 0xd6, - 0x6e, 0x11, 0x5c, 0x56, 0x6b, 0xef, 0xd4, 0x5e, 0xba, 0xde, 0x59, 0xed, 0x8c, 0x43, 0xd2, 0x4f, - 0x80, 0x72, 0xea, 0x89, 0x5b, 0x4e, 0x70, 0xe0, 0xce, 0x17, 0x40, 0x9c, 0x7a, 0xec, 0x0d, 0x2e, - 0x14, 0x94, 0x4a, 0x88, 0x8f, 0x81, 0xe6, 0x8f, 0xd7, 0xeb, 0x38, 0x86, 0xaa, 0xaa, 0xb8, 0x58, - 0x3b, 0xef, 0xfd, 0xde, 0xcc, 0x7b, 0xbf, 0xf7, 0x9b, 0x3f, 0x86, 0xeb, 0x14, 0xf9, 0x0e, 0x0a, - 0x87, 0xae, 0x4f, 0xb7, 0xe8, 0x71, 0x80, 0x88, 0xf8, 0x35, 0x82, 0x10, 0x53, 0xac, 0x15, 0x26, - 0x5e, 0x83, 0xdb, 0x4b, 0x6b, 0x7d, 0xdc, 0xc7, 0xdc, 0xb9, 0xc5, 0xbe, 0x04, 0xae, 0xb4, 0xd1, - 0xc7, 0xb8, 0xef, 0xa1, 0x2d, 0x3e, 0xea, 0x8e, 0x1e, 0x6d, 0x51, 0x77, 0x88, 0x08, 0xb5, 0x87, - 0x81, 0x04, 0xac, 0xc7, 0x96, 0xe9, 0x85, 0xc7, 0x01, 0xc5, 0x0c, 0x8b, 0x1f, 0x49, 0x77, 0x39, - 0xe6, 0x3e, 0x44, 0x21, 0x71, 0xb1, 0x1f, 0xcf, 0xa3, 0xa4, 0xcf, 0x64, 0x79, 0x68, 0x7b, 0xae, - 0x63, 0x53, 0x1c, 0x0a, 0x44, 0xe5, 0x53, 0xc8, 0xb7, 0xec, 0x90, 0xb6, 0x11, 0xbd, 0x87, 0x6c, - 0x07, 0x85, 0xda, 0x1a, 0x2c, 0x52, 0x4c, 0x6d, 0xaf, 0xa8, 0xe8, 0xca, 0x66, 0xde, 0x14, 0x03, - 0x4d, 0x03, 0x75, 0x60, 0x93, 0x41, 0x31, 0xa1, 0x2b, 0x9b, 0x39, 0x93, 0x7f, 0x57, 0x06, 0xa0, - 0xb2, 0x50, 0x16, 0xe1, 0xfa, 0x0e, 0x3a, 0x1a, 0x47, 0xf0, 0x01, 0xb3, 0x76, 0x8f, 0x29, 0x22, - 0x32, 0x44, 0x0c, 0xb4, 0x0f, 0x61, 0x91, 0xe7, 0x5f, 0x4c, 0xea, 0xca, 0x66, 0x76, 0xbb, 0x68, - 0xc4, 0x88, 0x12, 0xf5, 0x19, 0x2d, 0xe6, 0xaf, 0xa9, 0xcf, 0x5e, 0x6c, 0x2c, 0x98, 0x02, 0x5c, - 0xf1, 0x20, 0x55, 0xf3, 0x70, 0xef, 0x71, 0x63, 0x27, 0x4a, 0x44, 0x99, 0x24, 0xa2, 0xed, 0xc3, - 0x4a, 0x60, 0x87, 0xd4, 0x22, 0x88, 0x5a, 0x03, 0x5e, 0x05, 0x5f, 0x34, 0xbb, 0xbd, 0x61, 0x9c, - 0xef, 0x83, 0x31, 0x55, 0xac, 0x5c, 0x25, 0x1f, 0xc4, 0x8d, 0x95, 0xbf, 0x54, 0x58, 0x92, 0x64, - 0x7c, 0x06, 0x29, 0x49, 0x2b, 0x5f, 0x30, 0xbb, 0xbd, 0x1e, 0x9f, 0x51, 0xba, 0x8c, 0x3a, 0xf6, - 0x09, 0xf2, 0xc9, 0x88, 0xc8, 0xf9, 0xc6, 0x31, 0xda, 0x3b, 0x90, 0xee, 0x0d, 0x6c, 0xd7, 0xb7, - 0x5c, 0x87, 0x67, 0x94, 0xa9, 0x65, 0xcf, 0x5e, 0x6c, 0xa4, 0xea, 0xcc, 0xd6, 0xd8, 0x31, 0x53, - 0xdc, 0xd9, 0x70, 0xb4, 0xcb, 0xb0, 0x34, 0x40, 0x6e, 0x7f, 0x40, 0x39, 0x2d, 0x49, 0x53, 0x8e, - 0xb4, 0x4f, 0x40, 0x65, 0x82, 0x28, 0xaa, 0x7c, 0xed, 0x92, 0x21, 0xd4, 0x62, 0x8c, 0xd5, 0x62, - 0x74, 0xc6, 0x6a, 0xa9, 0xa5, 0xd9, 0xc2, 0x4f, 0xff, 0xd8, 0x50, 0x4c, 0x1e, 0xa1, 0xd5, 0x21, - 0xef, 0xd9, 0x84, 0x5a, 0x5d, 0x46, 0x1b, 0x5b, 0x7e, 0x91, 0x4f, 0x71, 0x75, 0x96, 0x10, 0x49, - 0xac, 0x4c, 0x3d, 0xcb, 0xa2, 0x84, 0xc9, 0xd1, 0x36, 0xa1, 0xc0, 0x27, 0xe9, 0xe1, 0xe1, 0xd0, - 0xa5, 0x16, 0xe7, 0x7d, 0x89, 0xf3, 0xbe, 0xcc, 0xec, 0x75, 0x6e, 0xbe, 0xc7, 0x3a, 0x70, 0x0d, - 0x32, 0x8e, 0x4d, 0x6d, 0x01, 0x49, 0x71, 0x48, 0x9a, 0x19, 0xb8, 0xf3, 0x5d, 0x58, 0x89, 0x54, - 0x47, 0x04, 0x24, 0x2d, 0x66, 0x99, 0x98, 0x39, 0xf0, 0x16, 0xac, 0xf9, 0xe8, 0x88, 0x5a, 0xe7, - 0xd1, 0x19, 0x8e, 0xd6, 0x98, 0xef, 0xe1, 0x74, 0xc4, 0xdb, 0xb0, 0xdc, 0x1b, 0x93, 0x2f, 0xb0, - 0xc0, 0xb1, 0xf9, 0xc8, 0xca, 0x61, 0x57, 0x21, 0x6d, 0x07, 0x81, 0x00, 0x64, 0x39, 0x20, 0x65, - 0x07, 0x01, 0x77, 0xdd, 0x84, 0x55, 0x5e, 0x63, 0x88, 0xc8, 0xc8, 0xa3, 0x72, 0x92, 0x1c, 0xc7, - 0xac, 0x30, 0x87, 0x29, 0xec, 0x1c, 0xfb, 0x16, 0xe4, 0xd1, 0xa1, 0xeb, 0x20, 0xbf, 0x87, 0x04, - 0x2e, 0xcf, 0x71, 0xb9, 0xb1, 0x91, 0x83, 0x6e, 0x40, 0x21, 0x08, 0x71, 0x80, 0x09, 0x0a, 0x2d, - 0xdb, 0x71, 0x42, 0x44, 0x48, 0x71, 0x59, 0xcc, 0x37, 0xb6, 0x57, 0x85, 0xb9, 0x52, 0x04, 0x75, - 0xc7, 0xa6, 0xb6, 0x56, 0x80, 0x24, 0x3d, 0x22, 0x45, 0x45, 0x4f, 0x6e, 0xe6, 0x4c, 0xf6, 0x59, - 0xf9, 0x3b, 0x01, 0xea, 0x43, 0x4c, 0x91, 0x76, 0x1b, 0x54, 0xd6, 0x26, 0xae, 0xbe, 0xe5, 0x8b, - 0xf4, 0xdc, 0x76, 0xfb, 0x3e, 0x72, 0xf6, 0x49, 0xbf, 0x73, 0x1c, 0x20, 0x93, 0x83, 0x63, 0x72, - 0x4a, 0x4c, 0xc9, 0x69, 0x0d, 0x16, 0x43, 0x3c, 0xf2, 0x1d, 0xae, 0xb2, 0x45, 0x53, 0x0c, 0xb4, - 0x5d, 0x48, 0x47, 0x2a, 0x51, 0xff, 0x4b, 0x25, 0x2b, 0x4c, 0x25, 0x4c, 0xc3, 0xd2, 0x60, 0xa6, - 0xba, 0x52, 0x2c, 0x35, 0xc8, 0x44, 0x87, 0x97, 0x54, 0xdb, 0xab, 0x09, 0x76, 0x12, 0xa6, 0xbd, - 0x07, 0xab, 0x51, 0xef, 0x23, 0xf2, 0x84, 0xe2, 0x0a, 0x91, 0x43, 0xb2, 0x37, 0x25, 0x2b, 0x4b, - 0x1c, 0x40, 0x29, 0x5e, 0xd7, 0x44, 0x56, 0x0d, 0x7e, 0x12, 0x5d, 0x87, 0x0c, 0x71, 0xfb, 0xbe, - 0x4d, 0x47, 0x21, 0x92, 0xca, 0x9b, 0x18, 0x2a, 0x3f, 0x2b, 0xb0, 0x24, 0x94, 0x1c, 0xe3, 0x4d, - 0xb9, 0x98, 0xb7, 0xc4, 0x3c, 0xde, 0x92, 0xaf, 0xcf, 0x5b, 0x15, 0x20, 0x4a, 0x86, 0x14, 0x55, - 0x3d, 0xb9, 0x99, 0xdd, 0xbe, 0x36, 0x3b, 0x91, 0x48, 0xb1, 0xed, 0xf6, 0xe5, 0x46, 0x8d, 0x05, - 0x55, 0x7e, 0x57, 0x20, 0x13, 0xf9, 0xb5, 0x2a, 0xe4, 0xc7, 0x79, 0x59, 0x8f, 0x3c, 0xbb, 0x2f, - 0xb5, 0xb3, 0x3e, 0x37, 0xb9, 0x3b, 0x9e, 0xdd, 0x37, 0xb3, 0x32, 0x1f, 0x36, 0xb8, 0xb8, 0x0f, - 0x89, 0x39, 0x7d, 0x98, 0x6a, 0x7c, 0xf2, 0xf5, 0x1a, 0x3f, 0xd5, 0x22, 0xf5, 0x7c, 0x8b, 0x7e, - 0x4a, 0x40, 0xba, 0xc5, 0xf7, 0x8e, 0xed, 0xfd, 0x1f, 0x3b, 0xe2, 0x1a, 0x64, 0x02, 0xec, 0x59, - 0xc2, 0xa3, 0x72, 0x4f, 0x3a, 0xc0, 0x9e, 0x39, 0xd3, 0xf6, 0xc5, 0x37, 0xb4, 0x5d, 0x96, 0xde, - 0x00, 0x6b, 0xa9, 0xf3, 0xac, 0x85, 0x90, 0x13, 0x54, 0xc8, 0xbb, 0xec, 0x16, 0xe3, 0x80, 0x5f, - 0x8e, 0xca, 0xec, 0xdd, 0x2b, 0xd2, 0x16, 0x48, 0x53, 0xe2, 0x58, 0x84, 0x38, 0xfa, 0xe5, 0x75, - 0x5a, 0x9c, 0x27, 0x4b, 0x53, 0xe2, 0x2a, 0xdf, 0x29, 0x00, 0x7b, 0x8c, 0x59, 0x5e, 0x2f, 0xbb, - 0x85, 0x08, 0x4f, 0xc1, 0x9a, 0x5a, 0xb9, 0x3c, 0xaf, 0x69, 0x72, 0xfd, 0x1c, 0x89, 0xe7, 0x5d, - 0x87, 0xfc, 0x44, 0x8c, 0x04, 0x8d, 0x93, 0xb9, 0x60, 0x92, 0xe8, 0x72, 0x68, 0x23, 0x6a, 0xe6, - 0x0e, 0x63, 0xa3, 0xca, 0x2f, 0x0a, 0x64, 0x78, 0x4e, 0xfb, 0x88, 0xda, 0x53, 0x3d, 0x54, 0x5e, - 0xbf, 0x87, 0xeb, 0x00, 0x62, 0x1a, 0xe2, 0x3e, 0x41, 0x52, 0x59, 0x19, 0x6e, 0x69, 0xbb, 0x4f, - 0x90, 0xf6, 0x51, 0x44, 0x78, 0xf2, 0xdf, 0x09, 0x97, 0x5b, 0x7a, 0x4c, 0xfb, 0x15, 0x48, 0xf9, - 0xa3, 0xa1, 0xc5, 0xae, 0x04, 0x55, 0xa8, 0xd5, 0x1f, 0x0d, 0x3b, 0x47, 0xa4, 0xf2, 0x35, 0xa4, - 0x3a, 0x47, 0xfc, 0x79, 0xc4, 0x24, 0x1a, 0x62, 0x2c, 0xef, 0x64, 0xf1, 0x16, 0x4a, 0x33, 0x03, - 0xbf, 0x82, 0x34, 0x50, 0xd9, 0xe5, 0x3b, 0x7e, 0xac, 0xb1, 0x6f, 0xcd, 0x78, 0xc5, 0x87, 0x97, - 0x7c, 0x72, 0xdd, 0xfc, 0x55, 0x81, 0x6c, 0xec, 0x7c, 0xd0, 0x3e, 0x80, 0x4b, 0xb5, 0xbd, 0x83, - 0xfa, 0x7d, 0xab, 0xb1, 0x63, 0xdd, 0xd9, 0xab, 0xde, 0xb5, 0x1e, 0x34, 0xef, 0x37, 0x0f, 0xbe, - 0x68, 0x16, 0x16, 0x4a, 0x97, 0x4f, 0x4e, 0x75, 0x2d, 0x86, 0x7d, 0xe0, 0x3f, 0xf6, 0xf1, 0x37, - 0xbe, 0xb6, 0x05, 0x6b, 0xd3, 0x21, 0xd5, 0x5a, 0x7b, 0xb7, 0xd9, 0x29, 0x28, 0xa5, 0x4b, 0x27, - 0xa7, 0xfa, 0x6a, 0x2c, 0xa2, 0xda, 0x25, 0xc8, 0xa7, 0xb3, 0x01, 0xf5, 0x83, 0xfd, 0xfd, 0x46, - 0xa7, 0x90, 0x98, 0x09, 0x90, 0x07, 0xf6, 0x0d, 0x58, 0x9d, 0x0e, 0x68, 0x36, 0xf6, 0x0a, 0xc9, - 0x92, 0x76, 0x72, 0xaa, 0x2f, 0xc7, 0xd0, 0x4d, 0xd7, 0x2b, 0xa5, 0xbf, 0xfd, 0xbe, 0xbc, 0xf0, - 0xe3, 0x0f, 0x65, 0x85, 0x55, 0x96, 0x9f, 0x3a, 0x23, 0xb4, 0xf7, 0xe1, 0x4a, 0xbb, 0x71, 0xb7, - 0xb9, 0xbb, 0x63, 0xed, 0xb7, 0xef, 0x5a, 0x9d, 0x2f, 0x5b, 0xbb, 0xb1, 0xea, 0x56, 0x4e, 0x4e, - 0xf5, 0xac, 0x2c, 0x69, 0x1e, 0xba, 0x65, 0xee, 0x3e, 0x3c, 0xe8, 0xec, 0x16, 0x14, 0x81, 0x6e, - 0x85, 0xe8, 0x10, 0x53, 0xc4, 0xd1, 0xb7, 0xe0, 0xea, 0x05, 0xe8, 0xa8, 0xb0, 0xd5, 0x93, 0x53, - 0x3d, 0xdf, 0x0a, 0x91, 0xd8, 0x3f, 0x3c, 0xc2, 0x80, 0xe2, 0x6c, 0xc4, 0x41, 0xeb, 0xa0, 0x5d, - 0xdd, 0x2b, 0xe8, 0xa5, 0xc2, 0xc9, 0xa9, 0x9e, 0x1b, 0x1f, 0x86, 0x0c, 0x3f, 0xa9, 0xac, 0xf6, - 0xf9, 0xb3, 0xb3, 0xb2, 0xf2, 0xfc, 0xac, 0xac, 0xfc, 0x79, 0x56, 0x56, 0x9e, 0xbe, 0x2c, 0x2f, - 0x3c, 0x7f, 0x59, 0x5e, 0xf8, 0xed, 0x65, 0x79, 0xe1, 0xab, 0x8f, 0xfb, 0x2e, 0x1d, 0x8c, 0xba, - 0x46, 0x0f, 0x0f, 0xb7, 0xe2, 0x7f, 0x09, 0x26, 0x9f, 0xe2, 0xaf, 0xc9, 0xf9, 0xbf, 0x0b, 0xdd, - 0x25, 0x6e, 0xbf, 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x78, 0x43, 0xdf, 0xef, 0x0c, - 0x00, 0x00, + // 1423 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0xdb, 0x64, + 0x18, 0xaf, 0x13, 0xb7, 0x49, 0x9e, 0xc4, 0x6d, 0xfa, 0xd2, 0x6d, 0x69, 0xb6, 0xa6, 0x91, 0xd1, + 0x58, 0x37, 0x50, 0x3a, 0x3a, 0xc4, 0x9f, 0x03, 0xa0, 0x24, 0xcd, 0xb6, 0x68, 0x6d, 0x1a, 0x9c, + 0x6c, 0x08, 0x2e, 0x96, 0x93, 0xbc, 0x4d, 0xcc, 0x1c, 0xdb, 0xb2, 0xdf, 0x94, 0x76, 0x9f, 0x00, + 0xf5, 0xb4, 0x13, 0xb7, 0x9e, 0xe0, 0x80, 0xc4, 0x05, 0x89, 0x2f, 0x80, 0x38, 0xed, 0xb8, 0x1b, + 0x9c, 0x06, 0xea, 0x24, 0x3e, 0x07, 0x7a, 0xff, 0xc4, 0xb1, 0x9b, 0x86, 0x4d, 0xd5, 0xc4, 0x25, + 0xf2, 0xfb, 0x3c, 0xbf, 0xe7, 0xff, 0xcf, 0x8f, 0xdf, 0xc0, 0x35, 0x82, 0xed, 0x1e, 0xf6, 0x86, + 0xa6, 0x4d, 0x36, 0xc9, 0x91, 0x8b, 0x7d, 0xfe, 0x5b, 0x72, 0x3d, 0x87, 0x38, 0x28, 0x3b, 0xd1, + 0x96, 0x98, 0x3c, 0xbf, 0xd2, 0x77, 0xfa, 0x0e, 0x53, 0x6e, 0xd2, 0x27, 0x8e, 0xcb, 0xaf, 0xf7, + 0x1d, 0xa7, 0x6f, 0xe1, 0x4d, 0x76, 0xea, 0x8c, 0xf6, 0x37, 0x89, 0x39, 0xc4, 0x3e, 0x31, 0x86, + 0xae, 0x00, 0xac, 0x85, 0xc2, 0x74, 0xbd, 0x23, 0x97, 0x38, 0x14, 0xeb, 0xec, 0x0b, 0x75, 0x21, + 0xa4, 0x3e, 0xc0, 0x9e, 0x6f, 0x3a, 0x76, 0x38, 0x8f, 0x7c, 0x71, 0x2a, 0xcb, 0x03, 0xc3, 0x32, + 0x7b, 0x06, 0x71, 0x3c, 0x8e, 0x50, 0x3f, 0x01, 0xa5, 0x69, 0x78, 0xa4, 0x85, 0xc9, 0x7d, 0x6c, + 0xf4, 0xb0, 0x87, 0x56, 0x60, 0x9e, 0x38, 0xc4, 0xb0, 0x72, 0x52, 0x51, 0xda, 0x50, 0x34, 0x7e, + 0x40, 0x08, 0xe4, 0x81, 0xe1, 0x0f, 0x72, 0xb1, 0xa2, 0xb4, 0x91, 0xd1, 0xd8, 0xb3, 0x3a, 0x00, + 0x99, 0x9a, 0x52, 0x0b, 0xd3, 0xee, 0xe1, 0xc3, 0xb1, 0x05, 0x3b, 0x50, 0x69, 0xe7, 0x88, 0x60, + 0x5f, 0x98, 0xf0, 0x03, 0xfa, 0x00, 0xe6, 0x59, 0xfe, 0xb9, 0x78, 0x51, 0xda, 0x48, 0x6f, 0xe5, + 0x4a, 0xa1, 0x46, 0xf1, 0xfa, 0x4a, 0x4d, 0xaa, 0xaf, 0xc8, 0xcf, 0x5e, 0xac, 0xcf, 0x69, 0x1c, + 0xac, 0x5a, 0x90, 0xa8, 0x58, 0x4e, 0xf7, 0x71, 0x7d, 0x3b, 0x48, 0x44, 0x9a, 0x24, 0x82, 0x76, + 0x61, 0xc9, 0x35, 0x3c, 0xa2, 0xfb, 0x98, 0xe8, 0x03, 0x56, 0x05, 0x0b, 0x9a, 0xde, 0x5a, 0x2f, + 0x9d, 0x9d, 0x43, 0x29, 0x52, 0xac, 0x88, 0xa2, 0xb8, 0x61, 0xa1, 0xfa, 0x8f, 0x0c, 0x0b, 0xa2, + 0x19, 0x9f, 0x42, 0x42, 0xb4, 0x95, 0x05, 0x4c, 0x6f, 0xad, 0x85, 0x3d, 0x0a, 0x55, 0xa9, 0xea, + 0xd8, 0x3e, 0xb6, 0xfd, 0x91, 0x2f, 0xfc, 0x8d, 0x6d, 0xd0, 0x3b, 0x90, 0xec, 0x0e, 0x0c, 0xd3, + 0xd6, 0xcd, 0x1e, 0xcb, 0x28, 0x55, 0x49, 0x9f, 0xbe, 0x58, 0x4f, 0x54, 0xa9, 0xac, 0xbe, 0xad, + 0x25, 0x98, 0xb2, 0xde, 0x43, 0x97, 0x61, 0x61, 0x80, 0xcd, 0xfe, 0x80, 0xb0, 0xb6, 0xc4, 0x35, + 0x71, 0x42, 0x1f, 0x83, 0x4c, 0x09, 0x91, 0x93, 0x59, 0xec, 0x7c, 0x89, 0xb3, 0xa5, 0x34, 0x66, + 0x4b, 0xa9, 0x3d, 0x66, 0x4b, 0x25, 0x49, 0x03, 0x3f, 0xfd, 0x6b, 0x5d, 0xd2, 0x98, 0x05, 0xaa, + 0x82, 0x62, 0x19, 0x3e, 0xd1, 0x3b, 0xb4, 0x6d, 0x34, 0xfc, 0x3c, 0x73, 0xb1, 0x3a, 0xdd, 0x10, + 0xd1, 0x58, 0x91, 0x7a, 0x9a, 0x5a, 0x71, 0x51, 0x0f, 0x6d, 0x40, 0x96, 0x39, 0xe9, 0x3a, 0xc3, + 0xa1, 0x49, 0x74, 0xd6, 0xf7, 0x05, 0xd6, 0xf7, 0x45, 0x2a, 0xaf, 0x32, 0xf1, 0x7d, 0x3a, 0x81, + 0xab, 0x90, 0xea, 0x19, 0xc4, 0xe0, 0x90, 0x04, 0x83, 0x24, 0xa9, 0x80, 0x29, 0x6f, 0xc0, 0x52, + 0xc0, 0x3a, 0x9f, 0x43, 0x92, 0xdc, 0xcb, 0x44, 0xcc, 0x80, 0xb7, 0x61, 0xc5, 0xc6, 0x87, 0x44, + 0x3f, 0x8b, 0x4e, 0x31, 0x34, 0xa2, 0xba, 0x47, 0x51, 0x8b, 0xeb, 0xb0, 0xd8, 0x1d, 0x37, 0x9f, + 0x63, 0x81, 0x61, 0x95, 0x40, 0xca, 0x60, 0xab, 0x90, 0x34, 0x5c, 0x97, 0x03, 0xd2, 0x0c, 0x90, + 0x30, 0x5c, 0x97, 0xa9, 0x6e, 0xc1, 0x32, 0xab, 0xd1, 0xc3, 0xfe, 0xc8, 0x22, 0xc2, 0x49, 0x86, + 0x61, 0x96, 0xa8, 0x42, 0xe3, 0x72, 0x86, 0x7d, 0x1b, 0x14, 0x7c, 0x60, 0xf6, 0xb0, 0xdd, 0xc5, + 0x1c, 0xa7, 0x30, 0x5c, 0x66, 0x2c, 0x64, 0xa0, 0x9b, 0x90, 0x75, 0x3d, 0xc7, 0x75, 0x7c, 0xec, + 0xe9, 0x46, 0xaf, 0xe7, 0x61, 0xdf, 0xcf, 0x2d, 0x72, 0x7f, 0x63, 0x79, 0x99, 0x8b, 0xd5, 0x1c, + 0xc8, 0xdb, 0x06, 0x31, 0x50, 0x16, 0xe2, 0xe4, 0xd0, 0xcf, 0x49, 0xc5, 0xf8, 0x46, 0x46, 0xa3, + 0x8f, 0xea, 0x2f, 0x71, 0x90, 0x1f, 0x39, 0x04, 0xa3, 0x3b, 0x20, 0xd3, 0x31, 0x31, 0xf6, 0x2d, + 0x9e, 0xc7, 0xe7, 0x96, 0xd9, 0xb7, 0x71, 0x6f, 0xd7, 0xef, 0xb7, 0x8f, 0x5c, 0xac, 0x31, 0x70, + 0x88, 0x4e, 0xb1, 0x08, 0x9d, 0x56, 0x60, 0xde, 0x73, 0x46, 0x76, 0x8f, 0xb1, 0x6c, 0x5e, 0xe3, + 0x07, 0x54, 0x83, 0x64, 0xc0, 0x12, 0xf9, 0x55, 0x2c, 0x59, 0xa2, 0x2c, 0xa1, 0x1c, 0x16, 0x02, + 0x2d, 0xd1, 0x11, 0x64, 0xa9, 0x40, 0x2a, 0x58, 0x5e, 0x82, 0x6d, 0xaf, 0x47, 0xd8, 0x89, 0x19, + 0x7a, 0x17, 0x96, 0x83, 0xd9, 0x07, 0xcd, 0xe3, 0x8c, 0xcb, 0x06, 0x0a, 0xd1, 0xbd, 0x08, 0xad, + 0x74, 0xbe, 0x80, 0x12, 0xac, 0xae, 0x09, 0xad, 0xea, 0x6c, 0x13, 0x5d, 0x83, 0x94, 0x6f, 0xf6, + 0x6d, 0x83, 0x8c, 0x3c, 0x2c, 0x98, 0x37, 0x11, 0xa0, 0xbb, 0xb0, 0x78, 0xe0, 0x10, 0xac, 0xe3, + 0x43, 0x82, 0x6d, 0xf6, 0xa6, 0xa7, 0x66, 0xed, 0x0e, 0x3a, 0x91, 0xda, 0x18, 0xa6, 0x29, 0x07, + 0xe1, 0xa3, 0x7a, 0x04, 0x4a, 0x44, 0x8f, 0x6e, 0x40, 0x96, 0x92, 0x8e, 0xbd, 0x17, 0xc4, 0xd1, + 0x69, 0x44, 0xb1, 0xb5, 0x14, 0xc3, 0x75, 0xe9, 0xe0, 0xdb, 0x0e, 0x9d, 0x1e, 0xfa, 0x1c, 0xae, + 0x05, 0x40, 0x1f, 0x5b, 0xfb, 0xba, 0x31, 0x22, 0x03, 0x6c, 0x13, 0xb3, 0x6b, 0x10, 0xd3, 0xee, + 0x8b, 0x05, 0xba, 0x2a, 0x8c, 0x5a, 0xd8, 0xda, 0x2f, 0x47, 0x00, 0xea, 0x67, 0xf0, 0x56, 0x24, + 0xb4, 0xf0, 0xfb, 0xba, 0x09, 0xa8, 0xbf, 0x49, 0xb0, 0xc0, 0x5f, 0xe6, 0x10, 0x75, 0xa4, 0xf3, + 0xa9, 0x13, 0x9b, 0x45, 0x9d, 0xf8, 0xc5, 0xa9, 0x53, 0x06, 0x08, 0xe6, 0xe1, 0xe7, 0xe4, 0x62, + 0x7c, 0x23, 0xbd, 0x75, 0x75, 0xda, 0x11, 0x4f, 0xb1, 0x65, 0xf6, 0xc5, 0xae, 0x0a, 0x19, 0xa9, + 0x3f, 0xc7, 0x20, 0x15, 0xe8, 0x51, 0x19, 0x94, 0x71, 0x5e, 0xfa, 0xbe, 0x65, 0xf4, 0xc5, 0xeb, + 0xb3, 0x36, 0x33, 0xb9, 0xbb, 0x96, 0xd1, 0xd7, 0xd2, 0x22, 0x1f, 0x7a, 0x38, 0x9f, 0x8a, 0xb1, + 0x19, 0x54, 0x8c, 0x70, 0x3f, 0x7e, 0x31, 0xee, 0x47, 0x58, 0x2a, 0x9f, 0x65, 0xe9, 0xce, 0x14, + 0x4b, 0xf9, 0x2b, 0x76, 0xfd, 0x15, 0x2c, 0xe5, 0x13, 0x3e, 0xcb, 0xd5, 0x5f, 0x63, 0x90, 0x6c, + 0xb2, 0x65, 0x64, 0x58, 0xff, 0xc7, 0x8a, 0xb9, 0x0a, 0x29, 0xd7, 0xb1, 0x74, 0xae, 0x91, 0x99, + 0x26, 0xe9, 0x3a, 0x96, 0x36, 0x45, 0xa2, 0xf9, 0x37, 0xb4, 0x7f, 0x16, 0xde, 0xc0, 0x0c, 0x12, + 0x67, 0x66, 0xa0, 0x7a, 0x90, 0xe1, 0xad, 0x10, 0x97, 0x83, 0xdb, 0xb4, 0x07, 0xec, 0xb6, 0x21, + 0x4d, 0x5f, 0x66, 0x78, 0xda, 0x1c, 0xa9, 0x09, 0x1c, 0xb5, 0xe0, 0xdf, 0x52, 0x71, 0x3f, 0xc9, + 0xcd, 0x22, 0xb9, 0x26, 0x70, 0xea, 0xf7, 0x12, 0xc0, 0x0e, 0xed, 0x2c, 0xab, 0x97, 0x7e, 0xd6, + 0x7d, 0x96, 0x82, 0x1e, 0x89, 0x5c, 0x98, 0x35, 0x34, 0x11, 0x3f, 0xe3, 0x87, 0xf3, 0xae, 0x82, + 0x32, 0xa1, 0xb6, 0x8f, 0xc7, 0xc9, 0x9c, 0xe3, 0x24, 0xf8, 0xda, 0xb6, 0x30, 0xd1, 0x32, 0x07, + 0xa1, 0x93, 0xfa, 0xbb, 0x04, 0x29, 0x96, 0xd3, 0x2e, 0x26, 0x46, 0x64, 0x86, 0xd2, 0xc5, 0x67, + 0xb8, 0x06, 0xc0, 0xdd, 0xf8, 0xe6, 0x13, 0x2c, 0x98, 0x95, 0x62, 0x92, 0x96, 0xf9, 0x04, 0xa3, + 0x0f, 0x83, 0x86, 0xc7, 0xff, 0xbb, 0xe1, 0x62, 0x41, 0x8c, 0xdb, 0x7e, 0x05, 0x12, 0xf6, 0x68, + 0xa8, 0xd3, 0x6f, 0xac, 0xcc, 0xd9, 0x6a, 0x8f, 0x86, 0xed, 0x43, 0x5f, 0xfd, 0x06, 0x12, 0xed, + 0x43, 0x76, 0xdf, 0xa4, 0x14, 0xf5, 0x1c, 0x47, 0x5c, 0x72, 0xf8, 0x96, 0x4c, 0x52, 0x01, 0xfb, + 0xa6, 0x23, 0x90, 0xe9, 0x16, 0x1d, 0xdf, 0x7e, 0xe9, 0x33, 0x2a, 0xbd, 0xe6, 0x4d, 0x56, 0xdc, + 0x61, 0x6f, 0xfd, 0x21, 0x41, 0x3a, 0xb4, 0x6d, 0xd0, 0xfb, 0x70, 0xa9, 0xb2, 0xb3, 0x57, 0x7d, + 0xa0, 0xd7, 0xb7, 0xf5, 0xbb, 0x3b, 0xe5, 0x7b, 0xfa, 0xc3, 0xc6, 0x83, 0xc6, 0xde, 0x97, 0x8d, + 0xec, 0x5c, 0xfe, 0xf2, 0xf1, 0x49, 0x11, 0x85, 0xb0, 0x0f, 0xed, 0xc7, 0xb6, 0xf3, 0xad, 0x8d, + 0x36, 0x61, 0x25, 0x6a, 0x52, 0xae, 0xb4, 0x6a, 0x8d, 0x76, 0x56, 0xca, 0x5f, 0x3a, 0x3e, 0x29, + 0x2e, 0x87, 0x2c, 0xca, 0x1d, 0x1f, 0xdb, 0x64, 0xda, 0xa0, 0xba, 0xb7, 0xbb, 0x5b, 0x6f, 0x67, + 0x63, 0x53, 0x06, 0x62, 0xfd, 0xdf, 0x84, 0xe5, 0xa8, 0x41, 0xa3, 0xbe, 0x93, 0x8d, 0xe7, 0xd1, + 0xf1, 0x49, 0x71, 0x31, 0x84, 0x6e, 0x98, 0x56, 0x3e, 0xf9, 0xdd, 0x0f, 0x85, 0xb9, 0x9f, 0x7e, + 0x2c, 0x48, 0xb4, 0x32, 0x25, 0xb2, 0x23, 0xd0, 0x7b, 0x70, 0xa5, 0x55, 0xbf, 0xd7, 0xa8, 0x6d, + 0xeb, 0xbb, 0xad, 0x7b, 0x7a, 0xfb, 0xab, 0x66, 0x2d, 0x54, 0xdd, 0xd2, 0xf1, 0x49, 0x31, 0x2d, + 0x4a, 0x9a, 0x85, 0x6e, 0x6a, 0xb5, 0x47, 0x7b, 0xed, 0x5a, 0x56, 0xe2, 0xe8, 0xa6, 0x87, 0xe9, + 0x02, 0x63, 0xe8, 0xdb, 0xb0, 0x7a, 0x0e, 0x3a, 0x28, 0x6c, 0xf9, 0xf8, 0xa4, 0xa8, 0x34, 0x3d, + 0xcc, 0xdf, 0x1f, 0x66, 0x51, 0x82, 0xdc, 0xb4, 0xc5, 0x5e, 0x73, 0xaf, 0x55, 0xde, 0xc9, 0x16, + 0xf3, 0xd9, 0xe3, 0x93, 0x62, 0x66, 0xbc, 0x0c, 0x29, 0x7e, 0x52, 0x59, 0xe5, 0x8b, 0x67, 0xa7, + 0x05, 0xe9, 0xf9, 0x69, 0x41, 0xfa, 0xfb, 0xb4, 0x20, 0x3d, 0x7d, 0x59, 0x98, 0x7b, 0xfe, 0xb2, + 0x30, 0xf7, 0xe7, 0xcb, 0xc2, 0xdc, 0xd7, 0x1f, 0xf5, 0x4d, 0x32, 0x18, 0x75, 0x4a, 0x5d, 0x67, + 0xb8, 0x19, 0xfe, 0x8f, 0x35, 0x79, 0xe4, 0xff, 0xf5, 0xce, 0xfe, 0xff, 0xea, 0x2c, 0x30, 0xf9, + 0x9d, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x38, 0xfc, 0x14, 0xb1, 0x40, 0x0e, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1433,6 +1556,18 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } if len(m.Signature) > 0 { i -= len(m.Signature) copy(dAtA[i:], m.Signature) @@ -1452,12 +1587,12 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err6 != nil { - return 0, err6 + n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err7 != nil { + return 0, err7 } - i -= n6 - i = encodeVarintTypes(dAtA, i, uint64(n6)) + i -= n7 + i = encodeVarintTypes(dAtA, i, uint64(n7)) i-- dAtA[i] = 0x2a { @@ -1488,6 +1623,73 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *VoteExtension) 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 *VoteExtension) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *VoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.AppDataSelfAuthenticating) > 0 { + i -= len(m.AppDataSelfAuthenticating) + copy(dAtA[i:], m.AppDataSelfAuthenticating) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppDataSelfAuthenticating))) + i-- + dAtA[i] = 0x12 + } + if len(m.AppDataToSign) > 0 { + i -= len(m.AppDataToSign) + copy(dAtA[i:], m.AppDataToSign) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppDataToSign))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *VoteExtensionToSign) 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 *VoteExtensionToSign) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *VoteExtensionToSign) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.AppDataToSign) > 0 { + i -= len(m.AppDataToSign) + copy(dAtA[i:], m.AppDataToSign) + i = encodeVarintTypes(dAtA, i, uint64(len(m.AppDataToSign))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *Commit) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1565,6 +1767,18 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.VoteExtension != nil { + { + size, err := m.VoteExtension.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } if len(m.Signature) > 0 { i -= len(m.Signature) copy(dAtA[i:], m.Signature) @@ -1572,12 +1786,12 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - n9, err9 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err9 != nil { - return 0, err9 + n11, err11 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err11 != nil { + return 0, err11 } - i -= n9 - i = encodeVarintTypes(dAtA, i, uint64(n9)) + i -= n11 + i = encodeVarintTypes(dAtA, i, uint64(n11)) i-- dAtA[i] = 0x1a if len(m.ValidatorAddress) > 0 { @@ -1622,12 +1836,12 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n10, err10 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err10 != nil { - return 0, err10 + n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err12 != nil { + return 0, err12 } - i -= n10 - i = encodeVarintTypes(dAtA, i, uint64(n10)) + i -= n12 + i = encodeVarintTypes(dAtA, i, uint64(n12)) i-- dAtA[i] = 0x32 { @@ -2022,6 +2236,40 @@ func (m *Vote) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *VoteExtension) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.AppDataToSign) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.AppDataSelfAuthenticating) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *VoteExtensionToSign) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.AppDataToSign) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -2067,6 +2315,10 @@ func (m *CommitSig) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + if m.VoteExtension != nil { + l = m.VoteExtension.Size() + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -3362,6 +3614,244 @@ func (m *Vote) Unmarshal(dAtA []byte) error { m.Signature = []byte{} } iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", 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.VoteExtension == nil { + m.VoteExtension = &VoteExtension{} + } + if err := m.VoteExtension.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 *VoteExtension) 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: VoteExtension: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: VoteExtension: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppDataToSign", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AppDataToSign = append(m.AppDataToSign[:0], dAtA[iNdEx:postIndex]...) + if m.AppDataToSign == nil { + m.AppDataToSign = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppDataSelfAuthenticating", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AppDataSelfAuthenticating = append(m.AppDataSelfAuthenticating[:0], dAtA[iNdEx:postIndex]...) + if m.AppDataSelfAuthenticating == nil { + m.AppDataSelfAuthenticating = []byte{} + } + 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 *VoteExtensionToSign) 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: VoteExtensionToSign: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: VoteExtensionToSign: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AppDataToSign", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.AppDataToSign = append(m.AppDataToSign[:0], dAtA[iNdEx:postIndex]...) + if m.AppDataToSign == nil { + m.AppDataToSign = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -3687,6 +4177,42 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { m.Signature = []byte{} } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", 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.VoteExtension == nil { + m.VoteExtension = &VoteExtensionToSign{} + } + if err := m.VoteExtension.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 8d4f009729d..2eebb95c527 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -102,6 +102,19 @@ message Vote { bytes validator_address = 6; int32 validator_index = 7; bytes signature = 8; + VoteExtension vote_extension = 9; +} + +// VoteExtension is app-defined additional information to the validator votes. +message VoteExtension { + bytes app_data_to_sign = 1; + bytes app_data_self_authenticating = 2; +} + +// VoteExtensionToSign is a subset of VoteExtension that is signed by the validators private key. +// VoteExtensionToSign is extracted from an existing VoteExtension. +message VoteExtensionToSign { + bytes app_data_to_sign = 1; } // Commit contains the evidence that a block was committed by a set of validators. @@ -119,6 +132,7 @@ message CommitSig { google.protobuf.Timestamp timestamp = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; bytes signature = 4; + VoteExtensionToSign vote_extension = 5; } message Proposal { diff --git a/proxy/app_conn.go b/proxy/app_conn.go index d8461484c28..34ca30c24fc 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -23,6 +23,9 @@ type AppConnConsensus interface { DeliverTxAsync(context.Context, types.RequestDeliverTx) (*abcicli.ReqRes, error) EndBlockSync(context.Context, types.RequestEndBlock) (*types.ResponseEndBlock, error) CommitSync(context.Context) (*types.ResponseCommit, error) + + ExtendVoteSync(context.Context, types.RequestExtendVote) (*types.ResponseExtendVote, error) + VerifyVoteExtensionSync(context.Context, types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) } type AppConnMempool interface { @@ -110,6 +113,14 @@ func (app *appConnConsensus) CommitSync(ctx context.Context) (*types.ResponseCom return app.appConn.CommitSync(ctx) } +func (app *appConnConsensus) ExtendVoteSync(ctx context.Context, req types.RequestExtendVote) (*types.ResponseExtendVote, error) { + return app.appConn.ExtendVoteSync(ctx, req) +} + +func (app *appConnConsensus) VerifyVoteExtensionSync(ctx context.Context, req types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { + return app.appConn.VerifyVoteExtensionSync(ctx, req) +} + //------------------------------------------------ // Implements AppConnMempool (subset of abcicli.Client) diff --git a/state/execution.go b/state/execution.go index fa8c9a5eb68..fb784c54924 100644 --- a/state/execution.go +++ b/state/execution.go @@ -265,6 +265,20 @@ func (blockExec *BlockExecutor) ApplyBlock( return state, nil } +func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) (types.VoteExtension, error) { + ctx := context.TODO() + req := abci.RequestExtendVote{ + Vote: vote.ToProto(), + } + + resp, err := blockExec.proxyApp.ExtendVoteSync(ctx, req) + if err != nil { + return types.VoteExtension{}, err + } + + return types.VoteExtensionFromProto(resp.VoteExtension), nil +} + // Commit locks the mempool, runs the ABCI Commit message, and updates the // mempool. // It returns the result of calling abci.Commit (the AppHash) and the height to retain (if any). @@ -512,7 +526,7 @@ func updateState( nextVersion := state.Version - // NOTE: the AppHash has not been populated. + // NOTE: the AppHash and the VoteExtension has not been populated. // It will be filled on state.Save. return State{ Version: nextVersion, diff --git a/state/execution_test.go b/state/execution_test.go index 8e0ec563ad0..8e29eb27466 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -77,11 +77,15 @@ func TestBeginBlockValidators(t *testing.T) { commitSig0 = types.NewCommitSigForBlock( []byte("Signature1"), state.Validators.Validators[0].Address, - now) + now, + types.VoteExtensionToSign{}, + ) commitSig1 = types.NewCommitSigForBlock( []byte("Signature2"), state.Validators.Validators[1].Address, - now) + now, + types.VoteExtensionToSign{}, + ) absentSig = types.NewCommitSigAbsent() ) diff --git a/types/block.go b/types/block.go index 2f444be7486..48f60e53f0c 100644 --- a/types/block.go +++ b/types/block.go @@ -602,19 +602,21 @@ const ( // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { - BlockIDFlag BlockIDFlag `json:"block_id_flag"` - ValidatorAddress Address `json:"validator_address"` - Timestamp time.Time `json:"timestamp"` - Signature []byte `json:"signature"` + BlockIDFlag BlockIDFlag `json:"block_id_flag"` + ValidatorAddress Address `json:"validator_address"` + Timestamp time.Time `json:"timestamp"` + Signature []byte `json:"signature"` + VoteExtension VoteExtensionToSign `json:"vote_extension"` } // NewCommitSigForBlock returns new CommitSig with BlockIDFlagCommit. -func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time) CommitSig { +func NewCommitSigForBlock(signature []byte, valAddr Address, ts time.Time, ext VoteExtensionToSign) CommitSig { return CommitSig{ BlockIDFlag: BlockIDFlagCommit, ValidatorAddress: valAddr, Timestamp: ts, Signature: signature, + VoteExtension: ext, } } @@ -647,12 +649,14 @@ func (cs CommitSig) Absent() bool { // 1. first 6 bytes of signature // 2. first 6 bytes of validator address // 3. block ID flag -// 4. timestamp +// 4. first 6 bytes of the vote extension +// 5. timestamp func (cs CommitSig) String() string { - return fmt.Sprintf("CommitSig{%X by %X on %v @ %s}", + return fmt.Sprintf("CommitSig{%X by %X on %v with %X @ %s}", tmbytes.Fingerprint(cs.Signature), tmbytes.Fingerprint(cs.ValidatorAddress), cs.BlockIDFlag, + tmbytes.Fingerprint(cs.VoteExtension.BytesPacked()), CanonicalTime(cs.Timestamp)) } @@ -801,6 +805,7 @@ func (commit *Commit) GetVote(valIdx int32) *Vote { ValidatorAddress: commitSig.ValidatorAddress, ValidatorIndex: valIdx, Signature: commitSig.Signature, + VoteExtension: commitSig.VoteExtension.ToVoteExtension(), } } diff --git a/types/canonical.go b/types/canonical.go index 01c3d851dd4..3417cdc04b3 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -51,16 +51,26 @@ func CanonicalizeProposal(chainID string, proposal *tmproto.Proposal) tmproto.Ca } } +func GetVoteExtensionToSign(ext *tmproto.VoteExtension) *tmproto.VoteExtensionToSign { + if ext == nil { + return nil + } + return &tmproto.VoteExtensionToSign{ + AppDataToSign: ext.AppDataToSign, + } +} + // CanonicalizeVote transforms the given Vote to a CanonicalVote, which does // not contain ValidatorIndex and ValidatorAddress fields. func CanonicalizeVote(chainID string, vote *tmproto.Vote) tmproto.CanonicalVote { return tmproto.CanonicalVote{ - Type: vote.Type, - Height: vote.Height, // encoded as sfixed64 - Round: int64(vote.Round), // encoded as sfixed64 - BlockID: CanonicalizeBlockID(vote.BlockID), - Timestamp: vote.Timestamp, - ChainID: chainID, + Type: vote.Type, + Height: vote.Height, // encoded as sfixed64 + Round: int64(vote.Round), // encoded as sfixed64 + BlockID: CanonicalizeBlockID(vote.BlockID), + Timestamp: vote.Timestamp, + ChainID: chainID, + VoteExtension: GetVoteExtensionToSign(vote.VoteExtension), } } diff --git a/types/vote.go b/types/vote.go index e8105ad70f6..9cc8169cf88 100644 --- a/types/vote.go +++ b/types/vote.go @@ -24,6 +24,7 @@ var ( ErrVoteInvalidBlockHash = errors.New("invalid block hash") ErrVoteNonDeterministicSignature = errors.New("non-deterministic signature") ErrVoteNil = errors.New("nil vote") + ErrVoteInvalidExtension = errors.New("invalid vote extension") ) type ErrVoteConflictingVotes struct { @@ -45,6 +46,52 @@ func NewConflictingVoteError(vote1, vote2 *Vote) *ErrVoteConflictingVotes { // Address is hex bytes. type Address = crypto.Address +// VoteExtensionToSign is a subset of VoteExtension +// that is signed by the validators private key +type VoteExtensionToSign struct { + AppDataToSign []byte `json:"app_data_to_sign"` +} + +// BytesPacked returns a bytes-packed representation for +// debugging and human identification. This function should +// not be used for any logical operations. +func (ext VoteExtensionToSign) BytesPacked() []byte { + res := make([]byte, len(ext.AppDataToSign)) + copy(res, ext.AppDataToSign) + return res +} + +// ToVoteExtension constructs a VoteExtension from a VoteExtensionToSign +func (ext VoteExtensionToSign) ToVoteExtension() VoteExtension { + return VoteExtension{ + AppDataToSign: ext.AppDataToSign, + } +} + +// VoteExtension is a set of data provided by the application +// that is additionally included in the vote +type VoteExtension struct { + AppDataToSign []byte `json:"app_data_to_sign"` + AppDataSelfAuthenticating []byte `json:"app_data_self_authenticating"` +} + +// ToSign constructs a VoteExtensionToSign from a VoteExtenstion +func (ext VoteExtension) ToSign() VoteExtensionToSign { + return VoteExtensionToSign{ + AppDataToSign: ext.AppDataToSign, + } +} + +// BytesPacked returns a bytes-packed representation for +// debugging and human identification. This function should +// not be used for any logical operations. +func (ext VoteExtension) BytesPacked() []byte { + res := make([]byte, len(ext.AppDataToSign)+len(ext.AppDataSelfAuthenticating)) + copy(res[:len(ext.AppDataToSign)], ext.AppDataToSign) + copy(res[len(ext.AppDataToSign):], ext.AppDataSelfAuthenticating) + return res +} + // Vote represents a prevote, precommit, or commit vote from validators for // consensus. type Vote struct { @@ -56,6 +103,7 @@ type Vote struct { ValidatorAddress Address `json:"validator_address"` ValidatorIndex int32 `json:"validator_index"` Signature []byte `json:"signature"` + VoteExtension VoteExtension `json:"vote_extension"` } // CommitSig converts the Vote to a CommitSig. @@ -79,6 +127,7 @@ func (vote *Vote) CommitSig() CommitSig { ValidatorAddress: vote.ValidatorAddress, Timestamp: vote.Timestamp, Signature: vote.Signature, + VoteExtension: vote.VoteExtension.ToSign(), } } @@ -102,6 +151,7 @@ func VoteSignBytes(chainID string, vote *tmproto.Vote) []byte { func (vote *Vote) Copy() *Vote { voteCopy := *vote + voteCopy.VoteExtension = vote.VoteExtension.Copy() return &voteCopy } @@ -115,7 +165,8 @@ func (vote *Vote) Copy() *Vote { // 6. type string // 7. first 6 bytes of block hash // 8. first 6 bytes of signature -// 9. timestamp +// 9. first 6 bytes of vote extension +// 10. timestamp func (vote *Vote) String() string { if vote == nil { return nilVoteStr @@ -131,7 +182,7 @@ func (vote *Vote) String() string { panic("Unknown vote type") } - return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X @ %s}", + return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X %X @ %s}", vote.ValidatorIndex, tmbytes.Fingerprint(vote.ValidatorAddress), vote.Height, @@ -140,6 +191,7 @@ func (vote *Vote) String() string { typeString, tmbytes.Fingerprint(vote.BlockID.Hash), tmbytes.Fingerprint(vote.Signature), + tmbytes.Fingerprint(vote.VoteExtension.BytesPacked()), CanonicalTime(vote.Timestamp), ) } @@ -198,9 +250,42 @@ func (vote *Vote) ValidateBasic() error { return fmt.Errorf("signature is too big (max: %d)", MaxSignatureSize) } + // XXX: add length verification for vote extension? + return nil } +func (ext VoteExtension) Copy() VoteExtension { + res := VoteExtension{ + AppDataToSign: make([]byte, len(ext.AppDataToSign)), + AppDataSelfAuthenticating: make([]byte, len(ext.AppDataSelfAuthenticating)), + } + copy(res.AppDataToSign, ext.AppDataToSign) + copy(res.AppDataSelfAuthenticating, ext.AppDataSelfAuthenticating) + return res +} + +func (ext VoteExtension) IsEmpty() bool { + if len(ext.AppDataToSign) != 0 { + return false + } + if len(ext.AppDataSelfAuthenticating) != 0 { + return false + } + return true +} + +func (ext VoteExtension) ToProto() *tmproto.VoteExtension { + if ext.IsEmpty() { + return nil + } + + return &tmproto.VoteExtension{ + AppDataToSign: ext.AppDataToSign, + AppDataSelfAuthenticating: ext.AppDataSelfAuthenticating, + } +} + // ToProto converts the handwritten type to proto generated type // return type, nil if everything converts safely, otherwise nil, error func (vote *Vote) ToProto() *tmproto.Vote { @@ -217,7 +302,17 @@ func (vote *Vote) ToProto() *tmproto.Vote { ValidatorAddress: vote.ValidatorAddress, ValidatorIndex: vote.ValidatorIndex, Signature: vote.Signature, + VoteExtension: vote.VoteExtension.ToProto(), + } +} + +func VoteExtensionFromProto(pext *tmproto.VoteExtension) VoteExtension { + ext := VoteExtension{} + if pext != nil { + ext.AppDataToSign = pext.AppDataToSign + ext.AppDataSelfAuthenticating = pext.AppDataSelfAuthenticating } + return ext } // FromProto converts a proto generetad type to a handwritten type @@ -241,6 +336,7 @@ func VoteFromProto(pv *tmproto.Vote) (*Vote, error) { vote.ValidatorAddress = pv.ValidatorAddress vote.ValidatorIndex = pv.ValidatorIndex vote.Signature = pv.Signature + vote.VoteExtension = VoteExtensionFromProto(pv.VoteExtension) return vote, vote.ValidateBasic() } diff --git a/types/vote_test.go b/types/vote_test.go index bfd1c416441..c4448278457 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -128,6 +128,33 @@ func TestVoteSignBytesTestVectors(t *testing.T) { 0x32, 0xd, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64}, // chainID }, + // containing vote extension + 5: { + "test_chain_id", &Vote{Height: 1, Round: 1, VoteExtension: VoteExtension{ + AppDataToSign: []byte("signed"), + AppDataSelfAuthenticating: []byte("auth"), + }}, + []byte{ + 0x38, // length + 0x11, // (field_number << 3) | wire_type + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, // height + 0x19, // (field_number << 3) | wire_type + 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, // round + // remaning fields: + 0x2a, // (field_number << 3) | wire_type + 0xb, 0x8, 0x80, 0x92, 0xb8, 0xc3, 0x98, 0xfe, 0xff, 0xff, 0xff, 0x1, // timestamp + // (field_number << 3) | wire_type + 0x32, + 0xd, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, // chainID + // (field_number << 3) | wire_type + 0x3a, + 0x8, // length + 0xa, // (field_number << 3) | wire_type + 0x6, // length + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, // AppDataSigned + // SelfAuthenticating data is excluded on signing + }, // chainID + }, } for i, tc := range tests { v := tc.vote.ToProto() @@ -220,13 +247,13 @@ func TestVoteVerify(t *testing.T) { func TestVoteString(t *testing.T) { str := examplePrecommit().String() - expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests + expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str) } str2 := examplePrevote().String() - expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests + expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str2 != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str2) } From 2279c7b81ae804161aea78243184b96ee71bba07 Mon Sep 17 00:00:00 2001 From: mconcat Date: Fri, 27 Aug 2021 17:41:44 +0900 Subject: [PATCH 13/23] add abcipp_kvstore.go --- abci/example/kvstore/abcipp_kvstore.go | 201 +++++++++++++++++++++ abci/example/kvstore/persistent_kvstore.go | 11 +- 2 files changed, 204 insertions(+), 8 deletions(-) create mode 100644 abci/example/kvstore/abcipp_kvstore.go diff --git a/abci/example/kvstore/abcipp_kvstore.go b/abci/example/kvstore/abcipp_kvstore.go new file mode 100644 index 00000000000..9a5d08ec8f4 --- /dev/null +++ b/abci/example/kvstore/abcipp_kvstore.go @@ -0,0 +1,201 @@ +package kvstore + +import ( + "bytes" + "strings" + + dbm "github.com/tendermint/tm-db" + + "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/libs/log" +) + +var _ types.Application = (*ABCIPPKVStoreApplication)(nil) + +type ABCIPPKVStoreApplication struct { + app *Application + + extension []byte + + logger log.Logger +} + +func NewABCIPPKVStoreApplication(dbDir string) *ABCIPPKVStoreApplication { + name := "kvstore" + db, err := dbm.NewGoLevelDB(name, dbDir) + if err != nil { + panic(err) + } + + state := loadState(db) + + return &ABCIPPKVStoreApplication{ + app: &Application{state: state}, + logger: log.NewNopLogger(), + } +} + +func (app *ABCIPPKVStoreApplication) Close() error { + return app.app.state.db.Close() +} + +func (app *ABCIPPKVStoreApplication) SetLogger(l log.Logger) { + app.logger = l +} + +func (app *ABCIPPKVStoreApplication) Info(req types.RequestInfo) types.ResponseInfo { + res := app.app.Info(req) + res.LastBlockHeight = app.app.state.Height + res.LastBlockAppHash = app.app.state.AppHash + return res +} + +// tx is either "val:pubkey!power" or "key=value" or just arbitrary bytes +func (app *ABCIPPKVStoreApplication) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx { + // if it starts with "prepare:", use it as placeholder transaction for prepare proposal + // format is "prepare:[null bytes]" + if isPrepareTx(req.Tx) { + return app.execPrepareTx(req.Tx) + } + + // if it starts with "extension:", use it as vote extension signed data + if isExtensionTx(req.Tx) { + return app.execExtensionTx(req.Tx) + } + + // otherwise, update the key-value store + return app.app.DeliverTx(req) +} + +func (app *ABCIPPKVStoreApplication) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx { + return app.app.CheckTx(req) +} + +// Commit will panic if InitChain was not called +func (app *ABCIPPKVStoreApplication) Commit() types.ResponseCommit { + return app.app.Commit() +} + +// When path=/val and data={validator address}, returns the validator update (types.ValidatorUpdate) varint encoded. +// For any other path, returns an associated value or nil if missing. +func (app *ABCIPPKVStoreApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) { + switch reqQuery.Path { + /* + case "/val": + key := []byte("val:" + string(reqQuery.Data)) + value, err := app.app.state.db.Get(key) + if err != nil { + panic(err) + } + + resQuery.Key = reqQuery.Data + resQuery.Value = value + return + */ + default: + return app.app.Query(reqQuery) + } +} + +// Save the validators in the merkle tree +func (app *ABCIPPKVStoreApplication) InitChain(req types.RequestInitChain) types.ResponseInitChain { + return types.ResponseInitChain{} +} + +// Track the block hash and header information +func (app *ABCIPPKVStoreApplication) BeginBlock(req types.RequestBeginBlock) types.ResponseBeginBlock { + return types.ResponseBeginBlock{} +} + +// Update the validator set +func (app *ABCIPPKVStoreApplication) EndBlock(req types.RequestEndBlock) types.ResponseEndBlock { + return types.ResponseEndBlock{} +} + +func (app *ABCIPPKVStoreApplication) ListSnapshots( + req types.RequestListSnapshots) types.ResponseListSnapshots { + return types.ResponseListSnapshots{} +} + +func (app *ABCIPPKVStoreApplication) LoadSnapshotChunk( + req types.RequestLoadSnapshotChunk) types.ResponseLoadSnapshotChunk { + return types.ResponseLoadSnapshotChunk{} +} + +func (app *ABCIPPKVStoreApplication) OfferSnapshot( + req types.RequestOfferSnapshot) types.ResponseOfferSnapshot { + return types.ResponseOfferSnapshot{Result: types.ResponseOfferSnapshot_ABORT} +} + +func (app *ABCIPPKVStoreApplication) ApplySnapshotChunk( + req types.RequestApplySnapshotChunk) types.ResponseApplySnapshotChunk { + return types.ResponseApplySnapshotChunk{Result: types.ResponseApplySnapshotChunk_ABORT} +} + +func (app *ABCIPPKVStoreApplication) ExtendVote( + req types.RequestExtendVote) types.ResponseExtendVote { + return types.RespondExtendVote(app.constructExtension(req.Vote.ValidatorAddress), nil) +} + +func (app *ABCIPPKVStoreApplication) VerifyVoteExtension( + req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { + return types.RespondVerifyVoteExtension( + app.verifyExtension(req.Vote.ValidatorAddress, req.Vote.VoteExtension.AppDataToSign)) +} + +func (app *ABCIPPKVStoreApplication) PrepareProposal( + req types.RequestPrepareProposal) types.ResponsePrepareProposal { + return types.ResponsePrepareProposal{BlockData: app.substPrepareTx(req.BlockData)} +} + +// ----------------------------- + +const PreparePrefix = "prepare" + +func isPrepareTx(tx []byte) bool { + return strings.HasPrefix(string(tx), PreparePrefix) +} + +// execPrepareTx is noop. tx data is considered as placeholder +// and is substitute at the PrepareProposal. +func (app *ABCIPPKVStoreApplication) execPrepareTx(tx []byte) types.ResponseDeliverTx { + // noop + return types.ResponseDeliverTx{} +} + +// substPrepareTx subst all the preparetx in the blockdata +// to null string(could be any arbitrary string). +func (app *ABCIPPKVStoreApplication) substPrepareTx(blockData [][]byte) [][]byte { + for i, tx := range blockData { + if isPrepareTx(tx) { + blockData[i] = make([]byte, len(tx)) + } + } + + return blockData +} + +const ExtensionPrefix = "extension" + +func isExtensionTx(tx []byte) bool { + return strings.HasPrefix(string(tx), ExtensionPrefix) +} + +// execExtensionTx stores the input string in the application struct +// which must be included in the VoteExtension.AppDataToSign +func (app *ABCIPPKVStoreApplication) execExtensionTx(tx []byte) types.ResponseDeliverTx { + app.extension = []byte(strings.Split(string(tx), ":")[1]) + + return types.ResponseDeliverTx{} +} + +func (app *ABCIPPKVStoreApplication) constructExtension(valAddr []byte) []byte { + ext := make([]byte, len(valAddr)+len(app.extension)) + copy(ext, valAddr) + copy(ext[len(valAddr):], app.extension) + return ext +} + +func (app *ABCIPPKVStoreApplication) verifyExtension(valAddr []byte, ext []byte) bool { + return bytes.Equal(app.constructExtension(valAddr), ext) +} diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index aca164202a8..e58650a777b 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -172,22 +172,17 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( func (app *PersistentKVStoreApplication) ExtendVote( req types.RequestExtendVote) types.ResponseExtendVote { - return types.RespondExtendVote(req.Vote.ValidatorAddress, nil) + return types.ResponseExtendVote{} } func (app *PersistentKVStoreApplication) VerifyVoteExtension( req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { - ok := bytes.Equal(req.Vote.ValidatorAddress, req.Vote.VoteExtension.AppDataToSign) - return types.RespondVerifyVoteExtension(ok) + return types.ResponseVerifyVoteExtension{} } func (app *PersistentKVStoreApplication) PrepareProposal( req types.RequestPrepareProposal) types.ResponsePrepareProposal { - if len(req.BlockData) >= 1 { - req.BlockData[1] = []byte("modified tx") - } - - return types.ResponsePrepareProposal{BlockData: req.BlockData} + return types.ResponsePrepareProposal{} } //--------------------------------------------- From ba4f88fe3fb68b4e4e47ee8f6dcf3f86c19f7b3f Mon Sep 17 00:00:00 2001 From: mconcat Date: Tue, 31 Aug 2021 02:06:12 +0900 Subject: [PATCH 14/23] add extension test --- abci/example/kvstore/README.md | 11 ++ abci/example/kvstore/abcipp_kvstore.go | 201 --------------------- abci/example/kvstore/persistent_kvstore.go | 71 +++++++- internal/consensus/state.go | 1 + rpc/client/helpers.go | 2 +- rpc/client/rpc_test.go | 2 +- types/block.go | 2 + types/vote.go | 42 ++++- types/vote_set.go | 1 + 9 files changed, 118 insertions(+), 215 deletions(-) delete mode 100644 abci/example/kvstore/abcipp_kvstore.go diff --git a/abci/example/kvstore/README.md b/abci/example/kvstore/README.md index a768342f8ba..c2ab080ec14 100644 --- a/abci/example/kvstore/README.md +++ b/abci/example/kvstore/README.md @@ -28,3 +28,14 @@ Validator set changes are effected using the following transaction format: where `pubkeyN` is a base64-encoded 32-byte ed25519 key and `powerN` is a new voting power for the validator with `pubkeyN` (possibly a new one). To remove a validator from the validator set, set power to `0`. There is no sybil protection against new validators joining. + +## ABCIPPKVStoreApplication + +The ABCIPPKVStoreApplication wraps the KVStoreApplication with ABCI++ specific +methods. + +### Prepare Proposal + +Transaction could be + +### Vote Extension diff --git a/abci/example/kvstore/abcipp_kvstore.go b/abci/example/kvstore/abcipp_kvstore.go deleted file mode 100644 index 9a5d08ec8f4..00000000000 --- a/abci/example/kvstore/abcipp_kvstore.go +++ /dev/null @@ -1,201 +0,0 @@ -package kvstore - -import ( - "bytes" - "strings" - - dbm "github.com/tendermint/tm-db" - - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" -) - -var _ types.Application = (*ABCIPPKVStoreApplication)(nil) - -type ABCIPPKVStoreApplication struct { - app *Application - - extension []byte - - logger log.Logger -} - -func NewABCIPPKVStoreApplication(dbDir string) *ABCIPPKVStoreApplication { - name := "kvstore" - db, err := dbm.NewGoLevelDB(name, dbDir) - if err != nil { - panic(err) - } - - state := loadState(db) - - return &ABCIPPKVStoreApplication{ - app: &Application{state: state}, - logger: log.NewNopLogger(), - } -} - -func (app *ABCIPPKVStoreApplication) Close() error { - return app.app.state.db.Close() -} - -func (app *ABCIPPKVStoreApplication) SetLogger(l log.Logger) { - app.logger = l -} - -func (app *ABCIPPKVStoreApplication) Info(req types.RequestInfo) types.ResponseInfo { - res := app.app.Info(req) - res.LastBlockHeight = app.app.state.Height - res.LastBlockAppHash = app.app.state.AppHash - return res -} - -// tx is either "val:pubkey!power" or "key=value" or just arbitrary bytes -func (app *ABCIPPKVStoreApplication) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx { - // if it starts with "prepare:", use it as placeholder transaction for prepare proposal - // format is "prepare:[null bytes]" - if isPrepareTx(req.Tx) { - return app.execPrepareTx(req.Tx) - } - - // if it starts with "extension:", use it as vote extension signed data - if isExtensionTx(req.Tx) { - return app.execExtensionTx(req.Tx) - } - - // otherwise, update the key-value store - return app.app.DeliverTx(req) -} - -func (app *ABCIPPKVStoreApplication) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx { - return app.app.CheckTx(req) -} - -// Commit will panic if InitChain was not called -func (app *ABCIPPKVStoreApplication) Commit() types.ResponseCommit { - return app.app.Commit() -} - -// When path=/val and data={validator address}, returns the validator update (types.ValidatorUpdate) varint encoded. -// For any other path, returns an associated value or nil if missing. -func (app *ABCIPPKVStoreApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) { - switch reqQuery.Path { - /* - case "/val": - key := []byte("val:" + string(reqQuery.Data)) - value, err := app.app.state.db.Get(key) - if err != nil { - panic(err) - } - - resQuery.Key = reqQuery.Data - resQuery.Value = value - return - */ - default: - return app.app.Query(reqQuery) - } -} - -// Save the validators in the merkle tree -func (app *ABCIPPKVStoreApplication) InitChain(req types.RequestInitChain) types.ResponseInitChain { - return types.ResponseInitChain{} -} - -// Track the block hash and header information -func (app *ABCIPPKVStoreApplication) BeginBlock(req types.RequestBeginBlock) types.ResponseBeginBlock { - return types.ResponseBeginBlock{} -} - -// Update the validator set -func (app *ABCIPPKVStoreApplication) EndBlock(req types.RequestEndBlock) types.ResponseEndBlock { - return types.ResponseEndBlock{} -} - -func (app *ABCIPPKVStoreApplication) ListSnapshots( - req types.RequestListSnapshots) types.ResponseListSnapshots { - return types.ResponseListSnapshots{} -} - -func (app *ABCIPPKVStoreApplication) LoadSnapshotChunk( - req types.RequestLoadSnapshotChunk) types.ResponseLoadSnapshotChunk { - return types.ResponseLoadSnapshotChunk{} -} - -func (app *ABCIPPKVStoreApplication) OfferSnapshot( - req types.RequestOfferSnapshot) types.ResponseOfferSnapshot { - return types.ResponseOfferSnapshot{Result: types.ResponseOfferSnapshot_ABORT} -} - -func (app *ABCIPPKVStoreApplication) ApplySnapshotChunk( - req types.RequestApplySnapshotChunk) types.ResponseApplySnapshotChunk { - return types.ResponseApplySnapshotChunk{Result: types.ResponseApplySnapshotChunk_ABORT} -} - -func (app *ABCIPPKVStoreApplication) ExtendVote( - req types.RequestExtendVote) types.ResponseExtendVote { - return types.RespondExtendVote(app.constructExtension(req.Vote.ValidatorAddress), nil) -} - -func (app *ABCIPPKVStoreApplication) VerifyVoteExtension( - req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { - return types.RespondVerifyVoteExtension( - app.verifyExtension(req.Vote.ValidatorAddress, req.Vote.VoteExtension.AppDataToSign)) -} - -func (app *ABCIPPKVStoreApplication) PrepareProposal( - req types.RequestPrepareProposal) types.ResponsePrepareProposal { - return types.ResponsePrepareProposal{BlockData: app.substPrepareTx(req.BlockData)} -} - -// ----------------------------- - -const PreparePrefix = "prepare" - -func isPrepareTx(tx []byte) bool { - return strings.HasPrefix(string(tx), PreparePrefix) -} - -// execPrepareTx is noop. tx data is considered as placeholder -// and is substitute at the PrepareProposal. -func (app *ABCIPPKVStoreApplication) execPrepareTx(tx []byte) types.ResponseDeliverTx { - // noop - return types.ResponseDeliverTx{} -} - -// substPrepareTx subst all the preparetx in the blockdata -// to null string(could be any arbitrary string). -func (app *ABCIPPKVStoreApplication) substPrepareTx(blockData [][]byte) [][]byte { - for i, tx := range blockData { - if isPrepareTx(tx) { - blockData[i] = make([]byte, len(tx)) - } - } - - return blockData -} - -const ExtensionPrefix = "extension" - -func isExtensionTx(tx []byte) bool { - return strings.HasPrefix(string(tx), ExtensionPrefix) -} - -// execExtensionTx stores the input string in the application struct -// which must be included in the VoteExtension.AppDataToSign -func (app *ABCIPPKVStoreApplication) execExtensionTx(tx []byte) types.ResponseDeliverTx { - app.extension = []byte(strings.Split(string(tx), ":")[1]) - - return types.ResponseDeliverTx{} -} - -func (app *ABCIPPKVStoreApplication) constructExtension(valAddr []byte) []byte { - ext := make([]byte, len(valAddr)+len(app.extension)) - copy(ext, valAddr) - copy(ext[len(valAddr):], app.extension) - return ext -} - -func (app *ABCIPPKVStoreApplication) verifyExtension(valAddr []byte, ext []byte) bool { - return bytes.Equal(app.constructExtension(valAddr), ext) -} diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index e58650a777b..19285e4b074 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -33,6 +33,8 @@ type PersistentKVStoreApplication struct { valAddrToPubKeyMap map[string]pc.PublicKey logger log.Logger + + extension []byte } func NewPersistentKVStoreApplication(dbDir string) *PersistentKVStoreApplication { @@ -76,6 +78,14 @@ func (app *PersistentKVStoreApplication) DeliverTx(req types.RequestDeliverTx) t return app.execValidatorTx(req.Tx) } + if isPrepareTx(req.Tx) { + return app.execPrepareTx(req.Tx) + } + + if isExtensionTx(req.Tx) { + return app.execExtensionTx(req.Tx) + } + // otherwise, update the key-value store return app.app.DeliverTx(req) } @@ -172,17 +182,18 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( func (app *PersistentKVStoreApplication) ExtendVote( req types.RequestExtendVote) types.ResponseExtendVote { - return types.ResponseExtendVote{} + return types.RespondExtendVote(app.constructExtension(req.Vote.ValidatorAddress), nil) } func (app *PersistentKVStoreApplication) VerifyVoteExtension( req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { - return types.ResponseVerifyVoteExtension{} + return types.RespondVerifyVoteExtension( + app.verifyExtension(req.Vote.ValidatorAddress, req.Vote.VoteExtension.AppDataToSign)) } func (app *PersistentKVStoreApplication) PrepareProposal( req types.RequestPrepareProposal) types.ResponsePrepareProposal { - return types.ResponsePrepareProposal{} + return types.ResponsePrepareProposal{BlockData: app.substPrepareTx(req.BlockData)} } //--------------------------------------------- @@ -299,3 +310,57 @@ func (app *PersistentKVStoreApplication) updateValidator(v types.ValidatorUpdate return types.ResponseDeliverTx{Code: code.CodeTypeOK} } + + + +// ----------------------------- + +const PreparePrefix = "prepare" + +func isPrepareTx(tx []byte) bool { + return strings.HasPrefix(string(tx), PreparePrefix) +} + +// execPrepareTx is noop. tx data is considered as placeholder +// and is substitute at the PrepareProposal. +func (app *PersistentKVStoreApplication) execPrepareTx(tx []byte) types.ResponseDeliverTx { + // noop + return types.ResponseDeliverTx{} +} + +// substPrepareTx subst all the preparetx in the blockdata +// to null string(could be any arbitrary string). +func (app *PersistentKVStoreApplication) substPrepareTx(blockData [][]byte) [][]byte { + for i, tx := range blockData { + if isPrepareTx(tx) { + blockData[i] = make([]byte, len(tx)) + } + } + + return blockData +} + +const ExtensionPrefix = "extension" + +func isExtensionTx(tx []byte) bool { + return strings.HasPrefix(string(tx), ExtensionPrefix) +} + +// execExtensionTx stores the input string in the application struct +// which must be included in the VoteExtension.AppDataToSign +func (app *PersistentKVStoreApplication) execExtensionTx(tx []byte) types.ResponseDeliverTx { + app.extension = []byte(strings.Split(string(tx), ":")[1]) + + return types.ResponseDeliverTx{} +} + +func (app *PersistentKVStoreApplication) constructExtension(valAddr []byte) []byte { + ext := make([]byte, len(valAddr)+len(app.extension)) + copy(ext, valAddr) + copy(ext[len(valAddr):], app.extension) + return ext +} + +func (app *PersistentKVStoreApplication) verifyExtension(valAddr []byte, ext []byte) bool { + return bytes.Equal(app.constructExtension(valAddr), ext) +} diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 858ce26c893..3d0c4969a9f 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -1960,6 +1960,7 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID types.NodeID // Attempt to add the vote. if its a duplicate signature, dupeout the validator func (cs *State) tryAddVote(vote *types.Vote, peerID types.NodeID) (bool, error) { added, err := cs.addVote(vote, peerID) + if err != nil { // If the vote height is off, we'll just ignore it, // But if it's a conflicting sig, add it to the cs.evpool. diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go index 49598e8149d..afd146043c4 100644 --- a/rpc/client/helpers.go +++ b/rpc/client/helpers.go @@ -71,7 +71,7 @@ func WaitForOneEvent(c EventsClient, eventValue string, timeout time.Duration) ( // make sure to un-register after the test is over defer func() { if deferErr := c.UnsubscribeAll(ctx, subscriber); deferErr != nil { - panic(err) + panic(deferErr) } }() diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index f8962fb3575..025e79954ce 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -63,8 +63,8 @@ func GetClients(t *testing.T, ns service.Service, conf *config.Config) []client. require.NoError(t, err) return []client.Client{ + ncl, getHTTPClient(t, conf), - ncl, } } diff --git a/types/block.go b/types/block.go index 48f60e53f0c..63c9bb20373 100644 --- a/types/block.go +++ b/types/block.go @@ -728,6 +728,7 @@ func (cs *CommitSig) ToProto() *tmproto.CommitSig { ValidatorAddress: cs.ValidatorAddress, Timestamp: cs.Timestamp, Signature: cs.Signature, + VoteExtension: cs.VoteExtension.ToProto(), } } @@ -739,6 +740,7 @@ func (cs *CommitSig) FromProto(csp tmproto.CommitSig) error { cs.ValidatorAddress = csp.ValidatorAddress cs.Timestamp = csp.Timestamp cs.Signature = csp.Signature + cs.VoteExtension = VoteExtensionToSignFromProto(csp.VoteExtension) return cs.ValidateBasic() } diff --git a/types/vote.go b/types/vote.go index 9cc8169cf88..f90929ec560 100644 --- a/types/vote.go +++ b/types/vote.go @@ -52,12 +52,38 @@ type VoteExtensionToSign struct { AppDataToSign []byte `json:"app_data_to_sign"` } +func (ext VoteExtensionToSign) ToProto() *tmproto.VoteExtensionToSign { + if ext.IsEmpty() { + return nil + } + return &tmproto.VoteExtensionToSign { + AppDataToSign: ext.AppDataToSign, + } +} + +func VoteExtensionToSignFromProto(pext *tmproto.VoteExtensionToSign) VoteExtensionToSign { + if pext == nil { + return VoteExtensionToSign{} + } + return VoteExtensionToSign{ + AppDataToSign: pext.AppDataToSign, + } +} + +func (ext VoteExtensionToSign) IsEmpty() bool { + if len(ext.AppDataToSign) != 0 { + return false + } + + return true +} + // BytesPacked returns a bytes-packed representation for // debugging and human identification. This function should // not be used for any logical operations. func (ext VoteExtensionToSign) BytesPacked() []byte { - res := make([]byte, len(ext.AppDataToSign)) - copy(res, ext.AppDataToSign) + res := []byte{} + res = append(res, ext.AppDataToSign...) return res } @@ -86,9 +112,9 @@ func (ext VoteExtension) ToSign() VoteExtensionToSign { // debugging and human identification. This function should // not be used for any logical operations. func (ext VoteExtension) BytesPacked() []byte { - res := make([]byte, len(ext.AppDataToSign)+len(ext.AppDataSelfAuthenticating)) - copy(res[:len(ext.AppDataToSign)], ext.AppDataToSign) - copy(res[len(ext.AppDataToSign):], ext.AppDataSelfAuthenticating) + res := []byte{} + res = append(res, ext.AppDataToSign...) + res = append(res, ext.AppDataSelfAuthenticating...) return res } @@ -257,11 +283,9 @@ func (vote *Vote) ValidateBasic() error { func (ext VoteExtension) Copy() VoteExtension { res := VoteExtension{ - AppDataToSign: make([]byte, len(ext.AppDataToSign)), - AppDataSelfAuthenticating: make([]byte, len(ext.AppDataSelfAuthenticating)), + AppDataToSign: ext.AppDataToSign, + AppDataSelfAuthenticating: ext.AppDataSelfAuthenticating, } - copy(res.AppDataToSign, ext.AppDataToSign) - copy(res.AppDataSelfAuthenticating, ext.AppDataSelfAuthenticating) return res } diff --git a/types/vote_set.go b/types/vote_set.go index b064f2c07ca..e67d83eacd3 100644 --- a/types/vote_set.go +++ b/types/vote_set.go @@ -610,6 +610,7 @@ func (voteSet *VoteSet) MakeCommit() *Commit { if commitSig.ForBlock() && !v.BlockID.Equals(*voteSet.maj23) { commitSig = NewCommitSigAbsent() } + commitSigs[i] = commitSig } From d53c4ec3608ecc2b4dd406c5bea775a03d00b2a6 Mon Sep 17 00:00:00 2001 From: mconcat Date: Wed, 1 Sep 2021 16:52:26 +0900 Subject: [PATCH 15/23] fix test --- privval/msgs_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/privval/msgs_test.go b/privval/msgs_test.go index 0c764830f2e..afb54a9eeb9 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -88,8 +88,8 @@ func TestPrivvalVectors(t *testing.T) { {"pubKey request", &privproto.PubKeyRequest{}, "0a00"}, {"pubKey response", &privproto.PubKeyResponse{PubKey: ppk, Error: nil}, "12240a220a20556a436f1218d30942efe798420f51dc9b6a311b929c578257457d05c5fcf230"}, {"pubKey response with error", &privproto.PubKeyResponse{PubKey: cryptoproto.PublicKey{}, Error: remoteError}, "12140a0012100801120c697427732061206572726f72"}, - {"Vote Request", &privproto.SignVoteRequest{Vote: votepb}, "1aa8010aa501080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a2f0a0f6170705f646174615f7369676e6564121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, - {"Vote Response", &privproto.SignedVoteResponse{Vote: *votepb, Error: nil}, "22a8010aa501080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a2f0a0f6170705f646174615f7369676e6564121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, + {"Vote Request", &privproto.SignVoteRequest{Vote: votepb}, "1aa9010aa601080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a300a106170705f646174615f746f5f7369676e121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, + {"Vote Response", &privproto.SignedVoteResponse{Vote: *votepb, Error: nil}, "22a9010aa601080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb034a300a106170705f646174615f746f5f7369676e121c6170705f646174615f73656c665f61757468656e7469636174696e67"}, {"Vote Response with error", &privproto.SignedVoteResponse{Vote: tmproto.Vote{}, Error: remoteError}, "22250a11220212002a0b088092b8c398feffffff0112100801120c697427732061206572726f72"}, {"Proposal Request", &privproto.SignProposalRequest{Proposal: proposalpb}, "2a700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, {"Proposal Response", &privproto.SignedProposalResponse{Proposal: *proposalpb, Error: nil}, "32700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, From 920518eea9924da7ae37fa96d653325dea67d71f Mon Sep 17 00:00:00 2001 From: mconcat Date: Wed, 1 Sep 2021 19:55:14 +0900 Subject: [PATCH 16/23] fix test --- abci/example/kvstore/persistent_kvstore.go | 16 ++++++++++------ internal/consensus/common_test.go | 6 ++++++ internal/consensus/reactor_test.go | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 19285e4b074..e6981149a44 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -14,6 +14,7 @@ import ( cryptoenc "github.com/tendermint/tendermint/crypto/encoding" "github.com/tendermint/tendermint/libs/log" pc "github.com/tendermint/tendermint/proto/tendermint/crypto" + ptypes "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( @@ -188,7 +189,7 @@ func (app *PersistentKVStoreApplication) ExtendVote( func (app *PersistentKVStoreApplication) VerifyVoteExtension( req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { return types.RespondVerifyVoteExtension( - app.verifyExtension(req.Vote.ValidatorAddress, req.Vote.VoteExtension.AppDataToSign)) + app.verifyExtension(req.Vote.ValidatorAddress, req.Vote.VoteExtension)) } func (app *PersistentKVStoreApplication) PrepareProposal( @@ -355,12 +356,15 @@ func (app *PersistentKVStoreApplication) execExtensionTx(tx []byte) types.Respon } func (app *PersistentKVStoreApplication) constructExtension(valAddr []byte) []byte { - ext := make([]byte, len(valAddr)+len(app.extension)) - copy(ext, valAddr) - copy(ext[len(valAddr):], app.extension) + ext := []byte{} + ext = append(ext, valAddr...) + ext = append(ext, app.extension...) return ext } -func (app *PersistentKVStoreApplication) verifyExtension(valAddr []byte, ext []byte) bool { - return bytes.Equal(app.constructExtension(valAddr), ext) +func (app *PersistentKVStoreApplication) verifyExtension(valAddr []byte, ext *ptypes.VoteExtension) bool { + if ext == nil { + return false + } + return bytes.Equal(app.constructExtension(valAddr), ext.AppDataToSign) } diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go index 17ba1ce2e40..82d75f67a2d 100644 --- a/internal/consensus/common_test.go +++ b/internal/consensus/common_test.go @@ -151,6 +151,12 @@ func signVote( panic(fmt.Errorf("failed to sign vote: %v", err)) } + // TODO: remove hardcoded vote extension. + // currently set for abci/examples/kvstore/persistent_kvstore.go + v.VoteExtension = types.VoteExtension { + AppDataToSign: v.ValidatorAddress, + } + vs.lastVote = v return v diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go index 8c70ca1d52d..e6e74bead94 100644 --- a/internal/consensus/reactor_test.go +++ b/internal/consensus/reactor_test.go @@ -620,7 +620,7 @@ func TestReactorVotingPowerChange(t *testing.T) { states[0].GetRoundState().LastValidators.TotalVotingPower(), ) } - +/* func TestReactorValidatorSetChanges(t *testing.T) { config := configSetup(t) @@ -754,4 +754,4 @@ func TestReactorValidatorSetChanges(t *testing.T) { delete(activeVals, string(newValidatorPubKey3.Address())) waitForBlockWithUpdatedValsAndValidateIt(t, nPeers, activeVals, blocksSubs, states) -} +}*/ From 1f6aa385bf9f814124e235f60db9724701c7c500 Mon Sep 17 00:00:00 2001 From: mconcat Date: Thu, 2 Sep 2021 01:49:50 +0900 Subject: [PATCH 17/23] fix test --- abci/example/kvstore/persistent_kvstore.go | 2 +- internal/consensus/common_test.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index e6981149a44..9bebd172665 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -357,7 +357,7 @@ func (app *PersistentKVStoreApplication) execExtensionTx(tx []byte) types.Respon func (app *PersistentKVStoreApplication) constructExtension(valAddr []byte) []byte { ext := []byte{} - ext = append(ext, valAddr...) + ext = append(ext, []byte("hello")...) ext = append(ext, app.extension...) return ext } diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go index 82d75f67a2d..4d25b38a2dc 100644 --- a/internal/consensus/common_test.go +++ b/internal/consensus/common_test.go @@ -120,6 +120,9 @@ func (vs *validatorStub) signVote( Timestamp: tmtime.Now(), Type: voteType, BlockID: types.BlockID{Hash: hash, PartSetHeader: header}, + VoteExtension: types.VoteExtension { + AppDataToSign: []byte("hello"), + }, } v := vote.ToProto() if err := vs.PrivValidator.SignVote(context.Background(), config.ChainID(), v); err != nil { @@ -154,7 +157,7 @@ func signVote( // TODO: remove hardcoded vote extension. // currently set for abci/examples/kvstore/persistent_kvstore.go v.VoteExtension = types.VoteExtension { - AppDataToSign: v.ValidatorAddress, + AppDataToSign: []byte("hello"), } vs.lastVote = v From ccdb40b121b7b775066f29246180d9315301ed11 Mon Sep 17 00:00:00 2001 From: mconcat Date: Thu, 2 Sep 2021 01:51:10 +0900 Subject: [PATCH 18/23] fit lint --- abci/client/grpc_client.go | 30 +++++----- abci/client/local_client.go | 14 ++--- abci/example/kvstore/persistent_kvstore.go | 66 +++++++++++----------- abci/types/application.go | 10 ++-- abci/types/messages.go | 4 +- abci/types/result.go | 28 ++++----- internal/consensus/common_test.go | 16 +++--- internal/consensus/reactor_test.go | 1 + internal/consensus/state.go | 10 ++-- privval/msgs_test.go | 4 +- rpc/client/rpc_test.go | 2 +- state/execution.go | 14 ++--- state/execution_test.go | 4 +- types/block.go | 4 +- types/vote.go | 42 +++++++------- 15 files changed, 123 insertions(+), 126 deletions(-) diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index b681b3e5fdf..10e1a79b8f8 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -343,13 +343,13 @@ func (cli *grpcClient) VerifyVoteExtensionAsync( } return cli.finishAsyncCall( ctx, - req, + req, &types.Response{ - Value: &types.Response_VerifyVoteExtension{ - VerifyVoteExtension: res, - }, - }, - ) + Value: &types.Response_VerifyVoteExtension{ + VerifyVoteExtension: res, + }, + }, + ) } func (cli *grpcClient) PrepareProposalAsync( @@ -359,14 +359,14 @@ func (cli *grpcClient) PrepareProposalAsync( req := types.ToRequestPrepareProposal(params) res, err := cli.client.PrepareProposal(ctx, req.GetPrepareProposal(), grpc.WaitForReady(true)) - if err != nil { - return nil, err - } - - return cli.finishAsyncCall( - ctx, - req, - &types.Response{ + if err != nil { + return nil, err + } + + return cli.finishAsyncCall( + ctx, + req, + &types.Response{ Value: &types.Response_PrepareProposal{ PrepareProposal: res, }, @@ -584,7 +584,7 @@ func (cli *grpcClient) VerifyVoteExtensionSync( if err != nil { return nil, err } - return cli.finishSyncCall(reqres).GetVerifyVoteExtension(), cli.Error() + return cli.finishSyncCall(reqres).GetVerifyVoteExtension(), cli.Error() } func (cli *grpcClient) PrepareProposalSync( diff --git a/abci/client/local_client.go b/abci/client/local_client.go index c2e13678a4f..baaf5a7a782 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -236,14 +236,14 @@ func (app *localClient) PrepareProposalAsync( ctx context.Context, req types.RequestPrepareProposal, ) (*ReqRes, error) { - app.mtx.Lock() - defer app.mtx.Unlock() + app.mtx.Lock() + defer app.mtx.Unlock() - res := app.Application.PrepareProposal(req) + res := app.Application.PrepareProposal(req) return app.callback( types.ToRequestPrepareProposal(req), types.ToResponsePrepareProposal(res), - ), nil + ), nil } //------------------------------------------------------- @@ -407,15 +407,15 @@ func (app *localClient) VerifyVoteExtensionSync( defer app.mtx.Unlock() res := app.Application.VerifyVoteExtension(req) - return &res, nil + return &res, nil } func (app *localClient) PrepareProposalSync( ctx context.Context, req types.RequestPrepareProposal, ) (*types.ResponsePrepareProposal, error) { - app.mtx.Lock() - defer app.mtx.Unlock() + app.mtx.Lock() + defer app.mtx.Unlock() res := app.Application.PrepareProposal(req) return &res, nil diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 9bebd172665..0bd69c13e87 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -14,7 +14,7 @@ import ( cryptoenc "github.com/tendermint/tendermint/crypto/encoding" "github.com/tendermint/tendermint/libs/log" pc "github.com/tendermint/tendermint/proto/tendermint/crypto" - ptypes "github.com/tendermint/tendermint/proto/tendermint/types" + ptypes "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( @@ -35,7 +35,7 @@ type PersistentKVStoreApplication struct { logger log.Logger - extension []byte + extension []byte } func NewPersistentKVStoreApplication(dbDir string) *PersistentKVStoreApplication { @@ -79,13 +79,13 @@ func (app *PersistentKVStoreApplication) DeliverTx(req types.RequestDeliverTx) t return app.execValidatorTx(req.Tx) } - if isPrepareTx(req.Tx) { - return app.execPrepareTx(req.Tx) - } + if isPrepareTx(req.Tx) { + return app.execPrepareTx(req.Tx) + } - if isExtensionTx(req.Tx) { - return app.execExtensionTx(req.Tx) - } + if isExtensionTx(req.Tx) { + return app.execExtensionTx(req.Tx) + } // otherwise, update the key-value store return app.app.DeliverTx(req) @@ -183,18 +183,18 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( func (app *PersistentKVStoreApplication) ExtendVote( req types.RequestExtendVote) types.ResponseExtendVote { - return types.RespondExtendVote(app.constructExtension(req.Vote.ValidatorAddress), nil) + return types.RespondExtendVote(app.constructExtension(req.Vote.ValidatorAddress), nil) } func (app *PersistentKVStoreApplication) VerifyVoteExtension( req types.RequestVerifyVoteExtension) types.ResponseVerifyVoteExtension { - return types.RespondVerifyVoteExtension( - app.verifyExtension(req.Vote.ValidatorAddress, req.Vote.VoteExtension)) + return types.RespondVerifyVoteExtension( + app.verifyExtension(req.Vote.ValidatorAddress, req.Vote.VoteExtension)) } func (app *PersistentKVStoreApplication) PrepareProposal( req types.RequestPrepareProposal) types.ResponsePrepareProposal { - return types.ResponsePrepareProposal{BlockData: app.substPrepareTx(req.BlockData)} + return types.ResponsePrepareProposal{BlockData: app.substPrepareTx(req.BlockData)} } //--------------------------------------------- @@ -312,59 +312,57 @@ func (app *PersistentKVStoreApplication) updateValidator(v types.ValidatorUpdate return types.ResponseDeliverTx{Code: code.CodeTypeOK} } - - // ----------------------------- const PreparePrefix = "prepare" func isPrepareTx(tx []byte) bool { - return strings.HasPrefix(string(tx), PreparePrefix) + return strings.HasPrefix(string(tx), PreparePrefix) } // execPrepareTx is noop. tx data is considered as placeholder // and is substitute at the PrepareProposal. func (app *PersistentKVStoreApplication) execPrepareTx(tx []byte) types.ResponseDeliverTx { - // noop - return types.ResponseDeliverTx{} + // noop + return types.ResponseDeliverTx{} } // substPrepareTx subst all the preparetx in the blockdata // to null string(could be any arbitrary string). func (app *PersistentKVStoreApplication) substPrepareTx(blockData [][]byte) [][]byte { - for i, tx := range blockData { - if isPrepareTx(tx) { - blockData[i] = make([]byte, len(tx)) - } - } + for i, tx := range blockData { + if isPrepareTx(tx) { + blockData[i] = make([]byte, len(tx)) + } + } - return blockData + return blockData } const ExtensionPrefix = "extension" func isExtensionTx(tx []byte) bool { - return strings.HasPrefix(string(tx), ExtensionPrefix) + return strings.HasPrefix(string(tx), ExtensionPrefix) } // execExtensionTx stores the input string in the application struct // which must be included in the VoteExtension.AppDataToSign func (app *PersistentKVStoreApplication) execExtensionTx(tx []byte) types.ResponseDeliverTx { - app.extension = []byte(strings.Split(string(tx), ":")[1]) + app.extension = []byte(strings.Split(string(tx), ":")[1]) - return types.ResponseDeliverTx{} + return types.ResponseDeliverTx{} } func (app *PersistentKVStoreApplication) constructExtension(valAddr []byte) []byte { - ext := []byte{} - ext = append(ext, []byte("hello")...) - ext = append(ext, app.extension...) - return ext + ext := []byte{} + ext = append(ext, []byte("hello")...) + ext = append(ext, app.extension...) + return ext } func (app *PersistentKVStoreApplication) verifyExtension(valAddr []byte, ext *ptypes.VoteExtension) bool { - if ext == nil { - return false - } - return bytes.Equal(app.constructExtension(valAddr), ext.AppDataToSign) + if ext == nil { + return false + } + return bytes.Equal(app.constructExtension(valAddr), ext.AppDataToSign) } diff --git a/abci/types/application.go b/abci/types/application.go index ca1b47b83c7..ebcec4ec82a 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -19,10 +19,10 @@ type Application interface { // Consensus Connection InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore PrepareProposal(RequestPrepareProposal) ResponsePrepareProposal - BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block - DeliverTx(RequestDeliverTx) ResponseDeliverTx // Deliver a tx for full processing - EndBlock(RequestEndBlock) ResponseEndBlock // Signals the end of a block, returns changes to the validator set - Commit() ResponseCommit // Commit the state and return the application Merkle root hash + BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block + DeliverTx(RequestDeliverTx) ResponseDeliverTx // Deliver a tx for full processing + EndBlock(RequestEndBlock) ResponseEndBlock // Signals the end of a block, returns changes to the validator set + Commit() ResponseCommit // Commit the state and return the application Merkle root hash ExtendVote(RequestExtendVote) ResponseExtendVote // Create application specific vote extension VerifyVoteExtension(RequestVerifyVoteExtension) ResponseVerifyVoteExtension // Verify application's vote extension data @@ -197,7 +197,7 @@ func (app *GRPCApplication) ExtendVote( func (app *GRPCApplication) VerifyVoteExtension( ctx context.Context, req *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) { res := app.app.VerifyVoteExtension(*req) - return &res, nil + return &res, nil } func (app *GRPCApplication) PrepareProposal( diff --git a/abci/types/messages.go b/abci/types/messages.go index f82632982ee..ec2a2d28d80 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -119,7 +119,7 @@ func ToRequestExtendVote(req RequestExtendVote) *Request { func ToRequestVerifyVoteExtension(req RequestVerifyVoteExtension) *Request { return &Request{ Value: &Request_VerifyVoteExtension{&req}, - } + } } func ToRequestPrepareProposal(req RequestPrepareProposal) *Request { @@ -228,7 +228,7 @@ func ToResponseExtendVote(res ResponseExtendVote) *Response { func ToResponseVerifyVoteExtension(res ResponseVerifyVoteExtension) *Response { return &Response{ Value: &Response_VerifyVoteExtension{&res}, - } + } } func ToResponsePrepareProposal(res ResponsePrepareProposal) *Response { diff --git a/abci/types/result.go b/abci/types/result.go index 9d6e8c7614e..cce09a7ffaa 100644 --- a/abci/types/result.go +++ b/abci/types/result.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/jsonpb" - types "github.com/tendermint/tendermint/proto/tendermint/types" + types "github.com/tendermint/tendermint/proto/tendermint/types" ) const ( @@ -135,20 +135,20 @@ var _ jsonRoundTripper = (*EventAttribute)(nil) // construct Result data func RespondExtendVote(app_data_to_sign, app_data_self_authenticating []byte) ResponseExtendVote { - return ResponseExtendVote { - VoteExtension: &types.VoteExtension { - AppDataToSign: app_data_to_sign, - AppDataSelfAuthenticating: app_data_self_authenticating, - }, - } + return ResponseExtendVote{ + VoteExtension: &types.VoteExtension{ + AppDataToSign: app_data_to_sign, + AppDataSelfAuthenticating: app_data_self_authenticating, + }, + } } func RespondVerifyVoteExtension(ok bool) ResponseVerifyVoteExtension { - result := ResponseVerifyVoteExtension_REJECT - if ok { - result = ResponseVerifyVoteExtension_ACCEPT - } - return ResponseVerifyVoteExtension { - Result: result, - } + result := ResponseVerifyVoteExtension_REJECT + if ok { + result = ResponseVerifyVoteExtension_ACCEPT + } + return ResponseVerifyVoteExtension{ + Result: result, + } } diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go index 4d25b38a2dc..a71a93b2a83 100644 --- a/internal/consensus/common_test.go +++ b/internal/consensus/common_test.go @@ -120,9 +120,9 @@ func (vs *validatorStub) signVote( Timestamp: tmtime.Now(), Type: voteType, BlockID: types.BlockID{Hash: hash, PartSetHeader: header}, - VoteExtension: types.VoteExtension { - AppDataToSign: []byte("hello"), - }, + VoteExtension: types.VoteExtension{ + AppDataToSign: []byte("hello"), + }, } v := vote.ToProto() if err := vs.PrivValidator.SignVote(context.Background(), config.ChainID(), v); err != nil { @@ -154,11 +154,11 @@ func signVote( panic(fmt.Errorf("failed to sign vote: %v", err)) } - // TODO: remove hardcoded vote extension. - // currently set for abci/examples/kvstore/persistent_kvstore.go - v.VoteExtension = types.VoteExtension { - AppDataToSign: []byte("hello"), - } + // TODO: remove hardcoded vote extension. + // currently set for abci/examples/kvstore/persistent_kvstore.go + v.VoteExtension = types.VoteExtension{ + AppDataToSign: []byte("hello"), + } vs.lastVote = v diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go index e6e74bead94..309b3f00396 100644 --- a/internal/consensus/reactor_test.go +++ b/internal/consensus/reactor_test.go @@ -620,6 +620,7 @@ func TestReactorVotingPowerChange(t *testing.T) { states[0].GetRoundState().LastValidators.TotalVotingPower(), ) } + /* func TestReactorValidatorSetChanges(t *testing.T) { config := configSetup(t) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index ddb58810b54..bd2835820ef 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -2217,7 +2217,6 @@ func (cs *State) signVote( BlockID: types.BlockID{Hash: hash, PartSetHeader: header}, } - // If the signedMessageType is for precommit, // use our local precommit Timeout as the max wait time for getting a singed commit. The same goes for prevote. var timeout time.Duration @@ -2239,14 +2238,13 @@ func (cs *State) signVote( v := vote.ToProto() - ctx, cancel := context.WithTimeout(context.TODO(), timeout) + ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() err := cs.privValidator.SignVote(ctx, cs.state.ChainID, v) vote.Signature = v.Signature vote.Timestamp = v.Timestamp - return vote, err } @@ -2276,9 +2274,9 @@ func (cs *State) voteTime() time.Time { // sign the vote and publish on internalMsgQueue func (cs *State) signAddVote( - msgType tmproto.SignedMsgType, - hash []byte, - header types.PartSetHeader, + msgType tmproto.SignedMsgType, + hash []byte, + header types.PartSetHeader, ) *types.Vote { if cs.privValidator == nil { // the node does not have a key return nil diff --git a/privval/msgs_test.go b/privval/msgs_test.go index afb54a9eeb9..19e6cd62375 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -35,8 +35,8 @@ func exampleVote() *types.Vote { }, ValidatorAddress: crypto.AddressHash([]byte("validator_address")), ValidatorIndex: 56789, - VoteExtension: types.VoteExtension { - AppDataToSign: []byte("app_data_to_sign"), + VoteExtension: types.VoteExtension{ + AppDataToSign: []byte("app_data_to_sign"), AppDataSelfAuthenticating: []byte("app_data_self_authenticating"), }, } diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index 025e79954ce..7fe6039ef38 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -63,7 +63,7 @@ func GetClients(t *testing.T, ns service.Service, conf *config.Config) []client. require.NoError(t, err) return []client.Client{ - ncl, + ncl, getHTTPClient(t, conf), } } diff --git a/state/execution.go b/state/execution.go index 904be99c1eb..9c125efd171 100644 --- a/state/execution.go +++ b/state/execution.go @@ -266,10 +266,10 @@ func (blockExec *BlockExecutor) ApplyBlock( } func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) (types.VoteExtension, error) { - ctx := context.TODO() - req := abci.RequestExtendVote{ - Vote: vote.ToProto(), - } + ctx := context.TODO() + req := abci.RequestExtendVote{ + Vote: vote.ToProto(), + } resp, err := blockExec.proxyApp.ExtendVoteSync(ctx, req) if err != nil { @@ -281,9 +281,9 @@ func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) (types.VoteExtensio func (blockExec *BlockExecutor) VerifyVoteExtension(vote *types.Vote) error { ctx := context.Background() - req := abci.RequestVerifyVoteExtension{ - Vote: vote.ToProto(), - } + req := abci.RequestVerifyVoteExtension{ + Vote: vote.ToProto(), + } resp, err := blockExec.proxyApp.VerifyVoteExtensionSync(ctx, req) if err != nil { diff --git a/state/execution_test.go b/state/execution_test.go index 92a1d0917b3..c71e463e19d 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -84,8 +84,8 @@ func TestBeginBlockValidators(t *testing.T) { []byte("Signature2"), state.Validators.Validators[1].Address, now, - types.VoteExtensionToSign{}, - ) + types.VoteExtensionToSign{}, + ) absentSig = types.NewCommitSigAbsent() ) diff --git a/types/block.go b/types/block.go index 63c9bb20373..33b6f3d1de2 100644 --- a/types/block.go +++ b/types/block.go @@ -728,7 +728,7 @@ func (cs *CommitSig) ToProto() *tmproto.CommitSig { ValidatorAddress: cs.ValidatorAddress, Timestamp: cs.Timestamp, Signature: cs.Signature, - VoteExtension: cs.VoteExtension.ToProto(), + VoteExtension: cs.VoteExtension.ToProto(), } } @@ -740,7 +740,7 @@ func (cs *CommitSig) FromProto(csp tmproto.CommitSig) error { cs.ValidatorAddress = csp.ValidatorAddress cs.Timestamp = csp.Timestamp cs.Signature = csp.Signature - cs.VoteExtension = VoteExtensionToSignFromProto(csp.VoteExtension) + cs.VoteExtension = VoteExtensionToSignFromProto(csp.VoteExtension) return cs.ValidateBasic() } diff --git a/types/vote.go b/types/vote.go index f90929ec560..aa466140528 100644 --- a/types/vote.go +++ b/types/vote.go @@ -53,37 +53,37 @@ type VoteExtensionToSign struct { } func (ext VoteExtensionToSign) ToProto() *tmproto.VoteExtensionToSign { - if ext.IsEmpty() { - return nil - } - return &tmproto.VoteExtensionToSign { - AppDataToSign: ext.AppDataToSign, - } + if ext.IsEmpty() { + return nil + } + return &tmproto.VoteExtensionToSign{ + AppDataToSign: ext.AppDataToSign, + } } func VoteExtensionToSignFromProto(pext *tmproto.VoteExtensionToSign) VoteExtensionToSign { - if pext == nil { - return VoteExtensionToSign{} - } - return VoteExtensionToSign{ - AppDataToSign: pext.AppDataToSign, - } + if pext == nil { + return VoteExtensionToSign{} + } + return VoteExtensionToSign{ + AppDataToSign: pext.AppDataToSign, + } } func (ext VoteExtensionToSign) IsEmpty() bool { - if len(ext.AppDataToSign) != 0 { - return false - } + if len(ext.AppDataToSign) != 0 { + return false + } - return true + return true } // BytesPacked returns a bytes-packed representation for // debugging and human identification. This function should // not be used for any logical operations. func (ext VoteExtensionToSign) BytesPacked() []byte { - res := []byte{} - res = append(res, ext.AppDataToSign...) + res := []byte{} + res = append(res, ext.AppDataToSign...) return res } @@ -112,9 +112,9 @@ func (ext VoteExtension) ToSign() VoteExtensionToSign { // debugging and human identification. This function should // not be used for any logical operations. func (ext VoteExtension) BytesPacked() []byte { - res := []byte{} - res = append(res, ext.AppDataToSign...) - res = append(res, ext.AppDataSelfAuthenticating...) + res := []byte{} + res = append(res, ext.AppDataToSign...) + res = append(res, ext.AppDataSelfAuthenticating...) return res } From 094adfa6262722ba33f0993a22dfef9be6fe1bda Mon Sep 17 00:00:00 2001 From: mconcat Date: Thu, 2 Sep 2021 01:55:23 +0900 Subject: [PATCH 19/23] uncomment test --- internal/consensus/reactor_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go index 309b3f00396..09a52724cce 100644 --- a/internal/consensus/reactor_test.go +++ b/internal/consensus/reactor_test.go @@ -621,7 +621,7 @@ func TestReactorVotingPowerChange(t *testing.T) { ) } -/* + func TestReactorValidatorSetChanges(t *testing.T) { config := configSetup(t) @@ -755,4 +755,4 @@ func TestReactorValidatorSetChanges(t *testing.T) { delete(activeVals, string(newValidatorPubKey3.Address())) waitForBlockWithUpdatedValsAndValidateIt(t, nPeers, activeVals, blocksSubs, states) -}*/ +} From 6d3dc26e03ee5f539d164dabca0ca17934473395 Mon Sep 17 00:00:00 2001 From: mconcat Date: Tue, 7 Sep 2021 17:25:03 +0900 Subject: [PATCH 20/23] refactor test in progress --- abci/example/kvstore/persistent_kvstore.go | 43 ++++++++-------------- internal/consensus/common_test.go | 8 +--- internal/consensus/reactor_test.go | 1 - 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 0bd69c13e87..3da16ae41f6 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -34,8 +34,6 @@ type PersistentKVStoreApplication struct { valAddrToPubKeyMap map[string]pc.PublicKey logger log.Logger - - extension []byte } func NewPersistentKVStoreApplication(dbDir string) *PersistentKVStoreApplication { @@ -83,10 +81,6 @@ func (app *PersistentKVStoreApplication) DeliverTx(req types.RequestDeliverTx) t return app.execPrepareTx(req.Tx) } - if isExtensionTx(req.Tx) { - return app.execExtensionTx(req.Tx) - } - // otherwise, update the key-value store return app.app.DeliverTx(req) } @@ -183,7 +177,9 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( func (app *PersistentKVStoreApplication) ExtendVote( req types.RequestExtendVote) types.ResponseExtendVote { - return types.RespondExtendVote(app.constructExtension(req.Vote.ValidatorAddress), nil) + return types.ResponseExtendVote { + VoteExtension: ConstructVoteExtension(req.Vote.ValidatorAddress), + } } func (app *PersistentKVStoreApplication) VerifyVoteExtension( @@ -339,30 +335,23 @@ func (app *PersistentKVStoreApplication) substPrepareTx(blockData [][]byte) [][] return blockData } -const ExtensionPrefix = "extension" - -func isExtensionTx(tx []byte) bool { - return strings.HasPrefix(string(tx), ExtensionPrefix) -} - -// execExtensionTx stores the input string in the application struct -// which must be included in the VoteExtension.AppDataToSign -func (app *PersistentKVStoreApplication) execExtensionTx(tx []byte) types.ResponseDeliverTx { - app.extension = []byte(strings.Split(string(tx), ":")[1]) - - return types.ResponseDeliverTx{} -} - -func (app *PersistentKVStoreApplication) constructExtension(valAddr []byte) []byte { - ext := []byte{} - ext = append(ext, []byte("hello")...) - ext = append(ext, app.extension...) - return ext +func ConstructVoteExtension(valAddr []byte) *ptypes.VoteExtension { + return &ptypes.VoteExtension{ + AppDataToSign: valAddr, + AppDataSelfAuthenticating: valAddr, + } } func (app *PersistentKVStoreApplication) verifyExtension(valAddr []byte, ext *ptypes.VoteExtension) bool { if ext == nil { return false } - return bytes.Equal(app.constructExtension(valAddr), ext.AppDataToSign) + canonical := ConstructVoteExtension(valAddr) + if !bytes.Equal(canonical.AppDataToSign, ext.AppDataToSign) { + return false + } + if !bytes.Equal(canonical.AppDataSelfAuthenticating, ext.AppDataSelfAuthenticating) { + return false + } + return true } diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go index a71a93b2a83..d03ceebfb52 100644 --- a/internal/consensus/common_test.go +++ b/internal/consensus/common_test.go @@ -120,9 +120,7 @@ func (vs *validatorStub) signVote( Timestamp: tmtime.Now(), Type: voteType, BlockID: types.BlockID{Hash: hash, PartSetHeader: header}, - VoteExtension: types.VoteExtension{ - AppDataToSign: []byte("hello"), - }, + VoteExtension: types.VoteExtensionFromProto(kvstore.ConstructVoteExtension(pubKey.Address())), } v := vote.ToProto() if err := vs.PrivValidator.SignVote(context.Background(), config.ChainID(), v); err != nil { @@ -156,9 +154,7 @@ func signVote( // TODO: remove hardcoded vote extension. // currently set for abci/examples/kvstore/persistent_kvstore.go - v.VoteExtension = types.VoteExtension{ - AppDataToSign: []byte("hello"), - } + v.VoteExtension = types.VoteExtensionFromProto(kvstore.ConstructVoteExtension(v.ValidatorAddress)) vs.lastVote = v diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go index 09a52724cce..8c70ca1d52d 100644 --- a/internal/consensus/reactor_test.go +++ b/internal/consensus/reactor_test.go @@ -621,7 +621,6 @@ func TestReactorVotingPowerChange(t *testing.T) { ) } - func TestReactorValidatorSetChanges(t *testing.T) { config := configSetup(t) From 020e6f9baa2a9eca6710de2e2846f40afa62e594 Mon Sep 17 00:00:00 2001 From: mconcat Date: Fri, 17 Sep 2021 00:45:43 +0900 Subject: [PATCH 21/23] gofmt --- abci/example/kvstore/persistent_kvstore.go | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 3da16ae41f6..d15be8c6751 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -177,9 +177,9 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk( func (app *PersistentKVStoreApplication) ExtendVote( req types.RequestExtendVote) types.ResponseExtendVote { - return types.ResponseExtendVote { - VoteExtension: ConstructVoteExtension(req.Vote.ValidatorAddress), - } + return types.ResponseExtendVote{ + VoteExtension: ConstructVoteExtension(req.Vote.ValidatorAddress), + } } func (app *PersistentKVStoreApplication) VerifyVoteExtension( @@ -336,22 +336,22 @@ func (app *PersistentKVStoreApplication) substPrepareTx(blockData [][]byte) [][] } func ConstructVoteExtension(valAddr []byte) *ptypes.VoteExtension { - return &ptypes.VoteExtension{ - AppDataToSign: valAddr, - AppDataSelfAuthenticating: valAddr, - } + return &ptypes.VoteExtension{ + AppDataToSign: valAddr, + AppDataSelfAuthenticating: valAddr, + } } func (app *PersistentKVStoreApplication) verifyExtension(valAddr []byte, ext *ptypes.VoteExtension) bool { if ext == nil { return false } - canonical := ConstructVoteExtension(valAddr) - if !bytes.Equal(canonical.AppDataToSign, ext.AppDataToSign) { - return false - } - if !bytes.Equal(canonical.AppDataSelfAuthenticating, ext.AppDataSelfAuthenticating) { - return false - } - return true + canonical := ConstructVoteExtension(valAddr) + if !bytes.Equal(canonical.AppDataToSign, ext.AppDataToSign) { + return false + } + if !bytes.Equal(canonical.AppDataSelfAuthenticating, ext.AppDataSelfAuthenticating) { + return false + } + return true } From fc796fa9fa93c022f3fd5b560cf76cb53d506303 Mon Sep 17 00:00:00 2001 From: mconcat Date: Fri, 17 Sep 2021 04:20:48 +0900 Subject: [PATCH 22/23] apply review --- internal/consensus/state.go | 2 +- state/execution.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index bd2835820ef..c26d8c90b46 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -2057,7 +2057,7 @@ func (cs *State) addVote(vote *types.Vote, peerID types.NodeID) (added bool, err // Verify VoteExtension if precommit if vote.Type == tmproto.PrecommitType { if err = cs.blockExec.VerifyVoteExtension(vote); err != nil { - return + return false, err } } diff --git a/state/execution.go b/state/execution.go index 9c125efd171..c70382ea073 100644 --- a/state/execution.go +++ b/state/execution.go @@ -266,7 +266,7 @@ func (blockExec *BlockExecutor) ApplyBlock( } func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) (types.VoteExtension, error) { - ctx := context.TODO() + ctx := context.Background() req := abci.RequestExtendVote{ Vote: vote.ToProto(), } From 85e18085e24262ce10ea520a303fb97752954cb7 Mon Sep 17 00:00:00 2001 From: mconcat Date: Fri, 17 Sep 2021 04:30:26 +0900 Subject: [PATCH 23/23] fix lint --- abci/types/application.go | 18 ++++++++++++------ abci/types/result.go | 6 +++--- internal/consensus/mempool_test.go | 2 +- proxy/app_conn.go | 8 ++++++-- test/e2e/app/app.go | 2 +- types/vote.go | 6 +----- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/abci/types/application.go b/abci/types/application.go index ebcec4ec82a..dfbe1bf6e09 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -19,12 +19,18 @@ type Application interface { // Consensus Connection InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore PrepareProposal(RequestPrepareProposal) ResponsePrepareProposal - BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block - DeliverTx(RequestDeliverTx) ResponseDeliverTx // Deliver a tx for full processing - EndBlock(RequestEndBlock) ResponseEndBlock // Signals the end of a block, returns changes to the validator set - Commit() ResponseCommit // Commit the state and return the application Merkle root hash - ExtendVote(RequestExtendVote) ResponseExtendVote // Create application specific vote extension - VerifyVoteExtension(RequestVerifyVoteExtension) ResponseVerifyVoteExtension // Verify application's vote extension data + // Signals the beginning of a block + BeginBlock(RequestBeginBlock) ResponseBeginBlock + // Deliver a tx for full processing + DeliverTx(RequestDeliverTx) ResponseDeliverTx + // Signals the end of a block, returns changes to the validator set + EndBlock(RequestEndBlock) ResponseEndBlock + // Commit the state and return the application Merkle root hash + Commit() ResponseCommit + // Create application specific vote extension + ExtendVote(RequestExtendVote) ResponseExtendVote + // Verify application's vote extension data + VerifyVoteExtension(RequestVerifyVoteExtension) ResponseVerifyVoteExtension // State Sync Connection ListSnapshots(RequestListSnapshots) ResponseListSnapshots // List available snapshots diff --git a/abci/types/result.go b/abci/types/result.go index cce09a7ffaa..a08c3fda574 100644 --- a/abci/types/result.go +++ b/abci/types/result.go @@ -134,11 +134,11 @@ var _ jsonRoundTripper = (*EventAttribute)(nil) // ----------------------------------------------- // construct Result data -func RespondExtendVote(app_data_to_sign, app_data_self_authenticating []byte) ResponseExtendVote { +func RespondExtendVote(appDataToSign, appDataSelfAuthenticating []byte) ResponseExtendVote { return ResponseExtendVote{ VoteExtension: &types.VoteExtension{ - AppDataToSign: app_data_to_sign, - AppDataSelfAuthenticating: app_data_self_authenticating, + AppDataToSign: appDataToSign, + AppDataSelfAuthenticating: appDataSelfAuthenticating, }, } } diff --git a/internal/consensus/mempool_test.go b/internal/consensus/mempool_test.go index f7d690db330..8cbb3b4c487 100644 --- a/internal/consensus/mempool_test.go +++ b/internal/consensus/mempool_test.go @@ -273,5 +273,5 @@ func (app *CounterApplication) Commit() abci.ResponseCommit { func (app *CounterApplication) PrepareProposal( req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { - return abci.ResponsePrepareProposal{BlockData: req.BlockData} //nolint:gosimple + return abci.ResponsePrepareProposal{BlockData: req.BlockData} } diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 34ca30c24fc..405667e50d7 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -113,11 +113,15 @@ func (app *appConnConsensus) CommitSync(ctx context.Context) (*types.ResponseCom return app.appConn.CommitSync(ctx) } -func (app *appConnConsensus) ExtendVoteSync(ctx context.Context, req types.RequestExtendVote) (*types.ResponseExtendVote, error) { +func (app *appConnConsensus) ExtendVoteSync( + ctx context.Context, req types.RequestExtendVote, +) (*types.ResponseExtendVote, error) { return app.appConn.ExtendVoteSync(ctx, req) } -func (app *appConnConsensus) VerifyVoteExtensionSync(ctx context.Context, req types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) { +func (app *appConnConsensus) VerifyVoteExtensionSync( + ctx context.Context, req types.RequestVerifyVoteExtension, +) (*types.ResponseVerifyVoteExtension, error) { return app.appConn.VerifyVoteExtensionSync(ctx, req) } diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 029f7ba2ae1..2409db408c8 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -206,7 +206,7 @@ func (app *Application) ApplySnapshotChunk(req abci.RequestApplySnapshotChunk) a func (app *Application) PrepareProposal( req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { - return abci.ResponsePrepareProposal{BlockData: req.BlockData} //nolint:gosimple + return abci.ResponsePrepareProposal{BlockData: req.BlockData} } // validatorUpdates generates a validator set update. diff --git a/types/vote.go b/types/vote.go index aa466140528..8a55695588a 100644 --- a/types/vote.go +++ b/types/vote.go @@ -71,11 +71,7 @@ func VoteExtensionToSignFromProto(pext *tmproto.VoteExtensionToSign) VoteExtensi } func (ext VoteExtensionToSign) IsEmpty() bool { - if len(ext.AppDataToSign) != 0 { - return false - } - - return true + return len(ext.AppDataToSign) == 0 } // BytesPacked returns a bytes-packed representation for