Skip to content

P
plugin
Commit cdb965ad authored by vipwzw's avatar vipwzw
Browse files
Options

auto ci

parent 95b55d15
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 80 deletions
plugin/dapp/x2Ethereum/cmd/build/allRelayerTest.sh
View file @ cdb965ad
......@@ -42,7 +42,6 @@ ethReceiverAddr2="0x0c05ba5c230fdaa503b53702af1962e08d0c60bf"
ethReceiverAddrKey2="9dc6df3a8ab139a54d8a984f54958ae0661f880229bf3bdbb886b87d58b56a08"
maturityDegree=10
function InitAndDeploy() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
result=$(${CLIA} relayer set_pwd -n 123456hzj -o kk)
......@@ -60,8 +59,7 @@ function InitAndDeploy() {
function EthImportKey() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
# 重启 ebrelayer 并解锁
for name in A B C D
do
for name in A B C D; do
start_ebrelayer "./"$name"/ebrelayer" "./"$name"/ebrelayer.log"
# 导入测试地址私钥
......@@ -107,8 +105,7 @@ function EthImportKey() {
function StartRelayerAndDeploy() {
echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
for name in A B C D
do
for name in A B C D; do
local ebrelayer="./$name/ebrelayer"
kill_ebrelayer "${ebrelayer}"
done
......@@ -128,7 +125,7 @@ function StartRelayerAndDeploy() {
# 获取 BridgeRegistry 地址
result=$(${CLIA} relayer ethereum bridgeRegistry)
BridgeRegistry=$(cli_ret "${result}" "bridgeRegistry" ".addr")
# BridgeRegistry="0x5331F912027057fBE8139D91B225246e8159232f"
# BridgeRegistry="0x5331F912027057fBE8139D91B225246e8159232f"
kill_ebrelayer "./A/ebrelayer"
# 修改 relayer.toml 配置文件
......@@ -171,7 +168,7 @@ function InitChain33Vilators() {
# cions 转帐到 x2ethereum 合约地址
hash=$(${Chain33Cli} send coins send_exec -e x2ethereum -a 200 -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
check_tx "${Chain33Cli}" "${hash}"
result=$(${Chain33Cli} account balance -a 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -e x2ethereum)
balance_ret "${result}" "200.0000"
......@@ -210,14 +207,14 @@ function TestChain33ToEthAssets() {
cli_ret "${result}" "balance" ".balance" "0"
# chain33 lock bty
hash=$(${Chain33Cli} send x2ethereum lock -a 5 -t bty -r ${ethReceiverAddr1} -q ${tokenAddr} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
block_wait "${Chain33Cli}" $((${maturityDegree}+2))
hash=$(${Chain33Cli} send x2ethereum lock -a 5 -t bty -r ${ethReceiverAddr1} -q ${tokenAddr} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
block_wait "${Chain33Cli}" $((maturityDegree + 2))
check_tx "${Chain33Cli}" "${hash}"
result=$(${Chain33Cli} account balance -a 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -e x2ethereum)
balance_ret "${result}" "195.0000"
eth_block_wait $((${maturityDegree}+2))
eth_block_wait $((maturityDegree + 2))
result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr1}" -t "${tokenAddr}")
cli_ret "${result}" "balance" ".balance" "5"
......@@ -230,7 +227,7 @@ function TestChain33ToEthAssets() {
cli_ret "${result}" "balance" ".balance" "0"
# eth 等待 10 个区块
eth_block_wait $((${maturityDegree}+2))
eth_block_wait $((maturityDegree + 2))
result=$(${Chain33Cli} account balance -a "${chain33SenderAddr}" -e x2ethereum)
balance_ret "${result}" "5.0000"
......@@ -258,7 +255,7 @@ function TestETH2Chain33Assets() {
cli_ret "${result}" "balance" ".balance" "10"
# eth 等待 10 个区块
eth_block_wait $((${maturityDegree}+2))
eth_block_wait $((maturityDegree + 2))
result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]")
balance_ret "${result}" "10"
......@@ -266,8 +263,8 @@ function TestETH2Chain33Assets() {
result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}")
balance=$(cli_ret "${result}" "balance" ".balance")
hash=$(${Chain33Cli} send x2ethereum burn -a 10 -t eth -r ${ethReceiverAddr2} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
block_wait "${Chain33Cli}" $((${maturityDegree}+2))
hash=$(${Chain33Cli} send x2ethereum burn -a 10 -t eth -r ${ethReceiverAddr2} -k 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv)
block_wait "${Chain33Cli}" $((maturityDegree + 2))
check_tx "${Chain33Cli}" "${hash}"
result=$(${Chain33Cli} x2ethereum balance -s 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv -t eth | jq ".res" | jq ".[]")
......@@ -279,7 +276,7 @@ function TestETH2Chain33Assets() {
cli_ret "${result}" "balance" ".balance" "0"
result=$(${CLIA} relayer ethereum balance -o "${ethReceiverAddr2}")
cli_ret "${result}" "balance" ".balance" $(echo "${balance}+10"|bc)
cli_ret "${result}" "balance" ".balance" $(echo "${balance}+10" | bc)
echo -e "${GRE}=========== $FUNCNAME end ===========${NOC}"
}
......@@ -317,14 +314,14 @@ function TestETH2Chain33Erc20() {
cli_ret "${result}" "balance" ".balance" "100"
# eth 等待 10 个区块
eth_block_wait $((${maturityDegree}+2))
eth_block_wait $((maturityDegree + 2))
result=$(${Chain33Cli} x2ethereum balance -s "${chain33Validator1}" -t "${tokenSymbol}" -a "${tokenAddr}" | jq ".res" | jq ".[]")
balance_ret "${result}" "100"
# chain33 burn 100
hash=$(${Chain33Cli} send x2ethereum burn -a 100 -t "${tokenSymbol}" -r ${ethReceiverAddr2} -q ${tokenAddr} -k "${chain33Validator1}")
block_wait "${Chain33Cli}" $((${maturityDegree}+2))
hash=$(${Chain33Cli} send x2ethereum burn -a 100 -t "${tokenSymbol}" -r ${ethReceiverAddr2} -q ${tokenAddr} -k "${chain33Validator1}")
block_wait "${Chain33Cli}" $((maturityDegree + 2))
check_tx "${Chain33Cli}" "${hash}"
result=$(${Chain33Cli} x2ethereum balance -s "${chain33Validator1}" -t "${tokenSymbol}" -a "${tokenAddr}" | jq ".res" | jq ".[]")
......@@ -348,7 +345,7 @@ function MainTest() {
echo -e "${GRE}===========allTest $FUNCNAME begin ===========${NOC}"
if [[ "${1}" != "" ]]; then
if [[ ${1} != "" ]]; then
maturityDegree=${1}
echo -e "${GRE}maturityDegree is ${maturityDegree} ${NOC}"
fi
......@@ -363,4 +360,4 @@ function MainTest() {
echo -e "${GRE}===========allTest $FUNCNAME end ===========${NOC}"
}
#MainTest "${1}"
\ No newline at end of file
#MainTest "${1}"
plugin/dapp/x2Ethereum/commands/commands.go
View file @ cdb965ad
......@@ -116,16 +116,16 @@ func Eth2Chain33(cmd *cobra.Command, args []string) {
params := &types3.Eth2Chain33{
EthereumChainID: ethid,
BridgeContractAddress: bcontract,
Nonce: nonce,
LocalCoinSymbol: csymbol,
LocalCoinExec: cexec,
TokenContractAddress: tcontract,
EthereumSender: sender,
Chain33Receiver: receiver,
ValidatorAddress: validator,
Amount: strconv.FormatFloat(types3.MultiplySpecifyTimes(amount, decimal), 'f', 4, 64),
ClaimType: claimtype,
Decimals: decimal,
Nonce: nonce,
LocalCoinSymbol: csymbol,
LocalCoinExec: cexec,
TokenContractAddress: tcontract,
EthereumSender: sender,
Chain33Receiver: receiver,
ValidatorAddress: validator,
Amount: strconv.FormatFloat(types3.MultiplySpecifyTimes(amount, decimal), 'f', 4, 64),
ClaimType: claimtype,
Decimals: decimal,
}
payLoad := types.MustPBToJSON(params)
......@@ -162,16 +162,16 @@ func WithdrawEth(cmd *cobra.Command, args []string) {
params := &types3.Eth2Chain33{
EthereumChainID: ethid,
BridgeContractAddress: bcontract,
Nonce: nonce,
LocalCoinSymbol: csymbol,
LocalCoinExec: cexec,
TokenContractAddress: tcontract,
EthereumSender: sender,
Chain33Receiver: receiver,
ValidatorAddress: validator,
Amount: strconv.FormatFloat(amount*1e8, 'f', 4, 64),
ClaimType: claimtype,
Decimals: decimal,
Nonce: nonce,
LocalCoinSymbol: csymbol,
LocalCoinExec: cexec,
TokenContractAddress: tcontract,
EthereumSender: sender,
Chain33Receiver: receiver,
ValidatorAddress: validator,
Amount: strconv.FormatFloat(amount*1e8, 'f', 4, 64),
ClaimType: claimtype,
Decimals: decimal,
}
payLoad := types.MustPBToJSON(params)
......
plugin/dapp/x2Ethereum/ebrelayer/ethtxs/relayToChain33.go
View file @ cdb965ad
......@@ -26,15 +26,15 @@ func RelayLockToChain33(privateKey chain33Crypto.PrivKey, claim *ebrelayerTypes.
params := &types.Eth2Chain33{
EthereumChainID: claim.EthereumChainID,
BridgeContractAddress: claim.BridgeBrankAddr,
Nonce: claim.Nonce,
LocalCoinSymbol: claim.Symbol,
LocalCoinExec: X2Eth,
TokenContractAddress: claim.TokenAddr,
EthereumSender: claim.EthereumSender,
Chain33Receiver: claim.Chain33Receiver,
Amount: claim.Amount,
ClaimType: int64(claim.ClaimType),
Decimals: claim.Decimal,
Nonce: claim.Nonce,
LocalCoinSymbol: claim.Symbol,
LocalCoinExec: X2Eth,
TokenContractAddress: claim.TokenAddr,
EthereumSender: claim.EthereumSender,
Chain33Receiver: claim.Chain33Receiver,
Amount: claim.Amount,
ClaimType: int64(claim.ClaimType),
Decimals: claim.Decimal,
}
pm := rpctypes.CreateTxIn{
......@@ -83,15 +83,15 @@ func RelayBurnToChain33(privateKey chain33Crypto.PrivKey, claim *ebrelayerTypes.
params := &types.Eth2Chain33{
EthereumChainID: claim.EthereumChainID,
BridgeContractAddress: claim.BridgeBrankAddr,
Nonce: claim.Nonce,
LocalCoinSymbol: claim.Symbol,
LocalCoinExec: X2Eth,
TokenContractAddress: claim.TokenAddr,
EthereumSender: claim.EthereumSender,
Chain33Receiver: claim.Chain33Receiver,
Amount: claim.Amount,
ClaimType: int64(claim.ClaimType),
Decimals: claim.Decimal,
Nonce: claim.Nonce,
LocalCoinSymbol: claim.Symbol,
LocalCoinExec: X2Eth,
TokenContractAddress: claim.TokenAddr,
EthereumSender: claim.EthereumSender,
Chain33Receiver: claim.Chain33Receiver,
Amount: claim.Amount,
ClaimType: int64(claim.ClaimType),
Decimals: claim.Decimal,
}
pm := rpctypes.CreateTxIn{
......
plugin/dapp/x2Ethereum/executor/ethbridge/claim.go
View file @ cdb965ad
......@@ -19,15 +19,15 @@ func NewEthBridgeClaim(ethereumChainID int64, bridgeContract string, nonce int64
return types.Eth2Chain33{
EthereumChainID: ethereumChainID,
BridgeContractAddress: bridgeContract,
Nonce: nonce,
TokenContractAddress: tokenContact,
EthereumSender: ethereumSender,
Chain33Receiver: chain33Receiver,
ValidatorAddress: validator,
Amount: amount,
ClaimType: claimType,
LocalCoinSymbol: localCoinSymbol,
LocalCoinExec: localCoinExec,
Nonce: nonce,
TokenContractAddress: tokenContact,
EthereumSender: ethereumSender,
Chain33Receiver: chain33Receiver,
ValidatorAddress: validator,
Amount: amount,
ClaimType: claimType,
LocalCoinSymbol: localCoinSymbol,
LocalCoinExec: localCoinExec,
}
}
......
plugin/dapp/x2Ethereum/executor/exec.go
View file @ cdb965ad
......@@ -2,6 +2,7 @@ package executor
import (
"errors"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/types"
x2ethereumtypes "github.com/33cn/plugin/plugin/dapp/x2Ethereum/types"
......
plugin/dapp/x2Ethereum/executor/exec_test.go
View file @ cdb965ad
......@@ -171,16 +171,16 @@ func (x *suiteX2Ethereum) Test_4_Eth2Chain33() {
payload := &types2.Eth2Chain33{
EthereumChainID: 0,
BridgeContractAddress: bridgeContractAddress,
Nonce: 0,
LocalCoinSymbol: symbol,
LocalCoinExec: coinExec,
TokenContractAddress: tokenContractAddress,
EthereumSender: ethereumAddr,
Chain33Receiver: chain33Receiver,
ValidatorAddress: addValidator1,
Amount: 10,
ClaimType: common2.LockText,
EthSymbol: symbol,
Nonce: 0,
LocalCoinSymbol: symbol,
LocalCoinExec: coinExec,
TokenContractAddress: tokenContractAddress,
EthereumSender: ethereumAddr,
Chain33Receiver: chain33Receiver,
ValidatorAddress: addValidator1,
Amount: 10,
ClaimType: common2.LockText,
EthSymbol: symbol,
}
receipt, err := x.action.procMsgEth2Chain33(payload)
......
plugin/dapp/x2Ethereum/types/oracle.pb.go
View file @ cdb965ad
......@@ -5,8 +5,9 @@ package types
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
proto "github.com/golang/protobuf/proto"
)
// Reference imports to suppress errors if they are not otherwise used.
......
plugin/dapp/x2Ethereum/types/x2ethereum.pb.go
View file @ cdb965ad
......@@ -6,10 +6,11 @@ package types
import (
context "context"
fmt "fmt"
math "math"
types "github.com/33cn/chain33/types"
proto "github.com/golang/protobuf/proto"
grpc "google.golang.org/grpc"
math "math"
)
// Reference imports to suppress errors if they are not otherwise used.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment