Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
5e89ddfb
Commit
5e89ddfb
authored
Nov 14, 2019
by
mdj33
Committed by
vipwzw
Nov 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linter
parent
4015a7d2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
12 deletions
+3
-12
chain33.para.test.toml
plugin/dapp/paracross/cmd/build/chain33.para.test.toml
+2
-10
type.go
plugin/dapp/paracross/types/type.go
+1
-2
No files found.
plugin/dapp/paracross/cmd/build/chain33.para.test.toml
View file @
5e89ddfb
...
@@ -95,26 +95,18 @@ writeBlockSeconds=2
...
@@ -95,26 +95,18 @@ writeBlockSeconds=2
mainBlockHashForkHeight
=
1
mainBlockHashForkHeight
=
1
mainForkParacrossCommitTx
=
5
mainForkParacrossCommitTx
=
5
mainParaSelfConsensusForkHeight
=
300
mainParaSelfConsensusForkHeight
=
300
SearchHashMatchedBlockDepth
=
100
#验证账户,验证节点需要配置自己的账户,并且钱包导入对应种子,非验证节点留空
#验证账户,验证节点需要配置自己的账户,并且钱包导入对应种子,非验证节点留空
authAccount
=
"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"
authAccount
=
"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"
#等待平行链共识消息在主链上链并成功的块数,超出会重发共识消息,最小是2
#等待平行链共识消息在主链上链并成功的块数,超出会重发共识消息,最小是2
waitBlocks4CommitMsg
=
2
waitBlocks4CommitMsg
=
2
#创世地址额度
#创世地址额度
genesisAmount
=
100000000
genesisAmount
=
100000000
selfConsensEnablePreContract
=
["0-1000"]
#主链每隔几个没有相关交易的区块,平行链上打包空区块
#主链每隔几个没有相关交易的区块,平行链上打包空区块
[[consensus.sub.para.emptyBlockInterval]]
[[consensus.sub.para.emptyBlockInterval]]
blockHeight
=
0
blockHeight
=
0
interval
=
4
interval
=
4
[[consensus.sub.para.selfConsensusEnable]]
blockHeight
=
0
enable
=
true
[[consensus.sub.para.selfConsensusEnable]]
blockHeight
=
20
enable
=
false
[[consensus.sub.para.selfConsensusEnable]]
blockHeight
=
40
enable
=
true
[store]
[store]
name
=
"mavl"
name
=
"mavl"
...
...
plugin/dapp/paracross/types/type.go
View file @
5e89ddfb
...
@@ -27,7 +27,6 @@ var (
...
@@ -27,7 +27,6 @@ var (
// ForkParaSelfConsStages 平行链自共识分阶段共识
// ForkParaSelfConsStages 平行链自共识分阶段共识
ForkParaSelfConsStages
=
"ForkParaSelfConsStages"
ForkParaSelfConsStages
=
"ForkParaSelfConsStages"
//para toml config params
// ParaConsSubConf sub
// ParaConsSubConf sub
ParaConsSubConf
=
"consensus.sub.para"
ParaConsSubConf
=
"consensus.sub.para"
//ParaPrefixConsSubConf prefix
//ParaPrefixConsSubConf prefix
...
@@ -37,7 +36,7 @@ var (
...
@@ -37,7 +36,7 @@ var (
//ParaSelfConsConfPreContract self consens enable string as ["0-100"] config pre stage contract
//ParaSelfConsConfPreContract self consens enable string as ["0-100"] config pre stage contract
ParaSelfConsConfPreContract
=
"selfConsensEnablePreContract"
ParaSelfConsConfPreContract
=
"selfConsensEnablePreContract"
//ParaFilterIgnoreTxGroup adapt 6.1.0 to check para tx in group
//ParaFilterIgnoreTxGroup adapt 6.1.0 to check para tx in group
ParaFilterIgnoreTxGroup
=
"
F
ilterIgnoreParaTxGroup"
ParaFilterIgnoreTxGroup
=
"
f
ilterIgnoreParaTxGroup"
)
)
func
init
()
{
func
init
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment