Revert "Feature: broadcast vote power"

Makefile

@@ -183,6 +183,3 @@ debug_external: clean
 
 build_localnet_validator:
 	bash test/build-localnet-validator.sh
-
-generate:
-	bash ./scripts/gogenerate.sh

api/proto/message/message.proto

@@ -29,7 +29,6 @@ enum MessageType {
   DRAND_INIT = 10 [deprecated=true];
   DRAND_COMMIT = 11 [deprecated=true];
   LOTTERY_REQUEST = 12 [deprecated=true]; // it should be either ENTER or GETPLAYERS but it will be removed later.
-  LAST_SIGN_POWER = 13;
 }
 
 // This is universal message for all communication protocols.
@@ -48,7 +47,6 @@ message Message {
     ViewChangeRequest viewchange = 7;
     // Refactor this later after demo.
     LotteryRequest lottery_request = 8 [deprecated=true];
-    LastSignPowerRequest last_sign_power = 9;
   }
 }
 
@@ -100,14 +98,6 @@ message DrandRequest {
   bytes payload = 4 [deprecated=true];
 }
 
-message LastSignPowerRequest {
-  int64 prepare = 1;
-  int64 commit = 2;
-  int64 change = 3;
-  bytes sender_pubkey = 4;
-  uint32 shard_id = 5;
-}
-
 message ViewChangeRequest {
   uint64 view_id = 1;
   uint64 block_num = 2;

consensus/consensus.go

@@ -140,9 +140,6 @@ type Consensus struct {
 	// Both flags only for initialization state.
 	start           bool
 	isInitialLeader bool
-
-	// value receives from
-	lastKnownSignPower int64
 }
 
 // Blockchain returns the blockchain.
@@ -402,18 +399,6 @@ func (consensus *Consensus) InitConsensusWithValidators() (err error) {
 	return nil
 }
 
-func (consensus *Consensus) SetLastKnownSignPower(i int64) {
-	consensus.mutex.Lock()
-	defer consensus.mutex.Unlock()
-	consensus.lastKnownSignPower = i
-}
-
-func (consensus *Consensus) GetLastKnownSignPower() int64 {
-	consensus.mutex.RLock()
-	defer consensus.mutex.RUnlock()
-	return consensus.lastKnownSignPower
-}
-
 type downloadAsync struct {
 }
 

consensus/consensus_service.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	bls_core "github.com/harmony-one/bls/ffi/go/bls"
-	"github.com/harmony-one/harmony/api/proto"
 	msg_pb "github.com/harmony-one/harmony/api/proto/message"
 	consensus_engine "github.com/harmony-one/harmony/consensus/engine"
 	"github.com/harmony-one/harmony/consensus/quorum"
@@ -18,10 +17,8 @@ import (
 	bls_cosi "github.com/harmony-one/harmony/crypto/bls"
 	"github.com/harmony-one/harmony/crypto/hash"
 	"github.com/harmony-one/harmony/internal/chain"
-	nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
 	"github.com/harmony-one/harmony/internal/utils"
 	"github.com/harmony-one/harmony/multibls"
-	"github.com/harmony-one/harmony/p2p"
 	"github.com/harmony-one/harmony/shard"
 	"github.com/harmony-one/harmony/shard/committee"
 	"github.com/harmony-one/harmony/webhooks"
@@ -156,56 +153,13 @@ func (consensus *Consensus) updateBitmaps() {
 
 }
 
-func (consensus *Consensus) sendLastSignPower() {
-	if consensus.isLeader() {
-		k, err := consensus.getLeaderPrivateKey(consensus.LeaderPubKey.Object)
-		if err != nil {
-			consensus.getLogger().Err(err).Msg("Leader not found in the committee")
-			return
-		}
-		comm, _ := consensus.decider.CurrentTotalPower(quorum.Commit)
-		prep, _ := consensus.decider.CurrentTotalPower(quorum.Prepare)
-		view, _ := consensus.decider.CurrentTotalPower(quorum.ViewChange)
-		msg := &msg_pb.Message{
-			ServiceType: msg_pb.ServiceType_CONSENSUS,
-			Type:        msg_pb.MessageType_LAST_SIGN_POWER,
-			Request: &msg_pb.Message_LastSignPower{
-				LastSignPower: &msg_pb.LastSignPowerRequest{
-					Prepare:      getOrZero(prep),
-					Commit:       getOrZero(comm),
-					Change:       getOrZero(view),
-					SenderPubkey: k.Pub.Bytes[:],
-					ShardId:      consensus.ShardID,
-				},
-			},
-		}
-		marshaledMessage, err := consensus.signAndMarshalConsensusMessage(msg, k.Pri)
-		if err != nil {
-			consensus.getLogger().Err(err).
-				Msg("[constructNewViewMessage] failed to sign and marshal the new view message")
-			return
-		}
-		msgToSend := proto.ConstructConsensusMessage(marshaledMessage)
-		if err := consensus.msgSender.SendWithoutRetry(
-			[]nodeconfig.GroupID{
-				nodeconfig.NewGroupIDByShardID(nodeconfig.ShardID(consensus.ShardID))},
-			p2p.ConstructMessage(msgToSend),
-		); err != nil {
-			consensus.getLogger().Err(err).
-				Msg("[LastSignPower] could not send out the ViewChange message")
-		}
-	}
-}
-
 // ResetState resets the state of the consensus
 func (consensus *Consensus) resetState() {
 	consensus.switchPhase("ResetState", FBFTAnnounce)
 
 	consensus.blockHash = [32]byte{}
 	consensus.block = []byte{}
 	consensus.decider.ResetPrepareAndCommitVotes()
-	consensus.sendLastSignPower()
-
 	if consensus.prepareBitmap != nil {
 		consensus.prepareBitmap.Clear()
 	}

consensus/consensus_v2.go

@@ -20,7 +20,6 @@ import (
 	vrf_bls "github.com/harmony-one/harmony/crypto/vrf/bls"
 	nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
 	"github.com/harmony-one/harmony/internal/utils"
-	"github.com/harmony-one/harmony/numeric"
 	"github.com/harmony-one/harmony/p2p"
 	"github.com/harmony-one/harmony/shard"
 	"github.com/harmony-one/vdf/src/vdf_go"
@@ -91,8 +90,6 @@ func (consensus *Consensus) HandleMessageUpdate(ctx context.Context, peer libp2p
 	case t == msg_pb.MessageType_NEWVIEW:
 		members := consensus.decider.Participants()
 		fbftMsg, err = ParseNewViewMessage(msg, members)
-	case t == msg_pb.MessageType_LAST_SIGN_POWER:
-		return nil
 	default:
 		fbftMsg, err = consensus.parseFBFTMessage(msg)
 	}
@@ -974,10 +971,3 @@ func (consensus *Consensus) DeleteMessagesLessThan(number uint64) {
 	defer consensus.mutex.Unlock()
 	consensus.fBFTLog.deleteMessagesLessThan(number)
 }
-
-func getOrZero(n *numeric.Dec) int64 {
-	if n == nil {
-		return 0
-	}
-	return (*n).Mul(numeric.NewDec(100)).TruncateInt64()
-}

consensus/fbft_log.go

@@ -36,7 +36,6 @@ type FBFTMessage struct {
 	M3AggSig           *bls_core.Sign
 	M3Bitmap           *bls_cosi.Mask
 	Verified           bool
-	LastVotePower      int64
 }
 
 func (m *FBFTMessage) Hash() []byte {

node/api.go

@@ -2,7 +2,9 @@ package node
 
 import (
 	"github.com/harmony-one/harmony/consensus/quorum"
+	"github.com/harmony-one/harmony/consensus/votepower"
 	"github.com/harmony-one/harmony/core/types"
+	"github.com/harmony-one/harmony/crypto/bls"
 	"github.com/harmony-one/harmony/eth/rpc"
 	"github.com/harmony-one/harmony/hmy"
 	"github.com/harmony-one/harmony/internal/tikv"
@@ -179,7 +181,27 @@ func (node *Node) GetLastSigningPower() (float64, error) {
 }
 
 func (node *Node) GetLastSigningPower2() (float64, error) {
-	p := node.Consensus.GetLastKnownSignPower()
-	round := float64(p) / 10000
+	bc := node.Consensus.Blockchain()
+	cur := bc.CurrentBlock()
+	ss, err := bc.ReadShardState(cur.Epoch())
+	if err != nil {
+		return 0, err
+	}
+	roster, err := votepower.Compute(&ss.Shards[bc.ShardID()], cur.Epoch())
+	if err != nil {
+		return 0, err
+	}
+	blsPubKeys, err := ss.Shards[bc.ShardID()].BLSPublicKeys()
+	if err != nil {
+		return 0, err
+	}
+
+	mask := bls.NewMask(blsPubKeys)
+	err = mask.SetMask(cur.Header().LastCommitBitmap())
+	if err != nil {
+		return 0, err
+	}
+	power := roster.VotePowerByMask(mask)
+	round := float64(power.MulInt64(10000).RoundInt64()) / 10000
 	return round, nil
 }

node/node.go

@@ -471,14 +471,12 @@ func (node *Node) validateNodeMessage(ctx context.Context, payload []byte) (
 	return payload[p2pNodeMsgPrefixSize:], msgType, nil
 }
 
-type ignore = bool
-
 // validateShardBoundMessage validate consensus message
 // validate shardID
 // validate public key size
 // verify message signature
 func validateShardBoundMessage(consensus *consensus.Consensus, peer libp2p_peer.ID, nodeConfig *nodeconfig.ConfigType, payload []byte,
-) (*msg_pb.Message, *bls.SerializedPublicKey, ignore, error) {
+) (*msg_pb.Message, *bls.SerializedPublicKey, bool, error) {
 	var (
 		m msg_pb.Message
 		//consensus = registry.GetConsensus()
@@ -530,16 +528,11 @@ func validateShardBoundMessage(consensus *consensus.Consensus, peer libp2p_peer.
 		}
 	}
 
-	var (
-		maybeCon     = m.GetConsensus()
-		maybeVC      = m.GetViewchange()
-		maybeSP      = m.GetLastSignPower()
-		senderKey    []byte
-		senderBitmap []byte
-	)
+	maybeCon, maybeVC := m.GetConsensus(), m.GetViewchange()
+	senderKey := []byte{}
+	senderBitmap := []byte{}
 
-	switch {
-	case maybeCon != nil:
+	if maybeCon != nil {
 		if maybeCon.ShardId != consensus.ShardID {
 			nodeConsensusMessageCounterVec.With(prometheus.Labels{"type": "invalid_shard"}).Inc()
 			return nil, nil, true, errors.WithStack(errWrongShardID)
@@ -553,7 +546,7 @@ func validateShardBoundMessage(consensus *consensus.Consensus, peer libp2p_peer.
 		if maybeCon.ViewId+5 < consensus.GetCurBlockViewID() {
 			return nil, nil, true, errors.WithStack(errViewIDTooOld)
 		}
-	case maybeVC != nil:
+	} else if maybeVC != nil {
 		if maybeVC.ShardId != consensus.ShardID {
 			nodeConsensusMessageCounterVec.With(prometheus.Labels{"type": "invalid_shard"}).Inc()
 			return nil, nil, true, errors.WithStack(errWrongShardID)
@@ -563,14 +556,7 @@ func validateShardBoundMessage(consensus *consensus.Consensus, peer libp2p_peer.
 		if maybeVC.ViewId+5 < consensus.GetViewChangingID() {
 			return nil, nil, true, errors.WithStack(errViewIDTooOld)
 		}
-	case maybeSP != nil:
-		if maybeSP.ShardId != consensus.ShardID {
-			nodeConsensusMessageCounterVec.With(prometheus.Labels{"type": "invalid_shard"}).Inc()
-			return nil, nil, true, errors.WithStack(errWrongShardID)
-		}
-		senderKey = maybeSP.SenderPubkey
-		consensus.SetLastKnownSignPower(maybeSP.Commit)
-	default:
+	} else {
 		nodeConsensusMessageCounterVec.With(prometheus.Labels{"type": "invalid"}).Inc()
 		return nil, nil, true, errors.WithStack(errNoSenderPubKey)
 	}