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
aabde6fb
Commit
aabde6fb
authored
May 13, 2020
by
hezhengjun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add process to enable eth tx is made when relayer is on going sync
parent
4596d426
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
ethereum.go
...in/dapp/x2Ethereum/ebrelayer/relayer/ethereum/ethereum.go
+12
-6
No files found.
plugin/dapp/x2Ethereum/ebrelayer/relayer/ethereum/ethereum.go
View file @
aabde6fb
...
@@ -378,9 +378,9 @@ func (ethRelayer *EthereumRelayer) proc() {
...
@@ -378,9 +378,9 @@ func (ethRelayer *EthereumRelayer) proc() {
}
}
relayerLog
.
Info
(
"Ethereum relayer starts to run..."
)
relayerLog
.
Info
(
"Ethereum relayer starts to run..."
)
ethRelayer
.
prePareSubscribeEvent
()
ethRelayer
.
prePareSubscribeEvent
()
ethRelayer
.
filterLogEvents
()
//向bridgeBank订阅事件
//向bridgeBank订阅事件
ethRelayer
.
subscribeEvent
()
ethRelayer
.
subscribeEvent
()
ethRelayer
.
filterLogEvents
()
relayerLog
.
Info
(
"Ethereum relayer starts to process online log event..."
)
relayerLog
.
Info
(
"Ethereum relayer starts to process online log event..."
)
timer
=
time
.
NewTicker
(
time
.
Duration
(
ethRelayer
.
fetchHeightPeriodMs
)
*
time
.
Millisecond
)
timer
=
time
.
NewTicker
(
time
.
Duration
(
ethRelayer
.
fetchHeightPeriodMs
)
*
time
.
Millisecond
)
goto
latter
goto
latter
...
@@ -396,7 +396,7 @@ latter:
...
@@ -396,7 +396,7 @@ latter:
case
err
:=
<-
ethRelayer
.
bridgeBankSub
.
Err
()
:
case
err
:=
<-
ethRelayer
.
bridgeBankSub
.
Err
()
:
panic
(
"bridgeBankSub"
+
err
.
Error
())
panic
(
"bridgeBankSub"
+
err
.
Error
())
case
vLog
:=
<-
ethRelayer
.
bridgeBankLog
:
case
vLog
:=
<-
ethRelayer
.
bridgeBankLog
:
ethRelayer
.
storeBridgeBankLogs
(
vLog
)
ethRelayer
.
storeBridgeBankLogs
(
vLog
,
true
)
}
}
}
}
}
}
...
@@ -451,7 +451,7 @@ func (ethRelayer *EthereumRelayer) procNewHeight(continueFailCount *int32, ctx c
...
@@ -451,7 +451,7 @@ func (ethRelayer *EthereumRelayer) procNewHeight(continueFailCount *int32, ctx c
}
}
}
}
func
(
ethRelayer
*
EthereumRelayer
)
storeBridgeBankLogs
(
vLog
types
.
Log
)
{
func
(
ethRelayer
*
EthereumRelayer
)
storeBridgeBankLogs
(
vLog
types
.
Log
,
setBlockNumber
bool
)
{
//lock,用于捕捉 (ETH/ERC20----->chain33) 跨链转移
//lock,用于捕捉 (ETH/ERC20----->chain33) 跨链转移
//burn,用于捕捉 (chain33 token----->chain33) 实现chain33资产withdraw操作,之后在chain33上实现unlock操作
//burn,用于捕捉 (chain33 token----->chain33) 实现chain33资产withdraw操作,之后在chain33上实现unlock操作
if
vLog
.
Topics
[
0
]
.
Hex
()
==
ethRelayer
.
bridgeBankEventLockSig
{
if
vLog
.
Topics
[
0
]
.
Hex
()
==
ethRelayer
.
bridgeBankEventLockSig
{
...
@@ -469,8 +469,11 @@ func (ethRelayer *EthereumRelayer) storeBridgeBankLogs(vLog types.Log) {
...
@@ -469,8 +469,11 @@ func (ethRelayer *EthereumRelayer) storeBridgeBankLogs(vLog types.Log) {
}
}
}
}
if
err
:=
ethRelayer
.
setHeight4BridgeBankLogAt
(
vLog
.
BlockNumber
);
nil
!=
err
{
//确定是否需要更新保存同步日志高度
panic
(
err
.
Error
())
if
setBlockNumber
{
if
err
:=
ethRelayer
.
setHeight4BridgeBankLogAt
(
vLog
.
BlockNumber
);
nil
!=
err
{
panic
(
err
.
Error
())
}
}
}
return
return
...
@@ -554,7 +557,10 @@ func (ethRelayer *EthereumRelayer) filterLogEvents() {
...
@@ -554,7 +557,10 @@ func (ethRelayer *EthereumRelayer) filterLogEvents() {
for
{
for
{
select
{
select
{
case
vLog
:=
<-
bridgeBankLog
:
case
vLog
:=
<-
bridgeBankLog
:
ethRelayer
.
storeBridgeBankLogs
(
vLog
)
ethRelayer
.
storeBridgeBankLogs
(
vLog
,
true
)
case
vLog
:=
<-
ethRelayer
.
bridgeBankLog
:
//因为此处是同步保存信息,防止未同步完成出现panic时,直接将其设置为最新高度,中间出现部分信息不同步的情况
ethRelayer
.
storeBridgeBankLogs
(
vLog
,
false
)
case
<-
done
:
case
<-
done
:
relayerLog
.
Info
(
"Finshed offline logs processed"
)
relayerLog
.
Info
(
"Finshed offline logs processed"
)
return
return
...
...
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