Fixed miner

pull/32/head
obscuren 11 years ago
parent 97b98b1250
commit e403b28eea
  1. 6
      ethereum/ethereum.go

@ -131,15 +131,14 @@ func main() {
// Create a new block which we're going to mine // Create a new block which we're going to mine
block := ethereum.BlockChain().NewBlock(addr, txs) block := ethereum.BlockChain().NewBlock(addr, txs)
log.Println("Mining on new block. Includes", len(block.Transactions()), "transactions") log.Println("Mining on new block. Includes", len(block.Transactions()), "transactions")
// Apply all transactions to the block
ethereum.StateManager().ApplyTransactions(block, block.Transactions())
ethereum.StateManager().Prepare(block.State(), block.State()) ethereum.StateManager().Prepare(block.State(), block.State())
// Apply all transactions to the block
ethereum.StateManager().ApplyTransactions(block, block.Transactions())
ethereum.StateManager().AccumelateRewards(block) ethereum.StateManager().AccumelateRewards(block)
// Search the nonce // Search the nonce
block.Nonce = pow.Search(block) block.Nonce = pow.Search(block)
ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
ethereum.StateManager().PrepareDefault(block) ethereum.StateManager().PrepareDefault(block)
err := ethereum.StateManager().ProcessBlock(block) err := ethereum.StateManager().ProcessBlock(block)
@ -148,6 +147,7 @@ func main() {
} else { } else {
log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockChain().CurrentBlock) log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockChain().CurrentBlock)
log.Printf("🔨 Mined block %x\n", block.Hash()) log.Printf("🔨 Mined block %x\n", block.Hash())
ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
} }
} }
}() }()

Loading…
Cancel
Save