forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 10:50:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

XIN-154 fix verify header bug on Validators (#66)

Browse source
This commit is contained in:
Jerome 2022-03-07 21:53:55 +11:00 committed by GitHub
parent d975ba4014
commit 6090b7f02e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
consensus/XDPoS/engines/engine_v2/engine.go
View file

@ -612,7 +612,8 @@ func (x *XDPoS_v2) verifyHeader(chain consensus.ChainReader, header *types.Heade
return utils.ErrInvalidCheckpointSigners return utils.ErrInvalidCheckpointSigners
} }
} else { } else {
if header.Validators != nil { if len(header.Validators) != 0 {
log.Warn("[verifyHeader] Validators shall not have values in non-epochSwitch block", "Hash", header.Hash(), "Number", header.Number, "Validators", header.Validators)
return utils.ErrInvalidFieldInNonEpochSwitch return utils.ErrInvalidFieldInNonEpochSwitch
} }
} }

14
consensus/tests/verify_block_test.go
View file

@ -5,6 +5,7 @@ import (
"testing" "testing"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils"
"github.com/XinFinOrg/XDPoSChain/params" "github.com/XinFinOrg/XDPoSChain/params"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -22,12 +23,19 @@ func TestShouldVerifyBlock(t *testing.T) {
// Skip the mining time validation by set mine time to 0 // Skip the mining time validation by set mine time to 0
config.XDPoS.V2.MinePeriod = 0 config.XDPoS.V2.MinePeriod = 0
// Block 901 is the first v2 block with round of 1 // Block 901 is the first v2 block with round of 1
blockchain, _, currentBlock, _, _, _ := PrepareXDCTestBlockChainForV2Engine(t, 901, &config, 0) blockchain, _, _, _, _, _ := PrepareXDCTestBlockChainForV2Engine(t, 910, &config, 0)
adaptor := blockchain.Engine().(*XDPoS.XDPoS) adaptor := blockchain.Engine().(*XDPoS.XDPoS)
// Happy path // Happy path
err = adaptor.VerifyHeader(blockchain, currentBlock.Header(), true) err = adaptor.VerifyHeader(blockchain, blockchain.GetBlockByNumber(901).Header(), true)
assert.Nil(t, err) assert.Nil(t, err)
// TODO: unhappy path XIN-135: https://hashlabs.atlassian.net/wiki/spaces/HASHLABS/pages/95944705/Verify+header // Verify non-epoch switch block
err = adaptor.VerifyHeader(blockchain, blockchain.GetBlockByNumber(902).Header(), true)
assert.Nil(t, err)
nonEpochSwitchWithValidators := blockchain.GetBlockByNumber(902).Header()
nonEpochSwitchWithValidators.Validators = acc1Addr.Bytes()
err = adaptor.VerifyHeader(blockchain, nonEpochSwitchWithValidators, true)
assert.Equal(t, utils.ErrInvalidFieldInNonEpochSwitch, err)
} }