Removed some log statements and disabled additional validation checks

pull/150/head
obscuren 11 years ago
parent c81804444f
commit 0651af9dfd
  1. 12
      ethminer/miner.go

@ -134,14 +134,18 @@ func (miner *Miner) listener() {
err := miner.ethereum.StateManager().ProcessBlock(miner.block, true) err := miner.ethereum.StateManager().ProcessBlock(miner.block, true)
if err != nil { if err != nil {
log.Println("Error result from process block:", err) log.Println("Error result from process block:", err)
miner.block.State().Reset()
} else { } else {
// XXX @maranh This is already done in the state manager, why a 2nd time? /*
if !miner.ethereum.StateManager().Pow.Verify(miner.block.HashNoNonce(), miner.block.Difficulty, miner.block.Nonce) { // XXX @maranh This is already done in the state manager, why a 2nd time?
log.Printf("Second stage verification error: Block's nonce is invalid (= %v)\n", ethutil.Hex(miner.block.Nonce)) if !miner.ethereum.StateManager().Pow.Verify(miner.block.HashNoNonce(), miner.block.Difficulty, miner.block.Nonce) {
} log.Printf("Second stage verification error: Block's nonce is invalid (= %v)\n", ethutil.Hex(miner.block.Nonce))
}
*/
miner.ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{miner.block.Value().Val}) miner.ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{miner.block.Value().Val})
log.Printf("[MINER] 🔨 Mined block %x\n", miner.block.Hash()) log.Printf("[MINER] 🔨 Mined block %x\n", miner.block.Hash())
log.Println(miner.block)
miner.txs = []*ethchain.Transaction{} // Move this somewhere neat miner.txs = []*ethchain.Transaction{} // Move this somewhere neat
miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs) miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs)

Loading…
Cancel
Save