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
40bb46f6
Commit
40bb46f6
authored
Jan 10, 2020
by
mdj33
Committed by
vipwzw
Feb 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix patch
parent
bdc1ab9a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
action.go
plugin/dapp/paracross/executor/action.go
+16
-16
No files found.
plugin/dapp/paracross/executor/action.go
View file @
40bb46f6
...
@@ -757,6 +757,22 @@ func execCrossTx(a *action, tx *types.TransactionDetail, crossTxHash []byte) (*t
...
@@ -757,6 +757,22 @@ func execCrossTx(a *action, tx *types.TransactionDetail, crossTxHash []byte) (*t
return
nil
,
err
return
nil
,
err
}
}
if
payload
.
Ty
==
pt
.
ParacrossActionCrossAssetTransfer
{
act
,
err
:=
getCrossAction
(
payload
.
GetCrossAssetTransfer
(),
string
(
a
.
tx
.
Execer
))
if
err
!=
nil
{
clog
.
Crit
(
"paracross.Commit getCrossAction Tx failed"
,
"error"
,
err
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
return
nil
,
err
}
if
act
==
pt
.
ParacrossMainWithdraw
||
act
==
pt
.
ParacrossParaTransfer
{
receipt
,
err
:=
a
.
crossAssetTransfer
(
payload
.
GetCrossAssetTransfer
(),
act
,
tx
.
Tx
)
if
err
!=
nil
{
clog
.
Crit
(
"paracross.Commit crossAssetTransfer Tx failed"
,
"error"
,
err
,
"act"
,
act
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
return
nil
,
err
}
clog
.
Debug
(
"paracross.Commit crossAssetTransfer done"
,
"act"
,
act
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
return
receipt
,
nil
}
}
}
//主链共识后,执行主链资产withdraw, 在支持CrossAssetTransfer之前使用此action
//主链共识后,执行主链资产withdraw, 在支持CrossAssetTransfer之前使用此action
...
@@ -788,22 +804,6 @@ func rollbackCrossTx(a *action, tx *types.TransactionDetail, crossTxHash []byte)
...
@@ -788,22 +804,6 @@ func rollbackCrossTx(a *action, tx *types.TransactionDetail, crossTxHash []byte)
if
payload
.
Ty
==
pt
.
ParacrossActionCrossAssetTransfer
{
if
payload
.
Ty
==
pt
.
ParacrossActionCrossAssetTransfer
{
act
,
err
:=
getCrossAction
(
payload
.
GetCrossAssetTransfer
(),
string
(
a
.
tx
.
Execer
))
act
,
err
:=
getCrossAction
(
payload
.
GetCrossAssetTransfer
(),
string
(
a
.
tx
.
Execer
))
if
err
!=
nil
{
if
err
!=
nil
{
clog
.
Crit
(
"paracross.Commit getCrossAction Tx failed"
,
"error"
,
err
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
return
nil
,
err
}
if
act
==
pt
.
ParacrossMainWithdraw
||
act
==
pt
.
ParacrossParaTransfer
{
receipt
,
err
:=
a
.
crossAssetTransfer
(
payload
.
GetCrossAssetTransfer
(),
act
,
tx
.
Tx
)
if
err
!=
nil
{
clog
.
Crit
(
"paracross.Commit crossAssetTransfer Tx failed"
,
"error"
,
err
,
"act"
,
act
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
return
nil
,
err
}
clog
.
Debug
(
"paracross.Commit crossAssetTransfer done"
,
"act"
,
act
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
return
receipt
,
nil
}
if
payload
.
Ty
==
pt
.
ParacrossActionCrossAssetTransfer
{
act
,
err
:=
getCrossAction
(
payload
.
GetCrossAssetTransfer
(),
string
(
a
.
tx
.
Execer
))
if
err
!=
nil
{
clog
.
Crit
(
"paracross.Commit.rollbackCrossTx getCrossAction failed"
,
"error"
,
err
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
clog
.
Crit
(
"paracross.Commit.rollbackCrossTx getCrossAction failed"
,
"error"
,
err
,
"txHash"
,
common
.
ToHex
(
crossTxHash
))
return
nil
,
err
return
nil
,
err
}
}
...
...
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