Skip to content

P
plugin
Commit a17afe2a authored by mdj33's avatar mdj33 Committed by vipwzw
Browse files
Options

fix relay

parent 3a335b89
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 21 deletions
build/docker-compose.sh
View file @ a17afe2a
......@@ -323,7 +323,8 @@ function transfer() {
exit 1
fi
hash=$(${1} send coins transfer -a 1000 -n transfer -t 14KEKbYtKKQm4wMthSK9J4La4nAiidGozt -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
hash=$(${1} send coins transfer -a 1000 -n transfer -t 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
echo "${hash}"
block_wait "${1}" 1
}
......
chain33.toml
View file @ a17afe2a
......@@ -205,7 +205,7 @@ cryptoPath="authdir/crypto"
signType="auth_ecdsa"
[exec.sub.relay]
genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
genesis="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
[exec.sub.manage]
superManager=[
......
plugin/dapp/paracross/cmd/build/testcase.sh
View file @ a17afe2a
......@@ -59,6 +59,8 @@ function para_set_wallet() {
para_import_key "${PARA_CLI}" "0xCC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" "genesis"
#12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv
para_import_key "${PARA_CLI}" "0x4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" "test"
#1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY
para_import_key "${PARA_CLI}" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "relay"
}
function para_import_key() {
......@@ -101,7 +103,9 @@ function para_transfer() {
main_transfer2account "1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs"
# super node test
main_transfer2account "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
#relay rpc test
para_transfer2account "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
para_transfer2account "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
block_wait "${CLI}" 2
echo "=========== # main chain send to paracross ============="
......@@ -113,7 +117,8 @@ function para_transfer() {
#1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY test
main_transfer2paracross "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588"
para_transfer2exec "0xCC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" "relay"
#relay rpc test
para_transfer2exec "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "relay"
para_transfer2exec "0x4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" "relay"
block_wait "${CLI}" 2
......@@ -130,7 +135,7 @@ function para_transfer() {
function main_transfer2account() {
echo "${1}"
hash1=$(${CLI} send coins transfer -a 100 -n test -t "${1}" -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
hash1=$(${CLI} send coins transfer -a 500 -n test -t "${1}" -k 4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01)
echo "${hash1}"
}
......
plugin/dapp/paracross/cmd/test/test-rpc.sh
View file @ a17afe2a
......@@ -2,9 +2,8 @@
# shellcheck disable=SC2128
MAIN_HTTP=""
PARA_HTTP=""
CASE_ERR=""
UNIT_HTTP=""
# $2=0 means true, other false
echo_rst() {
......@@ -18,14 +17,14 @@ echo_rst() {
}
chain33_lock() {
ok=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.Lock","params":[]}' -H 'content-type:text/plain;' ${UNIT_HTTP} | jq -r ".result.isOK")
ok=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.Lock","params":[]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result.isOK")
[ "$ok" == true ]
rst=$?
echo_rst "$FUNCNAME" "$rst"
}
chain33_unlock() {
ok=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}' -H 'content-type:text/plain;' ${UNIT_HTTP} | jq -r ".result.isOK")
ok=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result.isOK")
[ "$ok" == true ]
rst=$?
echo_rst "$FUNCNAME" "$rst"
......@@ -38,13 +37,10 @@ function run_testcases() {
}
function paracross_rpc_test() {
local ip=$1
MAIN_HTTP="http://$ip:8801"
PARA_HTTP="http://$ip:8901"
MAIN_HTTP="$1"
echo "=========== # paracross rpc test ============="
echo "main_ip=$MAIN_HTTP,para_ip=$PARA_HTTP"
echo "ip=$MAIN_HTTP"
UNIT_HTTP=$MAIN_HTTP
run_testcases
if [ -n "$CASE_ERR" ]; then
......
plugin/dapp/relay/cmd/test/test-rpc.sh
View file @ a17afe2a
......@@ -78,6 +78,18 @@ Chain33_SendToAddress() {
}
chain33_ImportPrivkey() {
pri=$2
acc=$3
req='"method":"Chain33.ImportPrivkey", "params":[{"privkey":"'"$pri"'", "label":"relayimportkey"}]'
echo "#request: $req"
resp=$(curl -ksd "{$req}" "$1")
# echo "#response: $resp"
ok=$(jq '(.error|not) and (.result.label=="testimportkey") and (.result.acc.addr == "'"$acc"'")' <<<"$resp")
[ "$ok" == true ]
echo_rst "$FUNCNAME" "$?"
}
signrawtx() {
txHex="$1"
priKey="$2"
......@@ -139,7 +151,7 @@ relay_CreateRawRelayAcceptTx() {
[ "$ok" == true ]
echo_rst "$FUNCNAME" "$?"
rawtx=$(jq -r ".result" <<<"$resp")
signrawtx "$rawtx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
signrawtx "$rawtx" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588"
}
......@@ -183,7 +195,7 @@ relay_CreateRawRelayConfirmTx() {
[ "$ok" == true ]
echo_rst "$FUNCNAME" "$?"
rawtx=$(jq -r ".result" <<<"$resp")
signrawtx "$rawtx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
signrawtx "$rawtx" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588"
}
......@@ -196,7 +208,7 @@ relay_CreateRawRelaySaveBTCHeadTx() {
[ "$ok" == true ]
echo_rst "$FUNCNAME" "$?"
rawtx=$(jq -r ".result" <<<"$resp")
signrawtx "$rawtx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
signrawtx "$rawtx" "0x4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01"
}
......@@ -209,7 +221,7 @@ relay_CreateRawRelaySaveBTCHeadTx_11() {
[ "$ok" == true ]
echo_rst "$FUNCNAME" "$?"
rawtx=$(jq -r ".result" <<<"$resp")
signrawtx "$rawtx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
signrawtx "$rawtx" "0x4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01"
}
......@@ -236,7 +248,7 @@ query_GetSellRelayOrder() {
}
query_GetBuyRelayOrder() {
req='"method":"Chain33.Query", "params":[{"execer":"relay","funcName":"GetBuyRelayOrder","payload":{"addr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt","status":"locking","coins":["BTC"],"pageNumber":0,"pageSize":0}}]'
req='"method":"Chain33.Query", "params":[{"execer":"relay","funcName":"GetBuyRelayOrder","payload":{"addr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","status":"locking","coins":["BTC"],"pageNumber":0,"pageSize":0}}]'
# echo "#request: $req"
resp=$(curl -ksd "{$req}" ${MAIN_HTTP})
# echo "#response: $resp"
......@@ -269,6 +281,8 @@ query_GetBTCHeaderCurHeight() {
}
init() {
chain33_ImportPrivkey "${MAIN_HTTP}" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
echo "ipara=$ispara"
local relay_addr=""
......@@ -282,7 +296,7 @@ init() {
from="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
Chain33_SendToAddress "$from" "$relay_addr" 30000000000
from="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
from="1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY"
Chain33_SendToAddress "$from" "$relay_addr" 30000000000
block_wait 1
......@@ -319,10 +333,10 @@ function rpc_test() {
run_testcases
if [ -n "$CASE_ERR" ]; then
echo "=======relay rpc test error ==========="
echo -e "${RED}=============Relay Rpc Test Fail=============${NOC}"
exit 1
else
echo "====== relay rpc test pass ==========="
echo -e "${GRE}=============Relay Rpc Test Pass==============${NOC}"
fi
}
......
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