core, miner, tests: added test, implemented bad block reporting

4 files changed, 61 insertions, 2 deletions

diff --git a/core/bad_block.go b/core/bad_block.go
new file mode 100644
index 000000000..e8e736a13
--- /dev/null
+++ b/core/bad_block.go
@@ -0,0 +1,56 @@
+package core
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/logger/glog"
+	"github.com/ethereum/go-ethereum/rlp"
+)
+
+// DisabledBadBlockReporting can be set to prevent blocks being reported.
+var DisableBadBlockReporting = true
+
+// ReportBlock reports the block to the block reporting tool found at
+// badblocks.ethdev.com
+func ReportBlock(block *types.Block, err error) {
+	if DisableBadBlockReporting {
+		return
+	}
+
+	const url = "https://badblocks.ethdev.com"
+
+	blockRlp, _ := rlp.EncodeToBytes(block)
+	data := map[string]interface{}{
+		"block":     common.Bytes2Hex(blockRlp),
+		"errortype": err.Error(),
+		"hints": map[string]interface{}{
+			"receipts": "NYI",
+			"vmtrace":  "NYI",
+		},
+	}
+	jsonStr, _ := json.Marshal(map[string]interface{}{"method": "eth_badBlock", "params": []interface{}{data}, "id": "1", "jsonrpc": "2.0"})
+
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		glog.V(logger.Error).Infoln("POST err:", err)
+		return
+	}
+	defer resp.Body.Close()
+
+	if glog.V(logger.Debug) {
+		glog.Infoln("response Status:", resp.Status)
+		glog.Infoln("response Headers:", resp.Header)
+		body, _ := ioutil.ReadAll(resp.Body)
+		glog.Infoln("response Body:", string(body))
+	}
+}
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 4855162b5..682ddd2d5 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -611,6 +611,8 @@ func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) {
 
 			blockErr(block, err)
 
+			go ReportBlock(block, err)
+
 			return i, err
 		}
 
diff --git a/miner/worker.go b/miner/worker.go
index 1615ff84b..c28258799 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -298,8 +298,6 @@ func (self *worker) push() {
 
 			if agent.Work() != nil {
 				agent.Work() <- self.current.block
-			} else {
-				common.Report(fmt.Sprintf("%v %T\n", agent, agent))
 			}
 		}
 	}
diff --git a/tests/init.go b/tests/init.go
index dd8df930f..a78a2f54b 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -8,6 +8,8 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"github.com/ethereum/go-ethereum/core"
 )
 
 var (
@@ -48,6 +50,7 @@ func readJson(reader io.Reader, value interface{}) error {
 		return fmt.Errorf("Error reading JSON file", err.Error())
 	}
 
+	core.DisableBadBlockReporting = true
 	if err = json.Unmarshal(data, &value); err != nil {
 		if syntaxerr, ok := err.(*json.SyntaxError); ok {
 			line := findLine(data, syntaxerr.Offset)