cleanup

Author: philipsu522

internal/consensus/metrics.gen.go

@@ -88,6 +88,7 @@ type Metrics struct {
 	ProposalBlockCreatedOnPropose metrics.Counter `metrics_labels:"success"`
 	ProposalTxs                   metrics.Gauge
 	ProposalMissingTxs            metrics.Gauge
+	MissingTxs                    metrics.Gauge `metrics_labels:"proposer_address"`
 
 	// QuroumPrevoteMessageDelay is the interval in seconds between the proposal
 	// timestamp and the timestamp of the earliest prevote that achieved a quorum

internal/consensus/metrics.go

@@ -1157,6 +1157,7 @@ func (r *Reactor) handleDataMessage(ctx context.Context, envelope *p2p.Envelope,
 		if r.state.config.GossipTransactionHashOnly {
 			missingTxKeys := r.state.blockExec.GetMissingTxs(proposalTxs)
 			//logger.Info("PSULOG - checking for missing keys", "proposal height", pMsg.Proposal.Height, "proposal round", pMsg.Proposal.Round, "txkeys", pMsg.Proposal.TxKeys, "missingTxKeys", missingTxKeys)
+			r.Metrics.MissingTxs.With("proposer_address", pMsg.Proposal.ProposerAddress.String()).Set(float64(len(missingTxKeys)))
 			if len(missingTxKeys) > 0 {
 				var txKeys []*tmproto.TxKey
 				for _, txKey := range missingTxKeys {

internal/consensus/reactor.go

@@ -1066,22 +1066,6 @@ func (cs *State) handleMsg(ctx context.Context, mi msgInfo, fsyncUponCompletion
 
 		cs.mtx.Lock()
 		if added && cs.ProposalBlockParts.IsComplete() {
-			// We also need to check we have all txs if we're only gossiping
-			// tx keys.
-			// TODO(psu): Figure out how to trigger handleCompleteProposal once all txs are received
-			//if cs.config.GossipTransactionHashOnly {
-			//	if cs.ProposalBlock == nil || len(cs.blockExec.GetMissingTxs(cs.ProposalBlock.TxKeys)) != 0 {
-			//		cs.logger.Info("PSULOG - proposal is complete but proposal block is still nil or missing txs", "proposal", cs.Proposal)
-			//		if cs.ProposalBlock != nil {
-			//			cs.logger.Info("PSULOG  proposal is complete but proposal block is still nil or missing txs", "missing txs", cs.blockExec.GetMissingTxs(cs.ProposalBlock.TxKeys))
-			//		}
-			//		return
-			//	} else if len(cs.blockExec.GetMissingTxs(cs.ProposalBlock.TxKeys)) != 0 {
-			//		cs.logger.Info("PSULOG - received all proposal blocks but still missing txs")
-			//		return
-			//	}
-			//}
-
 			if fsyncUponCompletion {
 				_, fsyncSpan := cs.tracer.Start(spanCtx, "cs.state.handleBlockPartMsg.fsync")
 				if err := cs.wal.FlushAndSync(); err != nil { // fsync
@@ -1574,7 +1558,6 @@ func (cs *State) createProposalBlock(ctx context.Context) (*types.Block, error)
 
 	proposerAddr := cs.privValidatorPubKey.Address()
 
-	//ret, err := cs.blockExec.CreateProposalBlock(ctx, cs.Height, cs.state, lastExtCommit, proposerAddr, cs.config.GossipTransactionHashOnly)
 	ret, err := cs.blockExec.CreateProposalBlock(ctx, cs.Height, cs.state, lastExtCommit, proposerAddr, false)
 	//cs.logger.Info("PSULOG - created proposal block", "height", ret.Height, "txs", ret.Txs, "txkeys", ret.TxKeys)
 	if err != nil {