updata

chain33.para.toml

@@ -259,7 +259,7 @@ ForkLoopCheckCommitTxDone=0
 #仅平行链适用，自共识分阶段开启，缺省是0，若对应主链高度7200000之前开启过自共识，需要重新配置此分叉，并为之前自共识设置selfConsensEnablePreContract配置项
 ForkParaSelfConsStages=0
 ForkParaAssetTransferRbk=0
-ForkParaSupervisionRbk=0
+ForkParaSupervision=0
 
 [fork.sub.evm]
 Enable=0

plugin/dapp/paracross/executor/paracross.go

@@ -355,7 +355,7 @@ func (c *Paracross) allow(tx *types.Transaction, index int) error {
 				return nil
 			}
 		}
-		if cfg.IsDappFork(c.GetHeight(), pt.ParaX, pt.ForkParaSupervisionRbk) {
+		if cfg.IsDappFork(c.GetHeight(), pt.ParaX, pt.ForkParaSupervision) {
 			if payload.Ty == pt.ParacrossActionSupervisionNodeGroupConfig {
 				return nil
 			}

plugin/dapp/paracross/executor/supervisionaccount.go

@@ -318,13 +318,13 @@ func (a *action) supervisionNodeGroupApply(config *pt.ParaNodeAddrConfig) (*type
 	}
 
 	// 判断申请节点之前没有申请或者状态不是申请退出
-	addrStat, err := getSupervisionNodeAddr(a.db, config.Title, config.Addr)
-	if err != nil && !isNotFound(err) {
-		return nil, errors.Wrapf(err, "nodeJoin get title=%s,nodeAddr=%s", config.Title, config.Addr)
-	}
-	if addrStat != nil && addrStat.Status != pt.ParacrossSupervisionNodeQuit {
-		return nil, errors.Wrapf(pt.ErrParaNodeAddrExisted, "nodeJoin nodeAddr existed:%s,status:%d", config.Addr, addrStat.Status)
-	}
+	//addrStat, err := getSupervisionNodeAddr(a.db, config.Title, config.Addr)
+	//if err != nil && !isNotFound(err) {
+	//	return nil, errors.Wrapf(err, "nodeJoin get title=%s,nodeAddr=%s", config.Title, config.Addr)
+	//}
+	//if addrStat != nil && addrStat.Status != pt.ParacrossSupervisionNodeQuit {
+	//	return nil, errors.Wrapf(pt.ErrParaSupervisionNodeGroupExisted, "nodeJoin nodeAddr existed:%s,status:%d", config.Addr, addrStat.Status)
+	//}
 
 	targetAddrs := ""
 	blsPubKeys := ""
@@ -461,7 +461,7 @@ func (a *action) SupervisionNodeGroupConfig(config *pt.ParaNodeAddrConfig) (*typ
 	if !validTitle(cfg, config.Title) {
 		return nil, pt.ErrInvalidTitle
 	}
-	if !types.IsParaExecName(string(a.tx.Execer)) && cfg.IsDappFork(a.exec.GetMainHeight(), pt.ParaX, pt.ForkParaSupervisionRbk) {
+	if !types.IsParaExecName(string(a.tx.Execer)) && cfg.IsDappFork(a.exec.GetMainHeight(), pt.ParaX, pt.ForkParaSupervision) {
 		return nil, errors.Wrapf(types.ErrInvalidParam, "exec=%s,should prefix with user.p.", string(a.tx.Execer))
 	}
 	if (config.Op == pt.ParacrossSupervisionNodeApprove || config.Op == pt.ParacrossSupervisionNodeQuit) && config.Id == "" {

plugin/dapp/paracross/proto/paracross.proto

@@ -24,10 +24,10 @@ message ParacrossHeightStatus {
     string                      title               = 2;
     int64                       height              = 3;
     ParacrossStatusDetails      details             = 4;
-    ParacrossStatusDetails      supervisionDetails  = 5;
-    int64                       mainHeight          = 6;
-    bytes                       mainHash            = 7;
-    ParacrossStatusBlockDetails blockDetails        = 8;
+    int64                       mainHeight          = 5;
+    bytes                       mainHash            = 6;
+    ParacrossStatusBlockDetails blockDetails        = 7;
+    ParacrossStatusDetails      supervisionDetails  = 8;
 }
 
 message ParacrossHeightStatusRsp {

plugin/dapp/paracross/types/type.go

@@ -28,8 +28,8 @@ var (
 	ForkParaSelfConsStages = "ForkParaSelfConsStages"
 	// ForkParaAssetTransferRbk 平行链资产转移平行链失败主链回滚
 	ForkParaAssetTransferRbk = "ForkParaAssetTransferRbk"
-	// ForkParaSupervisionRbk 平行链新增监督节点
-	ForkParaSupervisionRbk = "ForkParaSupervisionRbk"
+	// ForkParaSupervision 平行链新增监督节点
+	ForkParaSupervision = "ForkParaSupervision"
 
 	// ParaConsSubConf sub
 	ParaConsSubConf = "consensus.sub.para"
@@ -58,7 +58,7 @@ func InitFork(cfg *types.Chain33Config) {
 	cfg.RegisterDappFork(ParaX, ForkCommitTx, 1850000)
 	cfg.RegisterDappFork(ParaX, ForkLoopCheckCommitTxDone, 3230000)
 	cfg.RegisterDappFork(ParaX, ForkParaAssetTransferRbk, 4500000)
-	cfg.RegisterDappFork(ParaX, ForkParaSupervisionRbk, 6000000)
+	cfg.RegisterDappFork(ParaX, ForkParaSupervision, 6000000)
 
 	//只在平行链启用
 	cfg.RegisterDappFork(ParaX, ForkParaSelfConsStages, types.MaxHeight)