Jae Kwon
9 years ago
16 changed files with 682 additions and 1443 deletions
Split View
Diff Options
-
+7 -9blockchain/store.go
-
+23 -35consensus/height_vote_set.go
-
+0 -101consensus/pol.go
-
+0 -213consensus/pol_test.go
-
+545 -692consensus/state.go
-
+1 -170consensus/state_test.go
-
+5 -6consensus/types/proposal.go
-
+18 -58consensus/vote_set.go
-
+5 -62consensus/vote_set_test.go
-
+20 -27state/execution.go
-
+0 -10state/priv_validator.go
-
+1 -1state/state.go
-
+13 -13state/state_test.go
-
+9 -9state/validator_set.go
-
+35 -32types/block.go
-
+0 -5types/vote.go
+ 7
- 9
blockchain/store.go
View File
+ 23
- 35
consensus/height_vote_set.go
View File
+ 0
- 101
consensus/pol.go
View File
| @ -1,101 +0,0 @@ | |||
| package consensus | |||
| import ( | |||
| "fmt" | |||
| "github.com/tendermint/tendermint/account" | |||
| "github.com/tendermint/tendermint/binary" | |||
| . "github.com/tendermint/tendermint/common" | |||
| sm "github.com/tendermint/tendermint/state" | |||
| "github.com/tendermint/tendermint/types" | |||
| ) | |||
| // Each signature of a POL (proof-of-lock, see whitepaper) is | |||
| // either a prevote or a commit. | |||
| // Commits require an additional round which is strictly less than | |||
| // the POL round. Prevote rounds are equal to the POL round. | |||
| type POLVoteSignature struct { | |||
| Round uint `json:"round"` | |||
| Signature account.SignatureEd25519 `json:"signature"` | |||
| } | |||
| // Proof of lock. | |||
| // +2/3 of validators' prevotes for a given blockhash (or nil) | |||
| type POL struct { | |||
| Height uint `json:"height"` | |||
| Round uint `json:"round"` | |||
| BlockHash []byte `json:"block_hash"` // Could be nil, which makes this a proof of unlock. | |||
| BlockParts types.PartSetHeader `json:"block_parts"` // When BlockHash is nil, this is zero. | |||
| Votes []POLVoteSignature `json:"votes"` // Prevote and commit signatures in ValidatorSet order. | |||
| } | |||
| // Returns whether +2/3 have prevoted/committed for BlockHash. | |||
| func (pol *POL) Verify(valSet *sm.ValidatorSet) error { | |||
| if uint(len(pol.Votes)) != valSet.Size() { | |||
| return fmt.Errorf("Invalid POL votes count: Expected %v, got %v", | |||
| valSet.Size(), len(pol.Votes)) | |||
| } | |||
| talliedVotingPower := uint64(0) | |||
| prevoteDoc := account.SignBytes(config.GetString("chain_id"), &types.Vote{ | |||
| Height: pol.Height, Round: pol.Round, Type: types.VoteTypePrevote, | |||
| BlockHash: pol.BlockHash, | |||
| BlockParts: pol.BlockParts, | |||
| }) | |||
| seenValidators := map[string]struct{}{} | |||
| for idx, vote := range pol.Votes { | |||
| // vote may be zero, in which case skip. | |||
| if vote.Signature.IsZero() { | |||
| continue | |||
| } | |||
| voteDoc := prevoteDoc | |||
| _, val := valSet.GetByIndex(uint(idx)) | |||
| // Commit vote? | |||
| if vote.Round < pol.Round { | |||
| voteDoc = account.SignBytes(config.GetString("chain_id"), &types.Vote{ | |||
| Height: pol.Height, Round: vote.Round, Type: types.VoteTypeCommit, | |||
| BlockHash: pol.BlockHash, | |||
| BlockParts: pol.BlockParts, | |||
| }) | |||
| } else if vote.Round > pol.Round { | |||
| return fmt.Errorf("Invalid commit round %v for POL %v", vote.Round, pol) | |||
| } | |||
| // Validate | |||
| if _, seen := seenValidators[string(val.Address)]; seen { | |||
| return fmt.Errorf("Duplicate validator for vote %v for POL %v", vote, pol) | |||
| } | |||
| if !val.PubKey.VerifyBytes(voteDoc, vote.Signature) { | |||
| return fmt.Errorf("Invalid signature for vote %v for POL %v", vote, pol) | |||
| } | |||
| // Tally | |||
| seenValidators[string(val.Address)] = struct{}{} | |||
| talliedVotingPower += val.VotingPower | |||
| } | |||
| if talliedVotingPower > valSet.TotalVotingPower()*2/3 { | |||
| return nil | |||
| } else { | |||
| return fmt.Errorf("Invalid POL, insufficient voting power %v, needed %v", | |||
| talliedVotingPower, (valSet.TotalVotingPower()*2/3 + 1)) | |||
| } | |||
| } | |||
| func (pol *POL) StringShort() string { | |||
| if pol == nil { | |||
| return "nil-POL" | |||
| } else { | |||
| return fmt.Sprintf("POL{H:%v R:%v BH:%X}", pol.Height, pol.Round, | |||
| Fingerprint(pol.BlockHash), pol.BlockParts) | |||
| } | |||
| } | |||
| func (pol *POL) MakePartSet() *types.PartSet { | |||
| return types.NewPartSetFromData(binary.BinaryBytes(pol)) | |||
| } | |||
+ 0
- 213
consensus/pol_test.go
View File
| @ -1,213 +0,0 @@ | |||
| package consensus | |||
| import ( | |||
| "github.com/tendermint/tendermint/binary" | |||
| . "github.com/tendermint/tendermint/common" | |||
| _ "github.com/tendermint/tendermint/config/tendermint_test" | |||
| sm "github.com/tendermint/tendermint/state" | |||
| "github.com/tendermint/tendermint/types" | |||
| "bytes" | |||
| "testing" | |||
| ) | |||
| // NOTE: see consensus/test.go for common test methods. | |||
| // Convenience method. | |||
| // Signs the vote and sets the POL's vote at the desired index | |||
| // Returns the POLVoteSignature pointer, so you can modify it afterwards. | |||
| func signAddPOLVoteSignature(val *sm.PrivValidator, valSet *sm.ValidatorSet, vote *types.Vote, pol *POL) *POLVoteSignature { | |||
| vote = vote.Copy() | |||
| err := val.SignVote(config.GetString("chain_id"), vote) | |||
| if err != nil { | |||
| panic(err) | |||
| } | |||
| idx, _ := valSet.GetByAddress(val.Address) // now we have the index | |||
| pol.Votes[idx] = POLVoteSignature{vote.Round, vote.Signature} | |||
| return &pol.Votes[idx] | |||
| } | |||
| func TestVerifyVotes(t *testing.T) { | |||
| height, round := uint(1), uint(0) | |||
| _, valSet, privValidators := randVoteSet(height, round, types.VoteTypePrevote, 10, 1) | |||
| // Make a POL with -2/3 votes. | |||
| blockHash := RandBytes(32) | |||
| pol := &POL{ | |||
| Height: height, Round: round, BlockHash: blockHash, | |||
| Votes: make([]POLVoteSignature, valSet.Size()), | |||
| } | |||
| voteProto := &types.Vote{ | |||
| Height: height, Round: round, Type: types.VoteTypePrevote, BlockHash: blockHash, | |||
| } | |||
| for i := 0; i < 6; i++ { | |||
| signAddPOLVoteSignature(privValidators[i], valSet, voteProto, pol) | |||
| } | |||
| // Check that validation fails. | |||
| if err := pol.Verify(valSet); err == nil { | |||
| t.Errorf("Expected POL.Verify() to fail, not enough votes.") | |||
| } | |||
| // Insert another vote to make +2/3 | |||
| signAddPOLVoteSignature(privValidators[7], valSet, voteProto, pol) | |||
| // Check that validation succeeds. | |||
| if err := pol.Verify(valSet); err != nil { | |||
| t.Errorf("POL.Verify() failed: %v", err) | |||
| } | |||
| } | |||
| func TestVerifyInvalidVote(t *testing.T) { | |||
| height, round := uint(1), uint(0) | |||
| _, valSet, privValidators := randVoteSet(height, round, types.VoteTypePrevote, 10, 1) | |||
| // Make a POL with +2/3 votes with the wrong signature. | |||
| blockHash := RandBytes(32) | |||
| pol := &POL{ | |||
| Height: height, Round: round, BlockHash: blockHash, | |||
| Votes: make([]POLVoteSignature, valSet.Size()), | |||
| } | |||
| voteProto := &types.Vote{ | |||
| Height: height, Round: round, Type: types.VoteTypePrevote, BlockHash: blockHash, | |||
| } | |||
| for i := 0; i < 7; i++ { | |||
| polVoteSig := signAddPOLVoteSignature(privValidators[i], valSet, voteProto, pol) | |||
| polVoteSig.Signature[0] += byte(0x01) // mutated! | |||
| } | |||
| // Check that validation fails. | |||
| if err := pol.Verify(valSet); err == nil { | |||
| t.Errorf("Expected POL.Verify() to fail, wrong signatures.") | |||
| } | |||
| } | |||
| func TestVerifyCommits(t *testing.T) { | |||
| height, round := uint(1), uint(2) | |||
| _, valSet, privValidators := randVoteSet(height, round, types.VoteTypePrevote, 10, 1) | |||
| // Make a POL with +2/3 votes. | |||
| blockHash := RandBytes(32) | |||
| pol := &POL{ | |||
| Height: height, Round: round, BlockHash: blockHash, | |||
| Votes: make([]POLVoteSignature, valSet.Size()), | |||
| } | |||
| voteProto := &types.Vote{ | |||
| Height: height, Round: round - 1, Type: types.VoteTypeCommit, BlockHash: blockHash, | |||
| } | |||
| for i := 0; i < 7; i++ { | |||
| signAddPOLVoteSignature(privValidators[i], valSet, voteProto, pol) | |||
| } | |||
| // Check that validation succeeds. | |||
| if err := pol.Verify(valSet); err != nil { | |||
| t.Errorf("POL.Verify() failed: %v", err) | |||
| } | |||
| } | |||
| func TestVerifyInvalidCommits(t *testing.T) { | |||
| height, round := uint(1), uint(2) | |||
| _, valSet, privValidators := randVoteSet(height, round, types.VoteTypePrevote, 10, 1) | |||
| // Make a POL with +2/3 votes with the wrong signature. | |||
| blockHash := RandBytes(32) | |||
| pol := &POL{ | |||
| Height: height, Round: round, BlockHash: blockHash, | |||
| Votes: make([]POLVoteSignature, valSet.Size()), | |||
| } | |||
| voteProto := &types.Vote{ | |||
| Height: height, Round: round - 1, Type: types.VoteTypeCommit, BlockHash: blockHash, | |||
| } | |||
| for i := 0; i < 7; i++ { | |||
| polVoteSig := signAddPOLVoteSignature(privValidators[i], valSet, voteProto, pol) | |||
| polVoteSig.Signature[0] += byte(0x01) | |||
| } | |||
| // Check that validation fails. | |||
| if err := pol.Verify(valSet); err == nil { | |||
| t.Errorf("Expected POL.Verify() to fail, wrong signatures.") | |||
| } | |||
| } | |||
| func TestVerifyInvalidCommitRounds(t *testing.T) { | |||
| height, round := uint(1), uint(2) | |||
| _, valSet, privValidators := randVoteSet(height, round, types.VoteTypePrevote, 10, 1) | |||
| // Make a POL with +2/3 commits for the current round. | |||
| blockHash := RandBytes(32) | |||
| pol := &POL{ | |||
| Height: height, Round: round, BlockHash: blockHash, | |||
| Votes: make([]POLVoteSignature, valSet.Size()), | |||
| } | |||
| voteProto := &types.Vote{ | |||
| Height: height, Round: round, Type: types.VoteTypeCommit, BlockHash: blockHash, | |||
| } | |||
| for i := 0; i < 7; i++ { | |||
| signAddPOLVoteSignature(privValidators[i], valSet, voteProto, pol) | |||
| } | |||
| // Check that validation fails. | |||
| if err := pol.Verify(valSet); err == nil { | |||
| t.Errorf("Expected POL.Verify() to fail, same round.") | |||
| } | |||
| } | |||
| func TestVerifyInvalidCommitRounds2(t *testing.T) { | |||
| height, round := uint(1), uint(2) | |||
| _, valSet, privValidators := randVoteSet(height, round, types.VoteTypePrevote, 10, 1) | |||
| // Make a POL with +2/3 commits for future round. | |||
| blockHash := RandBytes(32) | |||
| pol := &POL{ | |||
| Height: height, Round: round, BlockHash: blockHash, | |||
| Votes: make([]POLVoteSignature, valSet.Size()), | |||
| } | |||
| voteProto := &types.Vote{ | |||
| Height: height, Round: round + 1, Type: types.VoteTypeCommit, BlockHash: blockHash, | |||
| } | |||
| for i := 0; i < 7; i++ { | |||
| polVoteSig := signAddPOLVoteSignature(privValidators[i], valSet, voteProto, pol) | |||
| polVoteSig.Round += 1 // mutate round | |||
| } | |||
| // Check that validation fails. | |||
| if err := pol.Verify(valSet); err == nil { | |||
| t.Errorf("Expected POL.Verify() to fail, future round.") | |||
| } | |||
| } | |||
| func TestReadWrite(t *testing.T) { | |||
| height, round := uint(1), uint(2) | |||
| _, valSet, privValidators := randVoteSet(height, round, types.VoteTypePrevote, 10, 1) | |||
| // Make a POL with +2/3 votes. | |||
| blockHash := RandBytes(32) | |||
| pol := &POL{ | |||
| Height: height, Round: round, BlockHash: blockHash, | |||
| Votes: make([]POLVoteSignature, valSet.Size()), | |||
| } | |||
| voteProto := &types.Vote{ | |||
| Height: height, Round: round, Type: types.VoteTypePrevote, BlockHash: blockHash, | |||
| } | |||
| for i := 0; i < 7; i++ { | |||
| signAddPOLVoteSignature(privValidators[i], valSet, voteProto, pol) | |||
| } | |||
| // Write it to a buffer. | |||
| buf, n, err := new(bytes.Buffer), new(int64), new(error) | |||
| binary.WriteBinary(pol, buf, n, err) | |||
| if *err != nil { | |||
| t.Fatalf("Failed to write POL: %v", *err) | |||
| } | |||
| // Read from buffer. | |||
| pol2 := binary.ReadBinary(&POL{}, buf, n, err).(*POL) | |||
| if *err != nil { | |||
| t.Fatalf("Failed to read POL: %v", *err) | |||
| } | |||
| // Check that validation succeeds. | |||
| if err := pol2.Verify(valSet); err != nil { | |||
| t.Errorf("POL.Verify() failed: %v", err) | |||
| } | |||
| } | |||