Merge pull request #1451 from flicker-harmony/pr_explorer_block_signers

fix block signers

api/service/explorer/service.go

@@ -16,8 +16,10 @@ import (
 	"github.com/gorilla/mux"
 	libp2p_peer "github.com/libp2p/go-libp2p-peer"
 
+	"github.com/harmony-one/bls/ffi/go/bls"
 	msg_pb "github.com/harmony-one/harmony/api/proto/message"
 	"github.com/harmony-one/harmony/core/types"
+	bls2 "github.com/harmony-one/harmony/crypto/bls"
 	"github.com/harmony-one/harmony/internal/bech32"
 	common2 "github.com/harmony-one/harmony/internal/common"
 	"github.com/harmony-one/harmony/internal/ctxerror"
@@ -198,11 +200,54 @@ func (s *Service) GetExplorerBlocks(w http.ResponseWriter, r *http.Request) {
 	}
 
 	accountBlocks := s.ReadBlocksFromDB(fromInt, toInt)
+	curEpoch := int64(-1)
+	committee := &types.Committee{}
 	for id, accountBlock := range accountBlocks {
 		if id == 0 || id == len(accountBlocks)-1 || accountBlock == nil {
 			continue
 		}
 		block := NewBlock(accountBlock, id+fromInt-1)
+		if int64(block.Epoch) > curEpoch {
+			if bytes, err := db.Get([]byte(GetCommitteeKey(uint32(s.ShardID), block.Epoch))); err == nil {
+				committee = &types.Committee{}
+				if err = rlp.DecodeBytes(bytes, committee); err != nil {
+					utils.Logger().Warn().Err(err).Msg("cannot read committee for new epoch")
+				}
+			} else {
+				state, err := accountBlock.Header().GetShardState()
+				if err == nil {
+					for _, shardCommittee := range state {
+						if shardCommittee.ShardID == accountBlock.ShardID() {
+							committee = &shardCommittee
+							break
+						}
+					}
+				}
+			}
+			curEpoch = int64(block.Epoch)
+		}
+		pubkeys := make([]*bls.PublicKey, len(committee.NodeList))
+		for i, validator := range committee.NodeList {
+			pubkeys[i] = new(bls.PublicKey)
+			validator.BlsPublicKey.ToLibBLSPublicKey(pubkeys[i])
+		}
+		mask, err := bls2.NewMask(pubkeys, nil)
+		if err == nil && accountBlocks[id+1] != nil {
+			err = mask.SetMask(accountBlocks[id+1].Header().LastCommitBitmap)
+			if err == nil {
+				for _, validator := range committee.NodeList {
+					oneAddress, err := common2.AddressToBech32(validator.EcdsaAddress)
+					if err != nil {
+						continue
+					}
+					blsPublicKey := new(bls.PublicKey)
+					validator.BlsPublicKey.ToLibBLSPublicKey(blsPublicKey)
+					if ok, err := mask.KeyEnabled(blsPublicKey); err == nil && ok {
+						block.Signers = append(block.Signers, oneAddress)
+					}
+				}
+			}
+		}
 		// Populate transactions
 		for _, tx := range accountBlock.Transactions() {
 			transaction := GetTransaction(tx, accountBlock)

api/service/explorer/structs.go

@@ -6,7 +6,6 @@ import (
 	"strconv"
 
 	"github.com/harmony-one/harmony/core/types"
-	"github.com/harmony-one/harmony/internal/common"
 	"github.com/harmony-one/harmony/internal/utils"
 )
 
@@ -88,22 +87,20 @@ type Shard struct {
 func NewBlock(block *types.Block, height int) *Block {
 	// TODO(ricl): use block.Header().CommitBitmap and GetPubKeyFromMask
 	signers := []string{}
-	state, err := block.Header().GetShardState()
+	/*state, err := block.Header().GetShardState()
 	if err == nil {
 		for _, committee := range state {
 			if committee.ShardID == block.ShardID() {
-				for _, validator := range committee.NodeList {
+				for i, validator := range committee.NodeList {
 					oneAddress, err := common.AddressToBech32(validator.EcdsaAddress)
-					if err != nil {
+					if err != nil && block.Header().LastCommitBitmap[i] != 0x0 {
 						continue
 					}
 					signers = append(signers, oneAddress)
 				}
 			}
 		}
-	} else {
-		utils.Logger().Warn().Err(err).Msgf("bad state block %d", block.NumberU64())
-	}
+	}*/
 	return &Block{
 		Height:     strconv.Itoa(height),
 		ID:         block.Hash().Hex(),