refactor fork

plugin/dapp/autonomy/types/types.go

@@ -29,8 +29,8 @@ func init() {
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
 	cfg.RegisterDappFork(AutonomyX, "Enable", 0)
-	cfg.RegisterDappFork(AutonomyX, ForkAutonomyDelRule, 9500000)
-	cfg.RegisterDappFork(AutonomyX, ForkAutonomyEnableItem, 10000000)
+	cfg.RegisterDappFork(AutonomyX, ForkAutonomyDelRule, 0)
+	cfg.RegisterDappFork(AutonomyX, ForkAutonomyEnableItem, 0)
 }
 
 //InitExecutor ...

plugin/dapp/blackwhite/types/types.go

@@ -30,8 +30,8 @@ func init() {
 
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
-	cfg.RegisterDappFork(BlackwhiteX, "ForkBlackWhiteV2", 900000)
-	cfg.RegisterDappFork(BlackwhiteX, "Enable", 850000)
+	cfg.RegisterDappFork(BlackwhiteX, "ForkBlackWhiteV2", 0)
+	cfg.RegisterDappFork(BlackwhiteX, "Enable", 0)
 }
 
 //InitExecutor ...

plugin/dapp/evm/types/evm.go

@@ -29,17 +29,17 @@ func init() {
 
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
-	cfg.RegisterDappFork(ExecutorName, EVMEnable, 500000)
+	cfg.RegisterDappFork(ExecutorName, EVMEnable, 0)
 	// EVM合约中的数据分散存储，支持大数据量
-	cfg.RegisterDappFork(ExecutorName, ForkEVMState, 650000)
+	cfg.RegisterDappFork(ExecutorName, ForkEVMState, 0)
 	// EVM合约状态数据生成哈希，保存在主链的StateDB中
-	cfg.RegisterDappFork(ExecutorName, ForkEVMKVHash, 1000000)
+	cfg.RegisterDappFork(ExecutorName, ForkEVMKVHash, 0)
 	// EVM合约支持ABI绑定和调用
-	cfg.RegisterDappFork(ExecutorName, ForkEVMABI, 1250000)
+	cfg.RegisterDappFork(ExecutorName, ForkEVMABI, 0)
 	// EEVM合约用户金额冻结
-	cfg.RegisterDappFork(ExecutorName, ForkEVMFrozen, 1300000)
+	cfg.RegisterDappFork(ExecutorName, ForkEVMFrozen, 0)
 	// EEVM 黄皮v1分叉高度
-	cfg.RegisterDappFork(ExecutorName, ForkEVMYoloV1, 9500000)
+	cfg.RegisterDappFork(ExecutorName, ForkEVMYoloV1, 0)
 	// EVM合约支持交易组
 	cfg.RegisterDappFork(ExecutorName, ForkEVMTxGroup, 0)
 }

plugin/dapp/hashlock/types/hashlock.go

@@ -26,7 +26,7 @@ func init() {
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
 	cfg.RegisterDappFork(HashlockX, "Enable", 0)
-	cfg.RegisterDappFork(HashlockX, ForkBadRepeatSecretX, 2715575)
+	cfg.RegisterDappFork(HashlockX, ForkBadRepeatSecretX, 0)
 }
 
 //InitExecutor ...

plugin/dapp/paracross/types/type.go

