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
165af6d9
Commit
165af6d9
authored
Dec 21, 2021
by
hezhengjun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
figx build error
parent
360e53e3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
relayer.proto
plugin/dapp/cross2eth/ebrelayer/proto/relayer.proto
+1
-1
ethereum.go
plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum.go
+2
-2
relayer.pb.go
plugin/dapp/cross2eth/ebrelayer/types/relayer.pb.go
+4
-4
No files found.
plugin/dapp/cross2eth/ebrelayer/proto/relayer.proto
View file @
165af6d9
...
...
@@ -273,7 +273,7 @@ message WithdrawTx {
int32
month
=
10
;
int32
day
=
11
;
int32
status
=
12
;
int32
statusDescription
=
13
;
string
statusDescription
=
13
;
string
errorDescription
=
14
;
}
...
...
plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum.go
View file @
165af6d9
...
...
@@ -572,7 +572,7 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33
}
defer
func
()
{
if
err
!=
nil
{
withdrawTx
.
Status
=
err
.
Error
()
withdrawTx
.
ErrorDescription
=
err
.
Error
()
relayerLog
.
Error
(
"handleLogWithdraw"
,
"Failed to withdraw due to:"
,
err
.
Error
())
}
...
...
@@ -690,7 +690,7 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33
}
relayerLog
.
Info
(
"handleLogWithdraw"
,
"SendTransaction Hash"
,
signedTx
.
Hash
())
withdrawTx
.
Status
=
"Withdraw Tx has been sent to Ethereum"
withdrawTx
.
Status
Description
=
"Withdraw Tx has been sent to Ethereum"
withdrawTx
.
TxHashOnEthereum
=
signedTx
.
Hash
()
.
String
()
return
}
...
...
plugin/dapp/cross2eth/ebrelayer/types/relayer.pb.go
View file @
165af6d9
...
...
@@ -2612,7 +2612,7 @@ type WithdrawTx struct {
Month
int32
`protobuf:"varint,10,opt,name=month,proto3" json:"month,omitempty"`
Day
int32
`protobuf:"varint,11,opt,name=day,proto3" json:"day,omitempty"`
Status
int32
`protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"`
StatusDescription
int32
`protobuf:"varint
,13,opt,name=statusDescription,proto3" json:"statusDescription,omitempty"`
StatusDescription
string
`protobuf:"bytes
,13,opt,name=statusDescription,proto3" json:"statusDescription,omitempty"`
ErrorDescription
string
`protobuf:"bytes,14,opt,name=errorDescription,proto3" json:"errorDescription,omitempty"`
}
...
...
@@ -2725,11 +2725,11 @@ func (x *WithdrawTx) GetStatus() int32 {
return
0
}
func
(
x
*
WithdrawTx
)
GetStatusDescription
()
int32
{
func
(
x
*
WithdrawTx
)
GetStatusDescription
()
string
{
if
x
!=
nil
{
return
x
.
StatusDescription
}
return
0
return
""
}
func
(
x
*
WithdrawTx
)
GetErrorDescription
()
string
{
...
...
@@ -3132,7 +3132,7 @@ var file_relayer_proto_rawDesc = []byte{
0x20
,
0x01
,
0x28
,
0x05
,
0x52
,
0x03
,
0x64
,
0x61
,
0x79
,
0x12
,
0x16
,
0x0a
,
0x06
,
0x73
,
0x74
,
0x61
,
0x74
,
0x75
,
0x73
,
0x18
,
0x0c
,
0x20
,
0x01
,
0x28
,
0x05
,
0x52
,
0x06
,
0x73
,
0x74
,
0x61
,
0x74
,
0x75
,
0x73
,
0x12
,
0x2c
,
0x0a
,
0x11
,
0x73
,
0x74
,
0x61
,
0x74
,
0x75
,
0x73
,
0x44
,
0x65
,
0x73
,
0x63
,
0x72
,
0x69
,
0x70
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x18
,
0x0d
,
0x20
,
0x01
,
0x28
,
0x0
5
,
0x52
,
0x11
,
0x73
,
0x74
,
0x69
,
0x70
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x18
,
0x0d
,
0x20
,
0x01
,
0x28
,
0x0
9
,
0x52
,
0x11
,
0x73
,
0x74
,
0x61
,
0x74
,
0x75
,
0x73
,
0x44
,
0x65
,
0x73
,
0x63
,
0x72
,
0x69
,
0x70
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x12
,
0x2a
,
0x0a
,
0x10
,
0x65
,
0x72
,
0x72
,
0x6f
,
0x72
,
0x44
,
0x65
,
0x73
,
0x63
,
0x72
,
0x69
,
0x70
,
0x74
,
0x69
,
0x6f
,
0x6e
,
0x18
,
0x0e
,
0x20
,
0x01
,
0x28
,
0x09
,
0x52
,
0x10
,
0x65
,
0x72
,
0x72
,
0x6f
,
0x72
,
...
...
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