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
501e7db5
Commit
501e7db5
authored
Jul 05, 2019
by
mdj33
Committed by
vipwzw
Jul 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cut commit status parameter
parent
86a50de1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
paracommitmsg.go
plugin/consensus/para/paracommitmsg.go
+3
-0
exec_local.go
plugin/dapp/paracross/executor/exec_local.go
+1
-1
No files found.
plugin/consensus/para/paracommitmsg.go
View file @
501e7db5
...
@@ -445,6 +445,9 @@ func (client *commitMsgClient) getNodeStatus(start, end int64) ([]*pt.ParacrossN
...
@@ -445,6 +445,9 @@ func (client *commitMsgClient) getNodeStatus(start, end int64) ([]*pt.ParacrossN
return
nil
,
errors
.
New
(
"paracommitmsg wrong block result"
)
return
nil
,
errors
.
New
(
"paracommitmsg wrong block result"
)
}
}
nodeList
[
block
.
Block
.
Height
]
.
BlockHash
=
block
.
Block
.
Hash
()
nodeList
[
block
.
Block
.
Height
]
.
BlockHash
=
block
.
Block
.
Hash
()
if
!
paracross
.
IsParaForkHeight
(
nodeList
[
block
.
Block
.
Height
]
.
MainBlockHeight
,
paracross
.
ForkLoopCheckCommitTxDone
){
nodeList
[
block
.
Block
.
Height
]
.
StateHash
=
block
.
Block
.
StateHash
}
}
}
var
needSentTxs
uint32
var
needSentTxs
uint32
...
...
plugin/dapp/paracross/executor/exec_local.go
View file @
501e7db5
...
@@ -222,7 +222,6 @@ func setMinerTxResultFork(status *pt.ParacrossNodeStatus, txs []*types.Transacti
...
@@ -222,7 +222,6 @@ func setMinerTxResultFork(status *pt.ParacrossNodeStatus, txs []*types.Transacti
if
len
(
curTxHashs
)
!=
0
&&
len
(
curTxHashs
)
==
len
(
isCommitTx
)
{
if
len
(
curTxHashs
)
!=
0
&&
len
(
curTxHashs
)
==
len
(
isCommitTx
)
{
status
.
NonCommitTxCounts
=
0
status
.
NonCommitTxCounts
=
0
}
}
crossTxHashs
:=
FilterParaCrossTxHashes
(
types
.
GetTitle
(),
txs
)
//主链自己过滤平行链tx, 对平行链执行失败的tx主链无法识别,主链和平行链需要获取相同的最初的tx map
//主链自己过滤平行链tx, 对平行链执行失败的tx主链无法识别,主链和平行链需要获取相同的最初的tx map
//全部平行链tx结果
//全部平行链tx结果
...
@@ -231,6 +230,7 @@ func setMinerTxResultFork(status *pt.ParacrossNodeStatus, txs []*types.Transacti
...
@@ -231,6 +230,7 @@ func setMinerTxResultFork(status *pt.ParacrossNodeStatus, txs []*types.Transacti
//ForkLoopCheckCommitTxDone 后只保留全部txreseult 结果
//ForkLoopCheckCommitTxDone 后只保留全部txreseult 结果
if
!
pt
.
IsParaForkHeight
(
status
.
MainBlockHeight
,
pt
.
ForkLoopCheckCommitTxDone
)
{
if
!
pt
.
IsParaForkHeight
(
status
.
MainBlockHeight
,
pt
.
ForkLoopCheckCommitTxDone
)
{
//跨链tx结果
//跨链tx结果
crossTxHashs
:=
FilterParaCrossTxHashes
(
types
.
GetTitle
(),
txs
)
status
.
CrossTxResult
=
[]
byte
(
hex
.
EncodeToString
(
util
.
CalcBitMap
(
crossTxHashs
,
curTxHashs
,
receipts
)))
status
.
CrossTxResult
=
[]
byte
(
hex
.
EncodeToString
(
util
.
CalcBitMap
(
crossTxHashs
,
curTxHashs
,
receipts
)))
status
.
TxHashs
=
[][]
byte
{
CalcTxHashsHash
(
curTxHashs
)}
status
.
TxHashs
=
[][]
byte
{
CalcTxHashsHash
(
curTxHashs
)}
status
.
CrossTxHashs
=
[][]
byte
{
CalcTxHashsHash
(
crossTxHashs
)}
status
.
CrossTxHashs
=
[][]
byte
{
CalcTxHashsHash
(
crossTxHashs
)}
...
...
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