forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-19 11:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove duplicate update m1 call (#8)

Browse source
This commit is contained in:
Liam 2021-09-04 17:51:32 +10:00 committed by GitHub
parent 9efb89dffb
commit 0a5c047600
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/blockchain.go
View file

@ -1071,8 +1071,7 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
if bc.chainConfig.XDPoS != nil && ((block.NumberU64() % bc.chainConfig.XDPoS.Epoch) == (bc.chainConfig.XDPoS.Epoch - bc.chainConfig.XDPoS.Gap)) { if bc.chainConfig.XDPoS != nil && ((block.NumberU64() % bc.chainConfig.XDPoS.Epoch) == (bc.chainConfig.XDPoS.Epoch - bc.chainConfig.XDPoS.Gap)) {
err := bc.UpdateM1() err := bc.UpdateM1()
if err != nil { if err != nil {
log.Error("Error when update masternodes set. Stopping node", "err", err) log.Crit("Error when update masternodes set. Stopping node", "err", err)
os.Exit(1)
} }
} }
} }

9
miner/worker.go
View file

@ -21,7 +21,6 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"math/big" "math/big"
"os"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
@ -621,14 +620,6 @@ func (w *worker) resultLoop() {
if (block.NumberU64() % w.config.XDPoS.Epoch) == 0 { if (block.NumberU64() % w.config.XDPoS.Epoch) == 0 {
core.CheckpointCh <- 1 core.CheckpointCh <- 1
} }
// prepare set of masternodes for the next epoch
if (block.NumberU64() % w.config.XDPoS.Epoch) == (w.config.XDPoS.Epoch - w.config.XDPoS.Gap) {
err := w.chain.UpdateM1()
if err != nil {
log.Error("Error when update masternodes set. Stopping node", "err", err)
os.Exit(1)
}
}
} }
w.chain.PostChainEvents(events, logs) w.chain.PostChainEvents(events, logs)