mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-17 18:30:45 +00:00
fix: staticcheck warning SA4003: every value of uint64 >= 0
This commit is contained in:
Daniel Liu
parent
7b7eb91fcb
commit
f9960875cc
3 changed files with 111 additions and 113 deletions
|
|
@ -30,43 +30,42 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
|
||||||
log.Crit("Can't get state at head of canonical chain", "head number", bc.CurrentHeader().Number.Uint64(), "err", err)
|
log.Crit("Can't get state at head of canonical chain", "head number", bc.CurrentHeader().Number.Uint64(), "err", err)
|
||||||
}
|
}
|
||||||
prevEpoc := blockNumberEpoc - chain.Config().XDPoS.Epoch
|
prevEpoc := blockNumberEpoc - chain.Config().XDPoS.Epoch
|
||||||
if prevEpoc >= 0 {
|
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
prevHeader := chain.GetHeaderByNumber(prevEpoc)
|
prevHeader := chain.GetHeaderByNumber(prevEpoc)
|
||||||
penSigners := adaptor.GetMasternodes(chain, prevHeader)
|
penSigners := adaptor.GetMasternodes(chain, prevHeader)
|
||||||
if len(penSigners) > 0 {
|
if len(penSigners) > 0 {
|
||||||
// Loop for each block to check missing sign.
|
// Loop for each block to check missing sign.
|
||||||
for i := prevEpoc; i < blockNumberEpoc; i++ {
|
for i := prevEpoc; i < blockNumberEpoc; i++ {
|
||||||
if i%common.MergeSignRange == 0 || !chainConfig.IsTIP2019(big.NewInt(int64(i))) {
|
if i%common.MergeSignRange == 0 || !chainConfig.IsTIP2019(big.NewInt(int64(i))) {
|
||||||
bheader := chain.GetHeaderByNumber(i)
|
bheader := chain.GetHeaderByNumber(i)
|
||||||
bhash := bheader.Hash()
|
bhash := bheader.Hash()
|
||||||
block := chain.GetBlock(bhash, i)
|
block := chain.GetBlock(bhash, i)
|
||||||
if len(penSigners) > 0 {
|
if len(penSigners) > 0 {
|
||||||
signedMasternodes, err := contracts.GetSignersFromContract(canonicalState, block)
|
signedMasternodes, err := contracts.GetSignersFromContract(canonicalState, block)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if len(signedMasternodes) > 0 {
|
if len(signedMasternodes) > 0 {
|
||||||
// Check signer signed?
|
// Check signer signed?
|
||||||
for _, signed := range signedMasternodes {
|
for _, signed := range signedMasternodes {
|
||||||
for j, addr := range penSigners {
|
for j, addr := range penSigners {
|
||||||
if signed == addr {
|
if signed == addr {
|
||||||
// Remove it from dupSigners.
|
// Remove it from dupSigners.
|
||||||
penSigners = append(penSigners[:j], penSigners[j+1:]...)
|
penSigners = append(penSigners[:j], penSigners[j+1:]...)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.Debug("Time Calculated HookPenalty ", "block", blockNumberEpoc, "time", common.PrettyDuration(time.Since(start)))
|
|
||||||
return penSigners, nil
|
|
||||||
}
|
}
|
||||||
return []common.Address{}, nil
|
log.Debug("Time Calculated HookPenalty ", "block", blockNumberEpoc, "time", common.PrettyDuration(time.Since(start)))
|
||||||
|
return penSigners, nil
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hook scans for bad masternodes and decide to penalty them
|
// Hook scans for bad masternodes and decide to penalty them
|
||||||
|
|
@ -77,105 +76,104 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
|
||||||
if header.Number.Uint64() > comebackLength {
|
if header.Number.Uint64() > comebackLength {
|
||||||
combackEpoch = header.Number.Uint64() - comebackLength
|
combackEpoch = header.Number.Uint64() - comebackLength
|
||||||
}
|
}
|
||||||
if prevEpoc >= 0 {
|
|
||||||
start := time.Now()
|
|
||||||
|
|
||||||
listBlockHash := make([]common.Hash, chain.Config().XDPoS.Epoch)
|
start := time.Now()
|
||||||
|
|
||||||
// get list block hash & stats total created block
|
listBlockHash := make([]common.Hash, chain.Config().XDPoS.Epoch)
|
||||||
statMiners := make(map[common.Address]int)
|
|
||||||
listBlockHash[0] = header.ParentHash
|
// get list block hash & stats total created block
|
||||||
parentnumber := header.Number.Uint64() - 1
|
statMiners := make(map[common.Address]int)
|
||||||
parentHash := header.ParentHash
|
listBlockHash[0] = header.ParentHash
|
||||||
for i := uint64(1); i < chain.Config().XDPoS.Epoch; i++ {
|
parentnumber := header.Number.Uint64() - 1
|
||||||
parentHeader := chain.GetHeader(parentHash, parentnumber)
|
parentHash := header.ParentHash
|
||||||
miner, _ := adaptor.RecoverSigner(parentHeader)
|
for i := uint64(1); i < chain.Config().XDPoS.Epoch; i++ {
|
||||||
value, exist := statMiners[miner]
|
parentHeader := chain.GetHeader(parentHash, parentnumber)
|
||||||
if exist {
|
miner, _ := adaptor.RecoverSigner(parentHeader)
|
||||||
value = value + 1
|
value, exist := statMiners[miner]
|
||||||
} else {
|
if exist {
|
||||||
value = 1
|
value = value + 1
|
||||||
}
|
} else {
|
||||||
statMiners[miner] = value
|
value = 1
|
||||||
parentHash = parentHeader.ParentHash
|
|
||||||
parentnumber--
|
|
||||||
listBlockHash[i] = parentHash
|
|
||||||
}
|
}
|
||||||
|
statMiners[miner] = value
|
||||||
|
parentHash = parentHeader.ParentHash
|
||||||
|
parentnumber--
|
||||||
|
listBlockHash[i] = parentHash
|
||||||
|
}
|
||||||
|
|
||||||
// add list not miner to penalties
|
// add list not miner to penalties
|
||||||
prevHeader := chain.GetHeaderByNumber(prevEpoc)
|
prevHeader := chain.GetHeaderByNumber(prevEpoc)
|
||||||
preMasternodes := adaptor.GetMasternodes(chain, prevHeader)
|
preMasternodes := adaptor.GetMasternodes(chain, prevHeader)
|
||||||
penalties := []common.Address{}
|
penalties := []common.Address{}
|
||||||
for miner, total := range statMiners {
|
for miner, total := range statMiners {
|
||||||
if total < common.MinimunMinerBlockPerEpoch {
|
if total < common.MinimunMinerBlockPerEpoch {
|
||||||
log.Debug("Find a node not enough requirement create block", "addr", miner.Hex(), "total", total)
|
log.Debug("Find a node not enough requirement create block", "addr", miner.Hex(), "total", total)
|
||||||
penalties = append(penalties, miner)
|
penalties = append(penalties, miner)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
for _, addr := range preMasternodes {
|
}
|
||||||
if _, exist := statMiners[addr]; !exist {
|
for _, addr := range preMasternodes {
|
||||||
log.Debug("Find a node don't create block", "addr", addr.Hex())
|
if _, exist := statMiners[addr]; !exist {
|
||||||
penalties = append(penalties, addr)
|
log.Debug("Find a node don't create block", "addr", addr.Hex())
|
||||||
}
|
penalties = append(penalties, addr)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// get list check penalties signing block & list master nodes wil comeback
|
// get list check penalties signing block & list master nodes wil comeback
|
||||||
penComebacks := []common.Address{}
|
penComebacks := []common.Address{}
|
||||||
if combackEpoch > 0 {
|
if combackEpoch > 0 {
|
||||||
combackHeader := chain.GetHeaderByNumber(combackEpoch)
|
combackHeader := chain.GetHeaderByNumber(combackEpoch)
|
||||||
penalties := common.ExtractAddressFromBytes(combackHeader.Penalties)
|
penalties := common.ExtractAddressFromBytes(combackHeader.Penalties)
|
||||||
for _, penaltie := range penalties {
|
for _, penaltie := range penalties {
|
||||||
for _, addr := range candidates {
|
for _, addr := range candidates {
|
||||||
if penaltie == addr {
|
if penaltie == addr {
|
||||||
penComebacks = append(penComebacks, penaltie)
|
penComebacks = append(penComebacks, penaltie)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Loop for each block to check missing sign. with comeback nodes
|
// Loop for each block to check missing sign. with comeback nodes
|
||||||
mapBlockHash := map[common.Hash]bool{}
|
mapBlockHash := map[common.Hash]bool{}
|
||||||
for i := common.RangeReturnSigner - 1; i >= 0; i-- {
|
for i := common.RangeReturnSigner - 1; i >= 0; i-- {
|
||||||
if len(penComebacks) > 0 {
|
if len(penComebacks) > 0 {
|
||||||
blockNumber := header.Number.Uint64() - uint64(i) - 1
|
blockNumber := header.Number.Uint64() - uint64(i) - 1
|
||||||
bhash := listBlockHash[i]
|
bhash := listBlockHash[i]
|
||||||
if blockNumber%common.MergeSignRange == 0 {
|
if blockNumber%common.MergeSignRange == 0 {
|
||||||
mapBlockHash[bhash] = true
|
mapBlockHash[bhash] = true
|
||||||
}
|
}
|
||||||
signData, ok := adaptor.GetCachedSigningTxs(bhash)
|
signData, ok := adaptor.GetCachedSigningTxs(bhash)
|
||||||
if !ok {
|
if !ok {
|
||||||
block := chain.GetBlock(bhash, blockNumber)
|
block := chain.GetBlock(bhash, blockNumber)
|
||||||
txs := block.Transactions()
|
txs := block.Transactions()
|
||||||
signData = adaptor.CacheSigningTxs(bhash, txs)
|
signData = adaptor.CacheSigningTxs(bhash, txs)
|
||||||
}
|
}
|
||||||
txs := signData.([]*types.Transaction)
|
txs := signData.([]*types.Transaction)
|
||||||
// Check signer signed?
|
// Check signer signed?
|
||||||
for _, tx := range txs {
|
for _, tx := range txs {
|
||||||
blkHash := common.BytesToHash(tx.Data()[len(tx.Data())-32:])
|
blkHash := common.BytesToHash(tx.Data()[len(tx.Data())-32:])
|
||||||
from := *tx.From()
|
from := *tx.From()
|
||||||
if mapBlockHash[blkHash] {
|
if mapBlockHash[blkHash] {
|
||||||
for j, addr := range penComebacks {
|
for j, addr := range penComebacks {
|
||||||
if from == addr {
|
if from == addr {
|
||||||
// Remove it from dupSigners.
|
// Remove it from dupSigners.
|
||||||
penComebacks = append(penComebacks[:j], penComebacks[j+1:]...)
|
penComebacks = append(penComebacks[:j], penComebacks[j+1:]...)
|
||||||
break
|
break
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debug("Time Calculated HookPenaltyTIPSigning ", "block", header.Number, "hash", header.Hash().Hex(), "pen comeback nodes", len(penComebacks), "not enough miner", len(penalties), "time", common.PrettyDuration(time.Since(start)))
|
|
||||||
penalties = append(penalties, penComebacks...)
|
|
||||||
if chain.Config().IsTIPRandomize(header.Number) {
|
|
||||||
return penalties, nil
|
|
||||||
}
|
|
||||||
return penComebacks, nil
|
|
||||||
}
|
}
|
||||||
return []common.Address{}, nil
|
|
||||||
|
log.Debug("Time Calculated HookPenaltyTIPSigning ", "block", header.Number, "hash", header.Hash().Hex(), "pen comeback nodes", len(penComebacks), "not enough miner", len(penalties), "time", common.PrettyDuration(time.Since(start)))
|
||||||
|
penalties = append(penalties, penComebacks...)
|
||||||
|
if chain.Config().IsTIPRandomize(header.Number) {
|
||||||
|
return penalties, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return penComebacks, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hook prepares validators M2 for the current epoch at checkpoint block
|
// Hook prepares validators M2 for the current epoch at checkpoint block
|
||||||
|
|
|
||||||
|
|
@ -1230,7 +1230,7 @@ func (net *Network) checkTopicRegister(data *topicRegister) (*pong, error) {
|
||||||
if rlpHash(data.Topics) != pongpkt.data.(*pong).TopicHash {
|
if rlpHash(data.Topics) != pongpkt.data.(*pong).TopicHash {
|
||||||
return nil, errors.New("topic hash mismatch")
|
return nil, errors.New("topic hash mismatch")
|
||||||
}
|
}
|
||||||
if data.Idx < 0 || int(data.Idx) >= len(data.Topics) {
|
if int(data.Idx) >= len(data.Topics) {
|
||||||
return nil, errors.New("topic index out of range")
|
return nil, errors.New("topic index out of range")
|
||||||
}
|
}
|
||||||
return pongpkt.data.(*pong), nil
|
return pongpkt.data.(*pong), nil
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ var (
|
||||||
|
|
||||||
func (i nodeEvent) String() string {
|
func (i nodeEvent) String() string {
|
||||||
switch {
|
switch {
|
||||||
case 0 <= i && i <= 8:
|
case i <= 8:
|
||||||
return _nodeEvent_name_0[_nodeEvent_index_0[i]:_nodeEvent_index_0[i+1]]
|
return _nodeEvent_name_0[_nodeEvent_index_0[i]:_nodeEvent_index_0[i+1]]
|
||||||
case 265 <= i && i <= 267:
|
case 265 <= i && i <= 267:
|
||||||
i -= 265
|
i -= 265
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue