fix(bpos): not support CRInfoMultiSignVersion before ChangeViewV1Height

elastos · Oct 19, 2023 · c1bf61e · c1bf61e
1 parent 935a427
commit c1bf61e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/core/transaction/registercrtransaction.go b/core/transaction/registercrtransaction.go
@@ -56,11 +56,10 @@ func (t *RegisterCRTransaction) HeightVersionCheck() error {
 				"before CRSchnorrStartHeight", t.TxType().Name()))
 		}
 	case payload.CRInfoMultiSignVersion:
-		//if blockHeight < chainParams.CRSchnorrStartHeight {
-		//	return errors.New(fmt.Sprintf("not support %s transaction "+
-		//		"before CRSchnorrStartHeight", t.TxType().Name()))
-		//}
-		log.Warnf("todo add one height for cr multisign")
+		if blockHeight < chainParams.DPoSConfiguration.ChangeViewV1Height {
+			return errors.New(fmt.Sprintf("not support %s transaction CRInfoMultiSignVersion"+
+				"before ChangeViewV1Height", t.TxType().Name()))
+		}
 	default:
 		return errors.New(fmt.Sprintf("invalid payload version, "+
 			"%s transaction", t.TxType().Name()))

diff --git a/dpos/arbitrator.go b/dpos/arbitrator.go
@@ -198,7 +198,6 @@ func (a *Arbitrator) OnSidechainIllegalEvidenceReceived(
 }
 
 func (a *Arbitrator) OnBlockReceived(b *types.Block, confirmed bool) {
-	log.Info("####OnBlockReceived begin b.Hash()", b.Hash())
 	if !a.cfg.Server.IsCurrent() {
 		return
 	}
@@ -217,11 +216,7 @@ func (a *Arbitrator) OnBlockReceived(b *types.Block, confirmed bool) {
 			return
 		}
 	}
-	log.Info("####OnBlockReceived before PostBlockReceivedTask b.Hash()", b.Hash())
-
 	a.network.PostBlockReceivedTask(b, confirmed)
-	log.Info("####OnBlockReceived end b.Hash()", b.Hash())
-
 }
 
 func (a *Arbitrator) OnConfirmReceived(p *mempool.ConfirmInfo) {

diff --git a/dpos/manager/dposmanager.go b/dpos/manager/dposmanager.go
@@ -215,7 +215,6 @@ func (d *DPOSManager) ProcessHigherBlock(b *types.Block) {
 	//	return
 	//}
 
-	//d.handler.DealPrecociousProposals()
 	if !d.consensus.IsOnDuty() {
 		log.Info("[ProcessHigherBlock] broadcast inv and try start new consensus")
 		d.network.BroadcastMessage(dmsg.NewInventory(b.Header.Previous))