fix(dpos2.0): increase the transaction priority for revertToPow

elastos · Apr 15, 2023 · 992b589 · 992b589
1 parent 0728416
commit 992b589
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/mempool/txpool.go b/mempool/txpool.go
@@ -80,6 +80,11 @@ func (mp *TxPool) removeCRAppropriationConflictTransactions() {
 }
 
 func (mp *TxPool) appendToTxPool(tx interfaces.Transaction) elaerr.ELAError {
+	// todo complete me
+	if tx.IsIllegalProposalTx() || tx.IsIllegalVoteTx() {
+		return elaerr.Simple(elaerr.ErrTxValidation, nil)
+	}
+
 	txHash := tx.Hash()
 
 	// If the transaction is CR appropriation transaction, need to remove

diff --git a/pow/revertlistener.go b/pow/revertlistener.go
@@ -29,6 +29,8 @@ func (pow *Service) ListenForRevert() {
 			}
 			lastBlockTimestamp := int64(pow.arbiters.GetLastBlockTimestamp())
 			localTimestamp := pow.chain.TimeSource.AdjustedTime().Unix()
+			log.Info("ListenForRevert lastBlockTimestamp:", lastBlockTimestamp,
+				"localTimestamp:", localTimestamp, "RevertToPOWNoBlockTime:", pow.chainParams.DPoSConfiguration.RevertToPOWNoBlockTime)
 			if localTimestamp-lastBlockTimestamp < pow.chainParams.DPoSConfiguration.RevertToPOWNoBlockTime {
 				continue
 			}

diff --git a/pow/service.go b/pow/service.go
@@ -281,12 +281,14 @@ func (pow *Service) GenerateBlock(minerAddr string,
 	txs := pow.txMemPool.GetTxsInPool()
 
 	isHighPriority := func(tx interfaces.Transaction) bool {
-		if tx.IsIllegalTypeTx() || tx.IsInactiveArbitrators() ||
+		if tx.IsRevertToPOW() || tx.IsRevertToDPOS() ||
+			tx.IsIllegalTypeTx() || tx.IsInactiveArbitrators() ||
 			tx.IsSideChainPowTx() || tx.IsUpdateVersion() ||
 			tx.IsActivateProducerTx() || tx.IsCRCAppropriationTx() ||
 			tx.IsCRAssetsRectifyTx() || tx.IsNextTurnDPOSInfoTx() {
 			return true
 		}
+
 		return false
 	}
 
@@ -303,6 +305,10 @@ func (pow *Service) GenerateBlock(minerAddr string,
 	var proposalsUsedAmount common.Fixed64
 	for _, tx := range txs {
 
+		if tx.IsIllegalProposalTx() || tx.IsIllegalVoteTx() {
+			continue
+		}
+
 		size := totalTxsSize + tx.GetSize()
 		if size > int(pact.MaxBlockContextSize) {
 			continue