diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 620ca144664..347d3fd267f 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -8,6 +8,7 @@ import ( fmt "fmt" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" types1 "github.com/cometbft/cometbft/proto/tendermint/types" + version "github.com/cometbft/cometbft/proto/tendermint/version" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -1101,6 +1102,20 @@ type RequestPrepareProposal struct { NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` // address of the public key of the validator proposing the block. ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` + // scheduled_msgs_hash + Version version.Consensus `protobuf:"bytes,9,opt,name=version,proto3" json:"version"` + LastBlockId types1.BlockID `protobuf:"bytes,10,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id"` + DataHash []byte `protobuf:"bytes,11,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` + LastCommitHash []byte `protobuf:"bytes,12,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,13,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` + ConsensusHash []byte `protobuf:"bytes,14,opt,name=consensus_hash,json=consensusHash,proto3" json:"consensus_hash,omitempty"` + LastResultsHash []byte `protobuf:"bytes,15,opt,name=last_results_hash,json=lastResultsHash,proto3" json:"last_results_hash,omitempty"` + // consensus info + EvidenceHash []byte `protobuf:"bytes,16,opt,name=evidence_hash,json=evidenceHash,proto3" json:"evidence_hash,omitempty"` + // encrypted random + EncryptedRandom *types1.EncryptedRandom `protobuf:"bytes,17,opt,name=encrypted_random,json=encryptedRandom,proto3" json:"encrypted_random,omitempty"` + // scheduled_msgs_hash + ImplicitHash []byte `protobuf:"bytes,18,opt,name=implicit_hash,json=implicitHash,proto3" json:"implicit_hash,omitempty"` } func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} } @@ -1192,6 +1207,76 @@ func (m *RequestPrepareProposal) GetProposerAddress() []byte { return nil } +func (m *RequestPrepareProposal) GetVersion() version.Consensus { + if m != nil { + return m.Version + } + return version.Consensus{} +} + +func (m *RequestPrepareProposal) GetLastBlockId() types1.BlockID { + if m != nil { + return m.LastBlockId + } + return types1.BlockID{} +} + +func (m *RequestPrepareProposal) GetDataHash() []byte { + if m != nil { + return m.DataHash + } + return nil +} + +func (m *RequestPrepareProposal) GetLastCommitHash() []byte { + if m != nil { + return m.LastCommitHash + } + return nil +} + +func (m *RequestPrepareProposal) GetValidatorsHash() []byte { + if m != nil { + return m.ValidatorsHash + } + return nil +} + +func (m *RequestPrepareProposal) GetConsensusHash() []byte { + if m != nil { + return m.ConsensusHash + } + return nil +} + +func (m *RequestPrepareProposal) GetLastResultsHash() []byte { + if m != nil { + return m.LastResultsHash + } + return nil +} + +func (m *RequestPrepareProposal) GetEvidenceHash() []byte { + if m != nil { + return m.EvidenceHash + } + return nil +} + +func (m *RequestPrepareProposal) GetEncryptedRandom() *types1.EncryptedRandom { + if m != nil { + return m.EncryptedRandom + } + return nil +} + +func (m *RequestPrepareProposal) GetImplicitHash() []byte { + if m != nil { + return m.ImplicitHash + } + return nil +} + type RequestProcessProposal struct { Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` ProposedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=proposed_last_commit,json=proposedLastCommit,proto3" json:"proposed_last_commit"` @@ -1203,6 +1288,20 @@ type RequestProcessProposal struct { NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` // address of the public key of the original proposer of the block. ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` + // scheduled_msgs_hash + Version version.Consensus `protobuf:"bytes,9,opt,name=version,proto3" json:"version"` + LastBlockId types1.BlockID `protobuf:"bytes,10,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id"` + DataHash []byte `protobuf:"bytes,11,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` + LastCommitHash []byte `protobuf:"bytes,12,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,13,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` + ConsensusHash []byte `protobuf:"bytes,14,opt,name=consensus_hash,json=consensusHash,proto3" json:"consensus_hash,omitempty"` + LastResultsHash []byte `protobuf:"bytes,15,opt,name=last_results_hash,json=lastResultsHash,proto3" json:"last_results_hash,omitempty"` + // consensus info + EvidenceHash []byte `protobuf:"bytes,16,opt,name=evidence_hash,json=evidenceHash,proto3" json:"evidence_hash,omitempty"` + // encrypted random + EncryptedRandom *types1.EncryptedRandom `protobuf:"bytes,17,opt,name=encrypted_random,json=encryptedRandom,proto3" json:"encrypted_random,omitempty"` + // scheduled_msgs_hash + ImplicitHash []byte `protobuf:"bytes,18,opt,name=implicit_hash,json=implicitHash,proto3" json:"implicit_hash,omitempty"` } func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} } @@ -1294,6 +1393,76 @@ func (m *RequestProcessProposal) GetProposerAddress() []byte { return nil } +func (m *RequestProcessProposal) GetVersion() version.Consensus { + if m != nil { + return m.Version + } + return version.Consensus{} +} + +func (m *RequestProcessProposal) GetLastBlockId() types1.BlockID { + if m != nil { + return m.LastBlockId + } + return types1.BlockID{} +} + +func (m *RequestProcessProposal) GetDataHash() []byte { + if m != nil { + return m.DataHash + } + return nil +} + +func (m *RequestProcessProposal) GetLastCommitHash() []byte { + if m != nil { + return m.LastCommitHash + } + return nil +} + +func (m *RequestProcessProposal) GetValidatorsHash() []byte { + if m != nil { + return m.ValidatorsHash + } + return nil +} + +func (m *RequestProcessProposal) GetConsensusHash() []byte { + if m != nil { + return m.ConsensusHash + } + return nil +} + +func (m *RequestProcessProposal) GetLastResultsHash() []byte { + if m != nil { + return m.LastResultsHash + } + return nil +} + +func (m *RequestProcessProposal) GetEvidenceHash() []byte { + if m != nil { + return m.EvidenceHash + } + return nil +} + +func (m *RequestProcessProposal) GetEncryptedRandom() *types1.EncryptedRandom { + if m != nil { + return m.EncryptedRandom + } + return nil +} + +func (m *RequestProcessProposal) GetImplicitHash() []byte { + if m != nil { + return m.ImplicitHash + } + return nil +} + // Extends a vote with application-injected data type RequestExtendVote struct { // the hash of the block that this vote may be referring to @@ -1308,6 +1477,20 @@ type RequestExtendVote struct { NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` // address of the public key of the original proposer of the block. ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` + // scheduled_msgs_hash + Version version.Consensus `protobuf:"bytes,9,opt,name=version,proto3" json:"version"` + LastBlockId types1.BlockID `protobuf:"bytes,10,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id"` + DataHash []byte `protobuf:"bytes,11,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` + LastCommitHash []byte `protobuf:"bytes,12,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,13,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` + ConsensusHash []byte `protobuf:"bytes,14,opt,name=consensus_hash,json=consensusHash,proto3" json:"consensus_hash,omitempty"` + LastResultsHash []byte `protobuf:"bytes,15,opt,name=last_results_hash,json=lastResultsHash,proto3" json:"last_results_hash,omitempty"` + // consensus info + EvidenceHash []byte `protobuf:"bytes,16,opt,name=evidence_hash,json=evidenceHash,proto3" json:"evidence_hash,omitempty"` + // encrypted random + EncryptedRandom *types1.EncryptedRandom `protobuf:"bytes,17,opt,name=encrypted_random,json=encryptedRandom,proto3" json:"encrypted_random,omitempty"` + // scheduled_msgs_hash + ImplicitHash []byte `protobuf:"bytes,18,opt,name=implicit_hash,json=implicitHash,proto3" json:"implicit_hash,omitempty"` } func (m *RequestExtendVote) Reset() { *m = RequestExtendVote{} } @@ -1399,6 +1582,76 @@ func (m *RequestExtendVote) GetProposerAddress() []byte { return nil } +func (m *RequestExtendVote) GetVersion() version.Consensus { + if m != nil { + return m.Version + } + return version.Consensus{} +} + +func (m *RequestExtendVote) GetLastBlockId() types1.BlockID { + if m != nil { + return m.LastBlockId + } + return types1.BlockID{} +} + +func (m *RequestExtendVote) GetDataHash() []byte { + if m != nil { + return m.DataHash + } + return nil +} + +func (m *RequestExtendVote) GetLastCommitHash() []byte { + if m != nil { + return m.LastCommitHash + } + return nil +} + +func (m *RequestExtendVote) GetValidatorsHash() []byte { + if m != nil { + return m.ValidatorsHash + } + return nil +} + +func (m *RequestExtendVote) GetConsensusHash() []byte { + if m != nil { + return m.ConsensusHash + } + return nil +} + +func (m *RequestExtendVote) GetLastResultsHash() []byte { + if m != nil { + return m.LastResultsHash + } + return nil +} + +func (m *RequestExtendVote) GetEvidenceHash() []byte { + if m != nil { + return m.EvidenceHash + } + return nil +} + +func (m *RequestExtendVote) GetEncryptedRandom() *types1.EncryptedRandom { + if m != nil { + return m.EncryptedRandom + } + return nil +} + +func (m *RequestExtendVote) GetImplicitHash() []byte { + if m != nil { + return m.ImplicitHash + } + return nil +} + // Verify the vote extension type RequestVerifyVoteExtension struct { // the hash of the block that this received vote corresponds to @@ -1483,6 +1736,17 @@ type RequestFinalizeBlock struct { ProposerAddress []byte `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` EncryptedRandom *types1.EncryptedRandom `protobuf:"bytes,9,opt,name=encrypted_random,json=encryptedRandom,proto3" json:"encrypted_random,omitempty"` Commit *types1.Commit `protobuf:"bytes,10,opt,name=commit,proto3" json:"commit,omitempty"` + Version version.Consensus `protobuf:"bytes,11,opt,name=version,proto3" json:"version"` + LastBlockId types1.BlockID `protobuf:"bytes,12,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id"` + DataHash []byte `protobuf:"bytes,13,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` + LastCommitHash []byte `protobuf:"bytes,14,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,15,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` + ConsensusHash []byte `protobuf:"bytes,16,opt,name=consensus_hash,json=consensusHash,proto3" json:"consensus_hash,omitempty"` + LastResultsHash []byte `protobuf:"bytes,17,opt,name=last_results_hash,json=lastResultsHash,proto3" json:"last_results_hash,omitempty"` + // consensus info + EvidenceHash []byte `protobuf:"bytes,18,opt,name=evidence_hash,json=evidenceHash,proto3" json:"evidence_hash,omitempty"` + // scheduled_msgs_hash + ImplicitHash []byte `protobuf:"bytes,19,opt,name=implicit_hash,json=implicitHash,proto3" json:"implicit_hash,omitempty"` } func (m *RequestFinalizeBlock) Reset() { *m = RequestFinalizeBlock{} } @@ -1588,6 +1852,69 @@ func (m *RequestFinalizeBlock) GetCommit() *types1.Commit { return nil } +func (m *RequestFinalizeBlock) GetVersion() version.Consensus { + if m != nil { + return m.Version + } + return version.Consensus{} +} + +func (m *RequestFinalizeBlock) GetLastBlockId() types1.BlockID { + if m != nil { + return m.LastBlockId + } + return types1.BlockID{} +} + +func (m *RequestFinalizeBlock) GetDataHash() []byte { + if m != nil { + return m.DataHash + } + return nil +} + +func (m *RequestFinalizeBlock) GetLastCommitHash() []byte { + if m != nil { + return m.LastCommitHash + } + return nil +} + +func (m *RequestFinalizeBlock) GetValidatorsHash() []byte { + if m != nil { + return m.ValidatorsHash + } + return nil +} + +func (m *RequestFinalizeBlock) GetConsensusHash() []byte { + if m != nil { + return m.ConsensusHash + } + return nil +} + +func (m *RequestFinalizeBlock) GetLastResultsHash() []byte { + if m != nil { + return m.LastResultsHash + } + return nil +} + +func (m *RequestFinalizeBlock) GetEvidenceHash() []byte { + if m != nil { + return m.EvidenceHash + } + return nil +} + +func (m *RequestFinalizeBlock) GetImplicitHash() []byte { + if m != nil { + return m.ImplicitHash + } + return nil +} + type Response struct { // Types that are valid to be assigned to Value: // @@ -3680,208 +4007,221 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3218 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x73, 0x23, 0xd5, - 0xd5, 0x57, 0x4b, 0x2d, 0x59, 0x3a, 0x7a, 0xb8, 0x7d, 0xed, 0x19, 0x34, 0x62, 0xb0, 0x4d, 0x53, - 0xc0, 0x30, 0x80, 0xcd, 0xe7, 0xf9, 0x86, 0x47, 0x0d, 0x7c, 0x55, 0xb2, 0x46, 0xf3, 0xc9, 0x9e, - 0xc1, 0x36, 0x6d, 0xcd, 0x50, 0xe4, 0x41, 0xd3, 0x96, 0xae, 0xac, 0x66, 0x24, 0x75, 0xd3, 0x7d, - 0x65, 0x64, 0x56, 0xa9, 0x90, 0x54, 0xa5, 0x58, 0x51, 0x95, 0x2c, 0x58, 0x84, 0x45, 0x16, 0xd9, - 0xe4, 0x2f, 0xc8, 0x2a, 0xd9, 0x64, 0xc1, 0x22, 0x0b, 0x96, 0x59, 0x91, 0x14, 0xec, 0xd8, 0x66, - 0x91, 0x6d, 0xea, 0x3e, 0xfa, 0x25, 0xa9, 0x2d, 0x69, 0x20, 0x8b, 0x54, 0xb2, 0xeb, 0x7b, 0xfa, - 0x9c, 0x73, 0xfb, 0x9e, 0x7b, 0xee, 0x79, 0xfc, 0xfa, 0xc2, 0xe3, 0x04, 0x0f, 0xda, 0xd8, 0xe9, - 0x9b, 0x03, 0xb2, 0x6d, 0x9c, 0xb4, 0xcc, 0x6d, 0x72, 0x6e, 0x63, 0x77, 0xcb, 0x76, 0x2c, 0x62, - 0xa1, 0xe5, 0xe0, 0xe5, 0x16, 0x7d, 0x59, 0x79, 0x22, 0xc4, 0xdd, 0x72, 0xce, 0x6d, 0x62, 0x6d, - 0xdb, 0x8e, 0x65, 0x75, 0x38, 0x7f, 0xe5, 0xea, 0xe4, 0xeb, 0x87, 0xf8, 0x5c, 0x68, 0x8b, 0x08, - 0xb3, 0x59, 0xb6, 0x6d, 0xc3, 0x31, 0xfa, 0xee, 0x14, 0x61, 0xfe, 0x3a, 0xf4, 0x29, 0x95, 0xcd, - 0x89, 0xb7, 0x67, 0x46, 0xcf, 0x6c, 0x1b, 0xc4, 0x72, 0x04, 0xc7, 0xc6, 0xa9, 0x65, 0x9d, 0xf6, - 0xf0, 0x36, 0x1b, 0x9d, 0x0c, 0x3b, 0xdb, 0xc4, 0xec, 0x63, 0x97, 0x18, 0x7d, 0x5b, 0x30, 0xac, - 0x9d, 0x5a, 0xa7, 0x16, 0x7b, 0xdc, 0xa6, 0x4f, 0x9c, 0xaa, 0xfe, 0x31, 0x07, 0x4b, 0x1a, 0xfe, - 0x60, 0x88, 0x5d, 0x82, 0x76, 0x40, 0xc6, 0xad, 0xae, 0x55, 0x96, 0x36, 0xa5, 0x6b, 0xf9, 0x9d, - 0xab, 0x5b, 0x63, 0xcb, 0xdf, 0x12, 0x7c, 0xf5, 0x56, 0xd7, 0x6a, 0x24, 0x34, 0xc6, 0x8b, 0x6e, - 0x42, 0xba, 0xd3, 0x1b, 0xba, 0xdd, 0x72, 0x92, 0x09, 0x3d, 0x11, 0x27, 0x74, 0x87, 0x32, 0x35, - 0x12, 0x1a, 0xe7, 0xa6, 0x53, 0x99, 0x83, 0x8e, 0x55, 0x4e, 0x5d, 0x3c, 0xd5, 0xde, 0xa0, 0xc3, - 0xa6, 0xa2, 0xbc, 0x68, 0x17, 0xc0, 0x1c, 0x98, 0x44, 0x6f, 0x75, 0x0d, 0x73, 0x50, 0x4e, 0x33, - 0xc9, 0x27, 0xe3, 0x25, 0x4d, 0x52, 0xa3, 0x8c, 0x8d, 0x84, 0x96, 0x33, 0xbd, 0x01, 0xfd, 0xdc, - 0x0f, 0x86, 0xd8, 0x39, 0x2f, 0x67, 0x2e, 0xfe, 0xdc, 0xb7, 0x28, 0x13, 0xfd, 0x5c, 0xc6, 0x8d, - 0x5e, 0x87, 0x6c, 0xab, 0x8b, 0x5b, 0x0f, 0x75, 0x32, 0x2a, 0x67, 0x99, 0xe4, 0x46, 0x9c, 0x64, - 0x8d, 0xf2, 0x35, 0x47, 0x8d, 0x84, 0xb6, 0xd4, 0xe2, 0x8f, 0xe8, 0x55, 0xc8, 0xb4, 0xac, 0x7e, - 0xdf, 0x24, 0xe5, 0x3c, 0x93, 0x5d, 0x8f, 0x95, 0x65, 0x5c, 0x8d, 0x84, 0x26, 0xf8, 0xd1, 0x01, - 0x94, 0x7a, 0xa6, 0x4b, 0x74, 0x77, 0x60, 0xd8, 0x6e, 0xd7, 0x22, 0x6e, 0xb9, 0xc0, 0x34, 0x3c, - 0x1d, 0xa7, 0xe1, 0x9e, 0xe9, 0x92, 0x63, 0x8f, 0xb9, 0x91, 0xd0, 0x8a, 0xbd, 0x30, 0x81, 0xea, - 0xb3, 0x3a, 0x1d, 0xec, 0xf8, 0x0a, 0xcb, 0xc5, 0x8b, 0xf5, 0x1d, 0x52, 0x6e, 0x4f, 0x9e, 0xea, - 0xb3, 0xc2, 0x04, 0xf4, 0x43, 0x58, 0xed, 0x59, 0x46, 0xdb, 0x57, 0xa7, 0xb7, 0xba, 0xc3, 0xc1, - 0xc3, 0x72, 0x89, 0x29, 0x7d, 0x2e, 0xf6, 0x23, 0x2d, 0xa3, 0xed, 0xa9, 0xa8, 0x51, 0x81, 0x46, - 0x42, 0x5b, 0xe9, 0x8d, 0x13, 0xd1, 0xbb, 0xb0, 0x66, 0xd8, 0x76, 0xef, 0x7c, 0x5c, 0xfb, 0x32, - 0xd3, 0x7e, 0x3d, 0x4e, 0x7b, 0x95, 0xca, 0x8c, 0xab, 0x47, 0xc6, 0x04, 0x15, 0x35, 0x41, 0xb1, - 0x1d, 0x6c, 0x1b, 0x0e, 0xd6, 0x6d, 0xc7, 0xb2, 0x2d, 0xd7, 0xe8, 0x95, 0x15, 0xa6, 0xfb, 0xd9, - 0x38, 0xdd, 0x47, 0x9c, 0xff, 0x48, 0xb0, 0x37, 0x12, 0xda, 0xb2, 0x1d, 0x25, 0x71, 0xad, 0x56, - 0x0b, 0xbb, 0x6e, 0xa0, 0x75, 0x65, 0x96, 0x56, 0xc6, 0x1f, 0xd5, 0x1a, 0x21, 0xa1, 0x3a, 0xe4, - 0xf1, 0x88, 0x8a, 0xeb, 0x67, 0x16, 0xc1, 0x65, 0xc4, 0x14, 0xaa, 0xb1, 0x27, 0x94, 0xb1, 0x3e, - 0xb0, 0x08, 0x6e, 0x24, 0x34, 0xc0, 0xfe, 0x08, 0x19, 0x70, 0xe9, 0x0c, 0x3b, 0x66, 0xe7, 0x9c, - 0xa9, 0xd1, 0xd9, 0x1b, 0xd7, 0xb4, 0x06, 0xe5, 0x55, 0xa6, 0xf0, 0xf9, 0x38, 0x85, 0x0f, 0x98, - 0x10, 0x55, 0x51, 0xf7, 0x44, 0x1a, 0x09, 0x6d, 0xf5, 0x6c, 0x92, 0x4c, 0x5d, 0xac, 0x63, 0x0e, - 0x8c, 0x9e, 0xf9, 0x11, 0xd6, 0x4f, 0x7a, 0x56, 0xeb, 0x61, 0x79, 0xed, 0x62, 0x17, 0xbb, 0x23, - 0xb8, 0x77, 0x29, 0x33, 0x75, 0xb1, 0x4e, 0x98, 0xb0, 0xbb, 0x04, 0xe9, 0x33, 0xa3, 0x37, 0xc4, - 0xfb, 0x72, 0x56, 0x56, 0xd2, 0xfb, 0x72, 0x76, 0x49, 0xc9, 0xee, 0xcb, 0xd9, 0x9c, 0x02, 0xfb, - 0x72, 0x16, 0x94, 0xbc, 0xfa, 0x2c, 0xe4, 0x43, 0x81, 0x09, 0x95, 0x61, 0xa9, 0x8f, 0x5d, 0xd7, - 0x38, 0xc5, 0x2c, 0x8e, 0xe5, 0x34, 0x6f, 0xa8, 0x96, 0xa0, 0x10, 0x0e, 0x46, 0xea, 0xa7, 0x92, - 0x2f, 0x49, 0xe3, 0x0c, 0x95, 0x3c, 0xc3, 0x0e, 0x33, 0x87, 0x90, 0x14, 0x43, 0xf4, 0x14, 0x14, - 0xd9, 0x52, 0x74, 0xef, 0x3d, 0x0d, 0x76, 0xb2, 0x56, 0x60, 0xc4, 0x07, 0x82, 0x69, 0x03, 0xf2, - 0xf6, 0x8e, 0xed, 0xb3, 0xa4, 0x18, 0x0b, 0xd8, 0x3b, 0xb6, 0xc7, 0xf0, 0x24, 0x14, 0xe8, 0xba, - 0x7d, 0x0e, 0x99, 0x4d, 0x92, 0xa7, 0x34, 0xc1, 0xa2, 0xfe, 0x39, 0x09, 0xca, 0x78, 0x00, 0x43, - 0xaf, 0x82, 0x4c, 0x63, 0xb9, 0x08, 0xcb, 0x95, 0x2d, 0x1e, 0xe8, 0xb7, 0xbc, 0x40, 0xbf, 0xd5, - 0xf4, 0x02, 0xfd, 0x6e, 0xf6, 0x8b, 0xaf, 0x36, 0x12, 0x9f, 0xfe, 0x75, 0x43, 0xd2, 0x98, 0x04, - 0xba, 0x42, 0xc3, 0x96, 0x61, 0x0e, 0x74, 0xb3, 0xcd, 0x3e, 0x39, 0x47, 0x63, 0x92, 0x61, 0x0e, - 0xf6, 0xda, 0xe8, 0x1e, 0x28, 0x2d, 0x6b, 0xe0, 0xe2, 0x81, 0x3b, 0x74, 0x75, 0x9e, 0x88, 0x44, - 0x30, 0x8e, 0x84, 0x54, 0x9e, 0x83, 0x6a, 0x1e, 0xe7, 0x11, 0x63, 0xd4, 0x96, 0x5b, 0x51, 0x02, - 0xba, 0x03, 0xe0, 0xe7, 0x23, 0xb7, 0x2c, 0x6f, 0xa6, 0xae, 0xe5, 0x77, 0x36, 0x27, 0x36, 0xfc, - 0x81, 0xc7, 0x72, 0xdf, 0x6e, 0x1b, 0x04, 0xef, 0xca, 0xf4, 0x73, 0xb5, 0x90, 0x24, 0x7a, 0x06, - 0x96, 0x0d, 0xdb, 0xd6, 0x5d, 0x62, 0x10, 0xac, 0x9f, 0x9c, 0x13, 0xec, 0xb2, 0x38, 0x5f, 0xd0, - 0x8a, 0x86, 0x6d, 0x1f, 0x53, 0xea, 0x2e, 0x25, 0xa2, 0xa7, 0xa1, 0x44, 0x63, 0xba, 0x69, 0xf4, - 0xf4, 0x2e, 0x36, 0x4f, 0xbb, 0x84, 0xc5, 0xf3, 0x94, 0x56, 0x14, 0xd4, 0x06, 0x23, 0xaa, 0x6d, - 0x7f, 0xc7, 0x59, 0x3c, 0x47, 0x08, 0xe4, 0xb6, 0x41, 0x0c, 0x66, 0xc9, 0x82, 0xc6, 0x9e, 0x29, - 0xcd, 0x36, 0x48, 0x57, 0xd8, 0x87, 0x3d, 0xa3, 0xcb, 0x90, 0x11, 0x6a, 0x53, 0x4c, 0xad, 0x18, - 0xa1, 0x35, 0x48, 0xdb, 0x8e, 0x75, 0x86, 0xd9, 0xd6, 0x65, 0x35, 0x3e, 0x50, 0x35, 0x28, 0x45, - 0x63, 0x3f, 0x2a, 0x41, 0x92, 0x8c, 0xc4, 0x2c, 0x49, 0x32, 0x42, 0x2f, 0x81, 0x4c, 0x0d, 0xc9, - 0xe6, 0x28, 0x4d, 0xc9, 0x76, 0x42, 0xae, 0x79, 0x6e, 0x63, 0x8d, 0x71, 0xaa, 0xcb, 0x50, 0x8c, - 0xe4, 0x04, 0xf5, 0x32, 0xac, 0x4d, 0x0b, 0xf1, 0x6a, 0xd7, 0xa7, 0x47, 0x42, 0x35, 0xba, 0x09, - 0x59, 0x3f, 0xc6, 0x73, 0xc7, 0xb9, 0x32, 0x31, 0xad, 0xc7, 0xac, 0xf9, 0xac, 0xd4, 0x63, 0xe8, - 0x06, 0x74, 0x0d, 0x91, 0xd1, 0x0b, 0xda, 0x92, 0x61, 0xdb, 0x0d, 0xc3, 0xed, 0xaa, 0xef, 0x41, - 0x39, 0x2e, 0x7e, 0x87, 0x0c, 0x26, 0x31, 0xb7, 0xf7, 0x0c, 0x76, 0x19, 0x32, 0x1d, 0xcb, 0xe9, - 0x1b, 0x84, 0x29, 0x2b, 0x6a, 0x62, 0x44, 0x0d, 0xc9, 0x63, 0x79, 0x8a, 0x91, 0xf9, 0x40, 0xd5, - 0xe1, 0x4a, 0x6c, 0x0c, 0xa7, 0x22, 0xe6, 0xa0, 0x8d, 0xb9, 0x59, 0x8b, 0x1a, 0x1f, 0x04, 0x8a, - 0xf8, 0xc7, 0xf2, 0x01, 0x9d, 0xd6, 0x65, 0x6b, 0x65, 0xfa, 0x73, 0x9a, 0x18, 0xa9, 0x9f, 0xa5, - 0xe0, 0xf2, 0xf4, 0x48, 0x8e, 0x36, 0xa1, 0xd0, 0x37, 0x46, 0x3a, 0x19, 0x09, 0xb7, 0x93, 0xd8, - 0xc6, 0x43, 0xdf, 0x18, 0x35, 0x47, 0xdc, 0xe7, 0x14, 0x48, 0x91, 0x91, 0x5b, 0x4e, 0x6e, 0xa6, - 0xae, 0x15, 0x34, 0xfa, 0x88, 0xee, 0xc3, 0x4a, 0xcf, 0x6a, 0x19, 0x3d, 0xbd, 0x67, 0xb8, 0x44, - 0x17, 0x29, 0x9e, 0x1f, 0xa2, 0xa7, 0x26, 0x8c, 0xcd, 0x63, 0x32, 0x6e, 0xf3, 0xfd, 0xa4, 0x01, - 0x47, 0xf8, 0xff, 0x32, 0xd3, 0x71, 0xcf, 0xf0, 0xb6, 0x1a, 0xdd, 0x86, 0x7c, 0xdf, 0x74, 0x4f, - 0x70, 0xd7, 0x38, 0x33, 0x2d, 0x47, 0x9c, 0xa6, 0x49, 0xa7, 0x79, 0x33, 0xe0, 0x11, 0x9a, 0xc2, - 0x62, 0xa1, 0x2d, 0x49, 0x47, 0x7c, 0xd8, 0x8b, 0x26, 0x99, 0x85, 0xa3, 0xc9, 0x4b, 0xb0, 0x36, - 0xc0, 0x23, 0xa2, 0x07, 0xe7, 0x95, 0xfb, 0xc9, 0x12, 0x33, 0x3d, 0xa2, 0xef, 0xfc, 0x13, 0xee, - 0x52, 0x97, 0x41, 0xcf, 0xb1, 0x5c, 0x68, 0x5b, 0x2e, 0x76, 0x74, 0xa3, 0xdd, 0x76, 0xb0, 0xeb, - 0xb2, 0xf2, 0xa9, 0xc0, 0x12, 0x1c, 0xa3, 0x57, 0x39, 0x59, 0xfd, 0x45, 0x78, 0x6b, 0xa2, 0xb9, - 0x4f, 0x18, 0x5e, 0x0a, 0x0c, 0x7f, 0x0c, 0x6b, 0x42, 0xbe, 0x1d, 0xb1, 0x3d, 0xaf, 0x41, 0x1f, - 0x9f, 0x3c, 0x5f, 0xe3, 0x36, 0x47, 0x9e, 0x78, 0xbc, 0xd9, 0x53, 0x8f, 0x66, 0x76, 0x04, 0x32, - 0x33, 0x8a, 0xcc, 0x43, 0x0c, 0x7d, 0xfe, 0x77, 0xdb, 0x8a, 0x8f, 0x53, 0xb0, 0x32, 0x51, 0x48, - 0xf8, 0x0b, 0x93, 0xa6, 0x2e, 0x2c, 0x39, 0x75, 0x61, 0xa9, 0x85, 0x17, 0x26, 0xf6, 0x5a, 0x9e, - 0xbd, 0xd7, 0xe9, 0xef, 0x71, 0xaf, 0x33, 0x8f, 0xb6, 0xd7, 0xff, 0xd2, 0x5d, 0xf8, 0xb5, 0x04, - 0x95, 0xf8, 0xea, 0x6b, 0xea, 0x76, 0x3c, 0x0f, 0x2b, 0xfe, 0xa7, 0xf8, 0xea, 0x79, 0x60, 0x54, - 0xfc, 0x17, 0x42, 0x7f, 0x6c, 0x8e, 0x7b, 0x1a, 0x4a, 0x63, 0xb5, 0x21, 0x77, 0xe5, 0xe2, 0x59, - 0x78, 0x7e, 0xf5, 0x67, 0xb2, 0x9f, 0x78, 0x22, 0x05, 0xdc, 0x94, 0xd3, 0xfa, 0x16, 0xac, 0xb6, - 0x71, 0xcb, 0x6c, 0x3f, 0xea, 0x61, 0x5d, 0x11, 0xd2, 0xff, 0x3d, 0xab, 0x13, 0x5e, 0x42, 0xcb, - 0x38, 0x3c, 0x60, 0x58, 0x03, 0x6e, 0xeb, 0x8e, 0x31, 0x68, 0x5b, 0xfd, 0x72, 0x2e, 0xae, 0x8c, - 0xab, 0x7b, 0x9c, 0x1a, 0x63, 0xd4, 0x96, 0x71, 0x94, 0x80, 0x5e, 0xf2, 0x1b, 0x55, 0x60, 0x3a, - 0xca, 0xd3, 0x4a, 0x41, 0xfa, 0xde, 0x6b, 0x50, 0xd5, 0x5f, 0x01, 0x64, 0x35, 0xec, 0xda, 0xb4, - 0x1e, 0x44, 0xbb, 0x90, 0xc3, 0xa3, 0x16, 0xb6, 0x89, 0x57, 0x42, 0x4f, 0x6f, 0x51, 0x38, 0x77, - 0xdd, 0xe3, 0xa4, 0x0d, 0xba, 0x2f, 0x86, 0x6e, 0x08, 0x0c, 0x22, 0x1e, 0x4e, 0x10, 0xe2, 0x61, - 0x10, 0xe2, 0x65, 0x0f, 0x84, 0x48, 0xc5, 0xf6, 0xd7, 0x5c, 0x6a, 0x0c, 0x85, 0xb8, 0x21, 0x50, - 0x08, 0x79, 0xc6, 0x64, 0x11, 0x18, 0xa2, 0x16, 0x81, 0x21, 0x32, 0x33, 0x96, 0x19, 0x83, 0x43, - 0xbc, 0xec, 0xe1, 0x10, 0x4b, 0x33, 0xbe, 0x78, 0x0c, 0x88, 0x78, 0x23, 0x04, 0x44, 0xf0, 0x7d, - 0xde, 0x8c, 0x15, 0x9d, 0x82, 0x44, 0xbc, 0xe6, 0x6f, 0x70, 0x21, 0x16, 0xc5, 0x10, 0xc2, 0xe3, - 0x50, 0xc4, 0xe1, 0x04, 0x14, 0xc1, 0xa1, 0x83, 0x67, 0x62, 0x55, 0xcc, 0xc0, 0x22, 0x0e, 0x27, - 0xb0, 0x88, 0xd2, 0x0c, 0x85, 0x33, 0xc0, 0x88, 0x1f, 0x4d, 0x07, 0x23, 0xe2, 0xe1, 0x02, 0xf1, - 0x99, 0xf3, 0xa1, 0x11, 0x7a, 0x0c, 0x1a, 0xa1, 0xc4, 0x76, 0xce, 0x5c, 0xfd, 0xdc, 0x70, 0xc4, - 0xfd, 0x29, 0x70, 0x04, 0x07, 0x0e, 0xae, 0xc5, 0x2a, 0x9f, 0x03, 0x8f, 0xb8, 0x3f, 0x05, 0x8f, - 0x40, 0x33, 0xd5, 0xce, 0x04, 0x24, 0xee, 0x44, 0x01, 0x89, 0xd5, 0x98, 0xaa, 0x37, 0x38, 0xed, - 0x31, 0x88, 0xc4, 0x49, 0x1c, 0x22, 0xc1, 0x51, 0x83, 0x17, 0x62, 0x35, 0x2e, 0x00, 0x49, 0x1c, - 0x4e, 0x40, 0x12, 0x97, 0x66, 0x78, 0xda, 0xfc, 0x98, 0x44, 0x5a, 0xc9, 0xec, 0xcb, 0xd9, 0xac, - 0x92, 0xe3, 0x68, 0xc4, 0xbe, 0x9c, 0xcd, 0x2b, 0x05, 0xf5, 0x39, 0x5a, 0x41, 0x8d, 0xc5, 0x39, - 0xda, 0xab, 0x60, 0xc7, 0xb1, 0x1c, 0x81, 0x2e, 0xf0, 0x81, 0x7a, 0x8d, 0xf6, 0xa8, 0x41, 0x4c, - 0xbb, 0x00, 0xbf, 0x60, 0x3d, 0x61, 0x28, 0x8e, 0xa9, 0xbf, 0x97, 0x02, 0x59, 0x86, 0x60, 0x84, - 0xfb, 0xdb, 0x9c, 0xe8, 0x6f, 0x43, 0xa8, 0x46, 0x32, 0x8a, 0x6a, 0x6c, 0x40, 0x9e, 0xf6, 0x7a, - 0x63, 0x80, 0x85, 0x61, 0xfb, 0x80, 0xc5, 0x75, 0x58, 0x61, 0x09, 0x9b, 0x63, 0x1f, 0x22, 0x2d, - 0xca, 0x2c, 0x2d, 0x2e, 0xd3, 0x17, 0xdc, 0x3a, 0x3c, 0x3f, 0xbe, 0x08, 0xab, 0x21, 0x5e, 0xbf, - 0x87, 0xe4, 0xdd, 0xbb, 0xe2, 0x73, 0x57, 0x45, 0x33, 0xf9, 0x27, 0x29, 0xb0, 0x50, 0x80, 0x74, - 0x4c, 0x03, 0x25, 0xa4, 0xef, 0x09, 0x94, 0x48, 0x3e, 0x32, 0x28, 0x11, 0xee, 0x89, 0x53, 0xd1, - 0x9e, 0xf8, 0x1f, 0x52, 0xb0, 0x27, 0x3e, 0xc4, 0xd0, 0xb2, 0xda, 0x58, 0x74, 0xa9, 0xec, 0x99, - 0x96, 0x44, 0x3d, 0xeb, 0x54, 0xf4, 0xa2, 0xf4, 0x91, 0x72, 0xf9, 0x89, 0x27, 0x27, 0xf2, 0x8a, - 0xdf, 0xe0, 0xf2, 0xc2, 0x43, 0x34, 0xb8, 0x0a, 0xa4, 0x1e, 0x62, 0x0e, 0x57, 0x17, 0x34, 0xfa, - 0x48, 0xf9, 0x98, 0xf3, 0x89, 0x02, 0x82, 0x0f, 0xd0, 0xab, 0x90, 0x63, 0xbf, 0x22, 0x74, 0xcb, - 0x76, 0x05, 0x44, 0x1d, 0x29, 0xad, 0xf8, 0xff, 0x88, 0xad, 0x23, 0xca, 0x73, 0x68, 0xbb, 0x5a, - 0xd6, 0x16, 0x4f, 0xa1, 0x8a, 0x27, 0x17, 0xa9, 0x78, 0xae, 0x42, 0x8e, 0x7e, 0xbd, 0x6b, 0x1b, - 0x2d, 0xcc, 0xea, 0x81, 0x9c, 0x16, 0x10, 0xd4, 0xdf, 0x25, 0x61, 0x79, 0x2c, 0xd1, 0x4c, 0x5d, - 0xbb, 0xe7, 0x92, 0xc9, 0x10, 0xe4, 0x32, 0x9f, 0x3d, 0xd6, 0x01, 0x4e, 0x0d, 0x57, 0xff, 0xd0, - 0x18, 0x10, 0xdc, 0x16, 0x46, 0x09, 0x51, 0x50, 0x05, 0xb2, 0x74, 0x34, 0x74, 0x71, 0x5b, 0xa0, - 0x3f, 0xfe, 0x18, 0x35, 0x20, 0x83, 0xcf, 0xf0, 0x80, 0xb8, 0xe5, 0x25, 0xb6, 0xed, 0x97, 0x27, - 0xdb, 0x71, 0xfa, 0x7a, 0xb7, 0x4c, 0x37, 0xfb, 0xdb, 0xaf, 0x36, 0x14, 0xce, 0xfd, 0x82, 0xd5, - 0x37, 0x09, 0xee, 0xdb, 0xe4, 0x5c, 0x13, 0xf2, 0x51, 0x2b, 0x64, 0xc7, 0xac, 0xc0, 0x70, 0xc8, - 0x82, 0x07, 0x2f, 0x50, 0x9b, 0x9a, 0x96, 0x63, 0x92, 0x73, 0xad, 0xd8, 0xc7, 0x7d, 0xdb, 0xb2, - 0x7a, 0x3a, 0x3f, 0xe3, 0x55, 0x28, 0x45, 0xf3, 0x2a, 0x7a, 0x0a, 0x8a, 0x0e, 0x26, 0x86, 0x39, - 0xd0, 0x23, 0x45, 0x78, 0x81, 0x13, 0xf9, 0x99, 0xda, 0x97, 0xb3, 0x92, 0x92, 0xdc, 0x97, 0xb3, - 0x49, 0x25, 0xa5, 0x1e, 0xc1, 0xa5, 0xa9, 0x79, 0x15, 0xbd, 0x02, 0xb9, 0x20, 0x25, 0x4b, 0x6c, - 0xb5, 0x17, 0x20, 0x3d, 0x01, 0xaf, 0xfa, 0x07, 0x29, 0x50, 0x19, 0xc5, 0x8e, 0xea, 0x90, 0x71, - 0xb0, 0x3b, 0xec, 0x71, 0x34, 0xa7, 0xb4, 0xf3, 0xe2, 0x7c, 0x19, 0x99, 0x52, 0x87, 0x3d, 0xa2, - 0x09, 0x61, 0xf5, 0x5d, 0xc8, 0x70, 0x0a, 0xca, 0xc3, 0xd2, 0xfd, 0x83, 0xbb, 0x07, 0x87, 0x6f, - 0x1f, 0x28, 0x09, 0x04, 0x90, 0xa9, 0xd6, 0x6a, 0xf5, 0xa3, 0xa6, 0x22, 0xa1, 0x1c, 0xa4, 0xab, - 0xbb, 0x87, 0x5a, 0x53, 0x49, 0x52, 0xb2, 0x56, 0xdf, 0xaf, 0xd7, 0x9a, 0x4a, 0x0a, 0xad, 0x40, - 0x91, 0x3f, 0xeb, 0x77, 0x0e, 0xb5, 0x37, 0xab, 0x4d, 0x45, 0x0e, 0x91, 0x8e, 0xeb, 0x07, 0xb7, - 0xeb, 0x9a, 0x92, 0x56, 0xff, 0x07, 0xae, 0xc4, 0xe6, 0xf0, 0x00, 0x18, 0x92, 0x42, 0xc0, 0x90, - 0xfa, 0x59, 0x92, 0x36, 0x55, 0x71, 0x89, 0x19, 0xed, 0x8f, 0x2d, 0x7c, 0x67, 0x81, 0xac, 0x3e, - 0xb6, 0x7a, 0xda, 0x47, 0x39, 0xb8, 0x83, 0x49, 0xab, 0xcb, 0x0b, 0x05, 0x1e, 0x81, 0x8a, 0x5a, - 0x51, 0x50, 0x99, 0x90, 0xcb, 0xd9, 0xde, 0xc7, 0x2d, 0xa2, 0x73, 0x27, 0x72, 0x59, 0x33, 0x93, - 0xa3, 0x6c, 0x94, 0x7a, 0xcc, 0x89, 0xea, 0x7b, 0x0b, 0xd9, 0x32, 0x07, 0x69, 0xad, 0xde, 0xd4, - 0xde, 0x51, 0x52, 0x08, 0x41, 0x89, 0x3d, 0xea, 0xc7, 0x07, 0xd5, 0xa3, 0xe3, 0xc6, 0x21, 0xb5, - 0xe5, 0x2a, 0x2c, 0x7b, 0xb6, 0xf4, 0x88, 0x69, 0xf5, 0x79, 0x78, 0x2c, 0xa6, 0xaa, 0x98, 0x6c, - 0xe9, 0xd4, 0xdf, 0x48, 0x61, 0xee, 0x68, 0x65, 0x70, 0x08, 0x19, 0x97, 0x18, 0x64, 0xe8, 0x0a, - 0x23, 0xbe, 0x32, 0x6f, 0x99, 0xb1, 0xe5, 0x3d, 0x1c, 0x33, 0x71, 0x4d, 0xa8, 0x51, 0x6f, 0x42, - 0x29, 0xfa, 0x26, 0xde, 0x06, 0x81, 0x13, 0x25, 0xd5, 0x5b, 0x80, 0x26, 0xab, 0x8f, 0x29, 0xed, - 0xad, 0x34, 0xad, 0xbd, 0xfd, 0xad, 0x04, 0x8f, 0x5f, 0x50, 0x69, 0xa0, 0xb7, 0xc6, 0x16, 0xf9, - 0xda, 0x22, 0x75, 0xca, 0x16, 0xa7, 0x8d, 0x2d, 0xf3, 0x06, 0x14, 0xc2, 0xf4, 0xf9, 0x16, 0xf9, - 0x6d, 0x32, 0x38, 0xc4, 0xd1, 0x3e, 0x3c, 0x08, 0x81, 0xd2, 0x77, 0x0c, 0x81, 0xaf, 0x03, 0x90, - 0x91, 0xce, 0xdd, 0xda, 0xcb, 0xa3, 0x4f, 0x4c, 0xc1, 0x37, 0x71, 0xab, 0x39, 0x12, 0x87, 0x20, - 0x47, 0xc4, 0x93, 0x8b, 0x8e, 0xc3, 0xa0, 0xc4, 0x90, 0xe5, 0x58, 0x57, 0x34, 0xec, 0xf3, 0x26, - 0xe3, 0x00, 0xbc, 0xe0, 0x64, 0x17, 0xbd, 0x03, 0x8f, 0x8d, 0x15, 0x0a, 0xbe, 0x6a, 0x79, 0xde, - 0x7a, 0xe1, 0x52, 0xb4, 0x5e, 0xf0, 0x54, 0x87, 0xb3, 0x7d, 0x3a, 0x9a, 0xed, 0xdf, 0x01, 0x08, - 0xc0, 0x09, 0x1a, 0x61, 0x1c, 0x6b, 0x38, 0x68, 0x33, 0x0f, 0x48, 0x6b, 0x7c, 0x80, 0x6e, 0x42, - 0x9a, 0x7a, 0x92, 0x67, 0xa7, 0xc9, 0x50, 0x4c, 0x3d, 0x21, 0x04, 0x6e, 0x70, 0x6e, 0xd5, 0x04, - 0x34, 0x09, 0x10, 0xc7, 0x4c, 0xf1, 0x46, 0x74, 0x8a, 0x27, 0x63, 0xa1, 0xe6, 0xe9, 0x53, 0x7d, - 0x04, 0x69, 0xb6, 0xf3, 0x34, 0xe9, 0xb2, 0xbf, 0x12, 0xa2, 0x5a, 0xa4, 0xcf, 0xe8, 0xc7, 0x00, - 0x06, 0x21, 0x8e, 0x79, 0x32, 0x0c, 0x26, 0xd8, 0x98, 0xee, 0x39, 0x55, 0x8f, 0x6f, 0xf7, 0xaa, - 0x70, 0xa1, 0xb5, 0x40, 0x34, 0xe4, 0x46, 0x21, 0x85, 0xea, 0x01, 0x94, 0xa2, 0xb2, 0x5e, 0x7d, - 0xc3, 0xbf, 0x21, 0x5a, 0xdf, 0xf0, 0x72, 0x55, 0xd4, 0x37, 0x7e, 0x75, 0x94, 0xe2, 0xbf, 0x5e, - 0xd8, 0x40, 0xfd, 0x49, 0x12, 0x0a, 0x61, 0xc7, 0xfb, 0xcf, 0x2b, 0x41, 0xd4, 0x9f, 0x4b, 0x90, - 0xf5, 0x97, 0x1f, 0xfd, 0x0f, 0x13, 0xf9, 0x71, 0xc5, 0xad, 0x97, 0x0c, 0xff, 0x3c, 0xe1, 0xbf, - 0xa9, 0x52, 0xfe, 0x6f, 0xaa, 0x5b, 0x7e, 0xfa, 0x8b, 0x03, 0x44, 0xc2, 0xb6, 0x16, 0x5e, 0xe5, - 0x65, 0xfb, 0x5b, 0x90, 0xf3, 0x4f, 0x2f, 0x6d, 0x3a, 0x3c, 0xe0, 0x4a, 0x12, 0x67, 0x48, 0x00, - 0x56, 0x6b, 0x90, 0xb6, 0xad, 0x0f, 0xc5, 0x9f, 0x99, 0x94, 0xc6, 0x07, 0x6a, 0x1b, 0x96, 0xc7, - 0x8e, 0x3e, 0xba, 0x05, 0x4b, 0xf6, 0xf0, 0x44, 0xf7, 0x9c, 0x63, 0x0c, 0xde, 0xf3, 0xca, 0xd9, - 0xe1, 0x49, 0xcf, 0x6c, 0xdd, 0xc5, 0xe7, 0xde, 0xc7, 0xd8, 0xc3, 0x93, 0xbb, 0xdc, 0x87, 0xf8, - 0x2c, 0xc9, 0xf0, 0x2c, 0xbf, 0x94, 0x20, 0xeb, 0x9d, 0x09, 0xf4, 0x7f, 0x90, 0xf3, 0xc3, 0x8a, - 0xff, 0x6b, 0x35, 0x36, 0x1e, 0x09, 0xfd, 0x81, 0x08, 0xaa, 0x7a, 0xff, 0x84, 0xcd, 0xb6, 0xde, - 0xe9, 0x19, 0xdc, 0x97, 0x4a, 0x51, 0x9b, 0xf1, 0xc0, 0xc3, 0xe2, 0xf1, 0xde, 0xed, 0x3b, 0x3d, - 0xe3, 0x54, 0xcb, 0x33, 0x99, 0xbd, 0x36, 0x1d, 0x88, 0xca, 0xee, 0xef, 0x12, 0x28, 0xe3, 0x27, - 0xf6, 0x3b, 0x7f, 0xdd, 0x64, 0x9a, 0x4b, 0x4d, 0x49, 0x73, 0x68, 0x1b, 0x56, 0x7d, 0x0e, 0xdd, - 0x35, 0x4f, 0x07, 0x06, 0x19, 0x3a, 0x58, 0x00, 0xa2, 0xc8, 0x7f, 0x75, 0xec, 0xbd, 0x99, 0x5c, - 0x75, 0xfa, 0x11, 0x57, 0xfd, 0x71, 0x12, 0xf2, 0x21, 0x78, 0x16, 0xfd, 0x6f, 0x28, 0x18, 0x95, - 0xa6, 0x64, 0x86, 0x10, 0x6f, 0xf0, 0x9b, 0x34, 0x6a, 0xa6, 0xe4, 0xe2, 0x66, 0x8a, 0x03, 0xc1, - 0x3d, 0xb4, 0x57, 0x5e, 0x18, 0xed, 0x7d, 0x01, 0x10, 0xb1, 0x88, 0xd1, 0xd3, 0xcf, 0x2c, 0x62, - 0x0e, 0x4e, 0x75, 0xee, 0x86, 0x3c, 0x74, 0x28, 0xec, 0xcd, 0x03, 0xf6, 0xe2, 0x88, 0x79, 0xe4, - 0x4f, 0x25, 0xc8, 0xfa, 0x65, 0xf7, 0xa2, 0x3f, 0x51, 0x2f, 0x43, 0x46, 0x54, 0x96, 0xfc, 0x2f, - 0xaa, 0x18, 0x4d, 0x85, 0xb5, 0x2b, 0x90, 0xed, 0x63, 0x62, 0xb0, 0x38, 0xc8, 0xb3, 0x9a, 0x3f, - 0xbe, 0xfe, 0x1a, 0xe4, 0x43, 0x3f, 0xa0, 0x69, 0x68, 0x3c, 0xa8, 0xbf, 0xad, 0x24, 0x2a, 0x4b, - 0x9f, 0x7c, 0xbe, 0x99, 0x3a, 0xc0, 0x1f, 0xd2, 0xd3, 0xac, 0xd5, 0x6b, 0x8d, 0x7a, 0xed, 0xae, - 0x22, 0x55, 0xf2, 0x9f, 0x7c, 0xbe, 0xb9, 0xa4, 0x61, 0x86, 0x28, 0x5e, 0xbf, 0x0b, 0xcb, 0x63, - 0x1b, 0x13, 0x2d, 0x5b, 0x10, 0x94, 0x6e, 0xdf, 0x3f, 0xba, 0xb7, 0x57, 0xab, 0x36, 0xeb, 0xfa, - 0x83, 0xc3, 0x66, 0x5d, 0x91, 0xd0, 0x63, 0xb0, 0x7a, 0x6f, 0xef, 0xff, 0x1b, 0x4d, 0xbd, 0x76, - 0x6f, 0xaf, 0x7e, 0xd0, 0xd4, 0xab, 0xcd, 0x66, 0xb5, 0x76, 0x57, 0x49, 0xee, 0x7c, 0x9e, 0x07, - 0xb9, 0xba, 0x5b, 0xdb, 0x43, 0x35, 0x90, 0x19, 0x14, 0x72, 0xe1, 0x0d, 0xb4, 0xca, 0xc5, 0xd8, - 0x30, 0xba, 0x03, 0x69, 0x86, 0x92, 0xa0, 0x8b, 0xaf, 0xa4, 0x55, 0x66, 0x80, 0xc5, 0xf4, 0x63, - 0xd8, 0x89, 0xbc, 0xf0, 0x8e, 0x5a, 0xe5, 0x62, 0xec, 0x18, 0xdd, 0x83, 0x25, 0xaf, 0x49, 0x9e, - 0x75, 0x71, 0xac, 0x32, 0x13, 0xd0, 0xa5, 0x4b, 0xe3, 0x60, 0xc3, 0xc5, 0xd7, 0xd7, 0x2a, 0x33, - 0x50, 0x65, 0xb4, 0x07, 0x19, 0xd1, 0x8e, 0xce, 0xb8, 0x91, 0x56, 0x99, 0x85, 0x13, 0x23, 0x0d, - 0x72, 0x01, 0x8c, 0x33, 0xfb, 0x52, 0x5e, 0x65, 0x0e, 0xc0, 0x1c, 0xbd, 0x0b, 0xc5, 0x68, 0xab, - 0x3b, 0xdf, 0xad, 0xb7, 0xca, 0x9c, 0x88, 0x34, 0xd5, 0x1f, 0xed, 0x7b, 0xe7, 0xbb, 0x05, 0x57, - 0x99, 0x13, 0xa0, 0x46, 0xef, 0xc3, 0xca, 0x64, 0x5f, 0x3a, 0xff, 0xa5, 0xb8, 0xca, 0x02, 0x90, - 0x35, 0xea, 0x03, 0x9a, 0xd2, 0xcf, 0x2e, 0x70, 0x47, 0xae, 0xb2, 0x08, 0x82, 0x8d, 0xda, 0xb0, - 0x3c, 0xde, 0x24, 0xce, 0x7b, 0x67, 0xae, 0x32, 0x37, 0x9a, 0xcd, 0x67, 0x89, 0x36, 0x97, 0xf3, - 0xde, 0xa1, 0xab, 0xcc, 0x0d, 0x6e, 0xa3, 0xfb, 0x00, 0xa1, 0xfe, 0x70, 0x8e, 0x3b, 0x75, 0x95, - 0x79, 0x60, 0x6e, 0x64, 0xc3, 0xea, 0xb4, 0xc6, 0x71, 0x91, 0x2b, 0x76, 0x95, 0x85, 0xd0, 0x6f, - 0xea, 0xcf, 0xd1, 0x16, 0x70, 0xbe, 0x2b, 0x77, 0x95, 0x39, 0x61, 0xf0, 0xdd, 0xea, 0x17, 0x5f, - 0xaf, 0x4b, 0x5f, 0x7e, 0xbd, 0x2e, 0xfd, 0xed, 0xeb, 0x75, 0xe9, 0xd3, 0x6f, 0xd6, 0x13, 0x5f, - 0x7e, 0xb3, 0x9e, 0xf8, 0xcb, 0x37, 0xeb, 0x89, 0x1f, 0x3c, 0x7b, 0x6a, 0x92, 0xee, 0xf0, 0x64, - 0xab, 0x65, 0xf5, 0xb7, 0x5b, 0x56, 0x1f, 0x93, 0x93, 0x0e, 0x09, 0x1e, 0x82, 0x7b, 0xd5, 0x27, - 0x19, 0x96, 0x41, 0x6f, 0xfc, 0x33, 0x00, 0x00, 0xff, 0xff, 0x9f, 0xfb, 0xec, 0x84, 0x77, 0x2d, + // 3426 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xbb, 0x73, 0x1b, 0xd7, + 0xb9, 0xc7, 0xe2, 0x8d, 0x0f, 0xaf, 0xe5, 0x21, 0x25, 0x43, 0x90, 0x4c, 0xd2, 0xeb, 0x91, 0x25, + 0xcb, 0x36, 0xe9, 0x4b, 0x5d, 0xf9, 0x31, 0xb2, 0xef, 0x0c, 0x08, 0x41, 0x17, 0xa4, 0x68, 0x92, + 0x5e, 0x42, 0xf2, 0xf8, 0xde, 0xc4, 0xeb, 0x25, 0x70, 0x48, 0xac, 0x05, 0x60, 0xd7, 0xbb, 0x0b, + 0x9a, 0x74, 0x95, 0x49, 0x26, 0x8d, 0x2b, 0xcf, 0x24, 0x99, 0x49, 0x11, 0x17, 0x29, 0xd2, 0xe4, + 0x2f, 0x48, 0x95, 0x34, 0x29, 0x5c, 0xa4, 0x70, 0x99, 0xca, 0xc9, 0xc8, 0x45, 0x66, 0xdc, 0xa6, + 0x70, 0x9b, 0x39, 0x8f, 0x7d, 0x01, 0xbb, 0xc4, 0x82, 0x76, 0x91, 0x99, 0xa8, 0xdb, 0xf3, 0x9d, + 0xef, 0xfb, 0xce, 0x9e, 0xb3, 0xdf, 0xeb, 0xfc, 0xce, 0x59, 0xb8, 0x6a, 0xe3, 0x51, 0x0f, 0x9b, + 0x43, 0x6d, 0x64, 0xaf, 0xab, 0x87, 0x5d, 0x6d, 0xdd, 0x3e, 0x33, 0xb0, 0xb5, 0x66, 0x98, 0xba, + 0xad, 0xa3, 0xaa, 0xd7, 0xb9, 0x46, 0x3a, 0xeb, 0xcf, 0xfa, 0xb8, 0xbb, 0xe6, 0x99, 0x61, 0xeb, + 0xeb, 0x86, 0xa9, 0xeb, 0x47, 0x8c, 0xbf, 0x7e, 0x6d, 0xba, 0xfb, 0x31, 0x3e, 0xe3, 0xda, 0x02, + 0xc2, 0x74, 0x94, 0x75, 0x43, 0x35, 0xd5, 0xa1, 0x15, 0x22, 0xcc, 0xba, 0x7d, 0xaf, 0x52, 0x5f, + 0x9d, 0xea, 0x3d, 0x51, 0x07, 0x5a, 0x4f, 0xb5, 0x75, 0x93, 0x73, 0x2c, 0xfb, 0x38, 0x4e, 0xb0, + 0x69, 0x69, 0xfa, 0x28, 0xa0, 0x61, 0xe5, 0x58, 0xd7, 0x8f, 0x07, 0x78, 0x9d, 0xb6, 0x0e, 0xc7, + 0x47, 0xeb, 0xb6, 0x36, 0xc4, 0x96, 0xad, 0x0e, 0x0d, 0xce, 0xb0, 0x74, 0xac, 0x1f, 0xeb, 0xf4, + 0x71, 0x9d, 0x3c, 0x31, 0xaa, 0xf4, 0xa7, 0x02, 0xe4, 0x64, 0xfc, 0xf1, 0x18, 0x5b, 0x36, 0xda, + 0x80, 0x34, 0xee, 0xf6, 0xf5, 0x9a, 0xb0, 0x2a, 0xdc, 0x2c, 0x6e, 0x5c, 0x5b, 0x9b, 0x58, 0x9e, + 0x35, 0xce, 0xd7, 0xea, 0xf6, 0xf5, 0x76, 0x42, 0xa6, 0xbc, 0xe8, 0x0e, 0x64, 0x8e, 0x06, 0x63, + 0xab, 0x5f, 0x4b, 0x52, 0xa1, 0x67, 0xa3, 0x84, 0xee, 0x13, 0xa6, 0x76, 0x42, 0x66, 0xdc, 0x64, + 0x28, 0x6d, 0x74, 0xa4, 0xd7, 0x52, 0xe7, 0x0f, 0xb5, 0x35, 0x3a, 0xa2, 0x43, 0x11, 0x5e, 0xb4, + 0x09, 0xa0, 0x8d, 0x34, 0x5b, 0xe9, 0xf6, 0x55, 0x6d, 0x54, 0xcb, 0x50, 0xc9, 0xe7, 0xa2, 0x25, + 0x35, 0xbb, 0x49, 0x18, 0xdb, 0x09, 0xb9, 0xa0, 0x39, 0x0d, 0xf2, 0xba, 0x1f, 0x8f, 0xb1, 0x79, + 0x56, 0xcb, 0x9e, 0xff, 0xba, 0xef, 0x12, 0x26, 0xf2, 0xba, 0x94, 0x1b, 0xbd, 0x05, 0xf9, 0x6e, + 0x1f, 0x77, 0x1f, 0x2b, 0xf6, 0x69, 0x2d, 0x4f, 0x25, 0x57, 0xa2, 0x24, 0x9b, 0x84, 0xaf, 0x73, + 0xda, 0x4e, 0xc8, 0xb9, 0x2e, 0x7b, 0x44, 0x6f, 0x40, 0xb6, 0xab, 0x0f, 0x87, 0x9a, 0x5d, 0x2b, + 0x52, 0xd9, 0xe5, 0x48, 0x59, 0xca, 0xd5, 0x4e, 0xc8, 0x9c, 0x1f, 0xed, 0x42, 0x65, 0xa0, 0x59, + 0xb6, 0x62, 0x8d, 0x54, 0xc3, 0xea, 0xeb, 0xb6, 0x55, 0x2b, 0x51, 0x0d, 0xd7, 0xa3, 0x34, 0xec, + 0x68, 0x96, 0x7d, 0xe0, 0x30, 0xb7, 0x13, 0x72, 0x79, 0xe0, 0x27, 0x10, 0x7d, 0xfa, 0xd1, 0x11, + 0x36, 0x5d, 0x85, 0xb5, 0xf2, 0xf9, 0xfa, 0xf6, 0x08, 0xb7, 0x23, 0x4f, 0xf4, 0xe9, 0x7e, 0x02, + 0xfa, 0x7f, 0x58, 0x1c, 0xe8, 0x6a, 0xcf, 0x55, 0xa7, 0x74, 0xfb, 0xe3, 0xd1, 0xe3, 0x5a, 0x85, + 0x2a, 0x7d, 0x31, 0xf2, 0x25, 0x75, 0xb5, 0xe7, 0xa8, 0x68, 0x12, 0x81, 0x76, 0x42, 0x5e, 0x18, + 0x4c, 0x12, 0xd1, 0x07, 0xb0, 0xa4, 0x1a, 0xc6, 0xe0, 0x6c, 0x52, 0x7b, 0x95, 0x6a, 0xbf, 0x15, + 0xa5, 0xbd, 0x41, 0x64, 0x26, 0xd5, 0x23, 0x75, 0x8a, 0x8a, 0x3a, 0x20, 0x1a, 0x26, 0x36, 0x54, + 0x13, 0x2b, 0x86, 0xa9, 0x1b, 0xba, 0xa5, 0x0e, 0x6a, 0x22, 0xd5, 0x7d, 0x23, 0x4a, 0xf7, 0x3e, + 0xe3, 0xdf, 0xe7, 0xec, 0xed, 0x84, 0x5c, 0x35, 0x82, 0x24, 0xa6, 0x55, 0xef, 0x62, 0xcb, 0xf2, + 0xb4, 0x2e, 0xcc, 0xd2, 0x4a, 0xf9, 0x83, 0x5a, 0x03, 0x24, 0xd4, 0x82, 0x22, 0x3e, 0x25, 0xe2, + 0xca, 0x89, 0x6e, 0xe3, 0x1a, 0xa2, 0x0a, 0xa5, 0x48, 0x0f, 0xa5, 0xac, 0x8f, 0x74, 0x1b, 0xb7, + 0x13, 0x32, 0x60, 0xb7, 0x85, 0x54, 0xb8, 0x74, 0x82, 0x4d, 0xed, 0xe8, 0x8c, 0xaa, 0x51, 0x68, + 0x0f, 0x89, 0x24, 0xb5, 0x45, 0xaa, 0xf0, 0xa5, 0x28, 0x85, 0x8f, 0xa8, 0x10, 0x51, 0xd1, 0x72, + 0x44, 0xda, 0x09, 0x79, 0xf1, 0x64, 0x9a, 0x4c, 0x4c, 0xec, 0x48, 0x1b, 0xa9, 0x03, 0xed, 0x53, + 0xac, 0x1c, 0x0e, 0xf4, 0xee, 0xe3, 0xda, 0xd2, 0xf9, 0x26, 0x76, 0x9f, 0x73, 0x6f, 0x12, 0x66, + 0x62, 0x62, 0x47, 0x7e, 0xc2, 0x66, 0x0e, 0x32, 0x27, 0xea, 0x60, 0x8c, 0xb7, 0xd3, 0xf9, 0xb4, + 0x98, 0xd9, 0x4e, 0xe7, 0x73, 0x62, 0x7e, 0x3b, 0x9d, 0x2f, 0x88, 0xb0, 0x9d, 0xce, 0x83, 0x58, + 0x94, 0x6e, 0x40, 0xd1, 0x17, 0x98, 0x50, 0x0d, 0x72, 0x43, 0x6c, 0x59, 0xea, 0x31, 0xa6, 0x71, + 0xac, 0x20, 0x3b, 0x4d, 0xa9, 0x02, 0x25, 0x7f, 0x30, 0x92, 0x3e, 0x17, 0x5c, 0x49, 0x12, 0x67, + 0x88, 0x24, 0x0f, 0xac, 0x8e, 0x24, 0x6f, 0xa2, 0xe7, 0xa1, 0x4c, 0xa7, 0xa2, 0x38, 0xfd, 0x24, + 0xd8, 0xa5, 0xe5, 0x12, 0x25, 0x3e, 0xe2, 0x4c, 0x2b, 0x50, 0x34, 0x36, 0x0c, 0x97, 0x25, 0x45, + 0x59, 0xc0, 0xd8, 0x30, 0x1c, 0x86, 0xe7, 0xa0, 0x44, 0xe6, 0xed, 0x72, 0xa4, 0xe9, 0x20, 0x45, + 0x42, 0xe3, 0x2c, 0xd2, 0x5f, 0x92, 0x20, 0x4e, 0x06, 0x30, 0xf4, 0x06, 0xa4, 0x49, 0x2c, 0xe7, + 0x61, 0xb9, 0xbe, 0xc6, 0x02, 0xfd, 0x9a, 0x13, 0xe8, 0xd7, 0x3a, 0x4e, 0xa0, 0xdf, 0xcc, 0x7f, + 0xf9, 0xf5, 0x4a, 0xe2, 0xf3, 0xbf, 0xad, 0x08, 0x32, 0x95, 0x40, 0x57, 0x48, 0xd8, 0x52, 0xb5, + 0x91, 0xa2, 0xf5, 0xe8, 0x2b, 0x17, 0x48, 0x4c, 0x52, 0xb5, 0xd1, 0x56, 0x0f, 0xed, 0x80, 0xd8, + 0xd5, 0x47, 0x16, 0x1e, 0x59, 0x63, 0x4b, 0x61, 0x89, 0x8a, 0x07, 0xe3, 0x40, 0x48, 0x65, 0x19, + 0xa6, 0xe9, 0x70, 0xee, 0x53, 0x46, 0xb9, 0xda, 0x0d, 0x12, 0xd0, 0x7d, 0x00, 0x37, 0x5f, 0x59, + 0xb5, 0xf4, 0x6a, 0xea, 0x66, 0x71, 0x63, 0x75, 0xea, 0x83, 0x3f, 0x72, 0x58, 0x1e, 0x1a, 0x3d, + 0xd5, 0xc6, 0x9b, 0x69, 0xf2, 0xba, 0xb2, 0x4f, 0x12, 0xbd, 0x00, 0x55, 0xd5, 0x30, 0x14, 0xcb, + 0x56, 0x6d, 0xac, 0x1c, 0x9e, 0xd9, 0xd8, 0xa2, 0x71, 0xbe, 0x24, 0x97, 0x55, 0xc3, 0x38, 0x20, + 0xd4, 0x4d, 0x42, 0x44, 0xd7, 0xa1, 0x42, 0x62, 0xba, 0xa6, 0x0e, 0x94, 0x3e, 0xd6, 0x8e, 0xfb, + 0x36, 0x8d, 0xe7, 0x29, 0xb9, 0xcc, 0xa9, 0x6d, 0x4a, 0x94, 0x7a, 0xee, 0x17, 0xa7, 0xf1, 0x1c, + 0x21, 0x48, 0xf7, 0x54, 0x5b, 0xa5, 0x2b, 0x59, 0x92, 0xe9, 0x33, 0xa1, 0x19, 0xaa, 0xdd, 0xe7, + 0xeb, 0x43, 0x9f, 0xd1, 0x65, 0xc8, 0x72, 0xb5, 0x29, 0xaa, 0x96, 0xb7, 0xd0, 0x12, 0x64, 0x0c, + 0x53, 0x3f, 0xc1, 0xf4, 0xd3, 0xe5, 0x65, 0xd6, 0x90, 0x64, 0xa8, 0x04, 0x63, 0x3f, 0xaa, 0x40, + 0xd2, 0x3e, 0xe5, 0xa3, 0x24, 0xed, 0x53, 0xf4, 0x2a, 0xa4, 0xc9, 0x42, 0xd2, 0x31, 0x2a, 0x21, + 0xd9, 0x8e, 0xcb, 0x75, 0xce, 0x0c, 0x2c, 0x53, 0x4e, 0xa9, 0x0a, 0xe5, 0x40, 0x4e, 0x90, 0x2e, + 0xc3, 0x52, 0x58, 0x88, 0x97, 0xfa, 0x2e, 0x3d, 0x10, 0xaa, 0xd1, 0x1d, 0xc8, 0xbb, 0x31, 0x9e, + 0x19, 0xce, 0x95, 0xa9, 0x61, 0x1d, 0x66, 0xd9, 0x65, 0x25, 0x16, 0x43, 0x3e, 0x40, 0x5f, 0xe5, + 0x19, 0xbd, 0x24, 0xe7, 0x54, 0xc3, 0x68, 0xab, 0x56, 0x5f, 0xfa, 0x10, 0x6a, 0x51, 0xf1, 0xdb, + 0xb7, 0x60, 0x02, 0x35, 0x7b, 0x67, 0xc1, 0x2e, 0x43, 0xf6, 0x48, 0x37, 0x87, 0xaa, 0x4d, 0x95, + 0x95, 0x65, 0xde, 0x22, 0x0b, 0xc9, 0x62, 0x79, 0x8a, 0x92, 0x59, 0x43, 0x52, 0xe0, 0x4a, 0x64, + 0x0c, 0x27, 0x22, 0xda, 0xa8, 0x87, 0xd9, 0xb2, 0x96, 0x65, 0xd6, 0xf0, 0x14, 0xb1, 0x97, 0x65, + 0x0d, 0x32, 0xac, 0x45, 0xe7, 0x4a, 0xf5, 0x17, 0x64, 0xde, 0x92, 0xbe, 0xcb, 0xc2, 0xe5, 0xf0, + 0x48, 0x8e, 0x56, 0xa1, 0x34, 0x54, 0x4f, 0x15, 0xfb, 0x94, 0x9b, 0x9d, 0x40, 0x3f, 0x3c, 0x0c, + 0xd5, 0xd3, 0xce, 0x29, 0xb3, 0x39, 0x11, 0x52, 0xf6, 0xa9, 0x55, 0x4b, 0xae, 0xa6, 0x6e, 0x96, + 0x64, 0xf2, 0x88, 0x1e, 0xc2, 0xc2, 0x40, 0xef, 0xaa, 0x03, 0x65, 0xa0, 0x5a, 0xb6, 0xc2, 0x53, + 0x3c, 0x73, 0xa2, 0xe7, 0xa7, 0x16, 0x9b, 0xc5, 0x64, 0xdc, 0x63, 0xdf, 0x93, 0x04, 0x1c, 0x6e, + 0xff, 0x55, 0xaa, 0x63, 0x47, 0x75, 0x3e, 0x35, 0xba, 0x07, 0xc5, 0xa1, 0x66, 0x1d, 0xe2, 0xbe, + 0x7a, 0xa2, 0xe9, 0x26, 0xf7, 0xa6, 0x69, 0xa3, 0x79, 0xc7, 0xe3, 0xe1, 0x9a, 0xfc, 0x62, 0xbe, + 0x4f, 0x92, 0x09, 0xd8, 0xb0, 0x13, 0x4d, 0xb2, 0x73, 0x47, 0x93, 0x57, 0x61, 0x69, 0x84, 0x4f, + 0x6d, 0xc5, 0xf3, 0x57, 0x66, 0x27, 0x39, 0xba, 0xf4, 0x88, 0xf4, 0xb9, 0x1e, 0x6e, 0x11, 0x93, + 0x41, 0x2f, 0xd2, 0x5c, 0x68, 0xe8, 0x16, 0x36, 0x15, 0xb5, 0xd7, 0x33, 0xb1, 0x65, 0xd1, 0xf2, + 0xa9, 0x44, 0x13, 0x1c, 0xa5, 0x37, 0x18, 0x19, 0xbd, 0xed, 0x05, 0xdf, 0xc2, 0x74, 0x69, 0xc6, + 0xbb, 0xbc, 0x40, 0xc4, 0x67, 0xec, 0x46, 0xe8, 0x26, 0x94, 0xe9, 0x47, 0x60, 0x61, 0x5a, 0xeb, + 0xd5, 0x60, 0xda, 0xe6, 0x59, 0x2c, 0xa3, 0x59, 0x65, 0xeb, 0x9e, 0xb3, 0x64, 0x44, 0x8a, 0x91, + 0x7a, 0xe8, 0x2a, 0x14, 0x48, 0x48, 0x60, 0xb3, 0x2a, 0xd2, 0xf7, 0xcc, 0x13, 0x02, 0x9d, 0xcb, + 0x4d, 0x10, 0x7d, 0x9f, 0x99, 0xf1, 0x94, 0x28, 0x4f, 0x65, 0xe0, 0x7e, 0x3b, 0xca, 0x79, 0x03, + 0xaa, 0x93, 0x4b, 0x54, 0x66, 0x8c, 0x27, 0xc1, 0xe5, 0xb9, 0x0e, 0x15, 0x2f, 0x06, 0x53, 0xbe, + 0x0a, 0x0b, 0x76, 0x2e, 0x95, 0xb2, 0xdd, 0x82, 0x05, 0x3a, 0xb2, 0x89, 0xad, 0xf1, 0xc0, 0xe6, + 0x9c, 0x55, 0xb6, 0x8c, 0xa4, 0x43, 0x66, 0x74, 0xca, 0xfb, 0x3c, 0x94, 0xf1, 0x89, 0xd6, 0xc3, + 0xa3, 0x2e, 0x66, 0x7c, 0x22, 0xe5, 0x2b, 0x39, 0x44, 0xca, 0xb4, 0x03, 0x22, 0x1e, 0xd1, 0x0d, + 0x0c, 0xee, 0x29, 0xa6, 0x3a, 0xea, 0xe9, 0x43, 0x5e, 0xa2, 0x84, 0xc4, 0xfe, 0x96, 0xc3, 0x29, + 0x53, 0x46, 0xb9, 0x8a, 0x83, 0x04, 0x32, 0xa4, 0x36, 0x34, 0x06, 0x5a, 0xd7, 0x59, 0x15, 0xc4, + 0x86, 0x74, 0x88, 0x34, 0x78, 0xfc, 0xc3, 0xef, 0x79, 0xc1, 0xd2, 0x86, 0xfb, 0x95, 0xe0, 0xf9, + 0xd5, 0x01, 0x2c, 0x71, 0xf3, 0xe8, 0x05, 0x5c, 0x8b, 0x6d, 0x31, 0xae, 0x4e, 0x87, 0xcf, 0x49, + 0x97, 0x42, 0x8e, 0x78, 0xb4, 0x57, 0xa5, 0x2e, 0xe6, 0x55, 0x08, 0xd2, 0x74, 0x8e, 0x69, 0x96, + 0x41, 0xc8, 0xf3, 0x53, 0x4f, 0x7b, 0xea, 0x69, 0xff, 0x46, 0x9e, 0xf6, 0x24, 0x0b, 0x0b, 0x53, + 0xdb, 0x00, 0xd7, 0x6e, 0x85, 0x50, 0xbb, 0x4d, 0x86, 0xda, 0x6d, 0x6a, 0x6e, 0xbb, 0xe5, 0xae, + 0x9c, 0x9e, 0xed, 0xca, 0x99, 0x1f, 0xd0, 0x95, 0xb3, 0x17, 0x73, 0xe5, 0xa7, 0x4e, 0xf6, 0xd4, + 0xc9, 0x2e, 0xea, 0x64, 0xbf, 0x11, 0xa0, 0x1e, 0xbd, 0x35, 0x0e, 0xf5, 0xb6, 0x97, 0x60, 0xc1, + 0x5d, 0x2f, 0xd7, 0x7a, 0x58, 0xd5, 0x2a, 0xba, 0x1d, 0x8e, 0xf9, 0x44, 0x6d, 0x40, 0xae, 0x43, + 0x65, 0x62, 0xe3, 0xce, 0x12, 0x51, 0xf9, 0xc4, 0x3f, 0xbe, 0xf4, 0xab, 0x9c, 0xbb, 0x2b, 0x08, + 0xec, 0xae, 0x43, 0x72, 0xed, 0xbb, 0xb0, 0xd8, 0xc3, 0x5d, 0xad, 0x77, 0xd1, 0x54, 0xbb, 0xc0, + 0xa5, 0x9f, 0x66, 0xda, 0xe9, 0x20, 0x10, 0x66, 0x98, 0x85, 0x0b, 0x1b, 0xe6, 0xab, 0x2e, 0x8a, + 0xc8, 0x82, 0x41, 0x2d, 0x6c, 0x9f, 0x4e, 0xfa, 0x5d, 0xf4, 0xd0, 0x17, 0x84, 0x8a, 0x3f, 0x44, + 0x10, 0x2a, 0x7d, 0xdf, 0x20, 0x54, 0x8e, 0x11, 0x84, 0x2a, 0x71, 0x83, 0x50, 0x35, 0x66, 0x10, + 0x12, 0x63, 0x07, 0xa1, 0x85, 0x98, 0x41, 0x08, 0x85, 0x04, 0xa1, 0xa9, 0xb0, 0xb1, 0x18, 0x12, + 0x36, 0x7e, 0x09, 0x90, 0x97, 0xb1, 0x65, 0x90, 0x57, 0x41, 0x9b, 0x50, 0xc0, 0xa7, 0x5d, 0x6c, + 0xd8, 0x0e, 0xe0, 0x14, 0x0e, 0xe8, 0x31, 0xee, 0x96, 0xc3, 0xd9, 0x4e, 0xc8, 0x9e, 0x18, 0xba, + 0xcd, 0x11, 0xfb, 0x68, 0xf0, 0x9d, 0x8b, 0xfb, 0x21, 0xfb, 0xd7, 0x1c, 0xc8, 0x3e, 0x15, 0x89, + 0x46, 0x33, 0xa9, 0x09, 0xcc, 0xfe, 0x36, 0xc7, 0xec, 0xd3, 0x33, 0x06, 0x0b, 0x80, 0xf6, 0xcd, + 0x00, 0x68, 0x9f, 0x9d, 0x31, 0xcd, 0x08, 0xd4, 0xfe, 0x35, 0x07, 0xb5, 0xcf, 0xcd, 0x78, 0xe3, + 0x09, 0xd8, 0xfe, 0x6d, 0x1f, 0x6c, 0xcf, 0x1c, 0x6f, 0x35, 0x52, 0x34, 0x04, 0xb7, 0x7f, 0xd3, + 0xf5, 0xb8, 0x52, 0x24, 0xe6, 0xcf, 0x85, 0x27, 0x81, 0xfb, 0xbd, 0x29, 0xe0, 0x9e, 0x01, 0xed, + 0x2f, 0x44, 0xaa, 0x98, 0x81, 0xdc, 0xef, 0x4d, 0x21, 0xf7, 0x95, 0x19, 0x0a, 0x67, 0x40, 0xf7, + 0x3f, 0x0a, 0x87, 0xee, 0xa3, 0xc1, 0x75, 0xfe, 0x9a, 0xf1, 0xb0, 0x7b, 0x25, 0x02, 0xbb, 0x17, + 0x23, 0x71, 0x66, 0xa6, 0x3e, 0x36, 0x78, 0xff, 0x30, 0x04, 0xbc, 0x67, 0x49, 0xff, 0x66, 0xa4, + 0xf2, 0x18, 0xe8, 0xfd, 0xc3, 0x10, 0xf4, 0x1e, 0xcd, 0x54, 0x3b, 0x13, 0xbe, 0xbf, 0x1f, 0x84, + 0xef, 0x17, 0x23, 0x30, 0x22, 0xcf, 0xdb, 0x23, 0xf0, 0xfb, 0xc3, 0x28, 0xfc, 0x9e, 0x61, 0xec, + 0x2f, 0x47, 0x6a, 0x9c, 0x03, 0xc0, 0xdf, 0x9b, 0x02, 0xf0, 0x2f, 0xcd, 0xb0, 0xb4, 0xf8, 0x08, + 0x7e, 0x46, 0xcc, 0x6e, 0xa7, 0xf3, 0x79, 0xb1, 0xc0, 0xb0, 0xfb, 0xed, 0x74, 0xbe, 0x28, 0x96, + 0xa4, 0x17, 0xc9, 0x8e, 0x65, 0x22, 0xce, 0xa1, 0x25, 0xc8, 0x60, 0xd3, 0xd4, 0x4d, 0x8e, 0xc5, + 0xb3, 0x86, 0x74, 0x13, 0x4a, 0xfe, 0x98, 0x76, 0x0e, 0xda, 0x4f, 0x11, 0x54, 0x5f, 0x1c, 0x93, + 0xfe, 0x20, 0x78, 0xb2, 0x14, 0xef, 0xf7, 0xa3, 0xc1, 0x05, 0x8e, 0x06, 0xfb, 0xce, 0x00, 0x92, + 0xc1, 0x33, 0x80, 0x15, 0x28, 0xaa, 0xc6, 0x14, 0xbc, 0xaf, 0x1a, 0x2e, 0xbc, 0xef, 0xa4, 0x14, + 0x96, 0x2e, 0x79, 0x9d, 0x92, 0xa6, 0x75, 0x4a, 0xd5, 0xcd, 0x88, 0x0c, 0x98, 0x46, 0xaf, 0xc0, + 0xa2, 0x8f, 0xd7, 0x45, 0x5c, 0x19, 0xd6, 0x2d, 0xba, 0xdc, 0x0d, 0x0e, 0xbd, 0xfe, 0x59, 0xf0, + 0x56, 0xc8, 0x3b, 0x17, 0x08, 0x83, 0xf0, 0x85, 0x1f, 0x08, 0xc2, 0x4f, 0x5e, 0x18, 0xc2, 0xf7, + 0x23, 0xc8, 0xa9, 0x20, 0x82, 0xfc, 0x9d, 0xe0, 0x7d, 0x13, 0x17, 0x90, 0xef, 0xea, 0x3d, 0xcc, + 0x31, 0x5d, 0xfa, 0x4c, 0x6a, 0xd4, 0x81, 0x7e, 0xcc, 0x91, 0x5b, 0xf2, 0x48, 0xb8, 0xdc, 0xc4, + 0x53, 0xe0, 0x79, 0xc5, 0x85, 0x83, 0x59, 0x25, 0xc8, 0xe1, 0x60, 0x11, 0x52, 0x8f, 0x31, 0x3b, + 0xdc, 0x2d, 0xc9, 0xe4, 0x91, 0xf0, 0x51, 0xe3, 0xe3, 0x15, 0x1d, 0x6b, 0xa0, 0x37, 0xa0, 0x40, + 0x0f, 0xf6, 0x15, 0xdd, 0xb0, 0xf8, 0x81, 0x6e, 0xa0, 0xd6, 0x65, 0xa7, 0xfb, 0x6b, 0xfb, 0x84, + 0x67, 0xcf, 0xb0, 0xe4, 0xbc, 0xc1, 0x9f, 0x7c, 0x25, 0x68, 0x21, 0x50, 0x82, 0x5e, 0x83, 0x02, + 0x79, 0x7b, 0xcb, 0x50, 0xbb, 0x98, 0x16, 0x68, 0x05, 0xd9, 0x23, 0x48, 0xbf, 0x4f, 0x42, 0x75, + 0x22, 0xd1, 0x84, 0xce, 0xdd, 0x31, 0xc9, 0xa4, 0xef, 0x80, 0x22, 0xde, 0x7a, 0x2c, 0x03, 0x1c, + 0xab, 0x96, 0xf2, 0x89, 0x3a, 0xb2, 0x71, 0x8f, 0x2f, 0x8a, 0x8f, 0x82, 0xea, 0x90, 0x27, 0xad, + 0xb1, 0x85, 0x7b, 0xfc, 0xac, 0xc4, 0x6d, 0xa3, 0x36, 0x64, 0xf1, 0x09, 0x1e, 0xd9, 0x56, 0x2d, + 0x47, 0x3f, 0xfb, 0xe5, 0x69, 0xf0, 0x9a, 0x74, 0x6f, 0xd6, 0xc8, 0xc7, 0xfe, 0xf6, 0xeb, 0x15, + 0x91, 0x71, 0xbf, 0xac, 0x0f, 0x35, 0x1b, 0x0f, 0x0d, 0xfb, 0x4c, 0xe6, 0xf2, 0xc1, 0x55, 0xc8, + 0x4f, 0xac, 0x02, 0x3d, 0xb5, 0x2b, 0x39, 0x60, 0x3c, 0x59, 0x53, 0x4d, 0x37, 0x35, 0xfb, 0x4c, + 0x2e, 0x0f, 0xf1, 0xd0, 0xd0, 0xf5, 0x81, 0xc2, 0x7c, 0xbc, 0x01, 0x95, 0x60, 0x5e, 0x25, 0xc5, + 0x95, 0x89, 0x6d, 0x55, 0x1b, 0x29, 0x81, 0x5d, 0x51, 0x89, 0x11, 0x99, 0x4f, 0x6d, 0xa7, 0xf3, + 0x82, 0x98, 0xdc, 0x4e, 0xe7, 0x93, 0x62, 0x4a, 0xda, 0x87, 0x4b, 0xa1, 0x79, 0x15, 0xbd, 0x0e, + 0x05, 0x2f, 0x25, 0x0b, 0x74, 0xb6, 0xe7, 0x9c, 0x8b, 0x78, 0xbc, 0xd2, 0x1f, 0x05, 0x4f, 0x65, + 0xf0, 0xa4, 0xa5, 0x05, 0x59, 0x56, 0x45, 0xd2, 0x2f, 0x59, 0xd9, 0x78, 0x25, 0x5e, 0x46, 0x5e, + 0x63, 0x25, 0xa6, 0xcc, 0x85, 0xa5, 0x0f, 0x20, 0xcb, 0x28, 0xa8, 0x08, 0xb9, 0x87, 0xbb, 0x0f, + 0x76, 0xf7, 0xde, 0xdb, 0x15, 0x13, 0x08, 0x20, 0xdb, 0x68, 0x36, 0x5b, 0xfb, 0x1d, 0x51, 0x40, + 0x05, 0xc8, 0x34, 0x36, 0xf7, 0xe4, 0x8e, 0x98, 0x24, 0x64, 0xb9, 0xb5, 0xdd, 0x6a, 0x76, 0xc4, + 0x14, 0x5a, 0x80, 0x32, 0x7b, 0x56, 0xee, 0xef, 0xc9, 0xef, 0x34, 0x3a, 0x62, 0xda, 0x47, 0x3a, + 0x68, 0xed, 0xde, 0x6b, 0xc9, 0x62, 0x46, 0xfa, 0x2f, 0xb8, 0x12, 0x99, 0xc3, 0xbd, 0x63, 0x14, + 0xc1, 0x77, 0x8c, 0x22, 0xfd, 0x3a, 0x49, 0x76, 0xb9, 0x51, 0x89, 0x19, 0x6d, 0x4f, 0x4c, 0x7c, + 0x63, 0x8e, 0xac, 0x3e, 0x31, 0x7b, 0x52, 0xb6, 0x9b, 0xf8, 0x08, 0xdb, 0xdd, 0x3e, 0x2b, 0x14, + 0x58, 0x04, 0x2a, 0xcb, 0x65, 0x4e, 0xa5, 0x42, 0x16, 0x63, 0xfb, 0x08, 0x77, 0x6d, 0x85, 0x19, + 0x91, 0x45, 0x77, 0x97, 0x05, 0xc2, 0x46, 0xa8, 0x07, 0x8c, 0x28, 0x7d, 0x38, 0xd7, 0x5a, 0x16, + 0x20, 0x23, 0xb7, 0x3a, 0xf2, 0xfb, 0x62, 0x0a, 0x21, 0xa8, 0xd0, 0x47, 0xe5, 0x60, 0xb7, 0xb1, + 0x7f, 0xd0, 0xde, 0x23, 0x6b, 0xb9, 0x08, 0x55, 0x67, 0x2d, 0x1d, 0x62, 0x46, 0x7a, 0x09, 0x9e, + 0x89, 0xa8, 0x2a, 0xa6, 0xf7, 0xd8, 0xd2, 0x6f, 0x05, 0x3f, 0x77, 0xb0, 0x32, 0xd8, 0x83, 0xac, + 0x65, 0xab, 0xf6, 0xd8, 0xe2, 0x8b, 0xf8, 0x7a, 0xdc, 0x32, 0x63, 0xcd, 0x79, 0x38, 0xa0, 0xe2, + 0x32, 0x57, 0x23, 0xdd, 0x81, 0x4a, 0xb0, 0x27, 0x7a, 0x0d, 0x3c, 0x23, 0x4a, 0x4a, 0x77, 0x01, + 0x4d, 0x57, 0x1f, 0x21, 0x78, 0x83, 0x10, 0x86, 0x37, 0xfc, 0x4e, 0x80, 0xab, 0xe7, 0x54, 0x1a, + 0xe8, 0xdd, 0x89, 0x49, 0xbe, 0x39, 0x4f, 0x9d, 0xb2, 0xc6, 0x68, 0x13, 0xd3, 0xbc, 0x0d, 0x25, + 0x3f, 0x3d, 0xde, 0x24, 0xbf, 0x4d, 0x7a, 0x4e, 0x1c, 0x04, 0x46, 0xbc, 0x10, 0x28, 0x7c, 0xcf, + 0x10, 0xf8, 0x16, 0x80, 0x7d, 0xea, 0xec, 0x2b, 0x79, 0x1e, 0x7d, 0x36, 0xe4, 0x34, 0x10, 0x77, + 0x3b, 0xa7, 0xdc, 0x09, 0x0a, 0x36, 0x7f, 0xb2, 0xd0, 0x81, 0x1f, 0x25, 0x1a, 0xd3, 0x1c, 0x6b, + 0x71, 0x04, 0x25, 0x6e, 0x32, 0xf6, 0xd0, 0x24, 0x46, 0xb6, 0xd0, 0xfb, 0xf0, 0xcc, 0x44, 0xa1, + 0xe0, 0xaa, 0x4e, 0xc7, 0xad, 0x17, 0x2e, 0x05, 0xeb, 0x05, 0x47, 0xb5, 0x3f, 0xdb, 0x67, 0x82, + 0xd9, 0xfe, 0x7d, 0x00, 0x0f, 0x2d, 0x22, 0x11, 0xc6, 0xd4, 0xc7, 0xa3, 0x1e, 0xb5, 0x80, 0x8c, + 0xcc, 0x1a, 0xe8, 0x0e, 0x64, 0x88, 0x25, 0x39, 0xeb, 0x34, 0x1d, 0x8a, 0x89, 0x25, 0xf8, 0xd0, + 0x26, 0xc6, 0x2d, 0x69, 0x80, 0xa6, 0x8f, 0x53, 0x23, 0x86, 0x78, 0x3b, 0x38, 0xc4, 0x73, 0x91, + 0x07, 0xb3, 0xe1, 0x43, 0x7d, 0x0a, 0x19, 0xfa, 0xe5, 0x49, 0xd2, 0xa5, 0x67, 0xf8, 0xbc, 0x5a, + 0x24, 0xcf, 0xe8, 0xc7, 0x00, 0xaa, 0x6d, 0x9b, 0xda, 0xe1, 0xd8, 0x1b, 0x60, 0x25, 0xdc, 0x72, + 0x1a, 0x0e, 0xdf, 0xe6, 0x35, 0x6e, 0x42, 0x4b, 0x9e, 0xa8, 0xcf, 0x8c, 0x7c, 0x0a, 0xa5, 0x5d, + 0xa8, 0x04, 0x65, 0x9d, 0xfa, 0x86, 0xbd, 0x43, 0xb0, 0xbe, 0x61, 0xe5, 0x2a, 0xaf, 0x6f, 0xdc, + 0xea, 0x28, 0xc5, 0x2e, 0x2a, 0xd0, 0x86, 0xf4, 0x93, 0x24, 0x94, 0xfc, 0x86, 0xf7, 0x9f, 0x57, + 0x82, 0x48, 0x3f, 0x17, 0x20, 0xef, 0x4e, 0x3f, 0x78, 0x6b, 0x21, 0x70, 0xcd, 0x83, 0xad, 0x5e, + 0xd2, 0x7f, 0xd5, 0x80, 0x5d, 0xea, 0x48, 0xb9, 0x97, 0x3a, 0xee, 0xba, 0xe9, 0x2f, 0x0a, 0x10, + 0xf1, 0xaf, 0x35, 0xb7, 0x2a, 0x27, 0xdb, 0xdf, 0x85, 0x82, 0xeb, 0xbd, 0x64, 0xd3, 0xe1, 0x20, + 0x89, 0x02, 0xf7, 0x21, 0x8e, 0x20, 0x2e, 0x41, 0xc6, 0xd0, 0x3f, 0xe1, 0xf7, 0x18, 0x52, 0x32, + 0x6b, 0x48, 0x3d, 0xa8, 0x4e, 0xb8, 0x3e, 0xba, 0x0b, 0x39, 0x63, 0x7c, 0xa8, 0x38, 0xc6, 0x31, + 0x81, 0xb7, 0x3a, 0xe5, 0xec, 0xf8, 0x70, 0xa0, 0x75, 0x1f, 0xe0, 0x33, 0xe7, 0x65, 0x8c, 0xf1, + 0xe1, 0x03, 0x66, 0x43, 0x6c, 0x94, 0xa4, 0x7f, 0x94, 0x5f, 0x08, 0x90, 0x77, 0x7c, 0x02, 0xfd, + 0x0f, 0x14, 0xdc, 0xb0, 0xe2, 0x5e, 0x44, 0x8a, 0x8c, 0x47, 0x5c, 0xbf, 0x27, 0x82, 0x1a, 0xce, + 0x0d, 0x2a, 0xad, 0xa7, 0x1c, 0x0d, 0x54, 0x66, 0x4b, 0x95, 0xe0, 0x9a, 0x05, 0xb0, 0xc4, 0xfb, + 0x03, 0xf5, 0x58, 0x2e, 0x1e, 0x32, 0x14, 0x91, 0x34, 0x78, 0x65, 0xf7, 0x4f, 0x01, 0xc4, 0x49, + 0x8f, 0xfd, 0xde, 0x6f, 0x37, 0x9d, 0xe6, 0x52, 0x21, 0x69, 0x0e, 0xad, 0xc3, 0xa2, 0xcb, 0xa1, + 0x58, 0xda, 0xf1, 0x48, 0xb5, 0xc7, 0x26, 0xe6, 0x08, 0x35, 0x72, 0xbb, 0x0e, 0x9c, 0x9e, 0xe9, + 0x59, 0x67, 0x2e, 0x38, 0xeb, 0x9f, 0x25, 0xa1, 0xe8, 0xc3, 0xcb, 0xd1, 0x7f, 0xfb, 0x82, 0x51, + 0x25, 0x24, 0x33, 0xf8, 0x78, 0xbd, 0x4b, 0x45, 0xc1, 0x65, 0x4a, 0xce, 0xbf, 0x4c, 0x51, 0xa7, + 0x12, 0x0e, 0xfc, 0x9e, 0x9e, 0x1b, 0x7e, 0x7f, 0x19, 0x90, 0xad, 0xdb, 0xea, 0x40, 0x39, 0xd1, + 0x6d, 0x6d, 0x74, 0xac, 0x30, 0x33, 0x64, 0xa1, 0x43, 0xa4, 0x3d, 0x8f, 0x68, 0xc7, 0x3e, 0xb5, + 0xc8, 0x9f, 0x0a, 0x90, 0x77, 0xcb, 0xee, 0x79, 0xaf, 0x1c, 0x5d, 0x86, 0x2c, 0xaf, 0x2c, 0xd9, + 0x9d, 0x23, 0xde, 0x0a, 0x3d, 0x67, 0xa8, 0x43, 0x7e, 0x88, 0x6d, 0x95, 0xc6, 0x41, 0x96, 0xd5, + 0xdc, 0xf6, 0xad, 0x37, 0xa1, 0xe8, 0xbb, 0xae, 0x45, 0x42, 0xe3, 0x6e, 0xeb, 0x3d, 0x31, 0x51, + 0xcf, 0x7d, 0xf6, 0xc5, 0x6a, 0x6a, 0x17, 0x7f, 0x42, 0xbc, 0x59, 0x6e, 0x35, 0xdb, 0xad, 0xe6, + 0x03, 0x51, 0xa8, 0x17, 0x3f, 0xfb, 0x62, 0x35, 0x27, 0x63, 0x8a, 0x28, 0xde, 0x7a, 0x00, 0xd5, + 0x89, 0x0f, 0x13, 0x2c, 0x5b, 0x10, 0x54, 0xee, 0x3d, 0xdc, 0xdf, 0xd9, 0x6a, 0x36, 0x3a, 0x2d, + 0xe5, 0xd1, 0x5e, 0xa7, 0x25, 0x0a, 0xe8, 0x19, 0x58, 0xdc, 0xd9, 0xfa, 0xdf, 0x76, 0x47, 0x69, + 0xee, 0x6c, 0xb5, 0x76, 0x3b, 0x4a, 0xa3, 0xd3, 0x69, 0x34, 0x1f, 0x88, 0xc9, 0x8d, 0x2f, 0x8a, + 0x90, 0x6e, 0x6c, 0x36, 0xb7, 0x50, 0x13, 0xd2, 0x14, 0x0a, 0x39, 0xf7, 0xbe, 0x76, 0xfd, 0x7c, + 0x6c, 0x18, 0xdd, 0x87, 0x0c, 0x45, 0x49, 0xd0, 0xf9, 0x17, 0xb8, 0xeb, 0x33, 0xc0, 0x62, 0xf2, + 0x32, 0xd4, 0x23, 0xcf, 0xbd, 0xd1, 0x5d, 0x3f, 0x1f, 0x3b, 0x46, 0x3b, 0x90, 0x73, 0x36, 0xc9, + 0xb3, 0xae, 0x59, 0xd7, 0x67, 0x02, 0xba, 0x64, 0x6a, 0x0c, 0x6c, 0x38, 0xff, 0xb2, 0x77, 0x7d, + 0x06, 0xaa, 0x8c, 0xb6, 0x20, 0xcb, 0xb7, 0xa3, 0x33, 0xee, 0x6f, 0xd7, 0x67, 0xe1, 0xc4, 0x48, + 0x86, 0x82, 0x07, 0xe3, 0xcc, 0xbe, 0xc2, 0x5e, 0x8f, 0x01, 0x98, 0xa3, 0x0f, 0xa0, 0x1c, 0xdc, + 0xea, 0xc6, 0xbb, 0x23, 0x5e, 0x8f, 0x89, 0x48, 0x13, 0xfd, 0xc1, 0x7d, 0x6f, 0xbc, 0x3b, 0xe3, + 0xf5, 0x98, 0x00, 0x35, 0xfa, 0x08, 0x16, 0xa6, 0xf7, 0xa5, 0xf1, 0xaf, 0x90, 0xd7, 0xe7, 0x80, + 0xac, 0xd1, 0x10, 0x50, 0xc8, 0x7e, 0x76, 0x8e, 0x1b, 0xe5, 0xf5, 0x79, 0x10, 0x6c, 0xd4, 0x83, + 0xea, 0xe4, 0x26, 0x31, 0xee, 0x0d, 0xf3, 0x7a, 0x6c, 0x34, 0x9b, 0x8d, 0x12, 0xdc, 0x5c, 0xc6, + 0xbd, 0x71, 0x5e, 0x8f, 0x0d, 0x6e, 0xa3, 0x87, 0x00, 0xbe, 0xfd, 0x61, 0x8c, 0x1b, 0xe8, 0xf5, + 0x38, 0x30, 0x37, 0x32, 0x60, 0x31, 0x6c, 0xe3, 0x38, 0xcf, 0x85, 0xf4, 0xfa, 0x5c, 0xe8, 0x37, + 0xb1, 0xe7, 0xe0, 0x16, 0x30, 0xde, 0x05, 0xf5, 0x7a, 0x4c, 0x18, 0x7c, 0xb3, 0xf1, 0xe5, 0x93, + 0x65, 0xe1, 0xab, 0x27, 0xcb, 0xc2, 0xdf, 0x9f, 0x2c, 0x0b, 0x9f, 0x7f, 0xb3, 0x9c, 0xf8, 0xea, + 0x9b, 0xe5, 0xc4, 0x5f, 0xbf, 0x59, 0x4e, 0xfc, 0xdf, 0x8d, 0x63, 0xcd, 0xee, 0x8f, 0x0f, 0xd7, + 0xba, 0xfa, 0x70, 0xbd, 0xab, 0x0f, 0xb1, 0x7d, 0x78, 0x64, 0x7b, 0x0f, 0xde, 0x5f, 0x4a, 0x87, + 0x59, 0x9a, 0x41, 0x6f, 0xff, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xf3, 0xe6, 0x05, 0xc5, 0x34, 0x00, 0x00, } @@ -5335,6 +5675,93 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.ImplicitHash) > 0 { + i -= len(m.ImplicitHash) + copy(dAtA[i:], m.ImplicitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ImplicitHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + if m.EncryptedRandom != nil { + { + size, err := m.EncryptedRandom.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 + } + if len(m.EvidenceHash) > 0 { + i -= len(m.EvidenceHash) + copy(dAtA[i:], m.EvidenceHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.EvidenceHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.LastResultsHash) > 0 { + i -= len(m.LastResultsHash) + copy(dAtA[i:], m.LastResultsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastResultsHash))) + i-- + dAtA[i] = 0x7a + } + if len(m.ConsensusHash) > 0 { + i -= len(m.ConsensusHash) + copy(dAtA[i:], m.ConsensusHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ConsensusHash))) + i-- + dAtA[i] = 0x72 + } + if len(m.ValidatorsHash) > 0 { + i -= len(m.ValidatorsHash) + copy(dAtA[i:], m.ValidatorsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ValidatorsHash))) + i-- + dAtA[i] = 0x6a + } + if len(m.LastCommitHash) > 0 { + i -= len(m.LastCommitHash) + copy(dAtA[i:], m.LastCommitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastCommitHash))) + i-- + dAtA[i] = 0x62 + } + if len(m.DataHash) > 0 { + i -= len(m.DataHash) + copy(dAtA[i:], m.DataHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.DataHash))) + i-- + dAtA[i] = 0x5a + } + { + size, err := m.LastBlockId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 + { + size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a if len(m.ProposerAddress) > 0 { i -= len(m.ProposerAddress) copy(dAtA[i:], m.ProposerAddress) @@ -5349,12 +5776,12 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x3a } - n20, err20 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) - if err20 != nil { - return 0, err20 + n23, err23 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + if err23 != nil { + return 0, err23 } - i -= n20 - i = encodeVarintTypes(dAtA, i, uint64(n20)) + i -= n23 + i = encodeVarintTypes(dAtA, i, uint64(n23)) i-- dAtA[i] = 0x32 if m.Height != 0 { @@ -5423,26 +5850,113 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.ProposerAddress) > 0 { - i -= len(m.ProposerAddress) - copy(dAtA[i:], m.ProposerAddress) - i = encodeVarintTypes(dAtA, i, uint64(len(m.ProposerAddress))) + if len(m.ImplicitHash) > 0 { + i -= len(m.ImplicitHash) + copy(dAtA[i:], m.ImplicitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ImplicitHash))) i-- - dAtA[i] = 0x42 - } - if len(m.NextValidatorsHash) > 0 { + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + if m.EncryptedRandom != nil { + { + size, err := m.EncryptedRandom.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 + } + if len(m.EvidenceHash) > 0 { + i -= len(m.EvidenceHash) + copy(dAtA[i:], m.EvidenceHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.EvidenceHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.LastResultsHash) > 0 { + i -= len(m.LastResultsHash) + copy(dAtA[i:], m.LastResultsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastResultsHash))) + i-- + dAtA[i] = 0x7a + } + if len(m.ConsensusHash) > 0 { + i -= len(m.ConsensusHash) + copy(dAtA[i:], m.ConsensusHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ConsensusHash))) + i-- + dAtA[i] = 0x72 + } + if len(m.ValidatorsHash) > 0 { + i -= len(m.ValidatorsHash) + copy(dAtA[i:], m.ValidatorsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ValidatorsHash))) + i-- + dAtA[i] = 0x6a + } + if len(m.LastCommitHash) > 0 { + i -= len(m.LastCommitHash) + copy(dAtA[i:], m.LastCommitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastCommitHash))) + i-- + dAtA[i] = 0x62 + } + if len(m.DataHash) > 0 { + i -= len(m.DataHash) + copy(dAtA[i:], m.DataHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.DataHash))) + i-- + dAtA[i] = 0x5a + } + { + size, err := m.LastBlockId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 + { + size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + if len(m.ProposerAddress) > 0 { + i -= len(m.ProposerAddress) + copy(dAtA[i:], m.ProposerAddress) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ProposerAddress))) + i-- + dAtA[i] = 0x42 + } + if len(m.NextValidatorsHash) > 0 { i -= len(m.NextValidatorsHash) copy(dAtA[i:], m.NextValidatorsHash) i = encodeVarintTypes(dAtA, i, uint64(len(m.NextValidatorsHash))) i-- dAtA[i] = 0x3a } - n22, err22 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) - if err22 != nil { - return 0, err22 + n28, err28 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + if err28 != nil { + return 0, err28 } - i -= n22 - i = encodeVarintTypes(dAtA, i, uint64(n22)) + i -= n28 + i = encodeVarintTypes(dAtA, i, uint64(n28)) i-- dAtA[i] = 0x32 if m.Height != 0 { @@ -5513,6 +6027,93 @@ func (m *RequestExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ImplicitHash) > 0 { + i -= len(m.ImplicitHash) + copy(dAtA[i:], m.ImplicitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ImplicitHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + if m.EncryptedRandom != nil { + { + size, err := m.EncryptedRandom.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 + } + if len(m.EvidenceHash) > 0 { + i -= len(m.EvidenceHash) + copy(dAtA[i:], m.EvidenceHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.EvidenceHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.LastResultsHash) > 0 { + i -= len(m.LastResultsHash) + copy(dAtA[i:], m.LastResultsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastResultsHash))) + i-- + dAtA[i] = 0x7a + } + if len(m.ConsensusHash) > 0 { + i -= len(m.ConsensusHash) + copy(dAtA[i:], m.ConsensusHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ConsensusHash))) + i-- + dAtA[i] = 0x72 + } + if len(m.ValidatorsHash) > 0 { + i -= len(m.ValidatorsHash) + copy(dAtA[i:], m.ValidatorsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ValidatorsHash))) + i-- + dAtA[i] = 0x6a + } + if len(m.LastCommitHash) > 0 { + i -= len(m.LastCommitHash) + copy(dAtA[i:], m.LastCommitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastCommitHash))) + i-- + dAtA[i] = 0x62 + } + if len(m.DataHash) > 0 { + i -= len(m.DataHash) + copy(dAtA[i:], m.DataHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.DataHash))) + i-- + dAtA[i] = 0x5a + } + { + size, err := m.LastBlockId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 + { + size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a if len(m.ProposerAddress) > 0 { i -= len(m.ProposerAddress) copy(dAtA[i:], m.ProposerAddress) @@ -5560,12 +6161,12 @@ func (m *RequestExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x22 } } - n25, err25 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) - if err25 != nil { - return 0, err25 + n34, err34 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + if err34 != nil { + return 0, err34 } - i -= n25 - i = encodeVarintTypes(dAtA, i, uint64(n25)) + i -= n34 + i = encodeVarintTypes(dAtA, i, uint64(n34)) i-- dAtA[i] = 0x1a if m.Height != 0 { @@ -5652,6 +6253,83 @@ func (m *RequestFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ImplicitHash) > 0 { + i -= len(m.ImplicitHash) + copy(dAtA[i:], m.ImplicitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ImplicitHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a + } + if len(m.EvidenceHash) > 0 { + i -= len(m.EvidenceHash) + copy(dAtA[i:], m.EvidenceHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.EvidenceHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + if len(m.LastResultsHash) > 0 { + i -= len(m.LastResultsHash) + copy(dAtA[i:], m.LastResultsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastResultsHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + if len(m.ConsensusHash) > 0 { + i -= len(m.ConsensusHash) + copy(dAtA[i:], m.ConsensusHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ConsensusHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.ValidatorsHash) > 0 { + i -= len(m.ValidatorsHash) + copy(dAtA[i:], m.ValidatorsHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ValidatorsHash))) + i-- + dAtA[i] = 0x7a + } + if len(m.LastCommitHash) > 0 { + i -= len(m.LastCommitHash) + copy(dAtA[i:], m.LastCommitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.LastCommitHash))) + i-- + dAtA[i] = 0x72 + } + if len(m.DataHash) > 0 { + i -= len(m.DataHash) + copy(dAtA[i:], m.DataHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.DataHash))) + i-- + dAtA[i] = 0x6a + } + { + size, err := m.LastBlockId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x62 + { + size, err := m.Version.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x5a if m.Commit != nil { { size, err := m.Commit.MarshalToSizedBuffer(dAtA[:i]) @@ -5690,12 +6368,12 @@ func (m *RequestFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n28, err28 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) - if err28 != nil { - return 0, err28 + n39, err39 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + if err39 != nil { + return 0, err39 } - i -= n28 - i = encodeVarintTypes(dAtA, i, uint64(n28)) + i -= n39 + i = encodeVarintTypes(dAtA, i, uint64(n39)) i-- dAtA[i] = 0x32 if m.Height != 0 { @@ -6658,20 +7336,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA50 := make([]byte, len(m.RefetchChunks)*10) - var j49 int + dAtA61 := make([]byte, len(m.RefetchChunks)*10) + var j60 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA50[j49] = uint8(uint64(num)&0x7f | 0x80) + dAtA61[j60] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j49++ + j60++ } - dAtA50[j49] = uint8(num) - j49++ + dAtA61[j60] = uint8(num) + j60++ } - i -= j49 - copy(dAtA[i:], dAtA50[:j49]) - i = encodeVarintTypes(dAtA, i, uint64(j49)) + i -= j60 + copy(dAtA[i:], dAtA61[:j60]) + i = encodeVarintTypes(dAtA, i, uint64(j60)) i-- dAtA[i] = 0x12 } @@ -7378,12 +8056,12 @@ func (m *Misbehavior) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n56, err56 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) - if err56 != nil { - return 0, err56 + n67, err67 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + if err67 != nil { + return 0, err67 } - i -= n56 - i = encodeVarintTypes(dAtA, i, uint64(n56)) + i -= n67 + i = encodeVarintTypes(dAtA, i, uint64(n67)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7901,6 +8579,42 @@ func (m *RequestPrepareProposal) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + l = m.Version.Size() + n += 1 + l + sovTypes(uint64(l)) + l = m.LastBlockId.Size() + n += 1 + l + sovTypes(uint64(l)) + l = len(m.DataHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.LastCommitHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ValidatorsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ConsensusHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.LastResultsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.EvidenceHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } + if m.EncryptedRandom != nil { + l = m.EncryptedRandom.Size() + n += 2 + l + sovTypes(uint64(l)) + } + l = len(m.ImplicitHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } return n } @@ -7941,6 +8655,42 @@ func (m *RequestProcessProposal) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + l = m.Version.Size() + n += 1 + l + sovTypes(uint64(l)) + l = m.LastBlockId.Size() + n += 1 + l + sovTypes(uint64(l)) + l = len(m.DataHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.LastCommitHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ValidatorsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ConsensusHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.LastResultsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.EvidenceHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } + if m.EncryptedRandom != nil { + l = m.EncryptedRandom.Size() + n += 2 + l + sovTypes(uint64(l)) + } + l = len(m.ImplicitHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } return n } @@ -7981,6 +8731,42 @@ func (m *RequestExtendVote) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + l = m.Version.Size() + n += 1 + l + sovTypes(uint64(l)) + l = m.LastBlockId.Size() + n += 1 + l + sovTypes(uint64(l)) + l = len(m.DataHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.LastCommitHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ValidatorsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ConsensusHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.LastResultsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.EvidenceHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } + if m.EncryptedRandom != nil { + l = m.EncryptedRandom.Size() + n += 2 + l + sovTypes(uint64(l)) + } + l = len(m.ImplicitHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } return n } @@ -8053,9 +8839,41 @@ func (m *RequestFinalizeBlock) Size() (n int) { l = m.Commit.Size() n += 1 + l + sovTypes(uint64(l)) } - return n -} - + l = m.Version.Size() + n += 1 + l + sovTypes(uint64(l)) + l = m.LastBlockId.Size() + n += 1 + l + sovTypes(uint64(l)) + l = len(m.DataHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.LastCommitHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ValidatorsHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.ConsensusHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } + l = len(m.LastResultsHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } + l = len(m.EvidenceHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } + l = len(m.ImplicitHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } + return n +} + func (m *Response) Size() (n int) { if m == nil { return 0 @@ -10978,59 +11796,75 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { m.ProposerAddress = []byte{} } iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) } - if (skippy < 0) || (iNdEx+skippy) < 0 { + 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 } - if (iNdEx + skippy) > l { + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { return io.ErrUnexpectedEOF } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *RequestProcessProposal) 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 err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - if iNdEx >= l { + iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastBlockId", 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 } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break + if err := m.LastBlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RequestProcessProposal: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RequestProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + iNdEx = postIndex + case 11: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Txs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DataHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -11057,14 +11891,16 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) - copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + m.DataHash = append(m.DataHash[:0], dAtA[iNdEx:postIndex]...) + if m.DataHash == nil { + m.DataHash = []byte{} + } iNdEx = postIndex - case 2: + case 12: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProposedLastCommit", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field LastCommitHash", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11074,30 +11910,31 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ProposedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.LastCommitHash = append(m.LastCommitHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastCommitHash == nil { + m.LastCommitHash = []byte{} } iNdEx = postIndex - case 3: + case 13: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorsHash", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11107,29 +11944,29 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Misbehavior = append(m.Misbehavior, Misbehavior{}) - if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.ValidatorsHash = append(m.ValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.ValidatorsHash == nil { + m.ValidatorsHash = []byte{} } iNdEx = postIndex - case 4: + case 14: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ConsensusHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -11156,16 +11993,16 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} + m.ConsensusHash = append(m.ConsensusHash[:0], dAtA[iNdEx:postIndex]...) + if m.ConsensusHash == nil { + m.ConsensusHash = []byte{} } iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastResultsHash", wireType) } - m.Height = 0 + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11175,16 +12012,31 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= int64(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - case 6: + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LastResultsHash = append(m.LastResultsHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastResultsHash == nil { + m.LastResultsHash = []byte{} + } + iNdEx = postIndex + case 16: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EvidenceHash", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11194,30 +12046,31 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { - return err + m.EvidenceHash = append(m.EvidenceHash[:0], dAtA[iNdEx:postIndex]...) + if m.EvidenceHash == nil { + m.EvidenceHash = []byte{} } iNdEx = postIndex - case 7: + case 17: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NextValidatorsHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EncryptedRandom", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11227,29 +12080,31 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.NextValidatorsHash = append(m.NextValidatorsHash[:0], dAtA[iNdEx:postIndex]...) - if m.NextValidatorsHash == nil { - m.NextValidatorsHash = []byte{} + if m.EncryptedRandom == nil { + m.EncryptedRandom = &types1.EncryptedRandom{} + } + if err := m.EncryptedRandom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex - case 8: + case 18: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProposerAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ImplicitHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -11276,9 +12131,9 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ProposerAddress = append(m.ProposerAddress[:0], dAtA[iNdEx:postIndex]...) - if m.ProposerAddress == nil { - m.ProposerAddress = []byte{} + m.ImplicitHash = append(m.ImplicitHash[:0], dAtA[iNdEx:postIndex]...) + if m.ImplicitHash == nil { + m.ImplicitHash = []byte{} } iNdEx = postIndex default: @@ -11302,7 +12157,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { } return nil } -func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { +func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -11325,15 +12180,15 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RequestExtendVote: wiretype end group for non-group") + return fmt.Errorf("proto: RequestProcessProposal: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RequestExtendVote: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: RequestProcessProposal: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Txs", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -11360,33 +12215,12 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} - } + m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) + copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) - } - m.Height = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Height |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProposedLastCommit", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11413,15 +12247,15 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := m.ProposedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 4: + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Txs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11431,29 +12265,31 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) - copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + m.Misbehavior = append(m.Misbehavior, Misbehavior{}) + if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 5: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProposedLastCommit", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11463,28 +12299,48 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ProposedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) + if m.Hash == nil { + m.Hash = []byte{} } iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11511,8 +12367,7 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Misbehavior = append(m.Misbehavior, Misbehavior{}) - if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11584,61 +12439,1367 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { m.ProposerAddress = []byte{} } iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastBlockId", 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 } - if (iNdEx + skippy) > l { + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > 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 err := m.LastBlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - if iNdEx >= l { + iNdEx = postIndex + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DataHash", 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 } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break + m.DataHash = append(m.DataHash[:0], dAtA[iNdEx:postIndex]...) + if m.DataHash == nil { + m.DataHash = []byte{} + } + iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastCommitHash", 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.LastCommitHash = append(m.LastCommitHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastCommitHash == nil { + m.LastCommitHash = []byte{} + } + iNdEx = postIndex + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorsHash", 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.ValidatorsHash = append(m.ValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.ValidatorsHash == nil { + m.ValidatorsHash = []byte{} + } + iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsensusHash", 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.ConsensusHash = append(m.ConsensusHash[:0], dAtA[iNdEx:postIndex]...) + if m.ConsensusHash == nil { + m.ConsensusHash = []byte{} + } + iNdEx = postIndex + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastResultsHash", 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.LastResultsHash = append(m.LastResultsHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastResultsHash == nil { + m.LastResultsHash = []byte{} + } + iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EvidenceHash", 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.EvidenceHash = append(m.EvidenceHash[:0], dAtA[iNdEx:postIndex]...) + if m.EvidenceHash == nil { + m.EvidenceHash = []byte{} + } + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EncryptedRandom", 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.EncryptedRandom == nil { + m.EncryptedRandom = &types1.EncryptedRandom{} + } + if err := m.EncryptedRandom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ImplicitHash", 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.ImplicitHash = append(m.ImplicitHash[:0], dAtA[iNdEx:postIndex]...) + if m.ImplicitHash == nil { + m.ImplicitHash = []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 *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 Hash", 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.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) + if m.Hash == nil { + m.Hash = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Txs", 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.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) + copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposedLastCommit", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ProposedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", 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.Misbehavior = append(m.Misbehavior, Misbehavior{}) + if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NextValidatorsHash", 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.NextValidatorsHash = append(m.NextValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.NextValidatorsHash == nil { + m.NextValidatorsHash = []byte{} + } + iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposerAddress", 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.ProposerAddress = append(m.ProposerAddress[:0], dAtA[iNdEx:postIndex]...) + if m.ProposerAddress == nil { + m.ProposerAddress = []byte{} + } + iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastBlockId", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.LastBlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DataHash", 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.DataHash = append(m.DataHash[:0], dAtA[iNdEx:postIndex]...) + if m.DataHash == nil { + m.DataHash = []byte{} + } + iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastCommitHash", 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.LastCommitHash = append(m.LastCommitHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastCommitHash == nil { + m.LastCommitHash = []byte{} + } + iNdEx = postIndex + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorsHash", 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.ValidatorsHash = append(m.ValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.ValidatorsHash == nil { + m.ValidatorsHash = []byte{} + } + iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsensusHash", 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.ConsensusHash = append(m.ConsensusHash[:0], dAtA[iNdEx:postIndex]...) + if m.ConsensusHash == nil { + m.ConsensusHash = []byte{} + } + iNdEx = postIndex + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastResultsHash", 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.LastResultsHash = append(m.LastResultsHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastResultsHash == nil { + m.LastResultsHash = []byte{} + } + iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EvidenceHash", 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.EvidenceHash = append(m.EvidenceHash[:0], dAtA[iNdEx:postIndex]...) + if m.EvidenceHash == nil { + m.EvidenceHash = []byte{} + } + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EncryptedRandom", 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.EncryptedRandom == nil { + m.EncryptedRandom = &types1.EncryptedRandom{} + } + if err := m.EncryptedRandom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ImplicitHash", 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.ImplicitHash = append(m.ImplicitHash[:0], dAtA[iNdEx:postIndex]...) + if m.ImplicitHash == nil { + m.ImplicitHash = []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 *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 + } + 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: 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 Hash", 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.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) + if m.Hash == nil { + m.Hash = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAddress", 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.ValidatorAddress = append(m.ValidatorAddress[:0], dAtA[iNdEx:postIndex]...) + if m.ValidatorAddress == nil { + m.ValidatorAddress = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", 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.VoteExtension = append(m.VoteExtension[:0], dAtA[iNdEx:postIndex]...) + if m.VoteExtension == nil { + m.VoteExtension = []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 *RequestFinalizeBlock) 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: RequestFinalizeBlock: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RequestFinalizeBlock: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Txs", 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.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) + copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DecidedLastCommit", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.DecidedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", 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.Misbehavior = append(m.Misbehavior, Misbehavior{}) + if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Hash", 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.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) + if m.Hash == nil { + m.Hash = []byte{} + } + iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= int64(b&0x7F) << shift + if b < 0x80 { + break + } } - } - 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: + case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11648,29 +13809,28 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex - case 2: + case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field NextValidatorsHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -11697,16 +13857,16 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ValidatorAddress = append(m.ValidatorAddress[:0], dAtA[iNdEx:postIndex]...) - if m.ValidatorAddress == nil { - m.ValidatorAddress = []byte{} + m.NextValidatorsHash = append(m.NextValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.NextValidatorsHash == nil { + m.NextValidatorsHash = []byte{} } iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposerAddress", wireType) } - m.Height = 0 + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11716,16 +13876,31 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= int64(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - case 4: + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProposerAddress = append(m.ProposerAddress[:0], dAtA[iNdEx:postIndex]...) + if m.ProposerAddress == nil { + m.ProposerAddress = []byte{} + } + iNdEx = postIndex + case 9: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VoteExtension", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EncryptedRandom", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11735,81 +13910,33 @@ func (m *RequestVerifyVoteExtension) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.VoteExtension = append(m.VoteExtension[:0], dAtA[iNdEx:postIndex]...) - if m.VoteExtension == nil { - m.VoteExtension = []byte{} + if m.EncryptedRandom == nil { + m.EncryptedRandom = &types1.EncryptedRandom{} } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { + if err := m.EncryptedRandom.Unmarshal(dAtA[iNdEx:postIndex]); 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 *RequestFinalizeBlock) 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: RequestFinalizeBlock: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RequestFinalizeBlock: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + iNdEx = postIndex + case 10: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Txs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11819,27 +13946,31 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) - copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) + if m.Commit == nil { + m.Commit = &types1.Commit{} + } + if err := m.Commit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 2: + case 11: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DecidedLastCommit", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11866,13 +13997,13 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.DecidedLastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 3: + case 12: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field LastBlockId", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11899,14 +14030,13 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Misbehavior = append(m.Misbehavior, Misbehavior{}) - if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.LastBlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 4: + case 13: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DataHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -11933,16 +14063,16 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} + m.DataHash = append(m.DataHash[:0], dAtA[iNdEx:postIndex]...) + if m.DataHash == nil { + m.DataHash = []byte{} } iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LastCommitHash", wireType) } - m.Height = 0 + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11952,16 +14082,31 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= int64(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - case 6: + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LastCommitHash = append(m.LastCommitHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastCommitHash == nil { + m.LastCommitHash = []byte{} + } + iNdEx = postIndex + case 15: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorsHash", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -11971,28 +14116,29 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { - return err + m.ValidatorsHash = append(m.ValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.ValidatorsHash == nil { + m.ValidatorsHash = []byte{} } iNdEx = postIndex - case 7: + case 16: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NextValidatorsHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ConsensusHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -12019,14 +14165,14 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.NextValidatorsHash = append(m.NextValidatorsHash[:0], dAtA[iNdEx:postIndex]...) - if m.NextValidatorsHash == nil { - m.NextValidatorsHash = []byte{} + m.ConsensusHash = append(m.ConsensusHash[:0], dAtA[iNdEx:postIndex]...) + if m.ConsensusHash == nil { + m.ConsensusHash = []byte{} } iNdEx = postIndex - case 8: + case 17: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProposerAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field LastResultsHash", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -12053,16 +14199,16 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ProposerAddress = append(m.ProposerAddress[:0], dAtA[iNdEx:postIndex]...) - if m.ProposerAddress == nil { - m.ProposerAddress = []byte{} + m.LastResultsHash = append(m.LastResultsHash[:0], dAtA[iNdEx:postIndex]...) + if m.LastResultsHash == nil { + m.LastResultsHash = []byte{} } iNdEx = postIndex - case 9: + case 18: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EncryptedRandom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EvidenceHash", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12072,33 +14218,31 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - if m.EncryptedRandom == nil { - m.EncryptedRandom = &types1.EncryptedRandom{} - } - if err := m.EncryptedRandom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.EvidenceHash = append(m.EvidenceHash[:0], dAtA[iNdEx:postIndex]...) + if m.EvidenceHash == nil { + m.EvidenceHash = []byte{} } iNdEx = postIndex - case 10: + case 19: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ImplicitHash", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTypes @@ -12108,26 +14252,24 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthTypes } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthTypes } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Commit == nil { - m.Commit = &types1.Commit{} - } - if err := m.Commit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.ImplicitHash = append(m.ImplicitHash[:0], dAtA[iNdEx:postIndex]...) + if m.ImplicitHash == nil { + m.ImplicitHash = []byte{} } iNdEx = postIndex default: diff --git a/go.mod b/go.mod index bf4fa84c452..075835a2122 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/google/uuid v1.6.0 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae - github.com/scrtlabs/tm-secret-enclave v1.11.8 + github.com/scrtlabs/tm-secret-enclave v1.12.3-implicit-hash golang.org/x/sync v0.10.0 gonum.org/v1/gonum v0.15.1 google.golang.org/protobuf v1.36.4 diff --git a/go.sum b/go.sum index 6c0ff5604cb..59f1992739a 100644 --- a/go.sum +++ b/go.sum @@ -329,8 +329,8 @@ github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/scrtlabs/tm-secret-enclave v1.11.8 h1:fctIfJDHGl8D+fcXlZLX6S4yDeePIsuyzdG5HngFNPQ= -github.com/scrtlabs/tm-secret-enclave v1.11.8/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME= +github.com/scrtlabs/tm-secret-enclave v1.12.3-implicit-hash h1:vssSAjnieWcH4XsGjpGv5MRk1fJTL4boCWrwbgkCFDQ= +github.com/scrtlabs/tm-secret-enclave v1.12.3-implicit-hash/go.mod h1:nxZQtzzAqBNBLOEXSv4cKlUnVA4vRmHOn6ujr3kxVME= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 9174d84024d..be131068683 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -10,6 +10,7 @@ import "tendermint/crypto/keys.proto"; import "tendermint/types/params.proto"; import "tendermint/types/types.proto"; import "tendermint/types/validator.proto"; +import "tendermint/version/types.proto"; import "google/protobuf/timestamp.proto"; import "gogoproto/gogo.proto"; @@ -140,6 +141,22 @@ message RequestPrepareProposal { bytes next_validators_hash = 7; // address of the public key of the validator proposing the block. bytes proposer_address = 8; + // scheduled_msgs_hash + tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false]; + tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false]; + bytes data_hash = 11; + bytes last_commit_hash = 12; // commit from validators from the last block + bytes validators_hash = 13; // validators for the current block + bytes consensus_hash = 14; // consensus params for current block + bytes last_results_hash = 15; // root hash of all results from the txs from the previous block + + // consensus info + bytes evidence_hash = 16; // evidence included in the block + // encrypted random + tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts + + // scheduled_msgs_hash + bytes implicit_hash = 18; } message RequestProcessProposal { @@ -153,6 +170,22 @@ message RequestProcessProposal { bytes next_validators_hash = 7; // address of the public key of the original proposer of the block. bytes proposer_address = 8; + // scheduled_msgs_hash + tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false]; + tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false]; + bytes data_hash = 11; + bytes last_commit_hash = 12; // commit from validators from the last block + bytes validators_hash = 13; // validators for the current block + bytes consensus_hash = 14; // consensus params for current block + bytes last_results_hash = 15; // root hash of all results from the txs from the previous block + + // consensus info + bytes evidence_hash = 16; // evidence included in the block + // encrypted random + tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts + + // scheduled_msgs_hash + bytes implicit_hash = 18; } // Extends a vote with application-injected data @@ -169,6 +202,22 @@ message RequestExtendVote { bytes next_validators_hash = 7; // address of the public key of the original proposer of the block. bytes proposer_address = 8; + // scheduled_msgs_hash + tendermint.version.Consensus version = 9 [(gogoproto.nullable) = false]; + tendermint.types.BlockID last_block_id = 10 [(gogoproto.nullable) = false]; + bytes data_hash = 11; + bytes last_commit_hash = 12; // commit from validators from the last block + bytes validators_hash = 13; // validators for the current block + bytes consensus_hash = 14; // consensus params for current block + bytes last_results_hash = 15; // root hash of all results from the txs from the previous block + + // consensus info + bytes evidence_hash = 16; // evidence included in the block + // encrypted random + tendermint.types.EncryptedRandom encrypted_random = 17; // a random number encrypted by the proposer to be used in contracts + + // scheduled_msgs_hash + bytes implicit_hash = 18; } // Verify the vote extension @@ -194,6 +243,18 @@ message RequestFinalizeBlock { bytes proposer_address = 8; tendermint.types.EncryptedRandom encrypted_random = 9; // a random number encrypted by the proposer to be used in contracts tendermint.types.Commit commit = 10; + tendermint.version.Consensus version = 11 [(gogoproto.nullable) = false]; + tendermint.types.BlockID last_block_id = 12 [(gogoproto.nullable) = false]; + bytes data_hash = 13; // commit from validators from the last block + bytes last_commit_hash = 14; // commit from validators from the last block + bytes validators_hash = 15; // validators for the current block + bytes consensus_hash = 16; // consensus params for current block + bytes last_results_hash = 17; // root hash of all results from the txs from the previous block + + // consensus info + bytes evidence_hash = 18; // evidence included in the block + // scheduled_msgs_hash + bytes implicit_hash = 19; } //---------------------------------------- diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 390086abc91..0cc94d12add 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -252,6 +252,8 @@ type Header struct { ProposerAddress []byte `protobuf:"bytes,14,opt,name=proposer_address,json=proposerAddress,proto3" json:"proposer_address,omitempty"` // encrypted random EncryptedRandom *EncryptedRandom `protobuf:"bytes,15,opt,name=encrypted_random,json=encryptedRandom,proto3" json:"encrypted_random,omitempty"` + // scheduled_msgs_hash + ImplicitHash []byte `protobuf:"bytes,16,opt,name=implicit_hash,json=implicitHash,proto3" json:"implicit_hash,omitempty"` } func (m *Header) Reset() { *m = Header{} } @@ -392,6 +394,13 @@ func (m *Header) GetEncryptedRandom() *EncryptedRandom { return nil } +func (m *Header) GetImplicitHash() []byte { + if m != nil { + return m.ImplicitHash + } + return nil +} + // Data contains the set of transactions included in the block type EncryptedRandom struct { Random []byte `protobuf:"bytes,1,opt,name=random,proto3" json:"random,omitempty"` @@ -1261,93 +1270,94 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1363 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x4f, 0x6f, 0x1b, 0x55, - 0x10, 0xcf, 0xda, 0xeb, 0x7f, 0x63, 0x3b, 0x76, 0x96, 0x88, 0xba, 0x6e, 0xe3, 0x18, 0x57, 0x40, - 0x28, 0x68, 0x53, 0xa5, 0x08, 0xc1, 0x01, 0xa1, 0xfc, 0x31, 0x6d, 0x44, 0x9d, 0x58, 0x6b, 0xb7, - 0x88, 0x5e, 0x56, 0x6b, 0xef, 0x8b, 0xbd, 0xd4, 0xde, 0xb7, 0xda, 0x7d, 0x0e, 0x4e, 0x3f, 0x01, - 0xea, 0xa9, 0x27, 0x6e, 0x3d, 0xc1, 0x81, 0x3b, 0x95, 0xb8, 0x22, 0x4e, 0x3d, 0xf6, 0x06, 0x17, - 0x0a, 0xa4, 0x5f, 0x04, 0xbd, 0x79, 0x6f, 0xd7, 0x76, 0x1c, 0x43, 0x55, 0x55, 0x20, 0x71, 0xb1, - 0xf6, 0xcd, 0xfc, 0x66, 0xde, 0xec, 0xcc, 0x6f, 0xc6, 0xb3, 0x70, 0x99, 0x11, 0xd7, 0x26, 0xfe, - 0xd0, 0x71, 0xd9, 0x26, 0x3b, 0xf1, 0x48, 0x20, 0x7e, 0x75, 0xcf, 0xa7, 0x8c, 0x6a, 0xc5, 0x89, - 0x56, 0x47, 0x79, 0x79, 0xb5, 0x47, 0x7b, 0x14, 0x95, 0x9b, 0xfc, 0x49, 0xe0, 0xca, 0xeb, 0x3d, - 0x4a, 0x7b, 0x03, 0xb2, 0x89, 0xa7, 0xce, 0xe8, 0x68, 0x93, 0x39, 0x43, 0x12, 0x30, 0x6b, 0xe8, - 0x49, 0xc0, 0xda, 0xd4, 0x35, 0x5d, 0xff, 0xc4, 0x63, 0x94, 0x63, 0xe9, 0x91, 0x54, 0x57, 0xa6, - 0xd4, 0xc7, 0xc4, 0x0f, 0x1c, 0xea, 0x4e, 0xc7, 0x51, 0xae, 0xce, 0x45, 0x79, 0x6c, 0x0d, 0x1c, - 0xdb, 0x62, 0xd4, 0x17, 0x88, 0xda, 0x47, 0x90, 0x6f, 0x5a, 0x3e, 0x6b, 0x11, 0x76, 0x93, 0x58, - 0x36, 0xf1, 0xb5, 0x55, 0x48, 0x30, 0xca, 0xac, 0x41, 0x49, 0xa9, 0x2a, 0x1b, 0x79, 0x43, 0x1c, - 0x34, 0x0d, 0xd4, 0xbe, 0x15, 0xf4, 0x4b, 0xb1, 0xaa, 0xb2, 0x91, 0x33, 0xf0, 0xb9, 0xd6, 0x07, - 0x95, 0x9b, 0x72, 0x0b, 0xc7, 0xb5, 0xc9, 0x38, 0xb4, 0xc0, 0x03, 0x97, 0x76, 0x4e, 0x18, 0x09, - 0xa4, 0x89, 0x38, 0x68, 0xef, 0x43, 0x02, 0xe3, 0x2f, 0xc5, 0xab, 0xca, 0x46, 0x76, 0xab, 0xa4, - 0x4f, 0x25, 0x4a, 0xbc, 0x9f, 0xde, 0xe4, 0xfa, 0x1d, 0xf5, 0xc9, 0xb3, 0xf5, 0x25, 0x43, 0x80, - 0x6b, 0x03, 0x48, 0xed, 0x0c, 0x68, 0xf7, 0xde, 0xfe, 0x5e, 0x14, 0x88, 0x32, 0x09, 0x44, 0x6b, - 0x40, 0xc1, 0xb3, 0x7c, 0x66, 0x06, 0x84, 0x99, 0x7d, 0x7c, 0x0b, 0xbc, 0x34, 0xbb, 0xb5, 0xae, - 0x9f, 0xad, 0x83, 0x3e, 0xf3, 0xb2, 0xf2, 0x96, 0xbc, 0x37, 0x2d, 0xac, 0x3d, 0x4e, 0x40, 0x52, - 0x26, 0xe3, 0x63, 0x48, 0xc9, 0xb4, 0xe2, 0x85, 0xd9, 0xad, 0xb5, 0x69, 0x8f, 0x52, 0xa5, 0xef, - 0x52, 0x37, 0x20, 0x6e, 0x30, 0x0a, 0xa4, 0xbf, 0xd0, 0x46, 0x7b, 0x0b, 0xd2, 0xdd, 0xbe, 0xe5, - 0xb8, 0xa6, 0x63, 0x63, 0x44, 0x99, 0x9d, 0xec, 0xe9, 0xb3, 0xf5, 0xd4, 0x2e, 0x97, 0xed, 0xef, - 0x19, 0x29, 0x54, 0xee, 0xdb, 0xda, 0xeb, 0x90, 0xec, 0x13, 0xa7, 0xd7, 0x67, 0x98, 0x96, 0xb8, - 0x21, 0x4f, 0xda, 0x87, 0xa0, 0x72, 0x42, 0x94, 0x54, 0xbc, 0xbb, 0xac, 0x0b, 0xb6, 0xe8, 0x21, - 0x5b, 0xf4, 0x76, 0xc8, 0x96, 0x9d, 0x34, 0xbf, 0xf8, 0xe1, 0xef, 0xeb, 0x8a, 0x81, 0x16, 0xda, - 0x2e, 0xe4, 0x07, 0x56, 0xc0, 0xcc, 0x0e, 0x4f, 0x1b, 0xbf, 0x3e, 0x81, 0x2e, 0x2e, 0xce, 0x27, - 0x44, 0x26, 0x56, 0x86, 0x9e, 0xe5, 0x56, 0x42, 0x64, 0x6b, 0x1b, 0x50, 0x44, 0x27, 0x5d, 0x3a, - 0x1c, 0x3a, 0xcc, 0xc4, 0xbc, 0x27, 0x31, 0xef, 0xcb, 0x5c, 0xbe, 0x8b, 0xe2, 0x9b, 0xbc, 0x02, - 0x97, 0x20, 0x63, 0x5b, 0xcc, 0x12, 0x90, 0x14, 0x42, 0xd2, 0x5c, 0x80, 0xca, 0xb7, 0xa1, 0x10, - 0xb1, 0x2e, 0x10, 0x90, 0xb4, 0xf0, 0x32, 0x11, 0x23, 0xf0, 0x1a, 0xac, 0xba, 0x64, 0xcc, 0xcc, - 0xb3, 0xe8, 0x0c, 0xa2, 0x35, 0xae, 0xbb, 0x33, 0x6b, 0xf1, 0x26, 0x2c, 0x77, 0xc3, 0xe4, 0x0b, - 0x2c, 0x20, 0x36, 0x1f, 0x49, 0x11, 0x76, 0x11, 0xd2, 0x96, 0xe7, 0x09, 0x40, 0x16, 0x01, 0x29, - 0xcb, 0xf3, 0x50, 0x75, 0x15, 0x56, 0xf0, 0x1d, 0x7d, 0x12, 0x8c, 0x06, 0x4c, 0x3a, 0xc9, 0x21, - 0xa6, 0xc0, 0x15, 0x86, 0x90, 0x23, 0xf6, 0x0a, 0xe4, 0xc9, 0xb1, 0x63, 0x13, 0xb7, 0x4b, 0x04, - 0x2e, 0x8f, 0xb8, 0x5c, 0x28, 0x44, 0xd0, 0x3b, 0x50, 0xf4, 0x7c, 0xea, 0xd1, 0x80, 0xf8, 0xa6, - 0x65, 0xdb, 0x3e, 0x09, 0x82, 0xd2, 0xb2, 0xf0, 0x17, 0xca, 0xb7, 0x85, 0x58, 0xbb, 0x05, 0x45, - 0xe2, 0x22, 0xeb, 0x89, 0x6d, 0xfa, 0x96, 0x6b, 0xd3, 0x61, 0xa9, 0x80, 0x75, 0x7a, 0x63, 0xbe, - 0x4e, 0xf5, 0x10, 0x69, 0x20, 0xd0, 0x28, 0x90, 0x59, 0x41, 0xed, 0x13, 0x28, 0x9c, 0xc1, 0x70, - 0x5e, 0x49, 0xb7, 0xa2, 0x5d, 0xe4, 0x89, 0xf7, 0xa6, 0xe8, 0x42, 0xd9, 0x9b, 0xa2, 0xcb, 0x4a, - 0xa0, 0xee, 0x59, 0xcc, 0xd2, 0x8a, 0x10, 0x67, 0xe3, 0xa0, 0xa4, 0x54, 0xe3, 0x1b, 0x39, 0x83, - 0x3f, 0xd6, 0x7e, 0x8c, 0x83, 0x7a, 0x87, 0x32, 0xa2, 0x5d, 0x07, 0x95, 0x47, 0x83, 0xee, 0x96, - 0xcf, 0x6b, 0xaf, 0x96, 0xd3, 0x73, 0x89, 0xdd, 0x08, 0x7a, 0xed, 0x13, 0x8f, 0x18, 0x08, 0x9e, - 0x62, 0x77, 0x6c, 0x86, 0xdd, 0xab, 0x90, 0xf0, 0xe9, 0xc8, 0xb5, 0x91, 0xf4, 0x09, 0x43, 0x1c, - 0xb4, 0x3a, 0xa4, 0x23, 0xd2, 0xaa, 0xff, 0x44, 0xda, 0x02, 0x27, 0x2d, 0x6f, 0x29, 0x29, 0x30, - 0x52, 0x1d, 0xc9, 0xdd, 0x1d, 0xc8, 0x44, 0xb3, 0x54, 0x92, 0xff, 0xc5, 0xfa, 0x67, 0x62, 0xa6, - 0xbd, 0x0b, 0x2b, 0x11, 0x15, 0xa3, 0x5a, 0x8a, 0x06, 0x28, 0x46, 0x8a, 0xb0, 0x98, 0xd3, 0x2c, - 0x37, 0xc5, 0x3c, 0x4c, 0xe1, 0x7b, 0x4d, 0x58, 0xbe, 0x8f, 0x83, 0xf1, 0x32, 0x64, 0x02, 0xa7, - 0xe7, 0x5a, 0x6c, 0xe4, 0x13, 0xd9, 0x08, 0x13, 0x01, 0xd7, 0x92, 0x31, 0x23, 0x2e, 0xce, 0x1c, - 0x41, 0xfc, 0x89, 0x40, 0xdb, 0x84, 0xd7, 0xa2, 0x83, 0x39, 0xf1, 0x22, 0x48, 0xaf, 0x45, 0xaa, - 0x56, 0xa8, 0xa9, 0xfd, 0xa4, 0x40, 0x52, 0xf4, 0xe9, 0x54, 0x19, 0x94, 0xf3, 0xcb, 0x10, 0x5b, - 0x54, 0x86, 0xf8, 0xcb, 0x97, 0x61, 0x1b, 0x20, 0x0a, 0x33, 0x28, 0xa9, 0xd5, 0xf8, 0x46, 0x76, - 0xeb, 0xd2, 0xbc, 0x23, 0x11, 0x62, 0xcb, 0xe9, 0xc9, 0x31, 0x34, 0x65, 0x54, 0xfb, 0x4d, 0x81, - 0x4c, 0xa4, 0xd7, 0xb6, 0x21, 0x1f, 0xc6, 0x65, 0x1e, 0x0d, 0xac, 0x9e, 0xa4, 0xe2, 0xda, 0xc2, - 0xe0, 0x3e, 0x1d, 0x58, 0x3d, 0x23, 0x2b, 0xe3, 0xe1, 0x87, 0xf3, 0xcb, 0x1a, 0x5b, 0x50, 0xd6, - 0x19, 0x1e, 0xc5, 0x5f, 0x8e, 0x47, 0x33, 0x15, 0x57, 0xcf, 0x54, 0xbc, 0xf6, 0xa7, 0x02, 0xcb, - 0xf5, 0x31, 0x86, 0x6f, 0xff, 0x97, 0xa5, 0xba, 0x2b, 0xb9, 0x65, 0x13, 0xdb, 0x9c, 0xab, 0xd9, - 0x95, 0x73, 0x06, 0xd2, 0x4c, 0xcc, 0x93, 0xda, 0x69, 0xa1, 0x97, 0xd6, 0xa4, 0x86, 0x8f, 0x63, - 0xb0, 0x32, 0x87, 0xff, 0xff, 0xd5, 0x72, 0xb6, 0x7b, 0x13, 0x2f, 0xd8, 0xbd, 0xc9, 0x85, 0xdd, - 0xfb, 0x43, 0x0c, 0xd2, 0x4d, 0xfc, 0xd3, 0xb0, 0x06, 0xff, 0xc6, 0xec, 0xbd, 0x04, 0x19, 0x8f, - 0x0e, 0x4c, 0xa1, 0x51, 0x51, 0x93, 0xf6, 0xe8, 0xc0, 0x98, 0xa3, 0x59, 0xe2, 0x15, 0x0d, 0xe6, - 0xe4, 0x2b, 0x28, 0x42, 0xea, 0x6c, 0x43, 0xf9, 0x90, 0x13, 0xa9, 0x90, 0x4b, 0xdc, 0x35, 0x9e, - 0x03, 0xdc, 0x0a, 0x95, 0xf9, 0xa5, 0x53, 0x84, 0x2d, 0x90, 0x86, 0xc4, 0x71, 0x0b, 0xb1, 0xf3, - 0xc8, 0x3d, 0xb2, 0xb4, 0x68, 0x62, 0x19, 0x12, 0x57, 0xfb, 0x46, 0x01, 0xb8, 0xc5, 0x33, 0x8b, - 0xef, 0xcb, 0xd7, 0xaf, 0x00, 0x43, 0x30, 0x67, 0x6e, 0xae, 0x2c, 0x2a, 0x9a, 0xbc, 0x3f, 0x17, - 0x4c, 0xc7, 0xbd, 0x0b, 0xf9, 0x09, 0xb7, 0x03, 0x12, 0x06, 0x73, 0x8e, 0x93, 0x68, 0x2b, 0x6a, - 0x11, 0x66, 0xe4, 0x8e, 0xa7, 0x4e, 0xb5, 0x9f, 0x15, 0xc8, 0x60, 0x4c, 0x0d, 0xc2, 0xac, 0x99, - 0x1a, 0x2a, 0x2f, 0x5f, 0xc3, 0x35, 0x00, 0xe1, 0x26, 0x70, 0xee, 0x13, 0xc9, 0xac, 0x0c, 0x4a, - 0x5a, 0xce, 0x7d, 0xa2, 0x7d, 0x10, 0x25, 0x3c, 0xfe, 0xf7, 0x09, 0x97, 0x13, 0x23, 0x4c, 0xfb, - 0x05, 0x48, 0xb9, 0xa3, 0xa1, 0xc9, 0x97, 0x0f, 0x55, 0xb0, 0xd5, 0x1d, 0x0d, 0xdb, 0xe3, 0xa0, - 0xf6, 0x25, 0xa4, 0xda, 0x63, 0xfc, 0x2e, 0xe0, 0x14, 0xf5, 0x29, 0x95, 0xcb, 0xa8, 0xd8, 0x6a, - 0xd2, 0x5c, 0x80, 0xbb, 0x97, 0x06, 0x2a, 0xdf, 0x3a, 0xc3, 0xaf, 0x14, 0xfe, 0xac, 0xe9, 0x2f, - 0xf8, 0xc5, 0x21, 0xb7, 0xa0, 0xab, 0xbf, 0x28, 0x90, 0x9f, 0xe9, 0x24, 0xed, 0x3d, 0xb8, 0xd0, - 0xda, 0xbf, 0x71, 0x50, 0xdf, 0x33, 0x1b, 0xad, 0x1b, 0x66, 0xfb, 0x8b, 0x66, 0xdd, 0xbc, 0x7d, - 0xf0, 0xd9, 0xc1, 0xe1, 0xe7, 0x07, 0xc5, 0xa5, 0x72, 0xe1, 0xc1, 0xa3, 0x6a, 0xf6, 0xb6, 0x7b, - 0xcf, 0xa5, 0x5f, 0xb9, 0x8b, 0xd0, 0x4d, 0xa3, 0x7e, 0xe7, 0xb0, 0x5d, 0x2f, 0x2a, 0x02, 0xdd, - 0xf4, 0xc9, 0x31, 0x65, 0x04, 0xd1, 0xd7, 0xe0, 0xe2, 0x39, 0xe8, 0xdd, 0xc3, 0x46, 0x63, 0xbf, - 0x5d, 0x8c, 0x95, 0x57, 0x1e, 0x3c, 0xaa, 0xe6, 0x9b, 0x3e, 0x11, 0x2c, 0x43, 0x0b, 0x1d, 0x4a, - 0xf3, 0x16, 0x87, 0xcd, 0xc3, 0xd6, 0xf6, 0xad, 0x62, 0xb5, 0x5c, 0x7c, 0xf0, 0xa8, 0x9a, 0x0b, - 0x47, 0x06, 0xc7, 0x97, 0xd3, 0x5f, 0x7f, 0x5b, 0x59, 0xfa, 0xfe, 0xbb, 0x8a, 0xb2, 0xd3, 0x78, - 0x72, 0x5a, 0x51, 0x9e, 0x9e, 0x56, 0x94, 0x3f, 0x4e, 0x2b, 0xca, 0xc3, 0xe7, 0x95, 0xa5, 0xa7, - 0xcf, 0x2b, 0x4b, 0xbf, 0x3e, 0xaf, 0x2c, 0xdd, 0xbd, 0xde, 0x73, 0x58, 0x7f, 0xd4, 0xd1, 0xbb, - 0x74, 0xb8, 0xd9, 0xa5, 0x43, 0xc2, 0x3a, 0x47, 0x6c, 0xf2, 0x20, 0xbe, 0x5a, 0xcf, 0x7e, 0x49, - 0x76, 0x92, 0x28, 0xbf, 0xfe, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x91, 0x91, 0x2b, 0x0a, - 0x0f, 0x00, 0x00, + // 1380 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xce, 0xda, 0xeb, 0x5f, 0xcf, 0x76, 0xec, 0x2c, 0x11, 0x75, 0xdd, 0xc6, 0x31, 0xae, 0x80, + 0x50, 0x90, 0x53, 0xa5, 0x08, 0xc1, 0x01, 0xa1, 0xfc, 0x30, 0x6d, 0x44, 0x9d, 0x58, 0x6b, 0xb7, + 0x88, 0x5e, 0x56, 0x6b, 0xef, 0xc4, 0x5e, 0xba, 0xde, 0x59, 0xed, 0x8e, 0x83, 0xd3, 0xbf, 0x00, + 0xf5, 0xd4, 0x13, 0xb7, 0x9e, 0xe0, 0xc0, 0x1d, 0x24, 0xae, 0x88, 0x53, 0x8f, 0xbd, 0x01, 0x07, + 0x0a, 0xa4, 0xff, 0x08, 0x9a, 0x37, 0xb3, 0x6b, 0x3b, 0x8e, 0xa1, 0xaa, 0x2a, 0x90, 0xb8, 0x58, + 0x3b, 0xef, 0x7d, 0xf3, 0xe6, 0xed, 0xfb, 0xde, 0x37, 0x7e, 0x0b, 0x97, 0x19, 0x71, 0x2d, 0xe2, + 0x0f, 0x6d, 0x97, 0x6d, 0xb2, 0x13, 0x8f, 0x04, 0xe2, 0xb7, 0xee, 0xf9, 0x94, 0x51, 0xad, 0x38, + 0xf1, 0xd6, 0xd1, 0x5e, 0x5e, 0xed, 0xd3, 0x3e, 0x45, 0xe7, 0x26, 0x7f, 0x12, 0xb8, 0xf2, 0x7a, + 0x9f, 0xd2, 0xbe, 0x43, 0x36, 0x71, 0xd5, 0x1d, 0x1d, 0x6d, 0x32, 0x7b, 0x48, 0x02, 0x66, 0x0e, + 0x3d, 0x09, 0x58, 0x9b, 0x3a, 0xa6, 0xe7, 0x9f, 0x78, 0x8c, 0x72, 0x2c, 0x3d, 0x92, 0xee, 0xca, + 0x94, 0xfb, 0x98, 0xf8, 0x81, 0x4d, 0xdd, 0xe9, 0x3c, 0xca, 0xd5, 0xb9, 0x2c, 0x8f, 0x4d, 0xc7, + 0xb6, 0x4c, 0x46, 0x7d, 0x81, 0xa8, 0x7d, 0x00, 0xf9, 0x96, 0xe9, 0xb3, 0x36, 0x61, 0x37, 0x89, + 0x69, 0x11, 0x5f, 0x5b, 0x85, 0x04, 0xa3, 0xcc, 0x74, 0x4a, 0x4a, 0x55, 0xd9, 0xc8, 0xeb, 0x62, + 0xa1, 0x69, 0xa0, 0x0e, 0xcc, 0x60, 0x50, 0x8a, 0x55, 0x95, 0x8d, 0x9c, 0x8e, 0xcf, 0xb5, 0x01, + 0xa8, 0x7c, 0x2b, 0xdf, 0x61, 0xbb, 0x16, 0x19, 0x87, 0x3b, 0x70, 0xc1, 0xad, 0xdd, 0x13, 0x46, + 0x02, 0xb9, 0x45, 0x2c, 0xb4, 0x77, 0x21, 0x81, 0xf9, 0x97, 0xe2, 0x55, 0x65, 0x23, 0xbb, 0x55, + 0xaa, 0x4f, 0x15, 0x4a, 0xbc, 0x5f, 0xbd, 0xc5, 0xfd, 0x3b, 0xea, 0xe3, 0xa7, 0xeb, 0x4b, 0xba, + 0x00, 0xd7, 0x1c, 0x48, 0xed, 0x38, 0xb4, 0x77, 0x6f, 0x7f, 0x2f, 0x4a, 0x44, 0x99, 0x24, 0xa2, + 0x35, 0xa1, 0xe0, 0x99, 0x3e, 0x33, 0x02, 0xc2, 0x8c, 0x01, 0xbe, 0x05, 0x1e, 0x9a, 0xdd, 0x5a, + 0xaf, 0x9f, 0xe5, 0xa1, 0x3e, 0xf3, 0xb2, 0xf2, 0x94, 0xbc, 0x37, 0x6d, 0xac, 0xfd, 0x9a, 0x80, + 0xa4, 0x2c, 0xc6, 0x87, 0x90, 0x92, 0x65, 0xc5, 0x03, 0xb3, 0x5b, 0x6b, 0xd3, 0x11, 0xa5, 0xab, + 0xbe, 0x4b, 0xdd, 0x80, 0xb8, 0xc1, 0x28, 0x90, 0xf1, 0xc2, 0x3d, 0xda, 0x1b, 0x90, 0xee, 0x0d, + 0x4c, 0xdb, 0x35, 0x6c, 0x0b, 0x33, 0xca, 0xec, 0x64, 0x4f, 0x9f, 0xae, 0xa7, 0x76, 0xb9, 0x6d, + 0x7f, 0x4f, 0x4f, 0xa1, 0x73, 0xdf, 0xd2, 0x5e, 0x85, 0xe4, 0x80, 0xd8, 0xfd, 0x01, 0xc3, 0xb2, + 0xc4, 0x75, 0xb9, 0xd2, 0xde, 0x07, 0x95, 0x37, 0x44, 0x49, 0xc5, 0xb3, 0xcb, 0x75, 0xd1, 0x2d, + 0xf5, 0xb0, 0x5b, 0xea, 0x9d, 0xb0, 0x5b, 0x76, 0xd2, 0xfc, 0xe0, 0x87, 0xbf, 0xaf, 0x2b, 0x3a, + 0xee, 0xd0, 0x76, 0x21, 0xef, 0x98, 0x01, 0x33, 0xba, 0xbc, 0x6c, 0xfc, 0xf8, 0x04, 0x86, 0xb8, + 0x38, 0x5f, 0x10, 0x59, 0x58, 0x99, 0x7a, 0x96, 0xef, 0x12, 0x26, 0x4b, 0xdb, 0x80, 0x22, 0x06, + 0xe9, 0xd1, 0xe1, 0xd0, 0x66, 0x06, 0xd6, 0x3d, 0x89, 0x75, 0x5f, 0xe6, 0xf6, 0x5d, 0x34, 0xdf, + 0xe4, 0x0c, 0x5c, 0x82, 0x8c, 0x65, 0x32, 0x53, 0x40, 0x52, 0x08, 0x49, 0x73, 0x03, 0x3a, 0xdf, + 0x84, 0x42, 0xd4, 0x75, 0x81, 0x80, 0xa4, 0x45, 0x94, 0x89, 0x19, 0x81, 0xd7, 0x60, 0xd5, 0x25, + 0x63, 0x66, 0x9c, 0x45, 0x67, 0x10, 0xad, 0x71, 0xdf, 0x9d, 0xd9, 0x1d, 0xaf, 0xc3, 0x72, 0x2f, + 0x2c, 0xbe, 0xc0, 0x02, 0x62, 0xf3, 0x91, 0x15, 0x61, 0x17, 0x21, 0x6d, 0x7a, 0x9e, 0x00, 0x64, + 0x11, 0x90, 0x32, 0x3d, 0x0f, 0x5d, 0x57, 0x61, 0x05, 0xdf, 0xd1, 0x27, 0xc1, 0xc8, 0x61, 0x32, + 0x48, 0x0e, 0x31, 0x05, 0xee, 0xd0, 0x85, 0x1d, 0xb1, 0x57, 0x20, 0x4f, 0x8e, 0x6d, 0x8b, 0xb8, + 0x3d, 0x22, 0x70, 0x79, 0xc4, 0xe5, 0x42, 0x23, 0x82, 0xde, 0x82, 0xa2, 0xe7, 0x53, 0x8f, 0x06, + 0xc4, 0x37, 0x4c, 0xcb, 0xf2, 0x49, 0x10, 0x94, 0x96, 0x45, 0xbc, 0xd0, 0xbe, 0x2d, 0xcc, 0xda, + 0x2d, 0x28, 0x12, 0x17, 0xbb, 0x9e, 0x58, 0x86, 0x6f, 0xba, 0x16, 0x1d, 0x96, 0x0a, 0xc8, 0xd3, + 0x6b, 0xf3, 0x3c, 0x35, 0x42, 0xa4, 0x8e, 0x40, 0xbd, 0x40, 0x66, 0x0d, 0x3c, 0x3b, 0x7b, 0xe8, + 0x39, 0x76, 0x2f, 0xa4, 0xaa, 0x28, 0xb2, 0x0b, 0x8d, 0x3c, 0xbb, 0xda, 0x47, 0x50, 0x38, 0x13, + 0x88, 0x37, 0x9f, 0x3c, 0x5b, 0x68, 0x4a, 0xae, 0xb8, 0x80, 0x85, 0x54, 0xa5, 0x80, 0x85, 0x14, + 0x4b, 0xa0, 0xee, 0x99, 0xcc, 0xd4, 0x8a, 0x10, 0x67, 0xe3, 0xa0, 0xa4, 0x54, 0xe3, 0x1b, 0x39, + 0x9d, 0x3f, 0xd6, 0x7e, 0x88, 0x83, 0x7a, 0x87, 0x32, 0xa2, 0x5d, 0x07, 0x95, 0xa7, 0x8c, 0xe1, + 0x96, 0xcf, 0xd3, 0x60, 0xdb, 0xee, 0xbb, 0xc4, 0x6a, 0x06, 0xfd, 0xce, 0x89, 0x47, 0x74, 0x04, + 0x4f, 0x49, 0x20, 0x36, 0x23, 0x81, 0x55, 0x48, 0xf8, 0x74, 0xe4, 0x5a, 0xa8, 0x8c, 0x84, 0x2e, + 0x16, 0x5a, 0x03, 0xd2, 0x51, 0x67, 0xab, 0xff, 0xd4, 0xd9, 0x05, 0xde, 0xd9, 0x5c, 0x77, 0xd2, + 0xa0, 0xa7, 0xba, 0xb2, 0xc1, 0x77, 0x20, 0x13, 0x5d, 0xb8, 0x52, 0x21, 0xcf, 0x27, 0xb2, 0xc9, + 0x36, 0xed, 0x6d, 0x58, 0x89, 0xfa, 0x35, 0x22, 0x5c, 0xa8, 0xa4, 0x18, 0x39, 0x42, 0xc6, 0xa7, + 0xa5, 0x60, 0x88, 0x4b, 0x33, 0x85, 0xef, 0x35, 0x91, 0xc2, 0x3e, 0xde, 0x9e, 0x97, 0x21, 0x13, + 0xd8, 0x7d, 0xd7, 0x64, 0x23, 0x9f, 0x48, 0xb5, 0x4c, 0x0c, 0xdc, 0x4b, 0xc6, 0x8c, 0xb8, 0x78, + 0x31, 0x09, 0x75, 0x4c, 0x0c, 0xda, 0x26, 0xbc, 0x12, 0x2d, 0x8c, 0x49, 0x14, 0xa1, 0x0c, 0x2d, + 0x72, 0xb5, 0x43, 0x4f, 0xed, 0x47, 0x05, 0x92, 0x42, 0xcc, 0x53, 0x34, 0x28, 0xe7, 0xd3, 0x10, + 0x5b, 0x44, 0x43, 0xfc, 0xc5, 0x69, 0xd8, 0x06, 0x88, 0xd2, 0x0c, 0x4a, 0x6a, 0x35, 0xbe, 0x91, + 0xdd, 0xba, 0x34, 0x1f, 0x48, 0xa4, 0xd8, 0xb6, 0xfb, 0xf2, 0xae, 0x9a, 0xda, 0x54, 0xfb, 0x4d, + 0x81, 0x4c, 0xe4, 0xd7, 0xb6, 0x21, 0x1f, 0xe6, 0x65, 0x1c, 0x39, 0x66, 0x5f, 0xb6, 0xe2, 0xda, + 0xc2, 0xe4, 0x3e, 0x76, 0xcc, 0xbe, 0x9e, 0x95, 0xf9, 0xf0, 0xc5, 0xf9, 0xb4, 0xc6, 0x16, 0xd0, + 0x3a, 0xd3, 0x47, 0xf1, 0x17, 0xeb, 0xa3, 0x19, 0xc6, 0xd5, 0x33, 0x8c, 0xd7, 0xfe, 0x54, 0x60, + 0xb9, 0x31, 0xc6, 0xf4, 0xad, 0xff, 0x92, 0xaa, 0xbb, 0xb2, 0xb7, 0x2c, 0x62, 0x19, 0x73, 0x9c, + 0x5d, 0x39, 0xe7, 0xd6, 0x9a, 0xc9, 0x79, 0xc2, 0x9d, 0x16, 0x46, 0x69, 0x4f, 0x38, 0xfc, 0x3e, + 0x06, 0x2b, 0x73, 0xf8, 0xff, 0x1f, 0x97, 0xb3, 0xea, 0x4d, 0x3c, 0xa7, 0x7a, 0x93, 0x0b, 0xd5, + 0xfb, 0x5d, 0x0c, 0xd2, 0x2d, 0xfc, 0x67, 0x31, 0x9d, 0x7f, 0xe3, 0xee, 0xbd, 0x04, 0x19, 0x8f, + 0x3a, 0x86, 0xf0, 0xa8, 0xe8, 0x49, 0x7b, 0xd4, 0xd1, 0xe7, 0xda, 0x2c, 0xf1, 0x92, 0x2e, 0xe6, + 0xe4, 0x4b, 0x20, 0x21, 0x75, 0x56, 0x50, 0x3e, 0xe4, 0x44, 0x29, 0xe4, 0xa4, 0x77, 0x8d, 0xd7, + 0x00, 0x47, 0x47, 0x65, 0x7e, 0x32, 0x15, 0x69, 0x0b, 0xa4, 0x2e, 0x71, 0x7c, 0x87, 0x18, 0x8c, + 0xe4, 0xb0, 0x59, 0x5a, 0x74, 0x63, 0xe9, 0x12, 0x57, 0xfb, 0x4a, 0x01, 0xb8, 0xc5, 0x2b, 0x8b, + 0xef, 0xcb, 0x67, 0xb4, 0x00, 0x53, 0x30, 0x66, 0x4e, 0xae, 0x2c, 0x22, 0x4d, 0x9e, 0x9f, 0x0b, + 0xa6, 0xf3, 0xde, 0x85, 0xfc, 0xa4, 0xb7, 0x03, 0x12, 0x26, 0x73, 0x4e, 0x90, 0x68, 0x74, 0x6a, + 0x13, 0xa6, 0xe7, 0x8e, 0xa7, 0x56, 0xb5, 0x9f, 0x14, 0xc8, 0x60, 0x4e, 0x4d, 0xc2, 0xcc, 0x19, + 0x0e, 0x95, 0x17, 0xe7, 0x70, 0x0d, 0x40, 0x84, 0x09, 0xec, 0xfb, 0x44, 0x76, 0x56, 0x06, 0x2d, + 0x6d, 0xfb, 0x3e, 0xd1, 0xde, 0x8b, 0x0a, 0x1e, 0xff, 0xfb, 0x82, 0xcb, 0x1b, 0x23, 0x2c, 0xfb, + 0x05, 0x48, 0xb9, 0xa3, 0xa1, 0xc1, 0x87, 0x0f, 0x55, 0x74, 0xab, 0x3b, 0x1a, 0x76, 0xc6, 0x41, + 0xed, 0x73, 0x48, 0x75, 0xc6, 0xf8, 0xf1, 0xc0, 0x5b, 0xd4, 0xa7, 0x54, 0x8e, 0x41, 0x62, 0xaa, + 0x49, 0x73, 0x03, 0x0e, 0x68, 0x1a, 0xa8, 0x7c, 0x34, 0x0d, 0x3f, 0x65, 0xf8, 0xb3, 0x56, 0x7f, + 0xce, 0xcf, 0x12, 0x39, 0x05, 0x5d, 0xfd, 0x59, 0x81, 0xfc, 0x8c, 0x92, 0xb4, 0x77, 0xe0, 0x42, + 0x7b, 0xff, 0xc6, 0x41, 0x63, 0xcf, 0x68, 0xb6, 0x6f, 0x18, 0x9d, 0xcf, 0x5a, 0x0d, 0xe3, 0xf6, + 0xc1, 0x27, 0x07, 0x87, 0x9f, 0x1e, 0x14, 0x97, 0xca, 0x85, 0x07, 0x8f, 0xaa, 0xd9, 0xdb, 0xee, + 0x3d, 0x97, 0x7e, 0xe1, 0x2e, 0x42, 0xb7, 0xf4, 0xc6, 0x9d, 0xc3, 0x4e, 0xa3, 0xa8, 0x08, 0x74, + 0xcb, 0x27, 0xc7, 0x94, 0x11, 0x44, 0x5f, 0x83, 0x8b, 0xe7, 0xa0, 0x77, 0x0f, 0x9b, 0xcd, 0xfd, + 0x4e, 0x31, 0x56, 0x5e, 0x79, 0xf0, 0xa8, 0x9a, 0x6f, 0xf9, 0x44, 0x74, 0x19, 0xee, 0xa8, 0x43, + 0x69, 0x7e, 0xc7, 0x61, 0xeb, 0xb0, 0xbd, 0x7d, 0xab, 0x58, 0x2d, 0x17, 0x1f, 0x3c, 0xaa, 0xe6, + 0xc2, 0x2b, 0x83, 0xe3, 0xcb, 0xe9, 0x2f, 0xbf, 0xae, 0x2c, 0x7d, 0xfb, 0x4d, 0x45, 0xd9, 0x69, + 0x3e, 0x3e, 0xad, 0x28, 0x4f, 0x4e, 0x2b, 0xca, 0x1f, 0xa7, 0x15, 0xe5, 0xe1, 0xb3, 0xca, 0xd2, + 0x93, 0x67, 0x95, 0xa5, 0x5f, 0x9e, 0x55, 0x96, 0xee, 0x5e, 0xef, 0xdb, 0x6c, 0x30, 0xea, 0xd6, + 0x7b, 0x74, 0xb8, 0xd9, 0xa3, 0x43, 0xc2, 0xba, 0x47, 0x6c, 0xf2, 0x20, 0x3e, 0x6d, 0xcf, 0x7e, + 0x6e, 0x76, 0x93, 0x68, 0xbf, 0xfe, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0x92, 0x7d, 0x8b, + 0x2f, 0x0f, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1490,6 +1500,15 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ImplicitHash) > 0 { + i -= len(m.ImplicitHash) + copy(dAtA[i:], m.ImplicitHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.ImplicitHash))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } if m.EncryptedRandom != nil { { size, err := m.EncryptedRandom.MarshalToSizedBuffer(dAtA[:i]) @@ -2377,6 +2396,10 @@ func (m *Header) Size() (n int) { l = m.EncryptedRandom.Size() n += 1 + l + sovTypes(uint64(l)) } + l = len(m.ImplicitHash) + if l > 0 { + n += 2 + l + sovTypes(uint64(l)) + } return n } @@ -3537,6 +3560,40 @@ func (m *Header) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ImplicitHash", 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.ImplicitHash = append(m.ImplicitHash[:0], dAtA[iNdEx:postIndex]...) + if m.ImplicitHash == nil { + m.ImplicitHash = []byte{} + } + 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 e98c1e6f677..4e1404e6bb9 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -71,6 +71,9 @@ message Header { // encrypted random EncryptedRandom encrypted_random = 15; // a random number encrypted by the proposer to be used in contracts + + // scheduled_msgs_hash + bytes implicit_hash = 16; } // Data contains the set of transactions included in the block diff --git a/state/execution.go b/state/execution.go index 5e2202d212d..6a7fda77b43 100644 --- a/state/execution.go +++ b/state/execution.go @@ -5,6 +5,8 @@ import ( "context" "encoding/hex" "fmt" + "time" + abci "github.com/cometbft/cometbft/abci/types" cryptoenc "github.com/cometbft/cometbft/crypto/encoding" "github.com/cometbft/cometbft/libs/fail" @@ -14,7 +16,6 @@ import ( "github.com/cometbft/cometbft/proxy" "github.com/cometbft/cometbft/types" tmenclave "github.com/scrtlabs/tm-secret-enclave" - "time" ) //----------------------------------------------------------------------------- @@ -138,6 +139,16 @@ func (blockExec *BlockExecutor) CreateProposalBlock( Time: block.Time, NextValidatorsHash: block.NextValidatorsHash, ProposerAddress: block.ProposerAddress, + ImplicitHash: block.ImplicitHash, + Version: block.Version, + DataHash: block.DataHash, + LastBlockId: block.LastBlockID.ToProto(), + LastCommitHash: block.LastCommitHash, + ValidatorsHash: block.ValidatorsHash, + ConsensusHash: block.ConsensusHash, + LastResultsHash: block.LastResultsHash, + EvidenceHash: block.EvidenceHash, + EncryptedRandom: block.EncryptedRandom.ToProto(), }, ) if err != nil { @@ -173,6 +184,16 @@ func (blockExec *BlockExecutor) ProcessProposal( Misbehavior: block.Evidence.Evidence.ToABCI(), ProposerAddress: block.ProposerAddress, NextValidatorsHash: block.NextValidatorsHash, + ImplicitHash: block.ImplicitHash, + Version: block.Version, + DataHash: block.DataHash, + LastBlockId: block.LastBlockID.ToProto(), + LastCommitHash: block.LastCommitHash, + ValidatorsHash: block.ValidatorsHash, + ConsensusHash: block.ConsensusHash, + LastResultsHash: block.LastResultsHash, + EvidenceHash: block.EvidenceHash, + EncryptedRandom: block.EncryptedRandom.ToProto(), }) if err != nil { return false, err @@ -253,6 +274,15 @@ func (blockExec *BlockExecutor) applyBlock(state State, blockID types.BlockID, b Txs: block.Txs.ToSliceOfBytes(), EncryptedRandom: block.EncryptedRandom.ToProto(), Commit: blockExec.blockStore.LoadSeenCommit(block.Height).ToProto(), + ImplicitHash: block.ImplicitHash, + Version: block.Version, + DataHash: block.DataHash, + LastBlockId: block.LastBlockID.ToProto(), + LastCommitHash: block.LastCommitHash, + ValidatorsHash: block.ValidatorsHash, + ConsensusHash: block.ConsensusHash, + LastResultsHash: block.LastResultsHash, + EvidenceHash: block.EvidenceHash, }) endTime := time.Now().UnixNano() blockExec.metrics.BlockProcessingTime.Observe(float64(endTime-startTime) / 1000000) @@ -367,6 +397,15 @@ func (blockExec *BlockExecutor) ExtendVote( Misbehavior: block.Evidence.Evidence.ToABCI(), NextValidatorsHash: block.NextValidatorsHash, ProposerAddress: block.ProposerAddress, + ImplicitHash: block.ImplicitHash, + Version: block.Version, + DataHash: block.DataHash, + LastBlockId: block.LastBlockID.ToProto(), + LastCommitHash: block.LastCommitHash, + ValidatorsHash: block.ValidatorsHash, + ConsensusHash: block.ConsensusHash, + LastResultsHash: block.LastResultsHash, + EvidenceHash: block.EvidenceHash, } resp, err := blockExec.proxyApp.ExtendVote(ctx, &req) @@ -769,6 +808,16 @@ func ExecCommitBlock( DecidedLastCommit: commitInfo, Misbehavior: block.Evidence.Evidence.ToABCI(), Txs: block.Txs.ToSliceOfBytes(), + ImplicitHash: block.ImplicitHash, + Version: block.Version, + DataHash: block.DataHash, + LastBlockId: block.LastBlockID.ToProto(), + LastCommitHash: block.LastCommitHash, + ValidatorsHash: block.ValidatorsHash, + ConsensusHash: block.ConsensusHash, + LastResultsHash: block.LastResultsHash, + EvidenceHash: block.EvidenceHash, + EncryptedRandom: block.EncryptedRandom.ToProto(), }) if err != nil { logger.Error("error in proxyAppConn.FinalizeBlock", "err", err) diff --git a/state/state.go b/state/state.go index 65ed89bc161..56b6354f5f6 100644 --- a/state/state.go +++ b/state/state.go @@ -2,19 +2,20 @@ package state import ( "bytes" + "encoding/hex" "errors" "fmt" "os" "time" - "encoding/hex" + "github.com/cosmos/gogoproto/proto" - tmenclave "github.com/scrtlabs/tm-secret-enclave" cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" "github.com/cometbft/cometbft/types" cmttime "github.com/cometbft/cometbft/types/time" "github.com/cometbft/cometbft/version" + tmenclave "github.com/scrtlabs/tm-secret-enclave" ) // database keys @@ -278,6 +279,11 @@ func (state State) MakeBlock( // println("Invalid random generated") panic("Failed to validate generated random") } + + implicitHash, err := tmenclave.GetImplicitHash() + if err != nil { + panic("Failed to get implicit hash") + } // ScrtLabs changes out <- // Fill rest of header with state data. @@ -286,9 +292,10 @@ func (state State) MakeBlock( timestamp, state.LastBlockID, state.Validators.Hash(), state.NextValidators.Hash(), state.ConsensusParams.Hash(), state.AppHash, state.LastResultsHash, - proposerAddress, &encryptedRandom, + proposerAddress, &encryptedRandom, implicitHash, ) + fmt.Printf("------------ HEADER HASH : %+v\n", block.Header.Hash()) return block } diff --git a/state/validation.go b/state/validation.go index 3648544bee7..b79b0d05491 100644 --- a/state/validation.go +++ b/state/validation.go @@ -2,12 +2,13 @@ package state import ( "bytes" + "encoding/hex" "errors" "fmt" - "encoding/hex" - tmenclave "github.com/scrtlabs/tm-secret-enclave" + "github.com/cometbft/cometbft/crypto" "github.com/cometbft/cometbft/types" + tmenclave "github.com/scrtlabs/tm-secret-enclave" ) //----------------------------------------------------- @@ -119,6 +120,14 @@ func validateBlock(state State, block *types.Block) error { } } + expectedImplicitHash, err := tmenclave.GetImplicitHash() // hash from last block's scheduling + if err != nil { + return fmt.Errorf("failed to get implicit hash: %w", err) + } + if !bytes.Equal(block.Header.ImplicitHash, expectedImplicitHash) { + return fmt.Errorf("implicit_hash mismatch: expected %X, got %X", hex.EncodeToString(expectedImplicitHash), hex.EncodeToString(block.Header.ImplicitHash)) + } + // Validate block Time switch { case block.Height > state.InitialHeight: diff --git a/types/block.go b/types/block.go index 5ded877964d..aca900a54bf 100644 --- a/types/block.go +++ b/types/block.go @@ -356,7 +356,8 @@ type Header struct { // ScrtLabs -> change in // encrypted Random Source - EncryptedRandom *EnclaveRandom `json:"encrypted_random"` + EncryptedRandom *EnclaveRandom `json:"encrypted_random"` + ImplicitHash cmtbytes.HexBytes `json:"implicit_hash"` // ScrtLabs <- change out } @@ -367,7 +368,7 @@ func (h *Header) Populate( timestamp time.Time, lastBlockID BlockID, valHash, nextValHash []byte, consensusHash, appHash, lastResultsHash []byte, - proposerAddress Address, encryptedRandom *EnclaveRandom, + proposerAddress Address, encryptedRandom *EnclaveRandom, implicitHash []byte, ) { h.Version = version h.ChainID = chainID @@ -381,6 +382,7 @@ func (h *Header) Populate( h.ProposerAddress = proposerAddress // ScrtLabs -> change in h.EncryptedRandom = encryptedRandom + h.ImplicitHash = implicitHash // ScrtLabs <- change out } @@ -433,6 +435,9 @@ func (h Header) ValidateBasic() error { if err := ValidateHash(h.NextValidatorsHash); err != nil { return fmt.Errorf("wrong NextValidatorsHash: %v", err) } + if err := ValidateHash(h.ImplicitHash); err != nil { + return fmt.Errorf("wrong ImplicitHash: %v", err) + } if err := ValidateHash(h.ConsensusHash); err != nil { return fmt.Errorf("wrong ConsensusHash: %v", err) } @@ -484,6 +489,7 @@ func (h *Header) Hash() cmtbytes.HexBytes { cdcEncode(h.LastResultsHash), cdcEncode(h.EvidenceHash), cdcEncode(h.ProposerAddress), + cdcEncode(h.ImplicitHash), }) } @@ -507,6 +513,7 @@ func (h *Header) StringIndented(indent string) string { %s Results: %v %s Evidence: %v %s Proposer: %v +%s ImplicitHash: %v %s}#%v`, indent, h.Version, indent, h.ChainID, @@ -522,6 +529,7 @@ func (h *Header) StringIndented(indent string) string { indent, h.LastResultsHash, indent, h.EvidenceHash, indent, h.ProposerAddress, + indent, h.ImplicitHash, indent, h.Hash(), ) } @@ -548,7 +556,8 @@ func (h *Header) ToProto() *cmtproto.Header { LastCommitHash: h.LastCommitHash, ProposerAddress: h.ProposerAddress, // ScrtLabs -> change in - EncryptedRandom: h.EncryptedRandom.ToProto(), + EncryptedRandom: h.EncryptedRandom.ToProto(), + ImplicitHash: h.ImplicitHash, // ScrtLabs <- change out } } @@ -591,6 +600,7 @@ func HeaderFromProto(ph *cmtproto.Header) (Header, error) { h.ProposerAddress = ph.ProposerAddress // ScrtLabs -> change in h.EncryptedRandom = encRandom + h.ImplicitHash = ph.ImplicitHash // ScrtLabs <- change out return *h, h.ValidateBasic() }