From 344b3556ebd8c96f96d78ad2d9d386e6ed66ce0a Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 1 Apr 2015 21:18:41 +0200 Subject: Fixed uncle rewards in miner The uncle rewards were changed in the block processor. This change will reflect those changes in the miner as well. --- miner/agent.go | 2 +- miner/worker.go | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'miner') diff --git a/miner/agent.go b/miner/agent.go index c650fa2f3..ad08e3841 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -60,7 +60,7 @@ out: } } - close(self.quitCurrentOp) + //close(self.quitCurrentOp) done: // Empty channel for { diff --git a/miner/worker.go b/miner/worker.go index e3680dea3..d89519fb1 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -270,7 +270,7 @@ gasLimit: self.current.block.SetUncles(uncles) - self.current.state.AddBalance(self.coinbase, core.BlockReward) + core.AccumulateRewards(self.current.state, self.current.block) self.current.state.Update(common.Big0) self.push() @@ -297,9 +297,6 @@ func (self *worker) commitUncle(uncle *types.Header) error { return core.UncleError(fmt.Sprintf("Uncle already in family (%x)", uncle.Hash())) } - self.current.state.AddBalance(uncle.Coinbase, uncleReward) - self.current.state.AddBalance(self.coinbase, inclusionReward) - return nil } -- cgit v1.2.3 From b8124ec79182dbf90b28c8527f2440cea6473f1b Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 1 Apr 2015 23:58:26 +0200 Subject: Removed old (unused) argument --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index d89519fb1..2ba3faed8 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -272,7 +272,7 @@ gasLimit: core.AccumulateRewards(self.current.state, self.current.block) - self.current.state.Update(common.Big0) + self.current.state.Update() self.push() } -- cgit v1.2.3 From 3f4c1aaf01032787367a97b6e4574c2784179546 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 2 Apr 2015 12:58:17 +0200 Subject: info => debug --- miner/worker.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index 2ba3faed8..3357c6f7b 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -171,6 +171,8 @@ func (self *worker) wait() { } self.mux.Post(core.NewMinedBlockEvent{block}) + minerlogger.Infof("ð”¨#%v", block.Number()) + jsonlogger.LogJson(&logger.EthMinerNewBlock{ BlockHash: block.Hash().Hex(), BlockNumber: block.Number(), -- cgit v1.2.3 From 60da9a12890710fd01013e4928cf094716bf8ea4 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 2 Apr 2015 13:03:33 +0200 Subject: Put the old hammer back in <3 --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index 3357c6f7b..4385b51c8 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -171,7 +171,7 @@ func (self *worker) wait() { } self.mux.Post(core.NewMinedBlockEvent{block}) - minerlogger.Infof("ð”¨#%v", block.Number()) + minerlogger.Infof("🔨 Mined block #%v", block.Number()) jsonlogger.LogJson(&logger.EthMinerNewBlock{ BlockHash: block.Hash().Hex(), -- cgit v1.2.3