aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitalik Buterin <v@buterin.com>2015-05-14 08:46:23 +0800
committerVitalik Buterin <v@buterin.com>2015-05-14 08:46:23 +0800
commitfca3333f7f586832daba9e70a7ecd711baa163a9 (patch)
tree81780cb0c3edc646a1b6f10ff4577305f9096e2a
parentbc837619960d46cb4a6f6e8334fd867289e4ecc1 (diff)
downloaddexon-fca3333f7f586832daba9e70a7ecd711baa163a9.tar
dexon-fca3333f7f586832daba9e70a7ecd711baa163a9.tar.gz
dexon-fca3333f7f586832daba9e70a7ecd711baa163a9.tar.bz2
dexon-fca3333f7f586832daba9e70a7ecd711baa163a9.tar.lz
dexon-fca3333f7f586832daba9e70a7ecd711baa163a9.tar.xz
dexon-fca3333f7f586832daba9e70a7ecd711baa163a9.tar.zst
dexon-fca3333f7f586832daba9e70a7ecd711baa163a9.zip
Created separate family and ancestors environment objects
-rw-r--r--miner/worker.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/miner/worker.go b/miner/worker.go
index f737be507..e714b5063 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -45,7 +45,8 @@ type environment struct {
state *state.StateDB // apply state changes here
coinbase *state.StateObject // the miner's account
block *types.Block // the new block
- family *set.Set // family set (used for checking uncles)
+ ancestors *set.Set // ancestor set (used for checking uncle parent validity)
+ family *set.Set // family set (used for checking uncle invalidity)
uncles *set.Set // uncle set
remove *set.Set // tx which will be removed
tcount int // tx count in cycle
@@ -62,6 +63,7 @@ func env(block *types.Block, eth core.Backend) *environment {
totalUsedGas: new(big.Int),
state: state,
block: block,
+ ancestors: set.New(),
family: set.New(),
uncles: set.New(),
coinbase: state.GetOrNewStateObject(block.Coinbase()),
@@ -265,6 +267,12 @@ func (self *worker) makeCurrent() {
current := env(block, self.eth)
for _, ancestor := range self.chain.GetAncestors(block, 7) {
+ current.ancestors.Add(ancestor.Hash())
+ }
+ for _, ancestor := range self.chain.GetAncestors(block, 7) {
+ for _, uncle := range ancestor.Uncles() {
+ current.family.Add(uncle.Hash())
+ }
current.family.Add(ancestor.Hash())
}
accounts, _ := self.eth.AccountManager().Accounts()
@@ -363,7 +371,7 @@ func (self *worker) commitUncle(uncle *types.Header) error {
}
self.current.uncles.Add(uncle.Hash())
- if !self.current.family.Has(uncle.ParentHash) {
+ if !self.current.ancestors.Has(uncle.ParentHash) {
return core.UncleError(fmt.Sprintf("Uncle's parent unknown (%x)", uncle.ParentHash[0:4]))
}