From 8b9dcdcdf04eb13e39101532a90b4a552754cb7f Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 27 Jan 2014 15:34:10 +0100
Subject: [PATCH] Debugging handles

---
 dev_console.go | 12 +++++++++++-
 ethereum.go    |  7 ++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dev_console.go b/dev_console.go
index 6beafc447..3395124dc 100644
--- a/dev_console.go
+++ b/dev_console.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/ethchain-go"
 	"github.com/ethereum/ethdb-go"
 	"github.com/ethereum/ethutil-go"
-	_ "github.com/ethereum/ethwire-go"
+	"github.com/ethereum/ethwire-go"
 	_ "math/big"
 	"os"
 	"strings"
@@ -60,6 +60,12 @@ func (i *Console) ValidateInput(action string, argumentLength int) error {
 	case action == "contract" && argumentLength != 1:
 		err = true
 		expArgCount = 1
+	case action == "say" && argumentLength != 1:
+		err = true
+		expArgCount = 1
+	case action == "addp" && argumentLength != 1:
+		err = true
+		expArgCount = 1
 	}
 
 	if err {
@@ -129,6 +135,10 @@ func (i *Console) ParseInput(input string) bool {
 			} else {
 				fmt.Println("getaddr: address unknown")
 			}
+		case "say":
+			i.ethereum.Broadcast(ethwire.MsgTalkTy, tokens[1])
+		case "addp":
+			i.ethereum.ConnectToPeer(tokens[1])
 		case "encode":
 			fmt.Printf("%q\n", ethutil.Encode(tokens[1]))
 			/*
diff --git a/ethereum.go b/ethereum.go
index e434f3c8e..d58033cdc 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -50,6 +50,8 @@ func main() {
 	ethchain.InitFees()
 	ethutil.ReadConfig()
 
+	log.Printf("Starting Ethereum v%s\n", ethutil.Config.Ver)
+
 	// Instantiated a eth stack
 	ethereum, err := eth.New()
 	if err != nil {
@@ -77,8 +79,6 @@ func main() {
 		go console.Start()
 	}
 
-	log.Println("Starting Ethereum")
-
 	RegisterInterupts(ethereum)
 
 	ethereum.Start()
@@ -90,10 +90,11 @@ func main() {
 		// Fake block mining. It broadcasts a new block every 5 seconds
 		go func() {
 			for {
-				txs := ethereum.TxPool.Flush()
 
 				time.Sleep(blockTime * time.Second)
 
+				txs := ethereum.TxPool.Flush()
+
 				block := ethchain.CreateBlock(
 					ethereum.BlockManager.CurrentBlock.State().Root,
 					ethereum.BlockManager.LastBlockHash,