aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-07-06 17:03:50 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-07-06 17:03:50 +0800
commitaa4502060b50733a3a82a0ab575eac0731cdb7ca (patch)
tree8c9ccc339ddb4de712de2aba988497d9e2bdaacd
parentb533aaa765c2a6fafed5d7e8bfe5a54c2303ad6d (diff)
parentbcc1660abc1c0a5ef838dea89e4f3830d84fb51c (diff)
downloaddexon-aa4502060b50733a3a82a0ab575eac0731cdb7ca.tar
dexon-aa4502060b50733a3a82a0ab575eac0731cdb7ca.tar.gz
dexon-aa4502060b50733a3a82a0ab575eac0731cdb7ca.tar.bz2
dexon-aa4502060b50733a3a82a0ab575eac0731cdb7ca.tar.lz
dexon-aa4502060b50733a3a82a0ab575eac0731cdb7ca.tar.xz
dexon-aa4502060b50733a3a82a0ab575eac0731cdb7ca.tar.zst
dexon-aa4502060b50733a3a82a0ab575eac0731cdb7ca.zip
Merge pull request #1400 from obscuren/badblock-reporting
core, miner, tests: added test, implemented bad block reporting
-rw-r--r--core/bad_block.go56
-rw-r--r--core/chain_manager.go2
-rw-r--r--miner/worker.go2
-rw-r--r--tests/init.go3
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 1deaf5912..832759f7e 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 (
@@ -43,6 +45,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)