Skip to content

core/vote: change waiting blocks for voting since start mining #3088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzzckck merged 2 commits into from
May 14, 2025
Merged

core/vote: change waiting blocks for voting since start mining #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d26392
core/vote: change waiting blocks for voting since start mining
buddh0 May 14, 2025
333781f
core/vote: fix ut TestValidVotePool
buddh0 May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/vote/vote_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ import (
"github.com/ethereum/go-ethereum/metrics"
)

const blocksNumberSinceMining = 5 // the number of blocks need to wait before voting, counting from the validator begin to mine
// Many validators maintain backup machines.
// When switching from a primary node to a backup (e.g., due to failure),
// the new node may cast votes for the same block height that the previous node already voted on.
// To avoid double-voting issues, the node should wait for a few blocks
// before participating in voting after it starts mining.
const blocksNumberSinceMining = 20

var diffInTurn = big.NewInt(2) // Block difficulty for in-turn signatures
var votesManagerCounter = metrics.NewRegisteredCounter("votesManager/local", nil)
Expand Down
21 changes: 10 additions & 11 deletions core/vote/vote_pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,10 @@ func (journal *VoteJournal) verifyJournal(size, lastLatestVoteNumber int) bool {
lastIndex, _ := journal.walLog.LastIndex()
firstIndex, _ := journal.walLog.FirstIndex()
if int(lastIndex)-int(firstIndex)+1 == size {
return true
}
lastVote, _ := journal.ReadVote(lastIndex)
if lastVote != nil && lastVote.Data.TargetNumber == uint64(lastLatestVoteNumber) {
return true
lastVote, _ := journal.ReadVote(lastIndex)
if lastVote != nil && lastVote.Data.TargetNumber == uint64(lastLatestVoteNumber)+blocksNumberSinceMining {
return true
}
}
}
return false
Expand Down Expand Up @@ -283,10 +282,10 @@ func testVotePool(t *testing.T, isValidRules bool) {
t.Fatalf("journal failed")
}

// Test future votes scenario: votes number within latestBlockHeader ~ latestBlockHeader + 13
// Test future votes scenario: votes number within latestBlockHeader ~ latestBlockHeader + 11
futureVote := &types.VoteEnvelope{
Data: &types.VoteData{
TargetNumber: 279,
TargetNumber: 294,
},
}
if err := voteManager.signer.SignVote(futureVote); err != nil {
Expand All @@ -306,7 +305,7 @@ func testVotePool(t *testing.T, isValidRules bool) {
// Test duplicate vote case, shouldn'd be put into vote pool
duplicateVote := &types.VoteEnvelope{
Data: &types.VoteData{
TargetNumber: 279,
TargetNumber: 294,
},
}
if err := voteManager.signer.SignVote(duplicateVote); err != nil {
Expand Down Expand Up @@ -335,14 +334,14 @@ func testVotePool(t *testing.T, isValidRules bool) {
t.Fatalf("put vote failed")
}

// Test transfer votes from future to cur, latest block header is #288 after the following generation
// Test transfer votes from future to cur, latest block header is #308 after the following generation
// For the above BlockNumber 279, it did not have blockHash, should be assigned as well below.
curNumber := 268
curNumber := 288
var futureBlockHash common.Hash
for i := 0; i < 20; i++ {
bs, _ = core.GenerateChain(params.TestChainConfig, bs[len(bs)-1], ethash.NewFaker(), db, 1, nil)
curNumber += 1
if curNumber == 279 {
if curNumber == 294 {
futureBlockHash = bs[0].Hash()
futureVotesMap := votePool.futureVotes
voteBox := futureVotesMap[common.Hash{}]
Expand Down