diff --git a/dev_console.go b/dev_console.go index f93300aad..e93b39c3a 100644 --- a/dev_console.go +++ b/dev_console.go @@ -144,11 +144,15 @@ func (i *Console) ParseInput(input string) bool { case "encode": fmt.Printf("%q\n", ethutil.Encode(tokens[1])) case "tx": - recipient, _ := hex.DecodeString(tokens[1]) - tx := ethchain.NewTransaction(recipient, ethutil.Big(tokens[2]), []string{""}) - fmt.Printf("%x\n", tx.Hash()) + recipient, err := hex.DecodeString(tokens[1]) + if err != nil { + fmt.Println("recipient err:", err) + } else { + tx := ethchain.NewTransaction(recipient, ethutil.Big(tokens[2]), []string{""}) + fmt.Printf("%x\n", tx.Hash()) + i.ethereum.TxPool.QueueTransaction(tx) + } - i.ethereum.TxPool.QueueTransaction(tx) case "gettx": addr, _ := hex.DecodeString(tokens[1]) data, _ := ethutil.Config.Db.Get(addr) diff --git a/ethereum.go b/ethereum.go index bae473854..680e52325 100644 --- a/ethereum.go +++ b/ethereum.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/eth-go" "github.com/ethereum/ethchain-go" "github.com/ethereum/ethutil-go" + "github.com/ethereum/ethwire-go" "log" "os" "os/signal" @@ -88,16 +89,11 @@ func main() { // Create a new block which we're going to mine block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs) // Apply all transactions to the block - ethereum.BlockManager.ApplyTransactions(block) + ethereum.BlockManager.ApplyTransactions(block, block.Transactions()) // Search the nonce block.Nonce = pow.Search(block) - // Process the block and verify - err := ethereum.BlockManager.ProcessBlock(block) - if err != nil { - log.Println(err) - } else { - log.Println("\n+++++++ MINED BLK +++++++\n", block.String()) - } + ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.RlpValue().Value}) + log.Println("\n+++++++ MINED BLK +++++++\n", block.String()) } }() }