modify test and .toml

chain33.para.toml

@@ -80,6 +80,7 @@ minerExecs=["paracross"]    #配置挖矿合约
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
+autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
@@ -211,6 +212,7 @@ ForkBase58AddressCheck=0
 #平行链上使能平行链执行器如user.p.x.coins执行器的注册，缺省为0，对已有的平行链需要设置一个fork高度
 ForkEnableParaRegExec=0
 ForkCacheDriver=0
+ForkTicketFundAddrV1=-1 #fork6.3
 
 [fork.sub.coins]
 Enable=0

plugin/consensus/ticket/testdata/chain33.cfg.toml

@@ -70,9 +70,11 @@ name="ticket"
 minerstart=true
 genesisBlockTime=1514533394
 genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
+minerExecs=["ticket", "autonomy"]
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
+autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
@@ -173,3 +175,7 @@ superManager=[
     "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", 
     "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
 ]
+
+[exec.sub.autonomy]
+total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"
+useBalance=false
\ No newline at end of file

plugin/dapp/ticket/executor/testdata/chain33.cfg.toml

@@ -70,9 +70,11 @@ name="ticket"
 minerstart=true
 genesisBlockTime=1514533394
 genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
+minerExecs=["ticket", "autonomy"]
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
+autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
@@ -180,6 +182,10 @@ superManager=[
     "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
 ]
 
+[exec.sub.autonomy]
+total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"
+useBalance=false
+
 #系统中所有的fork,默认用chain33的测试网络的
 #但是我们可以替换
 [fork.system]
@@ -204,6 +210,7 @@ ForkBlockCheck=-1 #fork 6.2
 ForkBase58AddressCheck=-1 #fork6.2
 ForkEnableParaRegExec=0
 ForkCacheDriver=0
+ForkTicketFundAddrV1=0 #fork6.3
 [fork.sub.coins]
 Enable=0
 [fork.sub.ticket]

plugin/dapp/ticket/executor/ticketdb.go

@@ -421,13 +421,15 @@ func (action *Action) TicketClose(tclose *ty.TicketClose) (*types.Receipt, error
 		kv = append(kv, receipt1.KV...)
 		//如果ticket 已经挖矿成功了，那么要解冻发展基金部分币
 		if t.prevstatus == 2 {
-			receipt2, err := action.coinsAccount.ExecActive(types.GetFundAddr(), action.execaddr, cfg.CoinDevFund)
-			if err != nil {
-				tlog.Error("TicketClose.ExecActive fund", "addr", types.GetFundAddr(), "execaddr", action.execaddr, "value", retValue)
-				return nil, err
+			if !types.IsFork(action.height, "ForkTicketFundAddrV1") {
+				receipt2, err := action.coinsAccount.ExecActive(types.GetFundAddr(), action.execaddr, cfg.CoinDevFund)
+				if err != nil {
+					tlog.Error("TicketClose.ExecActive fund", "addr", types.GetFundAddr(), "execaddr", action.execaddr, "value", retValue)
+					return nil, err
+				}
+				logs = append(logs, receipt2.Logs...)
+				kv = append(kv, receipt2.KV...)
 			}
-			logs = append(logs, receipt2.Logs...)
-			kv = append(kv, receipt2.KV...)
 		}
 		t.Save(action.db)
 	}