Skip to content

Commit

Permalink
Merge pull request ethereum#419 from thanhnguyennguyen/isMasterNode-g…
Browse files Browse the repository at this point in the history
…et-snapshot-from-parent

Tomochain: isMasterNode function gets snapshot at parent block
  • Loading branch information
ngtuna authored Jan 29, 2019
2 parents d90ecdf + e24460b commit 64edd5f
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions eth/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,17 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {

eth.txPool.IsMasterNode = func(address common.Address) bool {
currentHeader := eth.blockchain.CurrentHeader()
snap, err := c.GetSnapshot(eth.blockchain, currentHeader)
header := currentHeader
// Sometimes, the latest block hasn't been inserted to chain yet
// getSnapshot from parent block if it exists
parentHeader := eth.blockchain.GetHeader(currentHeader.ParentHash, currentHeader.Number.Uint64() - 1)
if parentHeader != nil {
// not genesis block
header = parentHeader
}
snap, err := c.GetSnapshot(eth.blockchain, header)
if err != nil {
log.Error("Can't get snapshot with current header ", "number", currentHeader.Number, "hash", currentHeader.Hash().Hex(), "err", err)
log.Error("Can't get snapshot with at ", "number", header.Number, "hash", header.Hash().Hex(), "err", err)
return false
}
if _, ok := snap.Signers[address]; ok {
Expand Down

0 comments on commit 64edd5f

Please sign in to comment.