Skip to content

P
plugin
Commit 6298e21d authored by vipwzw's avatar vipwzw Committed by vipwzw
Browse files
Options

update chain33

parent 40a85705
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
vendor/github.com/33cn/chain33/cmd/tools/strategy/create_plugin_file_template.go
View file @ 6298e21d
...@@ -220,7 +220,7 @@ ForkResetTx0= 200000 ...@@ -220,7 +220,7 @@ ForkResetTx0= 200000
ForkWithdraw= 200000 ForkWithdraw= 200000
ForkExecRollback= 450000 ForkExecRollback= 450000
ForkCheckBlockTime=1200000 ForkCheckBlockTime=1200000
ForkMultiSignAddress=1500000 ForkMultiSignAddress=1298600
ForkTxHeight= -1 ForkTxHeight= -1
ForkTxGroupPara= -1 ForkTxGroupPara= -1
ForkChainParamV2= -1 ForkChainParamV2= -1
......
vendor/github.com/33cn/chain33/types/config_merge_test.go
View file @ 6298e21d
...@@ -213,7 +213,7 @@ ForkResetTx0= 200000 ...@@ -213,7 +213,7 @@ ForkResetTx0= 200000
ForkWithdraw= 200000 ForkWithdraw= 200000
ForkExecRollback= 450000 ForkExecRollback= 450000
ForkCheckBlockTime=1200000 ForkCheckBlockTime=1200000
ForkMultiSignAddress=1500000 ForkMultiSignAddress=1298600
ForkTxHeight= -1 ForkTxHeight= -1
ForkTxGroupPara= -1 ForkTxGroupPara= -1
ForkChainParamV2= -1 ForkChainParamV2= -1
......
vendor/github.com/33cn/chain33/types/fork.go
View file @ 6298e21d
...@@ -205,7 +205,7 @@ func SetTestNetFork() { ...@@ -205,7 +205,7 @@ func SetTestNetFork() {
systemFork.SetFork("chain33", "ForkTxHeight", 806578) systemFork.SetFork("chain33", "ForkTxHeight", 806578)
systemFork.SetFork("chain33", "ForkTxGroupPara", 806578) systemFork.SetFork("chain33", "ForkTxGroupPara", 806578)
systemFork.SetFork("chain33", "ForkCheckBlockTime", 1200000) systemFork.SetFork("chain33", "ForkCheckBlockTime", 1200000)
systemFork.SetFork("chain33", "ForkMultiSignAddress", 1500000) systemFork.SetFork("chain33", "ForkMultiSignAddress", 1298600)
} }
......
vendor/github.com/33cn/chain33/types/testdata/bityuan.toml
View file @ 6298e21d
...@@ -168,7 +168,7 @@ ForkExecRollback= 450000 ...@@ -168,7 +168,7 @@ ForkExecRollback= 450000
ForkTxHeight= -1 ForkTxHeight= -1
ForkTxGroupPara= -1 ForkTxGroupPara= -1
ForkCheckBlockTime=1200000 ForkCheckBlockTime=1200000
ForkMultiSignAddress=1500000 ForkMultiSignAddress=1298600
[fork.sub.coins] [fork.sub.coins]
Enable=0 Enable=0
......
vendor/github.com/33cn/chain33/types/testdata/local.mvertest.toml
View file @ 6298e21d
...@@ -186,7 +186,7 @@ ForkExecRollback= 450000 ...@@ -186,7 +186,7 @@ ForkExecRollback= 450000
ForkTxHeight= -1 ForkTxHeight= -1
ForkTxGroupPara= -1 ForkTxGroupPara= -1
ForkCheckBlockTime=1200000 ForkCheckBlockTime=1200000
ForkMultiSignAddress=1500000 ForkMultiSignAddress=1298600
[fork.sub.coins] [fork.sub.coins]
Enable=0 Enable=0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment