max-bytes PR follow-up (#2318)
* ReapMaxTxs: return all txs if max is negative
this mirrors ReapMaxBytes behavior
See https://github.com/tendermint/tendermint/pull/2184#discussion_r214439950
* increase MaxAminoOverheadForBlock
tested with:
```
func TestMaxAminoOverheadForBlock(t *testing.T) {
maxChainID := ""
for i := 0; i < MaxChainIDLen; i++ {
maxChainID += "𠜎"
}
h := Header{
ChainID: maxChainID,
Height: 10,
Time: time.Now().UTC(),
NumTxs: 100,
TotalTxs: 200,
LastBlockID: makeBlockID(make([]byte, 20), 300, make([]byte, 20)),
LastCommitHash: tmhash.Sum([]byte("last_commit_hash")),
DataHash: tmhash.Sum([]byte("data_hash")),
ValidatorsHash: tmhash.Sum([]byte("validators_hash")),
NextValidatorsHash: tmhash.Sum([]byte("next_validators_hash")),
ConsensusHash: tmhash.Sum([]byte("consensus_hash")),
AppHash: tmhash.Sum([]byte("app_hash")),
LastResultsHash: tmhash.Sum([]byte("last_results_hash")),
EvidenceHash: tmhash.Sum([]byte("evidence_hash")),
ProposerAddress: tmhash.Sum([]byte("proposer_address")),
}
b := Block{
Header: h,
Data: Data{Txs: makeTxs(10000, 100)},
Evidence: EvidenceData{},
LastCommit: &Commit{},
}
bz, err := cdc.MarshalBinary(b)
require.NoError(t, err)
assert.Equal(t, MaxHeaderBytes+MaxAminoOverheadForBlock-2, len(bz)-1000000-20000-1)
}
```
* fix MaxYYY constants calculation
by using math.MaxInt64
See https://github.com/tendermint/tendermint/pull/2184#discussion_r214444244
* pass mempool filter as an option
See https://github.com/tendermint/tendermint/pull/2184#discussion_r214445869
* fixes after Dev's comments
6 years ago |
|
- package types
-
- import (
- "bytes"
- "errors"
- "fmt"
- "time"
-
- crypto "github.com/tendermint/tendermint/crypto"
- cmn "github.com/tendermint/tendermint/libs/common"
- )
-
- const (
- // MaxVoteBytes is a maximum vote size (including amino overhead).
- MaxVoteBytes = 200
- )
-
- var (
- ErrVoteUnexpectedStep = errors.New("Unexpected step")
- ErrVoteInvalidValidatorIndex = errors.New("Invalid validator index")
- ErrVoteInvalidValidatorAddress = errors.New("Invalid validator address")
- ErrVoteInvalidSignature = errors.New("Invalid signature")
- ErrVoteInvalidBlockHash = errors.New("Invalid block hash")
- ErrVoteNonDeterministicSignature = errors.New("Non-deterministic signature")
- ErrVoteNil = errors.New("Nil vote")
- )
-
- type ErrVoteConflictingVotes struct {
- *DuplicateVoteEvidence
- }
-
- func (err *ErrVoteConflictingVotes) Error() string {
- return fmt.Sprintf("Conflicting votes from validator %v", err.PubKey.Address())
- }
-
- func NewConflictingVoteError(val *Validator, voteA, voteB *Vote) *ErrVoteConflictingVotes {
- return &ErrVoteConflictingVotes{
- &DuplicateVoteEvidence{
- PubKey: val.PubKey,
- VoteA: voteA,
- VoteB: voteB,
- },
- }
- }
-
- // Types of votes
- // TODO Make a new type "VoteType"
- const (
- VoteTypePrevote = byte(0x01)
- VoteTypePrecommit = byte(0x02)
- )
-
- func IsVoteTypeValid(type_ byte) bool {
- switch type_ {
- case VoteTypePrevote:
- return true
- case VoteTypePrecommit:
- return true
- default:
- return false
- }
- }
-
- // Address is hex bytes. TODO: crypto.Address
- type Address = cmn.HexBytes
-
- // Represents a prevote, precommit, or commit vote from validators for consensus.
- type Vote struct {
- ValidatorAddress Address `json:"validator_address"`
- ValidatorIndex int `json:"validator_index"`
- Height int64 `json:"height"`
- Round int `json:"round"`
- Timestamp time.Time `json:"timestamp"`
- Type byte `json:"type"`
- BlockID BlockID `json:"block_id"` // zero if vote is nil.
- Signature []byte `json:"signature"`
- }
-
- func (vote *Vote) SignBytes(chainID string) []byte {
- bz, err := cdc.MarshalJSON(CanonicalVote(chainID, vote))
- if err != nil {
- panic(err)
- }
- return bz
- }
-
- func (vote *Vote) Copy() *Vote {
- voteCopy := *vote
- return &voteCopy
- }
-
- func (vote *Vote) String() string {
- if vote == nil {
- return "nil-Vote"
- }
- var typeString string
- switch vote.Type {
- case VoteTypePrevote:
- typeString = "Prevote"
- case VoteTypePrecommit:
- typeString = "Precommit"
- default:
- cmn.PanicSanity("Unknown vote type")
- }
-
- return fmt.Sprintf("Vote{%v:%X %v/%02d/%v(%v) %X %X @ %s}",
- vote.ValidatorIndex, cmn.Fingerprint(vote.ValidatorAddress),
- vote.Height, vote.Round, vote.Type, typeString,
- cmn.Fingerprint(vote.BlockID.Hash),
- cmn.Fingerprint(vote.Signature),
- CanonicalTime(vote.Timestamp))
- }
-
- func (vote *Vote) Verify(chainID string, pubKey crypto.PubKey) error {
- if !bytes.Equal(pubKey.Address(), vote.ValidatorAddress) {
- return ErrVoteInvalidValidatorAddress
- }
-
- if !pubKey.VerifyBytes(vote.SignBytes(chainID), vote.Signature) {
- return ErrVoteInvalidSignature
- }
- return nil
- }
|