mirror of
https://github.com/tendermint/tendermint.git
synced 2026-01-03 11:45:18 +00:00
* Add protos for ExtendedCommit Cherry-pick from e73f0178b72a16ee81f8e856aadf651f2c62ec6e just the changes to the .proto files, since we have deleted the .intermediate files. Signed-off-by: Thane Thomson <connect@thanethomson.com> * make proto-gen Signed-off-by: Thane Thomson <connect@thanethomson.com> * BlockStore holds extended commit Cherry-pick 8d504d4b50ec6afbdffe2df7ababbef30e15053d and fix conflicts. Signed-off-by: Thane Thomson <connect@thanethomson.com> * Reshuffle ExtendedCommit and ExtendedCommitSig Separate the data structures and functions from their Commit-oriented counterparts to adhere to the current coding style. Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix exit condition in blocksync * Add note to remove TxResult proto As Sergio pointed out in 3e31aa6f583cdc71e208ed03a82f1d804ec0de49, this proto message can probably be removed. We should do this in a separate PR. Signed-off-by: Thane Thomson <connect@thanethomson.com> * Lift termination condition into for loop Signed-off-by: Thane Thomson <connect@thanethomson.com> * Enforce vote extension signature requirement Signed-off-by: Thane Thomson <connect@thanethomson.com> * Expand on comment for PeekTwoBlocks for posterity Signed-off-by: Thane Thomson <connect@thanethomson.com> * Isolate TODO more clearly Signed-off-by: Thane Thomson <connect@thanethomson.com> * make mockery Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix comment Signed-off-by: Thane Thomson <connect@thanethomson.com> * Make panic output from BlockStore.SaveBlock more readable Signed-off-by: Thane Thomson <connect@thanethomson.com> * Add helper methods to ExtendedCommitSig and ExtendedCommit Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix most tests except TestHandshake* Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix store prefix collision Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix TestBlockFetchAtHeight Signed-off-by: Thane Thomson <connect@thanethomson.com> * Remove global state from store tests Signed-off-by: Thane Thomson <connect@thanethomson.com> * Apply suggestions from code review Co-authored-by: M. J. Fromberger <fromberger@interchain.io> Co-authored-by: Sergio Mena <sergio@informal.systems> * blocksync: Just return error Signed-off-by: Thane Thomson <connect@thanethomson.com> * make format Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Remove unused/commented-out code Signed-off-by: Thane Thomson <connect@thanethomson.com> * blocksync: Change pool AddBlock function signature to return errors Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Improve legibility of switch statements Signed-off-by: Thane Thomson <connect@thanethomson.com> * blocksync: Expand on extended commit requirement in AddBlock description Signed-off-by: Thane Thomson <connect@thanethomson.com> * blocksync: Return error without also logging it Signed-off-by: Thane Thomson <connect@thanethomson.com> * consensus: Rename short-lived local variable Signed-off-by: Thane Thomson <connect@thanethomson.com> * consensus: Allocate TODO to Sergio Signed-off-by: Thane Thomson <connect@thanethomson.com> * evidence/pool_test: Inline slice construction Signed-off-by: Thane Thomson <connect@thanethomson.com> * state: Rename LoadBlockExtCommit to LoadBlockExtendedCommit Signed-off-by: Thane Thomson <connect@thanethomson.com> * proto: Remove TODO on TxResult Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Minor format Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Reformat ExtendedCommitSig.BlockID Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Remove NewExtendedCommit constructor Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Remove NewCommit constructor Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Shorten receiver names for ExtendedCommit Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Convert ExtendedCommit.Copy to a deep clone Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Assign TODO to Sergio Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Fix legibility nits Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Improve legibility Signed-off-by: Thane Thomson <connect@thanethomson.com> * store/state: Add TODO to move prefixes to common package Signed-off-by: Thane Thomson <connect@thanethomson.com> * Propagate validator info to PrepareProposal In order to propagate validator voting power through to PrepareProposal, we need to load the validator set info from the height corresponding to the extended commit that we're passing through to PrepareProposal as the "LocalLastCommit". Signed-off-by: Thane Thomson <connect@thanethomson.com> * Rename local var for clarity Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix TestMaxProposalBlockSize Signed-off-by: Thane Thomson <connect@thanethomson.com> * Rename local var for clarity Signed-off-by: Thane Thomson <connect@thanethomson.com> * Remove debug log Signed-off-by: Thane Thomson <connect@thanethomson.com> * Remove CommigSig.ForBlock helper Signed-off-by: Thane Thomson <connect@thanethomson.com> * Remove CommigSig.Absent helper Signed-off-by: Thane Thomson <connect@thanethomson.com> * Remove ExtendedCommitSig.ForBlock helper Signed-off-by: Thane Thomson <connect@thanethomson.com> * Remove ExtendedCommitSig.Absent helper Signed-off-by: Thane Thomson <connect@thanethomson.com> * There are no extended commits below the initial height Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix comment grammar Signed-off-by: Thane Thomson <connect@thanethomson.com> * Remove JSON encoding from ExtendedCommit Signed-off-by: Thane Thomson <connect@thanethomson.com> * Embed CommitSig into ExtendedCommitSig instead of duplicating fields Signed-off-by: Thane Thomson <connect@thanethomson.com> * Rename ExtendedCommit vote_extension field to extension for consistency with domain types Signed-off-by: Thane Thomson <connect@thanethomson.com> * blocksync: Panic if we peek a block without an extended commit Signed-off-by: Thane Thomson <connect@thanethomson.com> * Apply suggestions from code review Co-authored-by: M. J. Fromberger <fromberger@interchain.io> * Remove Sergio from TODO Signed-off-by: Thane Thomson <connect@thanethomson.com> * Increase hard-coded vote extension max size to 1MB Signed-off-by: Thane Thomson <connect@thanethomson.com> * state: Remove unnecessary comment Signed-off-by: Thane Thomson <connect@thanethomson.com> * state: Ensure no of commit sigs equals validator set length Signed-off-by: Thane Thomson <connect@thanethomson.com> * make format Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Minor legibility improvements Signed-off-by: Thane Thomson <connect@thanethomson.com> * Improve legibility Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Remove unused GetVotes function on VoteSet Signed-off-by: Thane Thomson <connect@thanethomson.com> * Refactor TestMaxProposalBlockSize to construct more realistic extended commit Signed-off-by: Thane Thomson <connect@thanethomson.com> * Refactor buildExtendedCommitInfo to resemble buildLastCommitInfo Signed-off-by: Thane Thomson <connect@thanethomson.com> * Apply suggestions from code review Co-authored-by: M. J. Fromberger <fromberger@interchain.io> * abci++: Disable VerifyVoteExtension call on nil precommits (#8491) Signed-off-by: Thane Thomson <connect@thanethomson.com> * types: Require vote extensions on non-nil precommits and not otherwise Signed-off-by: Thane Thomson <connect@thanethomson.com> * Disable lint Signed-off-by: Thane Thomson <connect@thanethomson.com> * Increase timeout for TestReactorVotingPowerChange to counter flakiness Signed-off-by: Thane Thomson <connect@thanethomson.com> * Only sign and verify vote extensions in non-nil precommits Signed-off-by: Thane Thomson <connect@thanethomson.com> * Revert "Disable lint" This reverts commit6fffbf9402. Signed-off-by: Thane Thomson <connect@thanethomson.com> * Add missing non-nil check uncovered non-deterministically in TestHandshakeReplayAll Signed-off-by: Thane Thomson <connect@thanethomson.com> * Expand error message for accuracy Signed-off-by: Thane Thomson <connect@thanethomson.com> * Only call ExtendVote when we make non-nil precommits Signed-off-by: Thane Thomson <connect@thanethomson.com> * Revert "Increase timeout for TestReactorVotingPowerChange to counter flakiness" This reverts commitaf514939db. Signed-off-by: Thane Thomson <connect@thanethomson.com> * Refactor ValidateBasic for ExtendedCommitSig for legibility Signed-off-by: Thane Thomson <connect@thanethomson.com> Co-authored-by: Sergio Mena <sergio@informal.systems> Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
231 lines
7.3 KiB
Go
231 lines
7.3 KiB
Go
package light_test
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/tendermint/tendermint/crypto"
|
|
"github.com/tendermint/tendermint/crypto/ed25519"
|
|
tmtime "github.com/tendermint/tendermint/libs/time"
|
|
provider_mocks "github.com/tendermint/tendermint/light/provider/mocks"
|
|
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
|
|
"github.com/tendermint/tendermint/types"
|
|
"github.com/tendermint/tendermint/version"
|
|
)
|
|
|
|
// privKeys is a helper type for testing.
|
|
//
|
|
// It lets us simulate signing with many keys. The main use case is to create
|
|
// a set, and call GenSignedHeader to get properly signed header for testing.
|
|
//
|
|
// You can set different weights of validators each time you call ToValidators,
|
|
// and can optionally extend the validator set later with Extend.
|
|
type privKeys []crypto.PrivKey
|
|
|
|
// genPrivKeys produces an array of private keys to generate commits.
|
|
func genPrivKeys(n int) privKeys {
|
|
res := make(privKeys, n)
|
|
for i := range res {
|
|
res[i] = ed25519.GenPrivKey()
|
|
}
|
|
return res
|
|
}
|
|
|
|
// Extend adds n more keys (to remove, just take a slice).
|
|
func (pkz privKeys) Extend(n int) privKeys {
|
|
extra := genPrivKeys(n)
|
|
return append(pkz, extra...)
|
|
}
|
|
|
|
// ToValidators produces a valset from the set of keys.
|
|
// The first key has weight `init` and it increases by `inc` every step
|
|
// so we can have all the same weight, or a simple linear distribution
|
|
// (should be enough for testing).
|
|
func (pkz privKeys) ToValidators(init, inc int64) *types.ValidatorSet {
|
|
res := make([]*types.Validator, len(pkz))
|
|
for i, k := range pkz {
|
|
res[i] = types.NewValidator(k.PubKey(), init+int64(i)*inc)
|
|
}
|
|
return types.NewValidatorSet(res)
|
|
}
|
|
|
|
// signHeader properly signs the header with all keys from first to last exclusive.
|
|
func (pkz privKeys) signHeader(t testing.TB, header *types.Header, valSet *types.ValidatorSet, first, last int) *types.Commit {
|
|
t.Helper()
|
|
|
|
commitSigs := make([]types.CommitSig, len(pkz))
|
|
for i := 0; i < len(pkz); i++ {
|
|
commitSigs[i] = types.NewCommitSigAbsent()
|
|
}
|
|
|
|
blockID := types.BlockID{
|
|
Hash: header.Hash(),
|
|
PartSetHeader: types.PartSetHeader{Total: 1, Hash: crypto.CRandBytes(32)},
|
|
}
|
|
|
|
// Fill in the votes we want.
|
|
for i := first; i < last && i < len(pkz); i++ {
|
|
vote := makeVote(t, header, valSet, pkz[i], blockID)
|
|
commitSigs[vote.ValidatorIndex] = vote.CommitSig()
|
|
}
|
|
|
|
return &types.Commit{
|
|
Height: header.Height,
|
|
Round: 1,
|
|
BlockID: blockID,
|
|
Signatures: commitSigs,
|
|
}
|
|
}
|
|
|
|
func makeVote(t testing.TB, header *types.Header, valset *types.ValidatorSet, key crypto.PrivKey, blockID types.BlockID) *types.Vote {
|
|
t.Helper()
|
|
|
|
addr := key.PubKey().Address()
|
|
idx, _ := valset.GetByAddress(addr)
|
|
vote := &types.Vote{
|
|
ValidatorAddress: addr,
|
|
ValidatorIndex: idx,
|
|
Height: header.Height,
|
|
Round: 1,
|
|
Timestamp: tmtime.Now(),
|
|
Type: tmproto.PrecommitType,
|
|
BlockID: blockID,
|
|
}
|
|
|
|
v := vote.ToProto()
|
|
// Sign it
|
|
signBytes := types.VoteSignBytes(header.ChainID, v)
|
|
sig, err := key.Sign(signBytes)
|
|
require.NoError(t, err)
|
|
|
|
vote.Signature = sig
|
|
|
|
return vote
|
|
}
|
|
|
|
func genHeader(chainID string, height int64, bTime time.Time, txs types.Txs,
|
|
valset, nextValset *types.ValidatorSet, appHash, consHash, resHash []byte) *types.Header {
|
|
|
|
return &types.Header{
|
|
Version: version.Consensus{Block: version.BlockProtocol, App: 0},
|
|
ChainID: chainID,
|
|
Height: height,
|
|
Time: bTime,
|
|
// LastBlockID
|
|
// LastCommitHash
|
|
ValidatorsHash: valset.Hash(),
|
|
NextValidatorsHash: nextValset.Hash(),
|
|
DataHash: txs.Hash(),
|
|
AppHash: appHash,
|
|
ConsensusHash: consHash,
|
|
LastResultsHash: resHash,
|
|
ProposerAddress: valset.Validators[0].Address,
|
|
}
|
|
}
|
|
|
|
// GenSignedHeader calls genHeader and signHeader and combines them into a SignedHeader.
|
|
func (pkz privKeys) GenSignedHeader(t testing.TB, chainID string, height int64, bTime time.Time, txs types.Txs,
|
|
valset, nextValset *types.ValidatorSet, appHash, consHash, resHash []byte, first, last int) *types.SignedHeader {
|
|
|
|
t.Helper()
|
|
|
|
header := genHeader(chainID, height, bTime, txs, valset, nextValset, appHash, consHash, resHash)
|
|
return &types.SignedHeader{
|
|
Header: header,
|
|
Commit: pkz.signHeader(t, header, valset, first, last),
|
|
}
|
|
}
|
|
|
|
// GenSignedHeaderLastBlockID calls genHeader and signHeader and combines them into a SignedHeader.
|
|
func (pkz privKeys) GenSignedHeaderLastBlockID(t testing.TB, chainID string, height int64, bTime time.Time, txs types.Txs,
|
|
valset, nextValset *types.ValidatorSet, appHash, consHash, resHash []byte, first, last int,
|
|
lastBlockID types.BlockID) *types.SignedHeader {
|
|
|
|
t.Helper()
|
|
|
|
header := genHeader(chainID, height, bTime, txs, valset, nextValset, appHash, consHash, resHash)
|
|
header.LastBlockID = lastBlockID
|
|
return &types.SignedHeader{
|
|
Header: header,
|
|
Commit: pkz.signHeader(t, header, valset, first, last),
|
|
}
|
|
}
|
|
|
|
func (pkz privKeys) ChangeKeys(delta int) privKeys {
|
|
newKeys := pkz[delta:]
|
|
return newKeys.Extend(delta)
|
|
}
|
|
|
|
// genLightBlocksWithKeys generates the header and validator set to create
|
|
// blocks to height. BlockIntervals are in per minute.
|
|
// NOTE: Expected to have a large validator set size ~ 100 validators.
|
|
func genLightBlocksWithKeys(
|
|
t testing.TB,
|
|
numBlocks int64,
|
|
valSize int,
|
|
valVariation float32,
|
|
bTime time.Time,
|
|
) (map[int64]*types.SignedHeader, map[int64]*types.ValidatorSet, map[int64]privKeys) {
|
|
t.Helper()
|
|
|
|
var (
|
|
headers = make(map[int64]*types.SignedHeader, numBlocks)
|
|
valset = make(map[int64]*types.ValidatorSet, numBlocks+1)
|
|
keymap = make(map[int64]privKeys, numBlocks+1)
|
|
keys = genPrivKeys(valSize)
|
|
totalVariation = valVariation
|
|
valVariationInt int
|
|
newKeys privKeys
|
|
)
|
|
|
|
valVariationInt = int(totalVariation)
|
|
totalVariation = -float32(valVariationInt)
|
|
newKeys = keys.ChangeKeys(valVariationInt)
|
|
keymap[1] = keys
|
|
keymap[2] = newKeys
|
|
|
|
// genesis header and vals
|
|
lastHeader := keys.GenSignedHeader(t, chainID, 1, bTime.Add(1*time.Minute), nil,
|
|
keys.ToValidators(2, 0), newKeys.ToValidators(2, 0), hash("app_hash"), hash("cons_hash"),
|
|
hash("results_hash"), 0, len(keys))
|
|
currentHeader := lastHeader
|
|
headers[1] = currentHeader
|
|
valset[1] = keys.ToValidators(2, 0)
|
|
keys = newKeys
|
|
|
|
for height := int64(2); height <= numBlocks; height++ {
|
|
totalVariation += valVariation
|
|
valVariationInt = int(totalVariation)
|
|
totalVariation = -float32(valVariationInt)
|
|
newKeys = keys.ChangeKeys(valVariationInt)
|
|
currentHeader = keys.GenSignedHeaderLastBlockID(t, chainID, height, bTime.Add(time.Duration(height)*time.Minute),
|
|
nil,
|
|
keys.ToValidators(2, 0), newKeys.ToValidators(2, 0), hash("app_hash"), hash("cons_hash"),
|
|
hash("results_hash"), 0, len(keys), types.BlockID{Hash: lastHeader.Hash()})
|
|
headers[height] = currentHeader
|
|
valset[height] = keys.ToValidators(2, 0)
|
|
lastHeader = currentHeader
|
|
keys = newKeys
|
|
keymap[height+1] = keys
|
|
}
|
|
|
|
return headers, valset, keymap
|
|
}
|
|
|
|
func mockNodeFromHeadersAndVals(headers map[int64]*types.SignedHeader,
|
|
vals map[int64]*types.ValidatorSet) *provider_mocks.Provider {
|
|
mockNode := &provider_mocks.Provider{}
|
|
for i, header := range headers {
|
|
lb := &types.LightBlock{SignedHeader: header, ValidatorSet: vals[i]}
|
|
mockNode.On("LightBlock", mock.Anything, i).Return(lb, nil)
|
|
}
|
|
return mockNode
|
|
}
|
|
|
|
func hash(s string) []byte {
|
|
return crypto.Checksum([]byte(s))
|
|
}
|