@@ -64,12 +64,12 @@ func init() {
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
 	cfg.RegisterDappFork(ParaX, "Enable", 0)
-	cfg.RegisterDappFork(ParaX, "ForkParacrossWithdrawFromParachain", 1298600)
-	cfg.RegisterDappFork(ParaX, ForkCommitTx, 1850000)
-	cfg.RegisterDappFork(ParaX, ForkLoopCheckCommitTxDone, 3230000)
-	cfg.RegisterDappFork(ParaX, ForkParaAssetTransferRbk, 4500000)
-	cfg.RegisterDappFork(ParaX, ForkParaSupervision, 6000000)
-	cfg.RegisterDappFork(ParaX, ForkParaAutonomySuperGroup, 10200000)
+	cfg.RegisterDappFork(ParaX, "ForkParacrossWithdrawFromParachain", 0)
+	cfg.RegisterDappFork(ParaX, ForkCommitTx, 0)
+	cfg.RegisterDappFork(ParaX, ForkLoopCheckCommitTxDone, 0)
+	cfg.RegisterDappFork(ParaX, ForkParaAssetTransferRbk, 0)
+	cfg.RegisterDappFork(ParaX, ForkParaSupervision, 0)
+	cfg.RegisterDappFork(ParaX, ForkParaAutonomySuperGroup, 0)
 
 	//只在平行链启用
 	cfg.RegisterDappFork(ParaX, ForkParaSelfConsStages, types.MaxHeight)

plugin/dapp/privacy/types/privacy.go

@@ -47,7 +47,7 @@ func init() {
 
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
-	cfg.RegisterDappFork(PrivacyX, "Enable", 980000)
+	cfg.RegisterDappFork(PrivacyX, "Enable", 0)
 }
 
 //InitExecutor ...

plugin/dapp/relay/types/relay.go

@@ -56,7 +56,7 @@ func init() {
 
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
-	cfg.RegisterDappFork(RelayX, "Enable", 570000)
+	cfg.RegisterDappFork(RelayX, "Enable", 0)
 }
 
 //InitExecutor ...

plugin/dapp/retrieve/executor/retrieve_unit_test.go

@@ -9,9 +9,8 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"testing"
-
 	"strings"
+	"testing"
 
 	"github.com/33cn/chain33/client"
 	"github.com/33cn/chain33/common/address"
@@ -250,6 +249,8 @@ func TestExecDelLocalBackup(t *testing.T) {
 func constructRetrieveInstance() drivers.Driver {
 	cfgstring := strings.Replace(types.GetDefaultCfgstring(), "Title=\"local\"", "Title=\"chain33\"", 1)
 	chainTestCfg := types.NewChain33Config(cfgstring)
+	chainTestCfg.SetDappFork(rt.RetrieveX, rt.ForkRetriveX, 180000)
+	chainTestCfg.SetDappFork(rt.RetrieveX, rt.ForkRetriveAssetX, 3150000)
 	Init(rt.RetrieveX, chainTestCfg, nil)
 	q := queue.New("channel")
 	q.SetConfig(chainTestCfg)

plugin/dapp/retrieve/types/types.go

@@ -20,8 +20,8 @@ func init() {
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
 	cfg.RegisterDappFork(RetrieveX, "Enable", 0)
-	cfg.RegisterDappFork(RetrieveX, ForkRetriveX, 180000)
-	cfg.RegisterDappFork(RetrieveX, ForkRetriveAssetX, 3150000)
+	cfg.RegisterDappFork(RetrieveX, ForkRetriveX, 0)
+	cfg.RegisterDappFork(RetrieveX, ForkRetriveAssetX, 0)
 }
 
 //InitExecutor ...

plugin/dapp/ticket/types/ticket.go

@@ -78,8 +78,8 @@ func init() {
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
 	cfg.RegisterDappFork(TicketX, "Enable", 0)
-	cfg.RegisterDappFork(TicketX, "ForkTicketId", 1062000)
-	cfg.RegisterDappFork(TicketX, "ForkTicketVrf", 1770000)
+	cfg.RegisterDappFork(TicketX, "ForkTicketId", 0)
+	cfg.RegisterDappFork(TicketX, "ForkTicketVrf", 0)
 }
 
 //InitExecutor ...

plugin/dapp/token/executor/token_new_test.go

@@ -437,6 +437,8 @@ func getprivkey(key string) crypto.PrivKey {
 
 func TestToken_validSymbolWithHeight(t *testing.T) {
 	cfg := types.NewChain33Config(strings.Replace(types.GetDefaultCfgstring(), "Title=\"local\"", "Title=\"chain33\"", 1))
+	cfg.SetDappFork(pty.TokenX, pty.ForkBadTokenSymbolX, 184000)
+	cfg.SetDappFork(pty.TokenX, pty.ForkTokenSymbolWithNumberX, 1298600)
 	forkBadTokenSymbol := cfg.GetDappFork(pty.TokenX, pty.ForkBadTokenSymbolX)
 	forkTokenSymbolWithNumber := cfg.GetDappFork(pty.TokenX, pty.ForkTokenSymbolWithNumberX)
 	t.Log("x", "1", forkBadTokenSymbol, "2", forkTokenSymbolWithNumber)

plugin/dapp/token/executor/token_test.go

@@ -46,6 +46,7 @@ var (
 
 func TestToken(t *testing.T) {
 	cfg := types.NewChain33Config(strings.Replace(types.GetDefaultCfgstring(), "Title=\"local\"", "Title=\"chain33\"", 1))
+	cfg.SetDappFork(pty.TokenX, pty.ForkTokenCheckX, 1600000)
 	Init(pty.TokenX, cfg, nil)
 	tokenTotal := int64(10000 * 1e8)
 	tokenBurn := int64(10 * 1e8)

plugin/dapp/token/types/types.go

@@ -23,12 +23,12 @@ func init() {
 
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
-	cfg.RegisterDappFork(TokenX, "Enable", 100899)
-	cfg.RegisterDappFork(TokenX, ForkTokenBlackListX, 190000)
-	cfg.RegisterDappFork(TokenX, ForkBadTokenSymbolX, 184000)
-	cfg.RegisterDappFork(TokenX, ForkTokenPriceX, 560000)
-	cfg.RegisterDappFork(TokenX, ForkTokenSymbolWithNumberX, 1298600)
-	cfg.RegisterDappFork(TokenX, ForkTokenCheckX, 1600000)
+	cfg.RegisterDappFork(TokenX, "Enable", 0)
+	cfg.RegisterDappFork(TokenX, ForkTokenBlackListX, 0)
+	cfg.RegisterDappFork(TokenX, ForkBadTokenSymbolX, 0)
+	cfg.RegisterDappFork(TokenX, ForkTokenPriceX, 0)
+	cfg.RegisterDappFork(TokenX, ForkTokenSymbolWithNumberX, 0)
+	cfg.RegisterDappFork(TokenX, ForkTokenCheckX, 0)
 }
 
 //InitExecutor ...

plugin/dapp/trade/types/trade.go

@@ -59,12 +59,12 @@ func init() {
 
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
-	cfg.RegisterDappFork(TradeX, "Enable", 100899)
-	cfg.RegisterDappFork(TradeX, ForkTradeBuyLimitX, 301000)
-	cfg.RegisterDappFork(TradeX, ForkTradeAssetX, 1010000)
-	cfg.RegisterDappFork(TradeX, ForkTradeIDX, 1450000)
-	cfg.RegisterDappFork(TradeX, ForkTradeFixAssetDBX, 2500000)
-	cfg.RegisterDappFork(TradeX, ForkTradePriceX, 3150000)
+	cfg.RegisterDappFork(TradeX, "Enable", 0)
+	cfg.RegisterDappFork(TradeX, ForkTradeBuyLimitX, 0)
+	cfg.RegisterDappFork(TradeX, ForkTradeAssetX, 0)
+	cfg.RegisterDappFork(TradeX, ForkTradeIDX, 0)
+	cfg.RegisterDappFork(TradeX, ForkTradeFixAssetDBX, 0)
+	cfg.RegisterDappFork(TradeX, ForkTradePriceX, 0)
 }
 
 //InitExecutor ...

plugin/dapp/unfreeze/types/types.go

@@ -30,8 +30,8 @@ func init() {
 func InitFork(cfg *types.Chain33Config) {
 	name = UnfreezeX
 	cfg.RegisterDappFork(name, "Enable", 0)
-	cfg.RegisterDappFork(name, ForkTerminatePartX, 1298600)
-	cfg.RegisterDappFork(name, ForkUnfreezeIDX, 1450000)
+	cfg.RegisterDappFork(name, ForkTerminatePartX, 0)
+	cfg.RegisterDappFork(name, ForkUnfreezeIDX, 0)
 }
 
 //InitExecutor ...

plugin/store/kvmvccmavl/kvmvcc_mavl.go

@@ -67,7 +67,7 @@ func init() {
 
 //InitFork ...
 func InitFork(cfg *types.Chain33Config) {
-	cfg.RegisterDappFork("store-kvmvccmavl", "ForkKvmvccmavl", 187*10000)
+	cfg.RegisterDappFork("store-kvmvccmavl", "ForkKvmvccmavl", 0)
 }
 
 // KVmMavlStore provide kvmvcc and mavl store interface implementation