refactor! : bump comet to v1 (#19726)

Co-authored-by: yihuang <yi.codeplayer@gmail.com>
This commit is contained in:
Marko
2024-05-06 14:12:00 +00:00
committed by GitHub
co-authored by yihuang
parent 89ccbc13d1
commit 0dfb54e36a
224 changed files with 6638 additions and 5959 deletions
+7 -7
View File
@@ -5,7 +5,7 @@ import (
)
// InitChainer initializes application state at genesis
type InitChainer func(ctx Context, req *abci.RequestInitChain) (*abci.ResponseInitChain, error)
type InitChainer func(ctx Context, req *abci.InitChainRequest) (*abci.InitChainResponse, error)
// PrepareCheckStater runs code during commit after the block has been committed, and the `checkState`
// has been branched for the new block.
@@ -15,20 +15,20 @@ type PrepareCheckStater func(ctx Context)
type Precommiter func(ctx Context)
// PeerFilter responds to p2p filtering queries from Tendermint
type PeerFilter func(info string) *abci.ResponseQuery
type PeerFilter func(info string) *abci.QueryResponse
// ProcessProposalHandler defines a function type alias for processing a proposer
type ProcessProposalHandler func(Context, *abci.RequestProcessProposal) (*abci.ResponseProcessProposal, error)
type ProcessProposalHandler func(Context, *abci.ProcessProposalRequest) (*abci.ProcessProposalResponse, error)
// PrepareProposalHandler defines a function type alias for preparing a proposal
type PrepareProposalHandler func(Context, *abci.RequestPrepareProposal) (*abci.ResponsePrepareProposal, error)
type PrepareProposalHandler func(Context, *abci.PrepareProposalRequest) (*abci.PrepareProposalResponse, error)
// ExtendVoteHandler defines a function type alias for extending a pre-commit vote.
type ExtendVoteHandler func(Context, *abci.RequestExtendVote) (*abci.ResponseExtendVote, error)
type ExtendVoteHandler func(Context, *abci.ExtendVoteRequest) (*abci.ExtendVoteResponse, error)
// VerifyVoteExtensionHandler defines a function type alias for verifying a
// pre-commit vote extension.
type VerifyVoteExtensionHandler func(Context, *abci.RequestVerifyVoteExtension) (*abci.ResponseVerifyVoteExtension, error)
type VerifyVoteExtensionHandler func(Context, *abci.VerifyVoteExtensionRequest) (*abci.VerifyVoteExtensionResponse, error)
// PreBlocker runs code before the `BeginBlocker` and defines a function type alias for executing logic right
// before FinalizeBlock is called (but after its context has been set up). It is
@@ -36,7 +36,7 @@ type VerifyVoteExtensionHandler func(Context, *abci.RequestVerifyVoteExtension)
// persist their results in state.
//
// Note: returning an error will make FinalizeBlock fail.
type PreBlocker func(Context, *abci.RequestFinalizeBlock) error
type PreBlocker func(Context, *abci.FinalizeBlockRequest) error
// BeginBlocker defines a function type alias for executing application
// business logic before transactions are executed.
+76 -74
View File
@@ -5,8 +5,8 @@ package types
import (
fmt "fmt"
types "github.com/cometbft/cometbft/abci/types"
types1 "github.com/cometbft/cometbft/proto/tendermint/types"
v1 "github.com/cometbft/cometbft/api/cometbft/abci/v1"
v11 "github.com/cometbft/cometbft/api/cometbft/types/v1"
_ "github.com/cosmos/cosmos-proto"
_ "github.com/cosmos/gogoproto/gogoproto"
proto "github.com/cosmos/gogoproto/proto"
@@ -63,7 +63,9 @@ type TxResponse struct {
// these events include those emitted by processing all the messages and those
// emitted from the ante. Whereas Logs contains the events, with
// additional metadata, emitted only by processing the messages.
Events []types.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events"`
//
// Since: cosmos-sdk 0.42.11, 0.44.5, 0.45
Events []v1.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events"`
}
func (m *TxResponse) Reset() { *m = TxResponse{} }
@@ -331,7 +333,7 @@ type Result struct {
Log string `protobuf:"bytes,2,opt,name=log,proto3" json:"log,omitempty"`
// Events contains a slice of Event objects that were emitted during message
// or handler execution.
Events []types.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events"`
Events []v1.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events"`
// msg_responses contains the Msg handler responses type packed in Anys.
MsgResponses []*any.Any `protobuf:"bytes,4,rep,name=msg_responses,json=msgResponses,proto3" json:"msg_responses,omitempty"`
}
@@ -628,7 +630,7 @@ type SearchBlocksResult struct {
// Max count blocks per page
Limit int64 `protobuf:"varint,5,opt,name=limit,proto3" json:"limit,omitempty"`
// List of blocks in current page
Blocks []*types1.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"`
Blocks []*v11.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"`
}
func (m *SearchBlocksResult) Reset() { *m = SearchBlocksResult{} }
@@ -698,7 +700,7 @@ func (m *SearchBlocksResult) GetLimit() int64 {
return 0
}
func (m *SearchBlocksResult) GetBlocks() []*types1.Block {
func (m *SearchBlocksResult) GetBlocks() []*v11.Block {
if m != nil {
return m.Blocks
}
@@ -724,70 +726,70 @@ func init() {
}
var fileDescriptor_4e37629bc7eb0df8 = []byte{
// 1001 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x31, 0x6f, 0x1b, 0x37,
0x14, 0xd6, 0xe9, 0x2e, 0x27, 0x8b, 0x92, 0xea, 0x82, 0x35, 0xec, 0x73, 0x9a, 0x4a, 0xaa, 0x92,
0x02, 0x42, 0x81, 0x9c, 0x1a, 0x27, 0x0d, 0xda, 0x4c, 0xc9, 0xb9, 0x6d, 0x6a, 0x20, 0xc9, 0x40,
0x2b, 0x28, 0xd0, 0x45, 0xa0, 0x24, 0x86, 0x3a, 0x58, 0x77, 0x14, 0x8e, 0x94, 0x2d, 0x6f, 0x1d,
0x3b, 0x76, 0xea, 0xd4, 0xa1, 0x6b, 0x3b, 0x77, 0xee, 0x9c, 0xd1, 0xa3, 0x51, 0x04, 0x4e, 0x6b,
0x6f, 0xfd, 0x15, 0x05, 0x1f, 0x79, 0x92, 0x52, 0x57, 0xee, 0x90, 0x8d, 0xfc, 0xde, 0x23, 0xf9,
0xbe, 0xef, 0x7d, 0x24, 0xd1, 0xcd, 0x81, 0x90, 0x89, 0x90, 0x9d, 0x3e, 0x95, 0xac, 0x43, 0xfb,
0x83, 0xb8, 0x73, 0x78, 0xa7, 0xcf, 0x14, 0xbd, 0x03, 0x93, 0x70, 0x92, 0x09, 0x25, 0x70, 0x60,
0x92, 0x42, 0x9d, 0x14, 0x02, 0x6e, 0x93, 0xae, 0x6f, 0x70, 0xc1, 0x05, 0x24, 0x75, 0xf4, 0xc8,
0xe4, 0x5f, 0x7f, 0x5f, 0xb1, 0x74, 0xc8, 0xb2, 0x24, 0x4e, 0x95, 0xd9, 0x53, 0x1d, 0x4f, 0x98,
0xb4, 0xc1, 0x1b, 0x4b, 0x41, 0xc0, 0x3b, 0xfd, 0xb1, 0x18, 0x1c, 0xd8, 0xe8, 0x36, 0x17, 0x82,
0x8f, 0x59, 0x07, 0x66, 0xfd, 0xe9, 0x8b, 0x0e, 0x4d, 0x8f, 0xf3, 0x90, 0xa9, 0xa2, 0x67, 0x8e,
0xb3, 0x25, 0xc1, 0xa4, 0xf5, 0xda, 0x45, 0xa8, 0x3b, 0x23, 0x4c, 0x4e, 0x44, 0x2a, 0x19, 0xde,
0x44, 0xfe, 0x88, 0xc5, 0x7c, 0xa4, 0x02, 0xa7, 0xe9, 0xb4, 0x5d, 0x62, 0x67, 0xb8, 0x85, 0x7c,
0x35, 0x1b, 0x51, 0x39, 0x0a, 0x8a, 0x4d, 0xa7, 0x5d, 0x8e, 0xd0, 0xf9, 0x59, 0xc3, 0xef, 0xce,
0xbe, 0xa6, 0x72, 0x44, 0x6c, 0x04, 0xdf, 0x40, 0xe5, 0x81, 0x18, 0x32, 0x39, 0xa1, 0x03, 0x16,
0xb8, 0x3a, 0x8d, 0x2c, 0x00, 0x8c, 0x91, 0xa7, 0x27, 0x81, 0xd7, 0x74, 0xda, 0x35, 0x02, 0x63,
0x8d, 0x0d, 0xa9, 0xa2, 0xc1, 0x35, 0x48, 0x86, 0x31, 0xde, 0x42, 0xa5, 0x8c, 0x1e, 0xf5, 0xc6,
0x82, 0x07, 0x3e, 0xc0, 0x7e, 0x46, 0x8f, 0x9e, 0x08, 0x8e, 0x9f, 0x23, 0x6f, 0x2c, 0xb8, 0x0c,
0x4a, 0x4d, 0xb7, 0x5d, 0xd9, 0x69, 0x87, 0xab, 0x94, 0x0d, 0x1f, 0x45, 0xbb, 0x7b, 0x4f, 0x99,
0x94, 0x94, 0xb3, 0x27, 0x82, 0x47, 0x5b, 0x2f, 0xcf, 0x1a, 0x85, 0x5f, 0x5f, 0x37, 0xd6, 0xdf,
0xc4, 0x25, 0x81, 0xed, 0x74, 0x0d, 0x71, 0xfa, 0x42, 0x04, 0x6b, 0xa6, 0x06, 0x3d, 0xc6, 0x1f,
0x20, 0xc4, 0xa9, 0xec, 0x1d, 0xd1, 0x54, 0xb1, 0x61, 0x50, 0x06, 0x25, 0xca, 0x9c, 0xca, 0x6f,
0x00, 0xc0, 0xdb, 0x68, 0x4d, 0x87, 0xa7, 0x92, 0x0d, 0x03, 0x04, 0xc1, 0x12, 0xa7, 0xf2, 0xb9,
0x64, 0x43, 0x7c, 0x0b, 0x15, 0xd5, 0x2c, 0xa8, 0x34, 0x9d, 0x76, 0x65, 0x67, 0x23, 0x34, 0x1d,
0x09, 0xf3, 0x8e, 0x84, 0x8f, 0xd2, 0x63, 0x52, 0x54, 0x33, 0xad, 0x94, 0x8a, 0x13, 0x26, 0x15,
0x4d, 0x26, 0x41, 0xd5, 0x28, 0x35, 0x07, 0xf0, 0x63, 0xe4, 0xb3, 0x43, 0x96, 0x2a, 0x19, 0xd4,
0x80, 0xea, 0x66, 0xb8, 0xe8, 0xbb, 0x61, 0xfa, 0xa5, 0x0e, 0x1b, 0x62, 0x7f, 0xfc, 0x76, 0x7b,
0xdd, 0x28, 0x71, 0x5b, 0x0e, 0x0f, 0x9a, 0x9f, 0x84, 0xf7, 0x3e, 0x25, 0x76, 0xf9, 0x03, 0xef,
0xfb, 0x9f, 0x1b, 0x85, 0xd6, 0x2f, 0x0e, 0x7a, 0xe7, 0x4d, 0xea, 0xf8, 0x63, 0x54, 0x4e, 0x24,
0xef, 0xc5, 0xe9, 0x90, 0xcd, 0xa0, 0xd1, 0xb5, 0xa8, 0xf6, 0xf7, 0x59, 0x63, 0x01, 0x92, 0xb5,
0x44, 0xf2, 0x3d, 0x3d, 0xc2, 0xef, 0x22, 0x57, 0xf7, 0x02, 0xda, 0x4e, 0xf4, 0x10, 0xef, 0xcf,
0xeb, 0x73, 0xa1, 0xbe, 0x8f, 0x56, 0xb7, 0x62, 0x5f, 0x65, 0x71, 0xca, 0x4d, 0xb9, 0x1b, 0xb6,
0x0f, 0xd5, 0x25, 0x50, 0x2e, 0x6a, 0xfd, 0xee, 0x55, 0xd3, 0x69, 0x65, 0xa8, 0xb2, 0x14, 0xd5,
0xbd, 0xd1, 0x3e, 0x87, 0x12, 0xcb, 0x04, 0xc6, 0x78, 0x0f, 0x21, 0xaa, 0x54, 0x16, 0xf7, 0xa7,
0x8a, 0xc9, 0xa0, 0x08, 0x15, 0xdc, 0xbc, 0xc2, 0x0c, 0x79, 0x6e, 0xe4, 0xe9, 0xf3, 0xc9, 0xd2,
0x62, 0x7b, 0xe6, 0x5d, 0x54, 0x9e, 0x27, 0x69, 0xb6, 0x07, 0xec, 0xd8, 0x1e, 0xa8, 0x87, 0x78,
0x03, 0x5d, 0x3b, 0xa4, 0xe3, 0x29, 0xb3, 0x0a, 0x98, 0x49, 0x6b, 0x17, 0x95, 0x1e, 0x53, 0xb9,
0x77, 0xd9, 0x2c, 0x7a, 0xa5, 0xb7, 0xca, 0x2c, 0x45, 0x08, 0xe6, 0x66, 0x69, 0xfd, 0xee, 0x20,
0x9f, 0x30, 0x39, 0x1d, 0x2b, 0xbc, 0x69, 0x6f, 0x82, 0x5e, 0x5e, 0x8d, 0x8a, 0x81, 0x63, 0x6f,
0xc3, 0x65, 0xf5, 0xef, 0xfd, 0x4b, 0xfd, 0x55, 0xee, 0x30, 0x74, 0x6d, 0x2e, 0x7e, 0x86, 0x6a,
0xba, 0xb9, 0x99, 0xbd, 0xe7, 0x32, 0xf0, 0x60, 0xf1, 0x7f, 0x5a, 0x34, 0x7a, 0xef, 0xb2, 0xa9,
0xee, 0x93, 0x6a, 0x22, 0x79, 0xfe, 0x4c, 0xe4, 0xd6, 0xfa, 0xd1, 0x41, 0x78, 0x3f, 0x4e, 0xa6,
0x63, 0xaa, 0x62, 0x91, 0xce, 0x1f, 0x91, 0xaf, 0x0c, 0x65, 0xb8, 0x56, 0x0e, 0x5c, 0x85, 0x0f,
0x57, 0x37, 0xc8, 0xca, 0x18, 0xad, 0xe9, 0x7a, 0x4f, 0xce, 0x1a, 0x0e, 0xe8, 0x03, 0xca, 0x7e,
0x86, 0xfc, 0x0c, 0xe4, 0x01, 0xfe, 0x95, 0x9d, 0xe6, 0xea, 0x5d, 0x8c, 0x8c, 0xc4, 0xe6, 0xb7,
0x1e, 0xa2, 0xd2, 0x53, 0xc9, 0xbf, 0xd0, 0x0a, 0x6e, 0x23, 0xed, 0xe5, 0xde, 0x92, 0x8f, 0x4a,
0x89, 0xe4, 0x5d, 0x6d, 0xa5, 0xfc, 0xf9, 0xd1, 0xbb, 0x57, 0x8d, 0xe0, 0x0f, 0x7c, 0xed, 0x89,
0xc0, 0x69, 0xfd, 0xe4, 0xa0, 0x72, 0x77, 0x96, 0x6f, 0xf2, 0xf9, 0xbc, 0x3d, 0xee, 0xd5, 0x6c,
0xec, 0x82, 0xa5, 0x0e, 0x5e, 0x52, 0xbe, 0xf8, 0x96, 0xca, 0x83, 0x69, 0x5f, 0x39, 0x68, 0x7d,
0x9f, 0xd1, 0x6c, 0x30, 0xea, 0xce, 0xa4, 0xf5, 0x50, 0x03, 0x55, 0x94, 0x50, 0x74, 0xdc, 0x1b,
0x88, 0x69, 0xaa, 0xac, 0x13, 0x11, 0x40, 0xbb, 0x1a, 0xd1, 0x56, 0x36, 0x21, 0xe3, 0x43, 0x33,
0xd1, 0xcb, 0x26, 0x94, 0xb3, 0x5e, 0x3a, 0x4d, 0xfa, 0x2c, 0x83, 0x87, 0xdb, 0x23, 0x48, 0x43,
0xcf, 0x00, 0xd1, 0x06, 0x87, 0x04, 0xd8, 0x09, 0xde, 0x6f, 0x8f, 0x94, 0x35, 0xd2, 0xd5, 0x80,
0xde, 0x75, 0x1c, 0x27, 0xb1, 0x82, 0x57, 0xdc, 0x23, 0x66, 0x82, 0xef, 0x23, 0x57, 0xcd, 0x64,
0xe0, 0x03, 0xd9, 0x5b, 0xab, 0x05, 0x5b, 0xfc, 0x3d, 0x44, 0x2f, 0xb0, 0xf4, 0x4e, 0xb5, 0xb1,
0x80, 0x5e, 0xa4, 0x7f, 0xb8, 0x2b, 0x18, 0xba, 0xab, 0x19, 0xba, 0x57, 0x30, 0x74, 0xff, 0x87,
0xa1, 0xbb, 0x92, 0xa1, 0x9b, 0x33, 0xec, 0x20, 0x1f, 0xbe, 0xdf, 0x9c, 0xe4, 0xd6, 0xf2, 0x45,
0x34, 0xdf, 0x36, 0x14, 0x4f, 0x6c, 0x9a, 0xa1, 0x16, 0x3d, 0x3c, 0xfd, 0xab, 0x5e, 0x78, 0x79,
0x5e, 0x77, 0x4e, 0xce, 0xeb, 0xce, 0x9f, 0xe7, 0x75, 0xe7, 0x87, 0x8b, 0x7a, 0xe1, 0xe4, 0xa2,
0x5e, 0x38, 0xbd, 0xa8, 0x17, 0xbe, 0x6d, 0xf1, 0x58, 0x8d, 0xa6, 0xfd, 0x70, 0x20, 0x12, 0xfb,
0x4f, 0x77, 0x16, 0x76, 0x30, 0x9f, 0x7e, 0xdf, 0x07, 0xcb, 0xdc, 0xfd, 0x27, 0x00, 0x00, 0xff,
0xff, 0x6c, 0xe4, 0x4d, 0xa7, 0x81, 0x08, 0x00, 0x00,
// 1006 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0x5b, 0x37,
0x17, 0xd5, 0xd3, 0x53, 0x9e, 0x2c, 0xca, 0xfe, 0xfc, 0x81, 0x35, 0xe2, 0xe7, 0x20, 0x91, 0x54,
0x25, 0x05, 0x84, 0x02, 0x79, 0x8a, 0x9d, 0x26, 0x68, 0x33, 0x25, 0x72, 0x7f, 0xc4, 0x40, 0x92,
0x81, 0x56, 0x50, 0xa0, 0x8b, 0x40, 0x49, 0x34, 0xf5, 0x60, 0xbd, 0x47, 0x41, 0xa4, 0x6c, 0x79,
0xeb, 0xd8, 0xb1, 0x53, 0xa7, 0x0e, 0x5d, 0xdb, 0xb9, 0x7b, 0xd7, 0x8c, 0x1e, 0xd3, 0x22, 0x70,
0x53, 0x7b, 0xeb, 0x5f, 0x51, 0xdc, 0x4b, 0x3e, 0x49, 0xa9, 0x2b, 0x77, 0xe8, 0x46, 0x9e, 0x7b,
0x49, 0xde, 0x73, 0xee, 0x21, 0x49, 0x6e, 0xf7, 0x94, 0x4e, 0x94, 0x6e, 0x76, 0xb9, 0x16, 0x4d,
0xde, 0xed, 0xc5, 0xcd, 0xa3, 0xed, 0xae, 0x30, 0x7c, 0x1b, 0x27, 0xd1, 0x68, 0xac, 0x8c, 0xa2,
0xa1, 0x4d, 0x8a, 0x20, 0x29, 0x42, 0xdc, 0x25, 0xdd, 0xd8, 0x90, 0x4a, 0x2a, 0x4c, 0x6a, 0xc2,
0xc8, 0xe6, 0xdf, 0xb8, 0xd9, 0x53, 0x89, 0x30, 0xdd, 0x03, 0x93, 0xed, 0xd8, 0x34, 0x27, 0x23,
0xa1, 0x5d, 0xf4, 0xd6, 0x2c, 0x8a, 0x28, 0x84, 0xbb, 0x43, 0xd5, 0x3b, 0x74, 0xe1, 0x2d, 0xa9,
0x94, 0x1c, 0x8a, 0x26, 0xce, 0xba, 0x93, 0x83, 0x26, 0x4f, 0x4f, 0xb2, 0x90, 0xad, 0xa3, 0x63,
0x0f, 0x74, 0x45, 0xe1, 0xa4, 0xfe, 0xd6, 0x27, 0xa4, 0x3d, 0x65, 0x42, 0x8f, 0x54, 0xaa, 0x05,
0xbd, 0x4e, 0x82, 0x81, 0x88, 0xe5, 0xc0, 0x84, 0x5e, 0xcd, 0x6b, 0xf8, 0xcc, 0xcd, 0x68, 0x9d,
0x04, 0x66, 0x3a, 0xe0, 0x7a, 0x10, 0xe6, 0x6b, 0x5e, 0xa3, 0xd4, 0x22, 0xe7, 0x67, 0xd5, 0xa0,
0x3d, 0x7d, 0xca, 0xf5, 0x80, 0xb9, 0x08, 0xbd, 0x49, 0x4a, 0x3d, 0xd5, 0x17, 0x7a, 0xc4, 0x7b,
0x22, 0xf4, 0x21, 0x8d, 0xcd, 0x01, 0x4a, 0x49, 0x01, 0x26, 0x61, 0xa1, 0xe6, 0x35, 0xd6, 0x18,
0x8e, 0x01, 0xeb, 0x73, 0xc3, 0xc3, 0x6b, 0x98, 0x8c, 0x63, 0xba, 0x49, 0x8a, 0x63, 0x7e, 0xdc,
0x19, 0x2a, 0x19, 0x06, 0x08, 0x07, 0x63, 0x7e, 0xfc, 0x4c, 0x49, 0xfa, 0x92, 0x14, 0x86, 0x4a,
0xea, 0xb0, 0x58, 0xf3, 0x1b, 0xe5, 0x9d, 0x46, 0xb4, 0x4c, 0xdb, 0xe8, 0x49, 0x6b, 0x77, 0xef,
0xb9, 0xd0, 0x9a, 0x4b, 0xf1, 0x4c, 0xc9, 0xd6, 0xe6, 0xab, 0xb3, 0x6a, 0xee, 0xa7, 0xdf, 0xab,
0xeb, 0xef, 0xe2, 0x9a, 0xe1, 0x76, 0x50, 0x43, 0x9c, 0x1e, 0xa8, 0x70, 0xc5, 0xd6, 0x00, 0x63,
0x7a, 0x8b, 0x10, 0xc9, 0x75, 0xe7, 0x98, 0xa7, 0x46, 0xf4, 0xc3, 0x12, 0x2a, 0x51, 0x92, 0x5c,
0x7f, 0x89, 0x00, 0xdd, 0x22, 0x2b, 0x10, 0x9e, 0x68, 0xd1, 0x0f, 0x09, 0x06, 0x8b, 0x92, 0xeb,
0x97, 0x5a, 0xf4, 0xe9, 0x1d, 0x92, 0x37, 0xd3, 0xb0, 0x5c, 0xf3, 0x1a, 0xe5, 0x9d, 0x8d, 0xc8,
0x76, 0x24, 0xca, 0x3a, 0x12, 0x3d, 0x49, 0x4f, 0x58, 0xde, 0x4c, 0x41, 0x29, 0x13, 0x27, 0x42,
0x1b, 0x9e, 0x8c, 0xc2, 0x55, 0xab, 0xd4, 0x0c, 0xa0, 0x4f, 0x49, 0x20, 0x8e, 0x44, 0x6a, 0x74,
0xb8, 0x86, 0x54, 0x37, 0xa3, 0xac, 0xf1, 0x19, 0xcf, 0xe8, 0x33, 0x88, 0x5b, 0x66, 0xbf, 0xfd,
0x7c, 0x77, 0xdd, 0x4a, 0x71, 0x57, 0xf7, 0x0f, 0x6b, 0xf7, 0xa2, 0x8f, 0x1e, 0x30, 0xb7, 0xfe,
0x51, 0xe1, 0x9b, 0x1f, 0xaa, 0xb9, 0xfa, 0x8f, 0x1e, 0xf9, 0xdf, 0xbb, 0xdc, 0xe9, 0x87, 0xa4,
0x94, 0x68, 0xd9, 0x89, 0xd3, 0xbe, 0x98, 0x62, 0xa7, 0xd7, 0x5a, 0x6b, 0x7f, 0x9e, 0x55, 0xe7,
0x20, 0x5b, 0x49, 0xb4, 0xdc, 0x83, 0x11, 0xfd, 0x3f, 0xf1, 0xa1, 0x19, 0xd8, 0x77, 0x06, 0x43,
0xba, 0x3f, 0x2b, 0xd0, 0xc7, 0x02, 0x3f, 0x58, 0xde, 0x8b, 0x7d, 0x33, 0x8e, 0x53, 0x69, 0xcb,
0xdd, 0x70, 0x8d, 0x58, 0x5d, 0x00, 0xf5, 0xbc, 0xd6, 0xaf, 0xdf, 0xd4, 0xbc, 0xfa, 0x98, 0x94,
0x17, 0xa2, 0xd0, 0x1c, 0xf0, 0x3a, 0x96, 0x58, 0x62, 0x38, 0xa6, 0x7b, 0x84, 0x70, 0x63, 0xc6,
0x71, 0x77, 0x62, 0x84, 0x0e, 0xf3, 0x58, 0xc1, 0xed, 0x2b, 0xdc, 0x90, 0xe5, 0xb6, 0x0a, 0x70,
0x3e, 0x5b, 0x58, 0xec, 0xce, 0xbc, 0x4f, 0x4a, 0xb3, 0x24, 0x60, 0x7b, 0x28, 0x4e, 0xdc, 0x81,
0x30, 0xa4, 0x1b, 0xe4, 0xda, 0x11, 0x1f, 0x4e, 0x84, 0x53, 0xc0, 0x4e, 0xea, 0xbb, 0xa4, 0xf8,
0x05, 0xd7, 0x7b, 0x97, 0xdd, 0x02, 0x2b, 0x0b, 0xcb, 0xdc, 0x92, 0xc7, 0x60, 0xe6, 0x96, 0xfa,
0x2f, 0x1e, 0x09, 0x98, 0xd0, 0x93, 0xa1, 0xa1, 0xd7, 0xdd, 0x55, 0x80, 0xe5, 0xab, 0xad, 0x7c,
0xe8, 0xb9, 0xeb, 0x70, 0x59, 0xfd, 0x07, 0x7f, 0x53, 0x7f, 0xa9, 0x3d, 0x2c, 0x5f, 0x97, 0x4c,
0x5f, 0x90, 0x35, 0xe8, 0xee, 0xd8, 0xdd, 0x74, 0x1d, 0x16, 0x70, 0xf5, 0x3f, 0x9a, 0xb4, 0xf5,
0xde, 0x65, 0x57, 0x3d, 0x64, 0xab, 0x89, 0x96, 0xd9, 0x43, 0x91, 0x79, 0xeb, 0x3b, 0x8f, 0xd0,
0xfd, 0x38, 0x99, 0x0c, 0xb9, 0x89, 0x55, 0x3a, 0x7b, 0x46, 0x3e, 0xb7, 0x9c, 0xf1, 0x62, 0x79,
0x78, 0x19, 0xde, 0x5f, 0xde, 0x21, 0xa7, 0x63, 0x6b, 0x05, 0xea, 0x3d, 0x3d, 0xab, 0x7a, 0x28,
0x10, 0x4a, 0xfb, 0x31, 0x09, 0xc6, 0xa8, 0x0f, 0x0a, 0x50, 0xde, 0xa9, 0x2d, 0xdf, 0xc5, 0xea,
0xc8, 0x5c, 0x7e, 0xfd, 0x31, 0x29, 0x3e, 0xd7, 0xf2, 0x53, 0x90, 0x70, 0x8b, 0x80, 0x99, 0x3b,
0x0b, 0x46, 0x2a, 0x26, 0x5a, 0xb6, 0xc1, 0x4b, 0xd9, 0x03, 0x04, 0xbb, 0xaf, 0x5a, 0xc5, 0x1f,
0x05, 0x60, 0x8a, 0xd0, 0xab, 0x7f, 0xef, 0x91, 0x52, 0x7b, 0x9a, 0x6d, 0xf2, 0xc9, 0xac, 0x3f,
0xfe, 0xd5, 0x6c, 0xdc, 0x82, 0x85, 0x16, 0x5e, 0x52, 0x3e, 0xff, 0x1f, 0x95, 0x47, 0xd7, 0xbe,
0xf1, 0xc8, 0xfa, 0xbe, 0xe0, 0xe3, 0xde, 0xa0, 0x3d, 0xd5, 0xce, 0x44, 0x55, 0x52, 0x36, 0xca,
0xf0, 0x61, 0xa7, 0xa7, 0x26, 0xa9, 0x71, 0x56, 0x24, 0x08, 0xed, 0x02, 0x02, 0x5e, 0xb6, 0x21,
0x6b, 0x44, 0x3b, 0x81, 0x65, 0x23, 0x2e, 0x45, 0x27, 0x9d, 0x24, 0x5d, 0x31, 0xc6, 0xa7, 0xbb,
0xc0, 0x08, 0x40, 0x2f, 0x10, 0x01, 0x87, 0x63, 0x02, 0xee, 0x84, 0x2f, 0x78, 0x81, 0x95, 0x00,
0x69, 0x03, 0x00, 0xbb, 0x0e, 0xe3, 0x24, 0x36, 0xf8, 0x8e, 0x17, 0x98, 0x9d, 0xd0, 0x87, 0xc4,
0x37, 0x53, 0x1d, 0x06, 0x48, 0xf6, 0xce, 0x72, 0xc1, 0xe6, 0xbf, 0x0f, 0x83, 0x05, 0x8e, 0xde,
0xaf, 0x60, 0x2c, 0xa4, 0xd7, 0x82, 0x3f, 0xee, 0x0a, 0x86, 0xfe, 0x72, 0x86, 0xfe, 0x15, 0x0c,
0xfd, 0x7f, 0x61, 0xe8, 0x2f, 0x65, 0xe8, 0x67, 0x0c, 0xef, 0x91, 0x00, 0x3f, 0xe0, 0x8c, 0x64,
0x38, 0xbf, 0x89, 0xf6, 0xdf, 0x3e, 0xda, 0x8e, 0xb0, 0x7a, 0xe6, 0xf2, 0x2c, 0xb7, 0xd6, 0xe3,
0xd7, 0x7f, 0x54, 0x72, 0xaf, 0xce, 0x2b, 0xde, 0xe9, 0x79, 0xc5, 0x7b, 0x7b, 0x5e, 0xf1, 0xbe,
0xbd, 0xa8, 0xe4, 0x4e, 0x2f, 0x2a, 0xb9, 0xd7, 0x17, 0x95, 0xdc, 0x57, 0x75, 0x19, 0x9b, 0xc1,
0xa4, 0x0b, 0x7b, 0xb9, 0xaf, 0xba, 0x39, 0xf7, 0x83, 0xfd, 0xfa, 0xbb, 0x01, 0x7a, 0xe6, 0xfe,
0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x29, 0x1b, 0x28, 0xcc, 0x86, 0x08, 0x00, 0x00,
}
func (m *TxResponse) Marshal() (dAtA []byte, err error) {
@@ -1784,7 +1786,7 @@ func (this *SearchBlocksResult) String() string {
}
repeatedStringForBlocks := "[]*Block{"
for _, f := range this.Blocks {
repeatedStringForBlocks += strings.Replace(fmt.Sprintf("%v", f), "Block", "types1.Block", 1) + ","
repeatedStringForBlocks += strings.Replace(fmt.Sprintf("%v", f), "Block", "v11.Block", 1) + ","
}
repeatedStringForBlocks += "}"
s := strings.Join([]string{`&SearchBlocksResult{`,
@@ -2202,7 +2204,7 @@ func (m *TxResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Events = append(m.Events, types.Event{})
m.Events = append(m.Events, v1.Event{})
if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
@@ -2805,7 +2807,7 @@ func (m *Result) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Events = append(m.Events, types.Event{})
m.Events = append(m.Events, v1.Event{})
if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
@@ -3550,7 +3552,7 @@ func (m *SearchBlocksResult) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Blocks = append(m.Blocks, &types1.Block{})
m.Blocks = append(m.Blocks, &v11.Block{})
if err := m.Blocks[len(m.Blocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time"
abci "github.com/cometbft/cometbft/abci/types"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
"cosmossdk.io/core/comet"
"cosmossdk.io/core/header"
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"time"
abci "github.com/cometbft/cometbft/abci/types"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/suite"
+4 -4
View File
@@ -8,9 +8,9 @@ import (
// ResponseCheckTxWithEvents returns an ABCI ResponseCheckTx object with fields filled in
// from the given error, gas values and events.
func ResponseCheckTxWithEvents(err error, gw, gu uint64, events []abci.Event, debug bool) *abci.ResponseCheckTx {
func ResponseCheckTxWithEvents(err error, gw, gu uint64, events []abci.Event, debug bool) *abci.CheckTxResponse {
space, code, log := errorsmod.ABCIInfo(err, debug)
return &abci.ResponseCheckTx{
return &abci.CheckTxResponse{
Codespace: space,
Code: code,
Log: log,
@@ -36,9 +36,9 @@ func ResponseExecTxResultWithEvents(err error, gw, gu uint64, events []abci.Even
// QueryResult returns a ResponseQuery from an error. It will try to parse ABCI
// info from the error.
func QueryResult(err error, debug bool) *abci.ResponseQuery {
func QueryResult(err error, debug bool) *abci.QueryResponse {
space, code, log := errorsmod.ABCIInfo(err, debug)
return &abci.ResponseQuery{
return &abci.QueryResponse{
Codespace: space,
Code: code,
Log: log,
+14 -45
View File
@@ -27,7 +27,6 @@ import (
"sort"
abci "github.com/cometbft/cometbft/abci/types"
cmtcryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
"golang.org/x/exp/maps"
@@ -426,7 +425,7 @@ func (m *Manager) RegisterServices(cfg Configurator) error {
// InitGenesis performs init genesis functionality for modules. Exactly one
// module must return a non-empty validator set update to correctly initialize
// the chain.
func (m *Manager) InitGenesis(ctx sdk.Context, genesisData map[string]json.RawMessage) (*abci.ResponseInitChain, error) {
func (m *Manager) InitGenesis(ctx sdk.Context, genesisData map[string]json.RawMessage) (*abci.InitChainResponse, error) {
var validatorUpdates []ValidatorUpdate
ctx.Logger().Info("initializing blockchain state from genesis.json")
for _, moduleName := range m.OrderInitGenesis {
@@ -441,30 +440,30 @@ func (m *Manager) InitGenesis(ctx sdk.Context, genesisData map[string]json.RawMe
// core API genesis
source, err := genesis.SourceFromRawJSON(genesisData[moduleName])
if err != nil {
return &abci.ResponseInitChain{}, err
return &abci.InitChainResponse{}, err
}
err = module.InitGenesis(ctx, source)
if err != nil {
return &abci.ResponseInitChain{}, err
return &abci.InitChainResponse{}, err
}
} else if module, ok := mod.(HasGenesis); ok {
ctx.Logger().Debug("running initialization for module", "module", moduleName)
if err := module.InitGenesis(ctx, genesisData[moduleName]); err != nil {
return &abci.ResponseInitChain{}, err
return &abci.InitChainResponse{}, err
}
} else if module, ok := mod.(HasABCIGenesis); ok {
ctx.Logger().Debug("running initialization for module", "module", moduleName)
moduleValUpdates, err := module.InitGenesis(ctx, genesisData[moduleName])
if err != nil {
return &abci.ResponseInitChain{}, err
return &abci.InitChainResponse{}, err
}
// use these validator updates if provided, the module manager assumes
// only one module will update the validator set
if len(moduleValUpdates) > 0 {
if len(validatorUpdates) > 0 {
return &abci.ResponseInitChain{}, errors.New("validator InitGenesis updates already set by a previous module")
return &abci.InitChainResponse{}, errors.New("validator InitGenesis updates already set by a previous module")
}
validatorUpdates = moduleValUpdates
}
@@ -473,34 +472,19 @@ func (m *Manager) InitGenesis(ctx sdk.Context, genesisData map[string]json.RawMe
// a chain must initialize with a non-empty validator set
if len(validatorUpdates) == 0 {
return &abci.ResponseInitChain{}, fmt.Errorf("validator set is empty after InitGenesis, please ensure at least one validator is initialized with a delegation greater than or equal to the DefaultPowerReduction (%d)", sdk.DefaultPowerReduction)
return &abci.InitChainResponse{}, fmt.Errorf("validator set is empty after InitGenesis, please ensure at least one validator is initialized with a delegation greater than or equal to the DefaultPowerReduction (%d)", sdk.DefaultPowerReduction)
}
cometValidatorUpdates := make([]abci.ValidatorUpdate, len(validatorUpdates))
for i, v := range validatorUpdates {
var pubkey cmtcryptoproto.PublicKey
switch v.PubKeyType {
case "ed25519":
pubkey = cmtcryptoproto.PublicKey{
Sum: &cmtcryptoproto.PublicKey_Ed25519{
Ed25519: v.PubKey,
},
}
case "secp256k1":
pubkey = cmtcryptoproto.PublicKey{
Sum: &cmtcryptoproto.PublicKey_Secp256K1{
Secp256K1: v.PubKey,
},
}
}
cometValidatorUpdates[i] = abci.ValidatorUpdate{
PubKey: pubkey,
Power: v.Power,
PubKeyBytes: v.PubKey,
Power: v.Power,
PubKeyType: v.PubKeyType,
}
}
return &abci.ResponseInitChain{
return &abci.InitChainResponse{
Validators: cometValidatorUpdates,
}, nil
}
@@ -798,25 +782,10 @@ func (m *Manager) EndBlock(ctx sdk.Context) (sdk.EndBlock, error) {
cometValidatorUpdates := make([]abci.ValidatorUpdate, len(validatorUpdates))
for i, v := range validatorUpdates {
var pubkey cmtcryptoproto.PublicKey
switch v.PubKeyType {
case "ed25519":
pubkey = cmtcryptoproto.PublicKey{
Sum: &cmtcryptoproto.PublicKey_Ed25519{
Ed25519: v.PubKey,
},
}
case "secp256k1":
pubkey = cmtcryptoproto.PublicKey{
Sum: &cmtcryptoproto.PublicKey_Secp256K1{
Secp256K1: v.PubKey,
},
}
}
cometValidatorUpdates[i] = abci.ValidatorUpdate{
PubKey: pubkey,
Power: v.Power,
PubKeyBytes: v.PubKey,
PubKeyType: v.PubKeyType,
Power: v.Power,
}
}
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"strings"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
coretypes "github.com/cometbft/cometbft/rpc/core/types"
"github.com/cosmos/cosmos-sdk/codec"
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"time"
abci "github.com/cometbft/cometbft/abci/types"
cmtt "github.com/cometbft/cometbft/proto/tendermint/types"
cmtt "github.com/cometbft/cometbft/api/cometbft/types/v1"
coretypes "github.com/cometbft/cometbft/rpc/core/types"
cmt "github.com/cometbft/cometbft/types"
"github.com/stretchr/testify/suite"
+1 -1
View File
@@ -1,7 +1,7 @@
package types
import (
cmtprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto"
cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1"
"cosmossdk.io/math"
+92 -91
View File
@@ -6,7 +6,7 @@ package tx
import (
context "context"
fmt "fmt"
types1 "github.com/cometbft/cometbft/proto/tendermint/types"
v1 "github.com/cometbft/cometbft/api/cometbft/types/v1"
_ "github.com/cosmos/cosmos-proto"
types "github.com/cosmos/cosmos-sdk/types"
query "github.com/cosmos/cosmos-sdk/types/query"
@@ -658,9 +658,9 @@ func (m *GetBlockWithTxsRequest) GetPagination() *query.PageRequest {
// method.
type GetBlockWithTxsResponse struct {
// txs are the transactions in the block.
Txs []*Tx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
BlockId *types1.BlockID `protobuf:"bytes,2,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"`
Block *types1.Block `protobuf:"bytes,3,opt,name=block,proto3" json:"block,omitempty"`
Txs []*Tx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
BlockId *v1.BlockID `protobuf:"bytes,2,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"`
Block *v1.Block `protobuf:"bytes,3,opt,name=block,proto3" json:"block,omitempty"`
// pagination defines a pagination for the response.
Pagination *query.PageResponse `protobuf:"bytes,4,opt,name=pagination,proto3" json:"pagination,omitempty"`
}
@@ -705,14 +705,14 @@ func (m *GetBlockWithTxsResponse) GetTxs() []*Tx {
return nil
}
func (m *GetBlockWithTxsResponse) GetBlockId() *types1.BlockID {
func (m *GetBlockWithTxsResponse) GetBlockId() *v1.BlockID {
if m != nil {
return m.BlockId
}
return nil
}
func (m *GetBlockWithTxsResponse) GetBlock() *types1.Block {
func (m *GetBlockWithTxsResponse) GetBlock() *v1.Block {
if m != nil {
return m.Block
}
@@ -1124,89 +1124,90 @@ func init() {
func init() { proto.RegisterFile("cosmos/tx/v1beta1/service.proto", fileDescriptor_e0b00a618705eca7) }
var fileDescriptor_e0b00a618705eca7 = []byte{
// 1310 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x97, 0x51, 0x6f, 0xd3, 0x56,
0x14, 0xc7, 0x6b, 0x37, 0x69, 0xd2, 0x93, 0x94, 0x86, 0xdb, 0x00, 0x69, 0x80, 0x34, 0x18, 0x4a,
0x43, 0xa5, 0xda, 0x10, 0x40, 0x4c, 0x68, 0xd3, 0x14, 0x27, 0xa1, 0x2b, 0x0c, 0x82, 0x9c, 0x4e,
0x13, 0xd3, 0xa4, 0xc8, 0x49, 0x2e, 0x89, 0x47, 0x62, 0x87, 0xf8, 0x16, 0x39, 0x62, 0x68, 0xd3,
0x5e, 0x36, 0x4d, 0x9b, 0x36, 0x69, 0x9f, 0x60, 0xef, 0x7b, 0xe4, 0x43, 0x4c, 0x3c, 0x21, 0xf6,
0x32, 0xed, 0x69, 0x82, 0x3d, 0xed, 0x53, 0x4c, 0xbe, 0xbe, 0x4e, 0xec, 0xc4, 0xa6, 0x34, 0x7b,
0x89, 0x7c, 0x7d, 0xcf, 0x3d, 0xe7, 0x77, 0xfe, 0xf7, 0xde, 0x73, 0x1c, 0xd8, 0x68, 0x19, 0x66,
0xdf, 0x30, 0x25, 0x62, 0x49, 0x4f, 0xae, 0x34, 0x31, 0x51, 0xaf, 0x48, 0x26, 0x1e, 0x3e, 0xd1,
0x5a, 0x58, 0x1c, 0x0c, 0x0d, 0x62, 0xa0, 0xe3, 0x8e, 0x81, 0x48, 0x2c, 0x91, 0x19, 0x64, 0xcf,
0x74, 0x0c, 0xa3, 0xd3, 0xc3, 0x92, 0x3a, 0xd0, 0x24, 0x55, 0xd7, 0x0d, 0xa2, 0x12, 0xcd, 0xd0,
0x4d, 0x67, 0x41, 0xf6, 0x3c, 0xf3, 0xd8, 0x54, 0x4d, 0x2c, 0xa9, 0xcd, 0x96, 0x36, 0x76, 0x6c,
0x0f, 0x98, 0x51, 0x76, 0x36, 0x2c, 0xb1, 0xd8, 0xdc, 0xb6, 0xd7, 0xc1, 0xe3, 0x03, 0x3c, 0x1c,
0x8d, 0x6d, 0x06, 0x6a, 0x47, 0xd3, 0x69, 0x34, 0x66, 0x7b, 0x86, 0x60, 0xbd, 0x8d, 0x87, 0x7d,
0x4d, 0x27, 0x12, 0x19, 0x0d, 0xb0, 0x29, 0x35, 0x7b, 0x46, 0xeb, 0x51, 0xe8, 0x2c, 0xfd, 0x65,
0xb3, 0xeb, 0x4e, 0x9c, 0x06, 0x1d, 0x49, 0x2c, 0x4d, 0x3a, 0x10, 0xbe, 0xe3, 0x01, 0xed, 0x62,
0xb2, 0x6f, 0x99, 0xd5, 0x27, 0x58, 0x27, 0x0a, 0x7e, 0x7c, 0x80, 0x4d, 0x82, 0xb2, 0xb0, 0x84,
0xed, 0xb1, 0x99, 0xe1, 0xf2, 0x8b, 0x85, 0x65, 0x99, 0xcf, 0x70, 0x0a, 0x7b, 0x83, 0x6e, 0x03,
0x4c, 0xe8, 0x32, 0x7c, 0x9e, 0x2b, 0x24, 0x8a, 0x17, 0x45, 0xe6, 0xd5, 0x4e, 0x45, 0xa4, 0xa9,
0xb8, 0x22, 0x8a, 0xf7, 0xd5, 0x0e, 0x66, 0x7e, 0xa9, 0x1f, 0xcf, 0x6a, 0x74, 0x1d, 0xe2, 0xc6,
0xb0, 0x8d, 0x87, 0x8d, 0xe6, 0x28, 0xb3, 0x98, 0xe7, 0x0a, 0xc7, 0x8a, 0x59, 0x71, 0x66, 0x1b,
0xc4, 0x9a, 0x6d, 0x22, 0x8f, 0x94, 0x98, 0xe1, 0x3c, 0x20, 0x04, 0x91, 0x81, 0xda, 0xc1, 0x99,
0x48, 0x9e, 0x2b, 0x44, 0x14, 0xfa, 0x8c, 0xd2, 0x10, 0xed, 0x69, 0x7d, 0x8d, 0x64, 0xa2, 0xf4,
0xa5, 0x33, 0x40, 0x97, 0x20, 0x4a, 0x69, 0x32, 0x4b, 0x79, 0xae, 0xb0, 0x2c, 0xaf, 0xfd, 0xf5,
0x7c, 0x67, 0xd5, 0x09, 0xb0, 0x63, 0xb6, 0x1f, 0xe5, 0x2f, 0x8b, 0xd7, 0x2f, 0x2b, 0x8e, 0x85,
0xf0, 0x2f, 0x07, 0x6b, 0x3e, 0x29, 0xcc, 0x81, 0xa1, 0x9b, 0x18, 0x6d, 0xc1, 0x22, 0xb1, 0x1c,
0x21, 0x12, 0xc5, 0x13, 0x01, 0x78, 0xfb, 0x96, 0x62, 0x5b, 0xa0, 0x5d, 0x48, 0x12, 0xab, 0x31,
0x64, 0xeb, 0xcc, 0x0c, 0x4f, 0x57, 0x5c, 0xf0, 0x49, 0x43, 0x4f, 0x86, 0x67, 0x21, 0x33, 0x56,
0x12, 0x64, 0xfc, 0x6c, 0xa2, 0x3b, 0x3e, 0x85, 0x17, 0xa9, 0xc2, 0x5b, 0x87, 0x2a, 0xec, 0xac,
0x9e, 0x91, 0x38, 0x0d, 0x51, 0x62, 0x10, 0xb5, 0xc7, 0xc4, 0x72, 0x06, 0x02, 0x06, 0x24, 0x0f,
0x0d, 0xb5, 0xdd, 0x52, 0x4d, 0x62, 0x63, 0x38, 0xdb, 0xbe, 0x0e, 0x71, 0x62, 0x35, 0x9a, 0x23,
0x82, 0xed, 0x7c, 0xb9, 0x42, 0x52, 0x89, 0x11, 0x4b, 0xb6, 0x87, 0xe8, 0x1a, 0x44, 0xfa, 0x46,
0x1b, 0xd3, 0xfd, 0x3e, 0x56, 0xcc, 0x07, 0xc8, 0x30, 0xf6, 0x77, 0xd7, 0x68, 0x63, 0x85, 0x5a,
0x0b, 0x9f, 0xc3, 0x9a, 0x2f, 0x0c, 0x93, 0xb4, 0x0a, 0x09, 0x8f, 0x52, 0x34, 0xd4, 0xbb, 0x0a,
0x05, 0x13, 0xa1, 0x84, 0x1e, 0xac, 0xd6, 0xb5, 0xfe, 0x41, 0x4f, 0x25, 0xee, 0x01, 0x43, 0x97,
0x80, 0x27, 0x16, 0x73, 0x18, 0xbc, 0x57, 0x54, 0x20, 0x9e, 0x58, 0x48, 0xf4, 0x24, 0x6b, 0x67,
0x95, 0x0c, 0x38, 0x1d, 0xd7, 0xae, 0x8e, 0x15, 0x10, 0xbe, 0xe7, 0x20, 0x35, 0x09, 0xc7, 0x32,
0x79, 0x1f, 0xe2, 0x1d, 0xd5, 0x6c, 0x68, 0xfa, 0x43, 0x83, 0x45, 0x3d, 0x17, 0x9e, 0xc6, 0xae,
0x6a, 0xee, 0xe9, 0x0f, 0x0d, 0x25, 0xd6, 0x71, 0x1e, 0xd0, 0x7b, 0xb0, 0x34, 0xc4, 0xe6, 0x41,
0x8f, 0xb0, 0x6b, 0x94, 0x0f, 0x5f, 0xab, 0x50, 0x3b, 0x85, 0xd9, 0x0b, 0x02, 0x24, 0xe9, 0x59,
0x75, 0xf3, 0x46, 0x10, 0xe9, 0xaa, 0x66, 0x97, 0x32, 0x2c, 0x2b, 0xf4, 0x59, 0x78, 0x06, 0x2b,
0xcc, 0x86, 0xc1, 0x6e, 0x1e, 0x2a, 0x0e, 0x15, 0x66, 0x6a, 0x77, 0xf8, 0x39, 0x77, 0xe7, 0x27,
0x0e, 0x4e, 0xee, 0x62, 0x22, 0xdb, 0x65, 0xea, 0x53, 0x8d, 0x74, 0xf7, 0x2d, 0xd3, 0xa5, 0x3d,
0x09, 0x4b, 0x5d, 0xac, 0x75, 0xba, 0x84, 0xc2, 0x2c, 0x2a, 0x6c, 0x84, 0x6e, 0xcd, 0x5f, 0x5a,
0xbc, 0x67, 0xfe, 0xe6, 0x89, 0x57, 0xcf, 0x77, 0x8e, 0xfb, 0x37, 0xf2, 0xba, 0x58, 0x14, 0xbe,
0xe5, 0xe1, 0xd4, 0x0c, 0xd1, 0x51, 0x6f, 0xf9, 0x35, 0x88, 0xd3, 0xca, 0xdb, 0xd0, 0xda, 0x8c,
0x70, 0x5d, 0x9c, 0x54, 0x5f, 0xd1, 0xa9, 0xbb, 0x34, 0xc4, 0x5e, 0x45, 0x89, 0x51, 0xd3, 0xbd,
0x36, 0xda, 0x81, 0x28, 0x7d, 0x64, 0xb7, 0xf9, 0x54, 0xc8, 0x12, 0xc5, 0xb1, 0x42, 0xbb, 0x3e,
0x21, 0x22, 0x47, 0xaa, 0x00, 0xef, 0xa2, 0x44, 0x09, 0x56, 0xf7, 0xad, 0x0a, 0x6e, 0xd9, 0x37,
0xf5, 0xd0, 0xbb, 0x7f, 0x73, 0xed, 0xd5, 0xcc, 0xbd, 0xb8, 0x21, 0xdc, 0x83, 0xd4, 0xc4, 0xc5,
0x91, 0x0e, 0x58, 0xb0, 0xbf, 0xbb, 0x36, 0x52, 0x55, 0xf7, 0x22, 0xfd, 0x1f, 0x77, 0xb2, 0x8d,
0xe7, 0xba, 0x63, 0x78, 0x47, 0x4d, 0xf1, 0x36, 0xa4, 0x5d, 0x1f, 0xa5, 0xbe, 0xa6, 0x1b, 0x2e,
0xd7, 0x59, 0x00, 0xd5, 0x1e, 0x37, 0xbe, 0x30, 0x0d, 0x9d, 0x5d, 0xb9, 0x65, 0xfa, 0xe6, 0xb6,
0x69, 0xe8, 0xc1, 0xbe, 0x6a, 0x70, 0x62, 0xca, 0x17, 0x83, 0x3a, 0x07, 0x49, 0xc7, 0x59, 0x53,
0xd3, 0xd5, 0xe1, 0x88, 0x81, 0x25, 0xe8, 0x3b, 0x99, 0xbe, 0x0a, 0xd3, 0x3f, 0xed, 0xea, 0xef,
0x83, 0x9b, 0xd7, 0xdf, 0x1d, 0x1b, 0xd0, 0xe7, 0x8f, 0x01, 0xce, 0x91, 0xed, 0xf6, 0x47, 0x10,
0x63, 0x4d, 0x1b, 0x65, 0x20, 0x5d, 0x53, 0x2a, 0x55, 0xa5, 0x21, 0x3f, 0x68, 0x7c, 0x72, 0xaf,
0x7e, 0xbf, 0x5a, 0xde, 0xbb, 0xb5, 0x57, 0xad, 0xa4, 0x16, 0x50, 0x0a, 0x92, 0xe3, 0x99, 0x52,
0xbd, 0x9c, 0xe2, 0xd0, 0x71, 0x58, 0x19, 0xbf, 0xa9, 0x54, 0xeb, 0xe5, 0x14, 0xbf, 0xfd, 0x35,
0x07, 0x2b, 0xbe, 0xce, 0x82, 0x72, 0x90, 0x95, 0x95, 0x5a, 0xa9, 0x52, 0x2e, 0xd5, 0xf7, 0x1b,
0x77, 0x6b, 0x95, 0xea, 0x94, 0xdb, 0x33, 0x90, 0x9e, 0x9a, 0x97, 0x3f, 0xae, 0x95, 0xef, 0xa4,
0xb8, 0x2c, 0x1f, 0xe7, 0xd0, 0x29, 0x58, 0x9b, 0x9a, 0xad, 0x3f, 0xb8, 0x57, 0x4e, 0xf1, 0x36,
0xe7, 0xd4, 0x44, 0x89, 0xce, 0x2c, 0x16, 0x7f, 0x04, 0x88, 0xd5, 0x9d, 0x4f, 0x45, 0xf4, 0x14,
0xe2, 0x6e, 0x0f, 0x40, 0x42, 0xc0, 0x91, 0x9c, 0xea, 0x47, 0xd9, 0xf3, 0x6f, 0xb5, 0x61, 0x95,
0xf2, 0xe2, 0x37, 0x7f, 0xfc, 0xf3, 0x0b, 0x9f, 0xbf, 0xc9, 0x6d, 0x0b, 0xa7, 0xa5, 0x80, 0xcf,
0x54, 0x37, 0xe0, 0x63, 0x88, 0xd2, 0x82, 0x8e, 0x36, 0x02, 0xbc, 0x7a, 0xdb, 0x41, 0x36, 0x1f,
0x6e, 0xc0, 0x62, 0x6e, 0xd2, 0x98, 0x1b, 0xe8, 0xac, 0x14, 0xf4, 0x81, 0x6a, 0x4a, 0x4f, 0xed,
0x16, 0xf2, 0x0c, 0x7d, 0x05, 0x09, 0x4f, 0x03, 0x47, 0x9b, 0x6f, 0xeb, 0xfb, 0x93, 0xf0, 0x17,
0x0f, 0x33, 0x63, 0x10, 0xe7, 0x28, 0xc4, 0x69, 0x3b, 0xf1, 0x93, 0xc1, 0x1c, 0xe8, 0x4b, 0x48,
0x78, 0x3e, 0xca, 0x02, 0x01, 0x66, 0xbf, 0x5f, 0x03, 0x01, 0x02, 0xbe, 0xed, 0x84, 0x1c, 0x05,
0xc8, 0xa0, 0xb0, 0xe8, 0xbf, 0x71, 0xb0, 0x3a, 0xd5, 0x31, 0xd0, 0xa5, 0x60, 0xdf, 0x01, 0x7d,
0x2e, 0xbb, 0xfd, 0x2e, 0xa6, 0x0c, 0x45, 0x7e, 0x11, 0x54, 0xa9, 0x29, 0xdf, 0x16, 0xda, 0x0c,
0xd9, 0x25, 0xda, 0x2d, 0xa4, 0xa7, 0x4e, 0xfb, 0x7c, 0x86, 0x7e, 0xe0, 0x20, 0xee, 0x5e, 0xe2,
0xc0, 0xe3, 0x39, 0x55, 0xf4, 0x03, 0x8f, 0xe7, 0x74, 0x55, 0x17, 0x6e, 0xbc, 0x98, 0xbd, 0xe1,
0x94, 0x2b, 0x67, 0x6f, 0xdc, 0x7a, 0x00, 0x5a, 0xdb, 0x21, 0x70, 0x70, 0x9c, 0xa2, 0x17, 0x82,
0xe3, 0x2b, 0xf8, 0x21, 0x38, 0xfe, 0x2a, 0x3e, 0x07, 0x0e, 0x76, 0x08, 0x7e, 0xe5, 0x60, 0xc5,
0x57, 0x83, 0xd1, 0xd6, 0x5b, 0xe2, 0x79, 0x8b, 0x6a, 0xb6, 0x70, 0xb8, 0x21, 0xa3, 0xfb, 0x20,
0x8c, 0xee, 0x82, 0x4d, 0xb7, 0x11, 0x4a, 0x27, 0xd1, 0x8a, 0xca, 0x18, 0x3d, 0x65, 0x38, 0x84,
0x71, 0xb6, 0xf0, 0x87, 0x30, 0x06, 0x54, 0xf4, 0x39, 0x18, 0x9d, 0x0d, 0x75, 0x18, 0xe5, 0x0f,
0x7f, 0x7f, 0x9d, 0xe3, 0x5e, 0xbe, 0xce, 0x71, 0x7f, 0xbf, 0xce, 0x71, 0x3f, 0xbf, 0xc9, 0x2d,
0xbc, 0x7c, 0x93, 0x5b, 0xf8, 0xf3, 0x4d, 0x6e, 0xe1, 0xb3, 0xcd, 0x8e, 0x46, 0xba, 0x07, 0x4d,
0xb1, 0x65, 0xf4, 0x5d, 0x27, 0x93, 0x30, 0xee, 0x1f, 0x53, 0xab, 0xb9, 0x44, 0xff, 0x7b, 0x5e,
0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x02, 0x7f, 0xb9, 0x08, 0x93, 0x0f, 0x00, 0x00,
// 1314 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x97, 0xcf, 0x6f, 0x13, 0x47,
0x14, 0xc7, 0xb3, 0x9b, 0x5f, 0xce, 0x73, 0x42, 0xcc, 0x24, 0x80, 0x31, 0xe0, 0x98, 0x85, 0x10,
0x13, 0x89, 0x5d, 0x62, 0x88, 0xa8, 0x50, 0xab, 0xca, 0x6b, 0x9b, 0x34, 0x50, 0x30, 0x5a, 0xa7,
0xaa, 0xa8, 0x2a, 0x59, 0x6b, 0x7b, 0xb0, 0xb7, 0xd8, 0xbb, 0xc6, 0x3b, 0x89, 0xd6, 0xa2, 0xa8,
0x55, 0x4f, 0x6d, 0xd5, 0xaa, 0x95, 0xfa, 0x17, 0xf4, 0xde, 0x23, 0x7f, 0x44, 0xc5, 0x09, 0xd1,
0x4b, 0xd5, 0x53, 0x05, 0x3d, 0xf5, 0xaf, 0xa8, 0x76, 0x66, 0xd6, 0xde, 0xb5, 0x77, 0x49, 0xe2,
0xde, 0x66, 0x76, 0xde, 0xbc, 0xf7, 0x99, 0xef, 0xcc, 0xbc, 0x37, 0x0b, 0x6b, 0x75, 0xcb, 0xee,
0x58, 0xb6, 0x42, 0x1c, 0xe5, 0x60, 0xab, 0x86, 0x89, 0xbe, 0xa5, 0xd8, 0xb8, 0x77, 0x60, 0xd4,
0xb1, 0xdc, 0xed, 0x59, 0xc4, 0x42, 0x27, 0x99, 0x81, 0x4c, 0x1c, 0x99, 0x1b, 0xa4, 0xce, 0x37,
0x2d, 0xab, 0xd9, 0xc6, 0x8a, 0xde, 0x35, 0x14, 0xdd, 0x34, 0x2d, 0xa2, 0x13, 0xc3, 0x32, 0x6d,
0x36, 0x21, 0x75, 0x89, 0x7b, 0xac, 0xe9, 0x36, 0x56, 0xf4, 0x5a, 0xdd, 0x18, 0x38, 0x76, 0x3b,
0xdc, 0x28, 0x35, 0x1e, 0x96, 0x38, 0x7c, 0x6c, 0xd3, 0xef, 0xe0, 0xe9, 0x3e, 0xee, 0xf5, 0x07,
0x36, 0x5d, 0xbd, 0x69, 0x98, 0x34, 0x1a, 0xb7, 0xbd, 0x50, 0xb7, 0x3a, 0x98, 0xd4, 0x1e, 0x13,
0x85, 0xf4, 0xbb, 0xd8, 0x56, 0x0e, 0xb6, 0x94, 0x5a, 0xdb, 0xaa, 0x3f, 0x89, 0x1e, 0xa6, 0x0d,
0x3e, 0x7c, 0x96, 0x45, 0xaa, 0xd2, 0x9e, 0xc2, 0x17, 0x4a, 0x3b, 0xd2, 0xb7, 0x22, 0xa0, 0x1d,
0x4c, 0xf6, 0x1c, 0xbb, 0x74, 0x80, 0x4d, 0xa2, 0xe1, 0xa7, 0xfb, 0xd8, 0x26, 0x28, 0x05, 0x73,
0xd8, 0xed, 0xdb, 0x49, 0x21, 0x33, 0x9d, 0x5d, 0x50, 0xc5, 0xa4, 0xa0, 0xf1, 0x2f, 0xe8, 0x2e,
0xc0, 0x90, 0x2f, 0x29, 0x66, 0x84, 0x6c, 0x3c, 0x77, 0x45, 0xe6, 0x5e, 0xdd, 0xc5, 0xc8, 0x74,
0x31, 0x9e, 0x8c, 0xf2, 0x43, 0xbd, 0x89, 0xb9, 0x5f, 0xea, 0xc7, 0x37, 0x1b, 0x6d, 0x43, 0xcc,
0xea, 0x35, 0x70, 0xaf, 0x5a, 0xeb, 0x27, 0xa7, 0x33, 0x42, 0xf6, 0x44, 0x2e, 0x25, 0x8f, 0x6d,
0x84, 0x5c, 0x76, 0x4d, 0xd4, 0xbe, 0x36, 0x6f, 0xb1, 0x06, 0x42, 0x30, 0xd3, 0xd5, 0x9b, 0x38,
0x39, 0x93, 0x11, 0xb2, 0x33, 0x1a, 0x6d, 0xa3, 0x55, 0x98, 0x6d, 0x1b, 0x1d, 0x83, 0x24, 0x67,
0xe9, 0x47, 0xd6, 0x41, 0x57, 0x61, 0x96, 0xd2, 0x24, 0xe7, 0x32, 0x42, 0x76, 0x41, 0x5d, 0xf9,
0xeb, 0xc5, 0xb5, 0x65, 0x16, 0xe0, 0x9a, 0xdd, 0x78, 0x92, 0xb9, 0x2e, 0x6f, 0x5f, 0xd7, 0x98,
0x85, 0xf4, 0xaf, 0x00, 0x2b, 0x01, 0x29, 0xec, 0xae, 0x65, 0xda, 0x18, 0x6d, 0xc0, 0x34, 0x71,
0x98, 0x10, 0xf1, 0xdc, 0xa9, 0x10, 0xbc, 0x3d, 0x47, 0x73, 0x2d, 0xd0, 0x0e, 0x2c, 0x12, 0xa7,
0xda, 0xe3, 0xf3, 0xec, 0xa4, 0x48, 0x67, 0x5c, 0x0e, 0x48, 0x43, 0xcf, 0x86, 0x6f, 0x22, 0x37,
0xd6, 0xe2, 0x64, 0xd0, 0xb6, 0xd1, 0xbd, 0x80, 0xc2, 0xd3, 0x54, 0xe1, 0x8d, 0x43, 0x15, 0x66,
0xb3, 0xc7, 0x24, 0x5e, 0x85, 0x59, 0x62, 0x11, 0xbd, 0xcd, 0xc5, 0x62, 0x1d, 0x09, 0x03, 0x52,
0x7b, 0x96, 0xde, 0xa8, 0xeb, 0x36, 0x71, 0x31, 0xd8, 0xb6, 0x9f, 0x85, 0x18, 0x71, 0xaa, 0xb5,
0x3e, 0xc1, 0xee, 0x7a, 0x85, 0xec, 0xa2, 0x36, 0x4f, 0x1c, 0xd5, 0xed, 0xa2, 0x9b, 0x30, 0xd3,
0xb1, 0x1a, 0x98, 0xee, 0xf7, 0x89, 0x5c, 0x26, 0x44, 0x86, 0x81, 0xbf, 0xfb, 0x56, 0x03, 0x6b,
0xd4, 0x5a, 0xfa, 0x1c, 0x56, 0x02, 0x61, 0xb8, 0xa4, 0x25, 0x88, 0xfb, 0x94, 0xa2, 0xa1, 0x8e,
0x2a, 0x14, 0x0c, 0x85, 0x92, 0xda, 0xb0, 0x5c, 0x31, 0x3a, 0xfb, 0x6d, 0x9d, 0x78, 0x07, 0x0c,
0x5d, 0x05, 0x91, 0x38, 0xdc, 0x61, 0xf8, 0x5e, 0x51, 0x81, 0x44, 0xe2, 0x20, 0xd9, 0xb7, 0x58,
0x77, 0x55, 0x8b, 0x21, 0xa7, 0xe3, 0xe6, 0x8d, 0x81, 0x02, 0xd2, 0xf7, 0x02, 0x24, 0x86, 0xe1,
0xf8, 0x4a, 0xde, 0x87, 0x58, 0x53, 0xb7, 0xab, 0x86, 0xf9, 0xd8, 0xe2, 0x51, 0x2f, 0x46, 0x2f,
0x63, 0x47, 0xb7, 0x77, 0xcd, 0xc7, 0x96, 0x36, 0xdf, 0x64, 0x0d, 0xf4, 0x1e, 0xcc, 0xf5, 0xb0,
0xbd, 0xdf, 0x26, 0xfc, 0x1a, 0x65, 0xa2, 0xe7, 0x6a, 0xd4, 0x4e, 0xe3, 0xf6, 0x92, 0x04, 0x8b,
0xf4, 0xac, 0x7a, 0xeb, 0x46, 0x30, 0xd3, 0xd2, 0xed, 0x16, 0x65, 0x58, 0xd0, 0x68, 0x5b, 0x7a,
0x0e, 0x4b, 0xdc, 0x86, 0xc3, 0xae, 0x1f, 0x2a, 0x0e, 0x15, 0x66, 0x64, 0x77, 0xc4, 0x09, 0x77,
0xe7, 0x27, 0x01, 0x4e, 0xef, 0x60, 0xa2, 0xba, 0x79, 0xea, 0x53, 0x83, 0xb4, 0xf6, 0x1c, 0xdb,
0xa3, 0x3d, 0x0d, 0x73, 0x2d, 0x6c, 0x34, 0x5b, 0x84, 0xc2, 0x4c, 0x6b, 0xbc, 0x87, 0xee, 0x4c,
0x9e, 0x5a, 0xfc, 0x67, 0xfe, 0xf6, 0xa9, 0xd7, 0x2f, 0xae, 0x9d, 0x0c, 0x6e, 0xe4, 0xb6, 0x9c,
0x93, 0xbe, 0x13, 0xe1, 0xcc, 0x18, 0xd1, 0x71, 0x6f, 0xf9, 0x36, 0xc4, 0x68, 0xea, 0xad, 0x1a,
0x0d, 0x4e, 0xe8, 0xa6, 0x2c, 0x96, 0x7e, 0x65, 0x96, 0x75, 0x0f, 0xb6, 0x64, 0x1a, 0x63, 0xb7,
0xa8, 0xcd, 0x53, 0xdb, 0xdd, 0x06, 0x92, 0x61, 0x96, 0x36, 0xf9, 0x75, 0x4e, 0x46, 0xcd, 0xd1,
0x98, 0x19, 0xda, 0x09, 0x48, 0x31, 0x73, 0xac, 0x1c, 0x70, 0x14, 0x2d, 0xf2, 0xb0, 0xbc, 0xe7,
0x14, 0x71, 0xdd, 0xbd, 0xab, 0x87, 0xde, 0xfe, 0xdb, 0x2b, 0xaf, 0xc7, 0x6e, 0xc6, 0x2d, 0xe9,
0x01, 0x24, 0x86, 0x2e, 0x8e, 0x75, 0xc4, 0xc2, 0xfd, 0xdd, 0x77, 0x91, 0x4a, 0xa6, 0x1f, 0xe9,
0xff, 0xb8, 0x53, 0x5d, 0x3c, 0xcf, 0x1d, 0xc7, 0x3b, 0xee, 0x12, 0xef, 0xc2, 0xaa, 0xe7, 0x23,
0xdf, 0x31, 0x4c, 0xcb, 0xe3, 0xba, 0x00, 0xa0, 0xbb, 0xfd, 0xea, 0x17, 0xb6, 0x65, 0xf2, 0x4b,
0xb7, 0x40, 0xbf, 0xdc, 0xb5, 0x2d, 0x33, 0xdc, 0x57, 0x19, 0x4e, 0x8d, 0xf8, 0xe2, 0x50, 0x17,
0x61, 0x91, 0x39, 0xab, 0x19, 0xa6, 0xde, 0xeb, 0x73, 0xb0, 0x38, 0xfd, 0xa6, 0xd2, 0x4f, 0x51,
0xfa, 0xaf, 0x7a, 0xfa, 0x07, 0xe0, 0x26, 0xf5, 0x77, 0xcf, 0x05, 0x0c, 0xf8, 0xe3, 0x80, 0x13,
0xac, 0x76, 0xf3, 0x23, 0x98, 0xe7, 0x65, 0x1b, 0x25, 0x61, 0xb5, 0xac, 0x15, 0x4b, 0x5a, 0x55,
0x7d, 0x54, 0xfd, 0xe4, 0x41, 0xe5, 0x61, 0xa9, 0xb0, 0x7b, 0x67, 0xb7, 0x54, 0x4c, 0x4c, 0xa1,
0x04, 0x2c, 0x0e, 0x46, 0xf2, 0x95, 0x42, 0x42, 0x40, 0x27, 0x61, 0x69, 0xf0, 0xa5, 0x58, 0xaa,
0x14, 0x12, 0xe2, 0xe6, 0xd7, 0x02, 0x2c, 0x05, 0x6a, 0x0b, 0x4a, 0x43, 0x4a, 0xd5, 0xca, 0xf9,
0x62, 0x21, 0x5f, 0xd9, 0xab, 0xde, 0x2f, 0x17, 0x4b, 0x23, 0x6e, 0xcf, 0xc3, 0xea, 0xc8, 0xb8,
0xfa, 0x71, 0xb9, 0x70, 0x2f, 0x21, 0xa4, 0xc4, 0x98, 0x80, 0xce, 0xc0, 0xca, 0xc8, 0x68, 0xe5,
0xd1, 0x83, 0x42, 0x42, 0x74, 0x39, 0x47, 0x06, 0xf2, 0x74, 0x64, 0x3a, 0xf7, 0x23, 0xc0, 0x7c,
0x85, 0x3d, 0x17, 0xd1, 0x33, 0x88, 0x79, 0x55, 0x00, 0x49, 0x21, 0x47, 0x72, 0xa4, 0x22, 0xa5,
0x2e, 0xbd, 0xd3, 0x86, 0xe7, 0xca, 0x2b, 0xdf, 0xfc, 0xf1, 0xcf, 0x2f, 0x62, 0xe6, 0xb6, 0xb0,
0x29, 0x9d, 0x53, 0x42, 0x9e, 0xaa, 0x5e, 0xc0, 0xa7, 0x30, 0x4b, 0x53, 0x3a, 0x5a, 0x0b, 0xf1,
0xea, 0x2f, 0x08, 0xa9, 0x4c, 0xb4, 0x01, 0x8f, 0xb9, 0x4e, 0x63, 0xae, 0xa1, 0x0b, 0x4a, 0xd8,
0x23, 0xd5, 0x56, 0x9e, 0xb9, 0x45, 0xe4, 0x39, 0xfa, 0x0a, 0xe2, 0xbe, 0x12, 0x8e, 0xd6, 0xdf,
0x55, 0xf9, 0x87, 0xe1, 0xaf, 0x1c, 0x66, 0xc6, 0x21, 0x2e, 0x52, 0x88, 0x73, 0xee, 0xc2, 0x4f,
0x87, 0x73, 0xa0, 0x2f, 0x21, 0xee, 0x7b, 0x96, 0x85, 0x02, 0x8c, 0xbf, 0x60, 0x43, 0x01, 0x42,
0x5e, 0x77, 0x52, 0x9a, 0x02, 0x24, 0x51, 0x54, 0xf4, 0xdf, 0x04, 0x58, 0x1e, 0xa9, 0x19, 0xe8,
0x6a, 0xb8, 0xef, 0x90, 0x4a, 0x97, 0xda, 0x3c, 0x8a, 0x29, 0x47, 0x51, 0x5f, 0x86, 0x65, 0x6a,
0xca, 0xb7, 0x81, 0xd6, 0x23, 0x76, 0x89, 0x56, 0x0b, 0xe5, 0x19, 0x2b, 0xa0, 0xcf, 0xd1, 0x0f,
0x02, 0xc4, 0xbc, 0x4b, 0x1c, 0x7a, 0x3c, 0x47, 0x92, 0x7e, 0xe8, 0xf1, 0x1c, 0xcd, 0xea, 0xd2,
0xad, 0x97, 0xe3, 0x37, 0x9c, 0x72, 0xa5, 0xdd, 0x8d, 0x3b, 0x1b, 0x82, 0xd6, 0x60, 0x04, 0x0c,
0x87, 0x25, 0xbd, 0x08, 0x9c, 0x40, 0xc2, 0x8f, 0xc0, 0x09, 0x66, 0xf1, 0x09, 0x70, 0x30, 0x23,
0xf8, 0x55, 0x80, 0xa5, 0x40, 0x0e, 0x46, 0x1b, 0xef, 0x88, 0xe7, 0x4f, 0xaa, 0xa9, 0xec, 0xe1,
0x86, 0x9c, 0xee, 0x83, 0x28, 0xba, 0xcb, 0x2e, 0xdd, 0x5a, 0x24, 0x9d, 0x42, 0x33, 0x2a, 0x67,
0xf4, 0xa5, 0xe1, 0x08, 0xc6, 0xf1, 0xc4, 0x1f, 0xc1, 0x18, 0x92, 0xd1, 0x27, 0x60, 0x64, 0x1b,
0xca, 0x18, 0xd5, 0x0f, 0x7f, 0x7f, 0x93, 0x16, 0x5e, 0xbd, 0x49, 0x0b, 0x7f, 0xbf, 0x49, 0x0b,
0x3f, 0xbf, 0x4d, 0x4f, 0xbd, 0x7a, 0x9b, 0x9e, 0xfa, 0xf3, 0x6d, 0x7a, 0xea, 0xb3, 0xf5, 0xa6,
0x41, 0x5a, 0xfb, 0x35, 0xf7, 0x75, 0xe3, 0x39, 0x19, 0x86, 0xe1, 0x7f, 0xa7, 0xc4, 0xa9, 0xcd,
0xd1, 0xbf, 0xcf, 0x1b, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x1d, 0xd5, 0xa1, 0x97, 0x0f,
0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -3858,7 +3859,7 @@ func (m *GetBlockWithTxsResponse) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF
}
if m.BlockId == nil {
m.BlockId = &types1.BlockID{}
m.BlockId = &v1.BlockID{}
}
if err := m.BlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
@@ -3894,7 +3895,7 @@ func (m *GetBlockWithTxsResponse) Unmarshal(dAtA []byte) error {
return io.ErrUnexpectedEOF
}
if m.Block == nil {
m.Block = &types1.Block{}
m.Block = &v1.Block{}
}
if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err