extend explorer api with block.ID() and optional hexblock field

api/explorer.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/NebulousLabs/Sia/build"
 	"github.com/NebulousLabs/Sia/crypto"
+	"github.com/NebulousLabs/Sia/encoding"
 	"github.com/NebulousLabs/Sia/modules"
 	"github.com/NebulousLabs/Sia/types"
 
@@ -20,6 +21,8 @@ type (
 		MinerPayoutIDs []types.SiacoinOutputID `json:"minerpayoutids"`
 		Transactions   []ExplorerTransaction   `json:"transactions"`
 		RawBlock       types.Block             `json:"rawblock"`
+		HexBlock       string                  `json:"hexblock"`
+		BlockId        string                  `json:"blockid"`
 
 		modules.BlockFacts
 	}
@@ -171,8 +174,10 @@ func (api *API) buildExplorerTransaction(height types.BlockHeight, parent types.
 }
 
 // buildExplorerBlock takes a block and its height and uses it to construct an
-// explorer block.
-func (api *API) buildExplorerBlock(height types.BlockHeight, block types.Block) ExplorerBlock {
+// explorer block. hex_block_enable is a required flag and indicates if the
+// hex_block_field should be empty string (false) or
+// should contain the hexadecimal binary encoded block (true).
+func (api *API) buildExplorerBlock(height types.BlockHeight, block types.Block, hex_block_enable bool) ExplorerBlock {
 	var mpoids []types.SiacoinOutputID
 	for i := range block.MinerPayouts {
 		mpoids = append(mpoids, block.MinerPayoutID(uint64(i)))
@@ -188,10 +193,17 @@ func (api *API) buildExplorerBlock(height types.BlockHeight, block types.Block)
 		panic("incorrect request to buildExplorerBlock - block does not exist")
 	}
 
+	hex_block := ""
+	if hex_block_enable {
+		hex_block = fmt.Sprintf("%x", encoding.Marshal(block)[:])
+	}
+
 	return ExplorerBlock{
 		MinerPayoutIDs: mpoids,
 		Transactions:   etxns,
 		RawBlock:       block,
+		HexBlock:       hex_block,
+		BlockId:        fmt.Sprintf("%x", encoding.Marshal(block.ID())[:]),
 
 		BlockFacts: facts,
 	}
@@ -214,7 +226,8 @@ func (api *API) explorerBlocksHandler(w http.ResponseWriter, req *http.Request,
 		return
 	}
 	WriteJSON(w, ExplorerBlockGET{
-		Block: api.buildExplorerBlock(height, block),
+		Block: api.buildExplorerBlock(height, block,
+			req.FormValue("hexblock") == "true"),
 	})
 }
 
@@ -231,7 +244,7 @@ func (api *API) buildTransactionSet(txids []types.TransactionID) (txns []Explore
 
 		// Check if the block is the transaction.
 		if types.TransactionID(block.ID()) == txid {
-			blocks = append(blocks, api.buildExplorerBlock(height, block))
+			blocks = append(blocks, api.buildExplorerBlock(height, block, false))
 		} else {
 			// Find the transaction within the block with the correct id.
 			for _, t := range block.Transactions {
@@ -271,7 +284,8 @@ func (api *API) explorerHashHandler(w http.ResponseWriter, req *http.Request, ps
 	if exists {
 		WriteJSON(w, ExplorerHashGET{
 			HashType: "blockid",
-			Block:    api.buildExplorerBlock(height, block),
+			Block: api.buildExplorerBlock(height, block,
+				req.FormValue("hexblock") == "true"),
 		})
 		return
 	}