core: improve getBadBlocks to return full block rlp

core/blockchain.go

@@ -1389,23 +1389,35 @@ func (bc *BlockChain) update() {
 type BadBlockArgs struct {
 	Hash     common.Hash   `json:"hash"`
 	Header   *types.Header `json:"header"`
+	BlockRLP string        `json:"blockrlp"`
 }
 
 // BadBlocks returns a list of the last 'bad blocks' that the client has seen on the network
 func (bc *BlockChain) BadBlocks() ([]BadBlockArgs, error) {
-	headers := make([]BadBlockArgs, 0, bc.badBlocks.Len())
+	blocks := make([]BadBlockArgs, 0, bc.badBlocks.Len())
+	var (
+		err     error
+		rlpData []byte
+	)
 	for _, hash := range bc.badBlocks.Keys() {
-		if hdr, exist := bc.badBlocks.Peek(hash); exist {
+		if blk, exist := bc.badBlocks.Peek(hash); exist {
-			header := hdr.(*types.Header)
+			block := blk.(*types.Block)
-			headers = append(headers, BadBlockArgs{header.Hash(), header})
+			rlpData, err = rlp.EncodeToBytes(block)
+			if err != nil {
+				break
+			}
+			blocks = append(blocks, BadBlockArgs{
+				Hash:     block.Hash(),
+				Header:   block.Header(),
+				BlockRLP: fmt.Sprintf("%x", rlpData)})
 		}
 	}
-	return headers, nil
+	return blocks, err
 }
 
 // addBadBlock adds a bad block to the bad-block LRU cache
 func (bc *BlockChain) addBadBlock(block *types.Block) {
-	bc.badBlocks.Add(block.Header().Hash(), block.Header())
+	bc.badBlocks.Add(block.Hash(), block)
 }
 
 // reportBlock logs a bad block error.