updata

chain33.para.toml

@@ -115,6 +115,7 @@ mainBlockHashForkHeight=209186
 mainForkParacrossCommitTx=2270000
 #主链开启循环检查共识交易done的fork高度,需要和主链保持严格一致,不可修改,4320000是bityuan主链对应高度， ycc或其他按实际修改
 mainLoopCheckCommitTxDoneForkHeight=4320000
+#mainForkParaSupervision=10400000
 #无平行链交易的主链区块间隔，平行链产生一个空块，从高度0开始，配置[blockHeight:interval],比如["0:50","1000:100"]
 emptyBlockInterval=["0:50"]
 

plugin/dapp/paracross/executor/action.go

@@ -635,9 +635,6 @@ func (a *action) proCommitMsg(commit *pt.ParacrossNodeStatus, nodes map[string]s
 			stat.MainHeight = commit.MainBlockHeight
 			stat.MainHash = commit.MainBlockHash
 		}
-		if pt.IsParaForkHeight(cfg, a.exec.GetMainHeight(), pt.ForkParaSupervision) {
-			stat.SupervisionDetails = &pt.ParacrossStatusDetails{}
-		}
 	} else {
 		copyStat = proto.Clone(stat).(*pt.ParacrossHeightStatus)
 	}
@@ -654,6 +651,9 @@ func (a *action) proCommitMsg(commit *pt.ParacrossNodeStatus, nodes map[string]s
 	}
 
 	for _, addr := range supervisionValidAddrs {
+		if stat.SupervisionDetails == nil {
+			stat.SupervisionDetails = &pt.ParacrossStatusDetails{}
+		}
 		// 如有分叉， 同一个节点可能再次提交commit交易
 		found, index := hasCommited(stat.SupervisionDetails.Addrs, addr)
 		if found {
@@ -674,8 +674,11 @@ func (a *action) proCommitMsg(commit *pt.ParacrossNodeStatus, nodes map[string]s
 	//平行链fork pt.ForkCommitTx=0,主链在ForkCommitTx后支持nodegroup，这里平行链dappFork一定为true
 	if cfg.IsDappFork(commit.MainBlockHeight, pt.ParaX, pt.ForkCommitTx) {
 		updateCommitAddrs(stat, nodes)
-		//updateSupervisionDetailsCommitAddrs(stat, supervisionNodes) // ???
 	}
+	if stat.SupervisionDetails != nil {
+		updateSupervisionDetailsCommitAddrs(stat, supervisionNodes)
+	}
+
 	_ = saveTitleHeight(a.db, calcTitleHeightKey(stat.Title, stat.Height), stat)
 	//fork之前记录的stat 没有根据nodes更新而更新
 	if pt.IsParaForkHeight(cfg, stat.MainHeight, pt.ForkLoopCheckCommitTxDone) {

plugin/dapp/paracross/types/paracross.go

@@ -329,6 +329,8 @@ func GetDappForkHeight(cfg *types.Chain33Config, forkKey string) int64 {
 			key = MainForkParacrossCommitTx
 		case ForkLoopCheckCommitTxDone:
 			key = MainLoopCheckCommitTxDoneForkHeight
+			//case ForkParaSupervision:
+			//	key = MainForkParaSupervision
 		}
 
 		forkHeight = types.Conf(cfg, ParaPrefixConsSubConf).GInt(key)
@@ -336,9 +338,6 @@ func GetDappForkHeight(cfg *types.Chain33Config, forkKey string) int64 {
 			forkHeight = types.MaxHeight
 		}
 
-		if key == ForkParaSupervision { // ????
-			forkHeight = types.Conf(cfg, ParaPrefixConsSubConf).GInt(key)
-		}
 	} else {
 		forkHeight = cfg.GetDappFork(ParaX, forkKey)
 

plugin/dapp/paracross/types/type.go

@@ -24,6 +24,8 @@ var (
 	ForkLoopCheckCommitTxDone = "ForkLoopCheckCommitTxDone"
 	// MainLoopCheckCommitTxDoneForkHeight 平行链的配置项，对应主链的ForkLoopCheckCommitTxDone高度
 	MainLoopCheckCommitTxDoneForkHeight = "mainLoopCheckCommitTxDoneForkHeight"
+
+	//MainForkParaSupervision = "mainForkParaSupervision"
 	// ForkParaSelfConsStages 平行链自共识分阶段共识
 	ForkParaSelfConsStages = "ForkParaSelfConsStages"
 	// ForkParaAssetTransferRbk 平行链资产转移平行链失败主链回滚