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
3d1e43e8
Commit
3d1e43e8
authored
Dec 21, 2021
by
QM
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
332419b5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
dockerRelayerTest.sh
plugin/dapp/cross2eth/cmd/build/dockerRelayerTest.sh
+3
-3
ethereum.go
plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum.go
+7
-6
No files found.
plugin/dapp/cross2eth/cmd/build/dockerRelayerTest.sh
View file @
3d1e43e8
...
...
@@ -128,7 +128,7 @@ function TestETH2Chain33USDT_proxy() {
# shellcheck disable=SC2154
result
=
$(${
Chain33Cli
}
evm query
-a
"
${
chain33USDTBridgeTokenAddr
}
"
-c
"
${
chain33TestAddr1
}
"
-b
"balanceOf(
${
chain33ReceiverAddr
}
)"
)
# 结果是 12 * le8
#
is_equal "${result}" "1200000000"
is_equal
"
${
result
}
"
"1200000000"
result
=
$(${
Chain33Cli
}
evm query
-a
"
${
chain33USDTBridgeTokenAddr
}
"
-c
"
${
chain33TestAddr1
}
"
-b
"balanceOf(
${
chain33Validatorsp
}
)"
)
is_equal
"
${
result
}
"
"0"
...
...
@@ -151,11 +151,11 @@ function TestETH2Chain33USDT_proxy() {
result
=
$(${
Chain33Cli
}
evm query
-a
"
${
chain33USDTBridgeTokenAddr
}
"
-c
"
${
chain33TestAddr1
}
"
-b
"balanceOf(
${
chain33ReceiverAddr
}
)"
)
is_equal
"
${
result
}
"
"0"
result
=
$(${
Chain33Cli
}
evm query
-a
"
${
chain33USDTBridgeTokenAddr
}
"
-c
"
${
chain33TestAddr1
}
"
-b
"balanceOf(
${
chain33Validatorsp
}
)"
)
#
is_equal "${result}" "1200000000"
is_equal
"
${
result
}
"
"1200000000"
# 查询 ETH 这端 bridgeBank 地址 0
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethBridgeBank
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
cli_ret
"
${
result
}
"
"balance"
".balance"
"
0
"
cli_ret
"
${
result
}
"
"balance"
".balance"
"
12
"
# 更新后的金额 12
result
=
$(${
CLIA
}
ethereum balance
-o
"
${
ethReceiverAddr1
}
"
-t
"
${
ethereumUSDTERC20TokenAddr
}
"
)
cli_ret
"
${
result
}
"
"balance"
".balance"
"11"
...
...
plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum.go
View file @
3d1e43e8
...
...
@@ -588,12 +588,6 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33
return
}
//检查用户提币权限是否得到满足:比如是否超过累计提币额度
var
feeAmount
*
big
.
Int
if
feeAmount
,
err
=
ethRelayer
.
checkPermissionWithinOneDay
(
withdrawTx
);
nil
!=
err
{
return
}
tokenAddr
:=
common
.
HexToAddress
(
withdrawFromChain33TokenInfo
.
Address
)
//从chain33进行withdraw回来的token需要根据精度进行相应的缩放
if
8
!=
withdrawFromChain33TokenInfo
.
Decimal
{
...
...
@@ -617,8 +611,15 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33
chain33Msg
.
Amount
.
Div
(
chain33Msg
.
Amount
,
big
.
NewInt
(
value
))
}
}
withdrawTx
.
Amount
=
chain33Msg
.
Amount
.
String
()
relayerLog
.
Info
(
"handleLogWithdraw"
,
"token address"
,
tokenAddr
.
String
(),
"amount"
,
chain33Msg
.
Amount
.
String
(),
"Receiver on Ethereum"
,
chain33Msg
.
EthereumReceiver
.
String
())
//检查用户提币权限是否得到满足:比如是否超过累计提币额度
var
feeAmount
*
big
.
Int
if
feeAmount
,
err
=
ethRelayer
.
checkPermissionWithinOneDay
(
withdrawTx
);
nil
!=
err
{
return
}
if
chain33Msg
.
Amount
.
Cmp
(
feeAmount
)
<
0
{
relayerLog
.
Error
(
"handleLogWithdraw"
,
"ErrWithdrawAmountLessThanFee feeAmount"
,
feeAmount
.
String
(),
"Withdraw Amount"
,
chain33Msg
.
Amount
.
String
())
err
=
errors
.
New
(
"ErrWithdrawAmountLessThanFee"
)
...
...
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