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
c37a551b
Commit
c37a551b
authored
Dec 05, 2018
by
mdj33
Committed by
vipwzw
Dec 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add para support remote main node switch
parent
7af54530
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
27 deletions
+1
-27
para.go
plugin/consensus/para/para.go
+0
-0
paracommitmsg.go
plugin/consensus/para/paracommitmsg.go
+0
-27
chain33.para.toml
plugin/dapp/paracross/cmd/build/chain33.para.toml
+1
-0
No files found.
plugin/consensus/para/para.go
View file @
c37a551b
This diff is collapsed.
Click to expand it.
plugin/consensus/para/paracommitmsg.go
View file @
c37a551b
...
...
@@ -543,30 +543,3 @@ out:
}
}
func
checkMinerTx
(
current
*
types
.
BlockDetail
)
error
{
//检查第一个笔交易的execs, 以及执行状态
if
len
(
current
.
Block
.
Txs
)
==
0
{
return
types
.
ErrEmptyTx
}
baseTx
:=
current
.
Block
.
Txs
[
0
]
//判断交易类型和执行情况
var
action
paracross
.
ParacrossAction
err
:=
types
.
Decode
(
baseTx
.
GetPayload
(),
&
action
)
if
err
!=
nil
{
return
err
}
if
action
.
GetTy
()
!=
paracross
.
ParacrossActionMiner
{
return
paracross
.
ErrParaMinerTxType
}
//判断交易执行是否OK
if
action
.
GetMiner
()
==
nil
{
return
paracross
.
ErrParaEmptyMinerTx
}
//判断exec 是否成功
if
current
.
Receipts
[
0
]
.
Ty
!=
types
.
ExecOk
{
return
paracross
.
ErrParaMinerExecErr
}
return
nil
}
plugin/dapp/paracross/cmd/build/chain33.para.toml
View file @
c37a551b
...
...
@@ -83,6 +83,7 @@ emptyBlockInterval=50
authAccount
=
""
#等待平行链共识消息在主链上链并成功的块数,超出会重发共识消息,最小是2
waitBlocks4CommitMsg
=
2
searchHashMatchedBlockDepth
=
100
[mver.consensus]
...
...
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