forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-19 21:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

engine_v2: check overflow first, close XFN-20 (#1659)

Browse source
This commit is contained in:
Daniel Liu 2025-11-03 15:25:57 +08:00 committed by GitHub
parent 4acd3b05ee
commit 09b66ea8c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,10 +228,9 @@ func (x *XDPoS_v2) initial(chain consensus.ChainReader, header *types.Header) er
} }
// Initial first v2 snapshot // Initial first v2 snapshot
lastGapNum := x.config.V2.SwitchBlock.Uint64() - x.config.Gap lastGapNum := uint64(0)
// prevent overflow if x.config.V2.SwitchBlock.Uint64() > x.config.Gap {
if x.config.V2.SwitchBlock.Uint64() < x.config.Gap { lastGapNum = x.config.V2.SwitchBlock.Uint64() - x.config.Gap
lastGapNum = 0
} }
lastGapHeader := chain.GetHeaderByNumber(lastGapNum) lastGapHeader := chain.GetHeaderByNumber(lastGapNum)
@ -782,9 +781,10 @@ func (x *XDPoS_v2) verifyQC(blockChainReader consensus.ChainReader, quorumCert *
return <-sigErrChan return <-sigErrChan
} }
epochSwitchNumber := epochInfo.EpochSwitchBlockInfo.Number.Uint64() epochSwitchNumber := epochInfo.EpochSwitchBlockInfo.Number.Uint64()
gapNumber := epochSwitchNumber - epochSwitchNumber%x.config.Epoch - x.config.Gap gapNumber := epochSwitchNumber - epochSwitchNumber%x.config.Epoch
// prevent overflow if gapNumber > x.config.Gap {
if epochSwitchNumber-epochSwitchNumber%x.config.Epoch < x.config.Gap { gapNumber -= x.config.Gap
} else {
gapNumber = 0 gapNumber = 0
} }
if gapNumber != quorumCert.GapNumber { if gapNumber != quorumCert.GapNumber {

7
consensus/XDPoS/engines/engine_v2/snapshot.go
View file

@ -79,9 +79,10 @@ func (x *XDPoS_v2) getSnapshot(chain consensus.ChainReader, number uint64, isGap
if isGapNumber { if isGapNumber {
gapBlockNum = number gapBlockNum = number
} else { } else {
gapBlockNum = number - number%x.config.Epoch - x.config.Gap gapBlockNum = number - number%x.config.Epoch
//prevent overflow if gapBlockNum > x.config.Gap {
if number-number%x.config.Epoch < x.config.Gap { gapBlockNum -= x.config.Gap
} else {
gapBlockNum = 0 gapBlockNum = 0
} }
} }

14
consensus/XDPoS/engines/engine_v2/timeout.go
View file

@ -255,9 +255,10 @@ func (x *XDPoS_v2) sendTimeout(chain consensus.ChainReader) error {
if isEpochSwitch { if isEpochSwitch {
// Notice this +1 is because we expect a block whos is the child of currentHeader // Notice this +1 is because we expect a block whos is the child of currentHeader
currentNumber := currentBlockHeader.Number.Uint64() + 1 currentNumber := currentBlockHeader.Number.Uint64() + 1
gapNumber = currentNumber - currentNumber%x.config.Epoch - x.config.Gap gapNumber = currentNumber - currentNumber%x.config.Epoch
// prevent overflow if gapNumber > x.config.Gap {
if currentNumber-currentNumber%x.config.Epoch < x.config.Gap { gapNumber -= x.config.Gap
} else {
gapNumber = 0 gapNumber = 0
} }
log.Debug("[sendTimeout] is epoch switch when sending out timeout message", "currentNumber", currentNumber, "gapNumber", gapNumber) log.Debug("[sendTimeout] is epoch switch when sending out timeout message", "currentNumber", currentNumber, "gapNumber", gapNumber)
@ -267,9 +268,10 @@ func (x *XDPoS_v2) sendTimeout(chain consensus.ChainReader) error {
log.Error("[sendTimeout] Error when trying to get current epoch switch info for a non-epoch block", "currentRound", x.currentRound, "currentBlockNum", currentBlockHeader.Number, "currentBlockHash", currentBlockHeader.Hash(), "epochNum", epochNum) log.Error("[sendTimeout] Error when trying to get current epoch switch info for a non-epoch block", "currentRound", x.currentRound, "currentBlockNum", currentBlockHeader.Number, "currentBlockHash", currentBlockHeader.Hash(), "epochNum", epochNum)
return err return err
} }
gapNumber = epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64() - epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64()%x.config.Epoch - x.config.Gap gapNumber = epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64() - epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64()%x.config.Epoch
// prevent overflow if gapNumber > x.config.Gap {
if epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64()-epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64()%x.config.Epoch < x.config.Gap { gapNumber -= x.config.Gap
} else {
gapNumber = 0 gapNumber = 0
} }
log.Debug("[sendTimeout] non-epoch-switch block found its epoch block and calculated the gapNumber", "epochSwitchInfo.EpochSwitchBlockInfo.Number", epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64(), "gapNumber", gapNumber) log.Debug("[sendTimeout] non-epoch-switch block found its epoch block and calculated the gapNumber", "epochSwitchInfo.EpochSwitchBlockInfo.Number", epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64(), "gapNumber", gapNumber)

7
consensus/XDPoS/engines/engine_v2/vote.go
View file

@ -63,9 +63,10 @@ func (x *XDPoS_v2) sendVote(chainReader consensus.ChainReader, blockInfo *types.
return err return err
} }
epochSwitchNumber := epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64() epochSwitchNumber := epochSwitchInfo.EpochSwitchBlockInfo.Number.Uint64()
gapNumber := epochSwitchNumber - epochSwitchNumber%x.config.Epoch - x.config.Gap gapNumber := epochSwitchNumber - epochSwitchNumber%x.config.Epoch
// prevent overflow if gapNumber > x.config.Gap {
if epochSwitchNumber-epochSwitchNumber%x.config.Epoch < x.config.Gap { gapNumber -= x.config.Gap
} else {
gapNumber = 0 gapNumber = 0
} }
signedHash, err := x.signSignature(types.VoteSigHash(&types.VoteForSign{ signedHash, err := x.signSignature(types.VoteSigHash(&types.VoteForSign{