core, miner, tests: added test, implemented bad block reporting
This commit is contained in:
		
							
								
								
									
										56
									
								
								core/bad_block.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								core/bad_block.go
									
									
									
									
									
										Normal file
									
								
							@@ -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))
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -611,6 +611,8 @@ func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
			blockErr(block, err)
 | 
								blockErr(block, err)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								go ReportBlock(block, err)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			return i, err
 | 
								return i, err
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -298,8 +298,6 @@ func (self *worker) push() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
			if agent.Work() != nil {
 | 
								if agent.Work() != nil {
 | 
				
			||||||
				agent.Work() <- self.current.block
 | 
									agent.Work() <- self.current.block
 | 
				
			||||||
			} else {
 | 
					 | 
				
			||||||
				common.Report(fmt.Sprintf("%v %T\n", agent, agent))
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,6 +8,8 @@ import (
 | 
				
			|||||||
	"net/http"
 | 
						"net/http"
 | 
				
			||||||
	"os"
 | 
						"os"
 | 
				
			||||||
	"path/filepath"
 | 
						"path/filepath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						"github.com/ethereum/go-ethereum/core"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var (
 | 
					var (
 | 
				
			||||||
@@ -48,6 +50,7 @@ func readJson(reader io.Reader, value interface{}) error {
 | 
				
			|||||||
		return fmt.Errorf("Error reading JSON file", err.Error())
 | 
							return fmt.Errorf("Error reading JSON file", err.Error())
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						core.DisableBadBlockReporting = true
 | 
				
			||||||
	if err = json.Unmarshal(data, &value); err != nil {
 | 
						if err = json.Unmarshal(data, &value); err != nil {
 | 
				
			||||||
		if syntaxerr, ok := err.(*json.SyntaxError); ok {
 | 
							if syntaxerr, ok := err.(*json.SyntaxError); ok {
 | 
				
			||||||
			line := findLine(data, syntaxerr.Offset)
 | 
								line := findLine(data, syntaxerr.Offset)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user