Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sidecar-client-chain33
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
sidecar-client-chain33
Commits
daf81456
Commit
daf81456
authored
Aug 08, 2022
by
suyanlong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix paracross exec address bug
parent
cce2ea5c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
paracross.go
paracross/paracross.go
+3
-3
No files found.
paracross/paracross.go
View file @
daf81456
...
@@ -714,7 +714,7 @@ func (p *Paracross) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
...
@@ -714,7 +714,7 @@ func (p *Paracross) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
if
event
.
Payload
.
EventType
==
types
.
EventType_Burn
{
if
event
.
Payload
.
EventType
==
types
.
EventType_Burn
{
// 用户在联盟链一侧发起销毁。
// 用户在联盟链一侧发起销毁。
// 第一次提交。
// 第一次提交。
tx
,
err
:=
p
.
CreateRawAssetTransferTxExt
(
p
.
chainID
,
p
.
MinTxFeeRate
,
&
types33
.
CreateTx
{
tx
,
err
:=
p
.
CreateRawAssetTransferTxExt
(
&
types33
.
CreateTx
{
To
:
event
.
Payload
.
BurnAddress
,
To
:
event
.
Payload
.
BurnAddress
,
Amount
:
event
.
Payload
.
BurnAmount
,
Amount
:
event
.
Payload
.
BurnAmount
,
Fee
:
p
.
MinTxFeeRate
,
Fee
:
p
.
MinTxFeeRate
,
...
@@ -752,7 +752,7 @@ func (p *Paracross) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
...
@@ -752,7 +752,7 @@ func (p *Paracross) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
return
nil
,
errors
.
New
(
"ibtp error"
)
return
nil
,
errors
.
New
(
"ibtp error"
)
}
}
func
(
p
*
Paracross
)
CreateRawAssetTransferTxExt
(
chainID
int32
,
minFee
int64
,
param
*
types33
.
CreateTx
)
(
*
types33
.
Transaction
,
error
)
{
func
(
p
*
Paracross
)
CreateRawAssetTransferTxExt
(
param
*
types33
.
CreateTx
)
(
*
types33
.
Transaction
,
error
)
{
// 跨链交易需要在主链和平行链上执行, 所以应该可以在主链和平行链上构建
// 跨链交易需要在主链和平行链上执行, 所以应该可以在主链和平行链上构建
if
!
types33
.
IsParaExecName
(
param
.
GetExecName
())
{
if
!
types33
.
IsParaExecName
(
param
.
GetExecName
())
{
return
nil
,
types33
.
ErrInvalidParam
return
nil
,
types33
.
ErrInvalidParam
...
@@ -778,7 +778,7 @@ func (p *Paracross) CreateRawAssetTransferTxExt(chainID int32, minFee int64, par
...
@@ -778,7 +778,7 @@ func (p *Paracross) CreateRawAssetTransferTxExt(chainID int32, minFee int64, par
To
:
p
.
execAddress
,
To
:
p
.
execAddress
,
Fee
:
param
.
Fee
,
Fee
:
param
.
Fee
,
}
}
tx
,
err
:=
types33
.
FormatTxExt
(
chainID
,
true
,
minFee
,
param
.
GetExecName
(),
rawtx
)
tx
,
err
:=
p
.
FormatTx
(
rawtx
)
if
err
!=
nil
{
if
err
!=
nil
{
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