Peer add announces new block message num limit

[bytom/vapor.git] / api / block_retrieve.go

diff --git a/api/block_retrieve.go b/api/block_retrieve.go
index 1b8684e..10b9fb0 100644 (file)
--- a/api/block_retrieve.go
+++ b/api/block_retrieve.go
@@ -48,6 +48,7 @@ type GetBlockResp struct {
        PreviousBlockHash      *bc.Hash             `json:"previous_block_hash"`
        Timestamp              uint64               `json:"timestamp"`
        Witness                []chainjson.HexBytes `json:"witness"`
+       Blocker                string               `json:"blocker"`
        TransactionsMerkleRoot *bc.Hash             `json:"transaction_merkle_root"`
        TransactionStatusHash  *bc.Hash             `json:"transaction_status_hash"`
        Transactions           []*BlockTx           `json:"transactions"`
@@ -71,6 +72,12 @@ func (a *API) getBlock(ins BlockReq) Response {
        for i, w := range block.Witness {
                witness[i] = w
        }
+       var blocker string
+       if block.Height > 0 {
+               if blocker, err = a.chain.GetBlocker(&block.PreviousBlockHash, block.Timestamp); err != nil {
+                       return NewErrorResponse(err)
+               }
+       }
 
        resp := &GetBlockResp{
                Hash:                   &blockHash,
@@ -80,6 +87,7 @@ func (a *API) getBlock(ins BlockReq) Response {
                PreviousBlockHash:      &block.PreviousBlockHash,
                Timestamp:              block.Timestamp,
                Witness:                witness,
+               Blocker:                blocker,
                TransactionsMerkleRoot: &block.TransactionsMerkleRoot,
                TransactionStatusHash:  &block.TransactionStatusHash,
                Transactions:           []*BlockTx{},