fix(bpos):can change dpos state

elastos · Nov 10, 2023 · af3bf71 · af3bf71
1 parent adbfb6e
commit af3bf71
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 60 deletions.
diff --git a/core/transaction/cancelproducertransaction.go b/core/transaction/cancelproducertransaction.go
@@ -65,7 +65,7 @@ func (t *CancelProducerTransaction) SpecialContextCheck() (elaerr.ELAError, bool
 			return elaerr.Simple(elaerr.ErrTxPayload, errors.New("can not cancel DPoS V1&V2 producer")), true
 		}
 	}
-
+	//need return Returned
 	if producer.State() == state.Illegal ||
 		producer.State() == state.Canceled {
 		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("can not cancel this producer")), true

diff --git a/cr/state/committeeaction.go b/cr/state/committeeaction.go
@@ -70,6 +70,14 @@ func (c *Committee) processTransactions(txs []interfaces.Transaction, height uin
 	}
 }
 
+/*
+transaction effect statue is
+	MemberInactive by tx  CRCouncilMemberClaimNode ---》  MemberElected
+    by tx ReturnCRDepositCoin --》MemberReturned
+*/
+
+// MemberElected  MemberImpeached  MemberTerminated	MemberReturned MemberInactive MemberIllegal
+// MemberIllegal MemberInactive change is  in dpos state
 func canChangeState(nowState, targetState MemberState) bool {
 	switch targetState {
 	case MemberElected:
@@ -78,7 +86,7 @@ func canChangeState(nowState, targetState MemberState) bool {
 		} else {
 			return true
 		}
-	case MemberInactive:
+	case MemberInactive: //first is MemberElected,then
 		//only MemberElected
 		if nowState != MemberElected {
 			return false

diff --git a/dpos/state/arbitrators.go b/dpos/state/arbitrators.go
@@ -182,6 +182,7 @@ func (a *Arbiters) recoverFromCheckPoints(point *CheckPoint) {
 	// reset history
 	a.History = utils.NewHistory(maxHistoryCapacity)
 	a.State.History = utils.NewHistory(maxHistoryCapacity)
+	a.State.InactiveHistory = utils.NewHistory(maxHistoryCapacity)
 
 	a.DutyIndex = point.DutyIndex
 	a.CurrentArbitrators = point.CurrentArbitrators