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
a6f167d9
Commit
a6f167d9
authored
Jun 20, 2019
by
mdj33
Committed by
vipwzw
Jun 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix filter bug
parent
255c98f2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
11 deletions
+2
-11
action.go
plugin/dapp/paracross/executor/action.go
+1
-8
filtertxs.go
plugin/dapp/paracross/executor/filtertxs.go
+1
-3
No files found.
plugin/dapp/paracross/executor/action.go
View file @
a6f167d9
...
@@ -441,17 +441,10 @@ func (a *action) Commit(commit *pt.ParacrossCommitAction) (*types.Receipt, error
...
@@ -441,17 +441,10 @@ func (a *action) Commit(commit *pt.ParacrossCommitAction) (*types.Receipt, error
}
}
haveCrossTxs
:=
len
(
commit
.
Status
.
CrossTxHashs
)
>
0
haveCrossTxs
:=
len
(
commit
.
Status
.
CrossTxHashs
)
>
0
if
commit
.
Status
.
Height
>
0
&&
types
.
IsDappFork
(
commit
.
Status
.
MainBlockHeight
,
pt
.
ParaX
,
pt
.
ForkCommitTx
)
{
if
commit
.
Status
.
Height
>
0
&&
types
.
IsDappFork
(
commit
.
Status
.
MainBlockHeight
,
pt
.
ParaX
,
pt
.
ForkCommitTx
)
&&
len
(
commit
.
Status
.
CrossTxHashs
[
0
])
==
0
{
clog
.
Info
(
"paracross.Commit execCrossTx"
,
"haveCrossTxs"
,
haveCrossTxs
,
"crosstx"
,
hex
.
EncodeToString
(
commit
.
Status
.
CrossTxHashs
[
0
]))
if
commit
.
Status
.
CrossTxHashs
[
0
]
==
nil
{
haveCrossTxs
=
false
haveCrossTxs
=
false
}
}
}
clog
.
Info
(
"paracross.Commit execCrossTx"
,
"height"
,
commit
.
Status
.
Height
,
"haveCrossTxs"
,
haveCrossTxs
,
"fork"
,
types
.
IsDappFork
(
commit
.
Status
.
MainBlockHeight
,
pt
.
ParaX
,
pt
.
ForkCommitTx
),
"forkheight"
,
types
.
GetDappFork
(
pt
.
ParaX
,
pt
.
ForkCommitTx
))
if
enableParacrossTransfer
&&
commit
.
Status
.
Height
>
0
&&
haveCrossTxs
{
if
enableParacrossTransfer
&&
commit
.
Status
.
Height
>
0
&&
haveCrossTxs
{
clog
.
Debug
(
"paracross.Commit commitDone"
,
"do cross"
,
""
)
clog
.
Debug
(
"paracross.Commit commitDone"
,
"do cross"
,
""
)
crossTxReceipt
,
err
:=
a
.
execCrossTxs
(
commit
)
crossTxReceipt
,
err
:=
a
.
execCrossTxs
(
commit
)
...
...
plugin/dapp/paracross/executor/filtertxs.go
View file @
a6f167d9
...
@@ -86,11 +86,9 @@ func FilterTxsForPara(title string, main *types.BlockDetail) []*types.Transactio
...
@@ -86,11 +86,9 @@ func FilterTxsForPara(title string, main *types.BlockDetail) []*types.Transactio
continue
continue
}
}
//单独的paracross tx 如果主链执行失败也要排除
//单独的paracross tx 如果主链执行失败也要排除
if
main
.
Block
.
Height
>=
forkHeight
{
if
main
.
Block
.
Height
>=
forkHeight
&&
!
checkReceiptExecOk
(
main
.
Receipts
[
i
]){
if
types
.
IsMyParaExecName
(
string
(
tx
.
Execer
))
&&
!
checkReceiptExecOk
(
main
.
Receipts
[
i
])
{
continue
continue
}
}
}
txs
=
append
(
txs
,
tx
)
txs
=
append
(
txs
,
tx
)
}
}
...
...
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