Skip to content

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

take paraName in cli

parent 0165b426
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 164 deletions
plugin/dapp/paracross/cmd/build/testcase.sh
View file @ a16842cb
...@@ -456,7 +456,7 @@ function para_cross_transfer_withdraw_for_token() { ...@@ -456,7 +456,7 @@ function para_cross_transfer_withdraw_for_token() {
function para_create_nodegroup_test() { function para_create_nodegroup_test() {
echo "=========== # para chain create node group test =============" echo "=========== # para chain create node group test ============="
##apply ##apply
txhash=$(${PARA_CLI} send para nodegroup apply -t "$TITLE" -a "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR,1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs" -c 5 -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5) txhash=$(${PARA_CLI} send para nodegroup apply -a "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR,1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs" -c 5 -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5)
echo "tx=$txhash" echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}" query_tx "${PARA_CLI}" "${txhash}"
id=$txhash id=$txhash
...@@ -469,7 +469,7 @@ function para_create_nodegroup_test() { ...@@ -469,7 +469,7 @@ function para_create_nodegroup_test() {
echo "=========== # para chain quit node group =============" echo "=========== # para chain quit node group ============="
##quit ##quit
txhash=$(${PARA_CLI} send para nodegroup quit -i "$id" -t "$TITLE" -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5) txhash=$(${PARA_CLI} send para nodegroup quit -i "$id" -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5)
echo "tx=$txhash" echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}" query_tx "${PARA_CLI}" "${txhash}"
newid=$(${PARA_CLI} para nodegroup list -s 3 | jq -r ".ids[0].id") newid=$(${PARA_CLI} para nodegroup list -s 3 | jq -r ".ids[0].id")
...@@ -491,7 +491,7 @@ function para_create_nodegroup() { ...@@ -491,7 +491,7 @@ function para_create_nodegroup() {
echo "=========== # para chain create node group again =============" echo "=========== # para chain create node group again ============="
##apply ##apply
txhash=$(${PARA_CLI} send para nodegroup apply -a "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY,1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR,1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs" -c 6 -t "$TITLE" -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5) txhash=$(${PARA_CLI} send para nodegroup apply -a "1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY,1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR,1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs" -c 6 -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5)
echo "tx=$txhash" echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}" query_tx "${PARA_CLI}" "${txhash}"
id=$txhash id=$txhash
...@@ -504,24 +504,24 @@ function para_create_nodegroup() { ...@@ -504,24 +504,24 @@ function para_create_nodegroup() {
echo "=========== # para chain approve node group =============" echo "=========== # para chain approve node group ============="
##approve ##approve
txhash=$(${PARA_CLI} send para nodegroup approve -i "$id" -c 6 -t "$TITLE" -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc) txhash=$(${PARA_CLI} send para nodegroup approve -i "$id" -c 6 -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc)
echo "tx=$txhash" echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}" query_tx "${PARA_CLI}" "${txhash}"
status=$(${PARA_CLI} para nodegroup status -t user.p.para. | jq -r ".status") status=$(${PARA_CLI} para nodegroup status | jq -r ".status")
if [ "$status" != 2 ]; then if [ "$status" != 2 ]; then
echo "status not approve status=$status" echo "status not approve status=$status"
exit 1 exit 1
fi fi
${PARA_CLI} para nodegroup addrs -t user.p.para. ${PARA_CLI} para nodegroup addrs
echo "=========== # para chain quit node group fail =============" echo "=========== # para chain quit node group fail ============="
##quit fail ##quit fail
txhash=$(${PARA_CLI} send para nodegroup quit -i "$id" -t "$TITLE" -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5) txhash=$(${PARA_CLI} send para nodegroup quit -i "$id" -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5)
echo "tx=$txhash" echo "tx=$txhash"
query_tx "${CLI}" "${txhash}" query_tx "${CLI}" "${txhash}"
status=$(${CLI} para nodegroup status -t user.p.para. | jq -r ".status") status=$(${PARA_CLI} para nodegroup status | jq -r ".status")
if [ "$status" != 2 ]; then if [ "$status" != 2 ]; then
echo "status quit not approve status=$status" echo "status quit not approve status=$status"
exit 1 exit 1
...@@ -533,7 +533,7 @@ function para_create_nodegroup() { ...@@ -533,7 +533,7 @@ function para_create_nodegroup() {
fi fi
echo "=========== # para chain modify node group coin=5 =============" echo "=========== # para chain modify node group coin=5 ============="
txhash=$(${PARA_CLI} send para nodegroup modify -c 5 -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b) txhash=$(${PARA_CLI} send para nodegroup modify -c 5 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b)
echo "tx=$txhash" echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}" query_tx "${PARA_CLI}" "${txhash}"
modifyid=$(${PARA_CLI} para nodegroup list -s 4 | jq -r ".ids[0].id") modifyid=$(${PARA_CLI} para nodegroup list -s 4 | jq -r ".ids[0].id")
...@@ -543,56 +543,56 @@ function para_create_nodegroup() { ...@@ -543,56 +543,56 @@ function para_create_nodegroup() {
fi fi
##approve ##approve
txhash=$(${PARA_CLI} send para nodegroup approve -i "$modifyid" -c 5 -t "$TITLE" -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc) txhash=$(${PARA_CLI} send para nodegroup approve -i "$modifyid" -c 5 -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc)
echo "tx=$txhash" echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}" query_tx "${PARA_CLI}" "${txhash}"
id=$(${PARA_CLI} para nodegroup status -t user.p.para. | jq -r ".id") id=$(${PARA_CLI} para nodegroup status | jq -r ".id")
if [ "$modifyid" != "$id" ]; then if [ "$modifyid" != "$id" ]; then
echo " approve new id wrong" echo " approve new id wrong"
${PARA_CLI} para nodegroup_status -t user.p.para. ${PARA_CLI} para nodegroup_status
exit 1 exit 1
fi fi
coins=$(${PARA_CLI} para nodegroup status -t user.p.para. | jq -r ".coinsFrozen") coins=$(${PARA_CLI} para nodegroup status | jq -r ".coinsFrozen")
if [ "$coins" != "500000000" ]; then if [ "$coins" != "500000000" ]; then
echo " approve new coins wrong" echo " approve new coins wrong"
${PARA_CLI} para nodegroup_status -t user.p.para. ${PARA_CLI} para nodegroup_status
exit 1 exit 1
fi fi
} }
function para_nodegroup_behalf_quit_test() { function para_nodegroup_behalf_quit_test() {
echo "=========== # para chain behalf node quit =============" echo "=========== # para chain behalf node quit ============="
status=$(${PARA_CLI} para super_node addr_status -t user.p.para. -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY | jq -r ".status") status=$(${PARA_CLI} para super_node addr_status -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY | jq -r ".status")
if [ "${status}" != "10" ]; then if [ "${status}" != "10" ]; then
echo "wrong 1E5 status" echo "wrong 1E5 status"
${PARA_CLI} para super_node addr_status -t user.p.para. -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY ${PARA_CLI} para super_node addr_status -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY
exit 1 exit 1
fi fi
hash=$(${PARA_CLI} send para super_node quit -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b) hash=$(${PARA_CLI} send para super_node quit -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
id=$hash id=$hash
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4 ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588 ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588
hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115) hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
status=$(${PARA_CLI} para super_node addr_status -t user.p.para. -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY | jq -r ".status") status=$(${PARA_CLI} para super_node addr_status -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY | jq -r ".status")
if [ "${status}" != "11" ]; then if [ "${status}" != "11" ]; then
echo "wrong vote status" echo "wrong vote status"
${PARA_CLI} para super_node addr_status -t user.p.para. -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY ${PARA_CLI} para super_node addr_status -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY
exit 1 exit 1
fi fi
node=$(${PARA_CLI} para nodegroup addrs -t user.p.para. | jq -r '.value|contains("1E5")') node=$(${PARA_CLI} para nodegroup addrs | jq -r '.value|contains("1E5")')
if [ "${node}" == "true" ]; then if [ "${node}" == "true" ]; then
echo "wrong node group addr" echo "wrong node group addr"
${PARA_CLI} para nodegroup addrs -t user.p.para. ${PARA_CLI} para nodegroup addrs
exit 1 exit 1
fi fi
...@@ -613,7 +613,7 @@ function para_nodemanage_cancel_test() { ...@@ -613,7 +613,7 @@ function para_nodemanage_cancel_test() {
fi fi
echo "=========== # para chain new node join =============" echo "=========== # para chain new node join ============="
hash=$(${PARA_CLI} send para super_node join -c 5 -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -t "$TITLE" -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588) hash=$(${PARA_CLI} send para super_node join -c 5 -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
id=$hash id=$hash
...@@ -624,7 +624,7 @@ function para_nodemanage_cancel_test() { ...@@ -624,7 +624,7 @@ function para_nodemanage_cancel_test() {
fi fi
echo "=========== # para chain node cancel =============" echo "=========== # para chain node cancel ============="
hash=$(${PARA_CLI} send para super_node cancel -i "$id" -t "$TITLE" -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588) hash=$(${PARA_CLI} send para super_node cancel -i "$id" -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
...@@ -646,7 +646,7 @@ function para_nodemanage_test() { ...@@ -646,7 +646,7 @@ function para_nodemanage_test() {
fi fi
echo "=========== # para chain new node join reject=============" echo "=========== # para chain new node join reject============="
hash=$(${PARA_CLI} send para super_node join -c 5 -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -t "$TITLE" -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588) hash=$(${PARA_CLI} send para super_node join -c 5 -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
...@@ -658,30 +658,30 @@ function para_nodemanage_test() { ...@@ -658,30 +658,30 @@ function para_nodemanage_test() {
id=$hash id=$hash
echo "=========== # para chain node vote =============" echo "=========== # para chain node vote ============="
${PARA_CLI} send para super_node vote -i "$id" -v 2 -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b ${PARA_CLI} send para super_node vote -i "$id" -v 2 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
${PARA_CLI} send para super_node vote -i "$id" -v 2 -t "$TITLE" -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4 ${PARA_CLI} send para super_node vote -i "$id" -v 2 -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 2 -t "$TITLE" -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115) hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 2 -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
status=$(${PARA_CLI} para super_node addr_status -t user.p.para. -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY | jq -r ".status") status=$(${PARA_CLI} para super_node addr_status -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY | jq -r ".status")
if [ "${status}" == "10" ]; then if [ "${status}" == "10" ]; then
echo "wrong vote status" echo "wrong vote status"
${PARA_CLI} para super_node addr_status -t user.p.para. -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY ${PARA_CLI} para super_node addr_status -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY
exit 1 exit 1
fi fi
status=$(${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" | jq -r ".status") status=$(${PARA_CLI} para super_node id_status -i "$id" | jq -r ".status")
if [ "${status}" != "3" ]; then if [ "${status}" != "3" ]; then
echo "wrong cancel status" echo "wrong cancel status"
${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" ${PARA_CLI} para super_node id_status -i "$id"
exit 1 exit 1
fi fi
node=$(${PARA_CLI} para nodegroup addrs -t user.p.para. | jq -r '.value|contains("1E5")') node=$(${PARA_CLI} para nodegroup addrs | jq -r '.value|contains("1E5")')
if [ "${node}" == "true" ]; then if [ "${node}" == "true" ]; then
echo "wrong node group addr" echo "wrong node group addr"
${PARA_CLI} para nodegroup addrs -t user.p.para. ${PARA_CLI} para nodegroup addrs
exit 1 exit 1
fi fi
...@@ -691,35 +691,35 @@ function para_nodemanage_test() { ...@@ -691,35 +691,35 @@ function para_nodemanage_test() {
exit 1 exit 1
fi fi
echo "=========== # para chain node quit reject =============" echo "=========== # para chain node quit reject ============="
txhash=$(${PARA_CLI} send para super_node quit -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 -t "$TITLE" -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588) txhash=$(${PARA_CLI} send para super_node quit -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588)
echo "${txhash}" echo "${txhash}"
query_tx "${PARA_CLI}" "${txhash}" query_tx "${PARA_CLI}" "${txhash}"
id=$txhash id=$txhash
echo "=========== # para chain node vote quit =============" echo "=========== # para chain node vote quit ============="
${PARA_CLI} send para super_node vote -i "$id" -v 2 -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b ${PARA_CLI} send para super_node vote -i "$id" -v 2 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
${PARA_CLI} send para super_node vote -i "$id" -v 2 -t "$TITLE" -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4 ${PARA_CLI} send para super_node vote -i "$id" -v 2 -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 2 -t "$TITLE" -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115) hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 2 -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
status=$(${PARA_CLI} para super_node addr_status -t user.p.para. -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 | jq -r ".status") status=$(${PARA_CLI} para super_node addr_status -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 | jq -r ".status")
if [ "${status}" != "10" ]; then if [ "${status}" != "10" ]; then
echo "wrong vote status" echo "wrong vote status"
${PARA_CLI} para super_node addr_status -t user.p.para. -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 ${PARA_CLI} para super_node addr_status -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4
exit 1 exit 1
fi fi
status=$(${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" | jq -r ".status") status=$(${PARA_CLI} para super_node id_status -i "$id" | jq -r ".status")
if [ "${status}" != "3" ]; then if [ "${status}" != "3" ]; then
echo "wrong close status" echo "wrong close status"
${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" ${PARA_CLI} para super_node id_status -i "$id"
exit 1 exit 1
fi fi
node=$(${PARA_CLI} para nodegroup addrs -t user.p.para. | jq -r '.value|contains("1KS")') node=$(${PARA_CLI} para nodegroup addrs | jq -r '.value|contains("1KS")')
if [ "${node}" != "true" ]; then if [ "${node}" != "true" ]; then
echo "wrong node group addr" echo "wrong node group addr"
${PARA_CLI} para nodegroup addrs -t user.p.para. ${PARA_CLI} para nodegroup addrs
exit 1 exit 1
fi fi
...@@ -728,7 +728,7 @@ function para_nodemanage_test() { ...@@ -728,7 +728,7 @@ function para_nodemanage_test() {
function para_nodemanage_node_behalf_join() { function para_nodemanage_node_behalf_join() {
echo "=========== # para chain behalf node vote test =============" echo "=========== # para chain behalf node vote test ============="
echo "=========== # para chain new node join 1 =============" echo "=========== # para chain new node join 1 ============="
hash=$(${PARA_CLI} send para super_node join -c 8 -t "$TITLE" -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5) hash=$(${PARA_CLI} send para super_node join -c 8 -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
node1_id=$hash node1_id=$hash
...@@ -746,7 +746,7 @@ function para_nodemanage_node_behalf_join() { ...@@ -746,7 +746,7 @@ function para_nodemanage_node_behalf_join() {
fi fi
echo "=========== # para chain new node join 2=============" echo "=========== # para chain new node join 2============="
hash=$(${PARA_CLI} send para super_node join -c 9 -t "$TITLE" -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5) hash=$(${PARA_CLI} send para super_node join -c 9 -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
id=$hash id=$hash
...@@ -757,48 +757,48 @@ function para_nodemanage_node_behalf_join() { ...@@ -757,48 +757,48 @@ function para_nodemanage_node_behalf_join() {
exit 1 exit 1
fi fi
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4 ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115) hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
status=$(${PARA_CLI} para super_node addr_status -t user.p.para. -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB | jq -r ".status") status=$(${PARA_CLI} para super_node addr_status -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB | jq -r ".status")
if [ "${status}" != "10" ]; then if [ "${status}" != "10" ]; then
echo "wrong vote status" echo "wrong vote status"
${PARA_CLI} para super_node addr_status -t user.p.para. -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB ${PARA_CLI} para super_node addr_status -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB
exit 1 exit 1
fi fi
status=$(${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" | jq -r ".status") status=$(${PARA_CLI} para super_node id_status -i "$id" | jq -r ".status")
if [ "${status}" != "3" ]; then if [ "${status}" != "3" ]; then
echo "wrong close status" echo "wrong close status"
${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" ${PARA_CLI} para super_node id_status -i "$id"
exit 1 exit 1
fi fi
node=$(${PARA_CLI} para nodegroup addrs -t user.p.para. | jq -r '.value|contains("1NNa")') node=$(${PARA_CLI} para nodegroup addrs | jq -r '.value|contains("1NNa")')
if [ "${node}" != "true" ]; then if [ "${node}" != "true" ]; then
echo "wrong node group addr" echo "wrong node group addr"
${PARA_CLI} para nodegroup addrs -t user.p.para. ${PARA_CLI} para nodegroup addrs
exit 1 exit 1
fi fi
echo "=========== # para chain same node vote again fail =============" echo "=========== # para chain same node vote again fail ============="
${PARA_CLI} send para super_node vote -i "$node1_id" -v 1 -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b ${PARA_CLI} send para super_node vote -i "$node1_id" -v 1 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
${PARA_CLI} send para super_node vote -i "$node1_id" -v 1 -t "$TITLE" -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4 ${PARA_CLI} send para super_node vote -i "$node1_id" -v 1 -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
hash=$(${PARA_CLI} send para super_node vote -i "$node1_id" -v 1 -t "$TITLE" -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115) hash=$(${PARA_CLI} send para super_node vote -i "$node1_id" -v 1 -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
echo "${hash}" echo "${hash}"
query_tx "${CLI}" "${hash}" query_tx "${CLI}" "${hash}"
status=$(${CLI} para super_node id_status -t user.p.para. -i "$node1_id" | jq -r ".status") status=$(${PARA_CLI} para super_node id_status -i "$node1_id" | jq -r ".status")
if [ "${status}" == "3" ]; then if [ "${status}" == "3" ]; then
echo "wrong vote status" echo "wrong vote status"
${CLI} para super_node id_status -t user.p.para. -i "$node1_id" ${PARA_CLI} para super_node id_status -i "$node1_id"
exit 1 exit 1
fi fi
echo "=========== # para chain node 1 cancel =============" echo "=========== # para chain node 1 cancel ============="
hash=$(${PARA_CLI} send para super_node cancel -i "$node1_id" -t "$TITLE" -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5) hash=$(${PARA_CLI} send para super_node cancel -i "$node1_id" -k 0xd165c84ed37c2a427fea487470ee671b7a0495d68d82607cafbc6348bf23bec5)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
...@@ -807,24 +807,24 @@ function para_nodemanage_node_behalf_join() { ...@@ -807,24 +807,24 @@ function para_nodemanage_node_behalf_join() {
echo "unfrozen coinfrozen error balance=$balance" echo "unfrozen coinfrozen error balance=$balance"
exit 1 exit 1
fi fi
status=$(${PARA_CLI} para super_node id_status -t user.p.para. -i "$node1_id" | jq -r ".status") status=$(${PARA_CLI} para super_node id_status -i "$node1_id" | jq -r ".status")
if [ "${status}" != "4" ]; then if [ "${status}" != "4" ]; then
echo "wrong cancel status" echo "wrong cancel status"
${PARA_CLI} para super_node id_status -t user.p.para. -i "$node1_id" ${PARA_CLI} para super_node id_status -i "$node1_id"
exit 1 exit 1
fi fi
echo "=========== # para chain node 2 quit =============" echo "=========== # para chain node 2 quit ============="
hash=$(${PARA_CLI} send para super_node quit -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -t "$TITLE" -k 0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d) hash=$(${PARA_CLI} send para super_node quit -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -k 0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
id=$hash id=$hash
echo "=========== # para chain node2 vote quit =============" echo "=========== # para chain node2 vote quit ============="
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4 ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d ${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d
hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 1 -t "$TITLE" -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115) hash=$(${PARA_CLI} send para super_node vote -i "$id" -v 1 -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
echo "${hash}" echo "${hash}"
query_tx "${PARA_CLI}" "${hash}" query_tx "${PARA_CLI}" "${hash}"
...@@ -834,22 +834,22 @@ function para_nodemanage_node_behalf_join() { ...@@ -834,22 +834,22 @@ function para_nodemanage_node_behalf_join() {
exit 1 exit 1
fi fi
status=$(${PARA_CLI} para super_node addr_status -t user.p.para. -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB | jq -r ".status") status=$(${PARA_CLI} para super_node addr_status -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB | jq -r ".status")
if [ "${status}" != "11" ]; then if [ "${status}" != "11" ]; then
echo "wrong vote status" echo "wrong vote status"
${PARA_CLI} para super_node addr_status -t user.p.para. -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB ${PARA_CLI} para super_node addr_status -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB
exit 1 exit 1
fi fi
status=$(${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" | jq -r ".status") status=$(${PARA_CLI} para super_node id_status -i "$id" | jq -r ".status")
if [ "${status}" != "3" ]; then if [ "${status}" != "3" ]; then
echo "wrong cancel status" echo "wrong cancel status"
${PARA_CLI} para super_node id_status -t user.p.para. -i "$id" ${PARA_CLI} para super_node id_status -i "$id"
exit 1 exit 1
fi fi
node=$(${PARA_CLI} para nodegroup addrs -t user.p.para. | jq -r '.value|contains("1NNa")') node=$(${PARA_CLI} para nodegroup addrs | jq -r '.value|contains("1NNa")')
if [ "${node}" == "true" ]; then if [ "${node}" == "true" ]; then
echo "wrong node group addr" echo "wrong node group addr"
${PARA_CLI} para nodegroup addrs -t user.p.para. ${PARA_CLI} para nodegroup addrs
exit 1 exit 1
fi fi
......
plugin/dapp/paracross/commands/paracross.go
View file @ a16842cb
...@@ -261,18 +261,16 @@ func addNodeJoinFlags(cmd *cobra.Command) { ...@@ -261,18 +261,16 @@ func addNodeJoinFlags(cmd *cobra.Command) {
cmd.Flags().Float64P("coins", "c", 0, "frozen coins amount, should not less nodegroup's setting") cmd.Flags().Float64P("coins", "c", 0, "frozen coins amount, should not less nodegroup's setting")
cmd.MarkFlagRequired("coins") cmd.MarkFlagRequired("coins")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func createNodeJoinTx(cmd *cobra.Command, args []string) { func createNodeJoinTx(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle")
opAddr, _ := cmd.Flags().GetString("addr") opAddr, _ := cmd.Flags().GetString("addr")
coins, _ := cmd.Flags().GetFloat64("coins") coins, _ := cmd.Flags().GetFloat64("coins")
paraName, _ := cmd.Flags().GetString("paraName")
payload := &pt.ParaNodeAddrConfig{Title: title, Op: 1, Addr: opAddr, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4} payload := &pt.ParaNodeAddrConfig{Title: paraName, Op: 1, Addr: opAddr, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeConfig", ActionName: "NodeConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -298,19 +296,16 @@ func addNodeVoteFlags(cmd *cobra.Command) { ...@@ -298,19 +296,16 @@ func addNodeVoteFlags(cmd *cobra.Command) {
cmd.Flags().Uint32P("value", "v", 1, "vote value: 1:yes,2:no") cmd.Flags().Uint32P("value", "v", 1, "vote value: 1:yes,2:no")
cmd.MarkFlagRequired("value") cmd.MarkFlagRequired("value")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func createNodeVoteTx(cmd *cobra.Command, args []string) { func createNodeVoteTx(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
id, _ := cmd.Flags().GetString("id") id, _ := cmd.Flags().GetString("id")
val, _ := cmd.Flags().GetUint32("value") val, _ := cmd.Flags().GetUint32("value")
payload := &pt.ParaNodeAddrConfig{Title: title, Op: 2, Id: id, Value: val} payload := &pt.ParaNodeAddrConfig{Title: paraName, Op: 2, Id: id, Value: val}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeConfig", ActionName: "NodeConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -335,17 +330,15 @@ func addNodeQuitFlags(cmd *cobra.Command) { ...@@ -335,17 +330,15 @@ func addNodeQuitFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "target quit addr") cmd.Flags().StringP("addr", "a", "", "target quit addr")
cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func createNodeQuitTx(cmd *cobra.Command, args []string) { func createNodeQuitTx(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
opAddr, _ := cmd.Flags().GetString("addr") opAddr, _ := cmd.Flags().GetString("addr")
payload := &pt.ParaNodeAddrConfig{Title: title, Op: 3, Addr: opAddr} payload := &pt.ParaNodeAddrConfig{Title: paraName, Op: 3, Addr: opAddr}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeConfig", ActionName: "NodeConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -370,18 +363,15 @@ func addNodeCancelFlags(cmd *cobra.Command) { ...@@ -370,18 +363,15 @@ func addNodeCancelFlags(cmd *cobra.Command) {
cmd.Flags().StringP("id", "i", "", "operating target apply id") cmd.Flags().StringP("id", "i", "", "operating target apply id")
cmd.MarkFlagRequired("id") cmd.MarkFlagRequired("id")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func createNodeCancelTx(cmd *cobra.Command, args []string) { func createNodeCancelTx(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
id, _ := cmd.Flags().GetString("id") id, _ := cmd.Flags().GetString("id")
payload := &pt.ParaNodeAddrConfig{Title: title, Op: 4, Id: id} payload := &pt.ParaNodeAddrConfig{Title: paraName, Op: 4, Id: id}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeConfig", ActionName: "NodeConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -414,9 +404,6 @@ func getNodeInfoCmd() *cobra.Command { ...@@ -414,9 +404,6 @@ func getNodeInfoCmd() *cobra.Command {
} }
func addNodeBodyCmdFlags(cmd *cobra.Command) { func addNodeBodyCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
cmd.Flags().StringP("addr", "a", "", "addr apply for super user") cmd.Flags().StringP("addr", "a", "", "addr apply for super user")
cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
...@@ -424,11 +411,11 @@ func addNodeBodyCmdFlags(cmd *cobra.Command) { ...@@ -424,11 +411,11 @@ func addNodeBodyCmdFlags(cmd *cobra.Command) {
func nodeInfo(cmd *cobra.Command, args []string) { func nodeInfo(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ptitle, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
addr, _ := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
params := pt.ReqParacrossNodeInfo{ params := pt.ReqParacrossNodeInfo{
Title: ptitle, Title: paraName,
Addr: addr, Addr: addr,
} }
var res pt.ParaNodeAddrIdStatus var res pt.ParaNodeAddrIdStatus
...@@ -448,9 +435,6 @@ func getNodeIDInfoCmd() *cobra.Command { ...@@ -448,9 +435,6 @@ func getNodeIDInfoCmd() *cobra.Command {
} }
func addNodeIDBodyCmdFlags(cmd *cobra.Command) { func addNodeIDBodyCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
cmd.Flags().StringP("id", "i", "", "id apply for super user") cmd.Flags().StringP("id", "i", "", "id apply for super user")
cmd.MarkFlagRequired("id") cmd.MarkFlagRequired("id")
...@@ -458,11 +442,11 @@ func addNodeIDBodyCmdFlags(cmd *cobra.Command) { ...@@ -458,11 +442,11 @@ func addNodeIDBodyCmdFlags(cmd *cobra.Command) {
func nodeIDInfo(cmd *cobra.Command, args []string) { func nodeIDInfo(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ptitle, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
id, _ := cmd.Flags().GetString("id") id, _ := cmd.Flags().GetString("id")
params := pt.ReqParacrossNodeInfo{ params := pt.ReqParacrossNodeInfo{
Title: ptitle, Title: paraName,
Id: id, Id: id,
} }
var res pt.ParaNodeIdStatus var res pt.ParaNodeIdStatus
...@@ -482,9 +466,6 @@ func getNodeListCmd() *cobra.Command { ...@@ -482,9 +466,6 @@ func getNodeListCmd() *cobra.Command {
} }
func addNodeListCmdFlags(cmd *cobra.Command) { func addNodeListCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
cmd.Flags().Int32P("status", "s", 0, "status:0:all,1:joining,2:quiting,3:closed,4:canceled") cmd.Flags().Int32P("status", "s", 0, "status:0:all,1:joining,2:quiting,3:closed,4:canceled")
cmd.MarkFlagRequired("status") cmd.MarkFlagRequired("status")
...@@ -492,11 +473,11 @@ func addNodeListCmdFlags(cmd *cobra.Command) { ...@@ -492,11 +473,11 @@ func addNodeListCmdFlags(cmd *cobra.Command) {
func nodeList(cmd *cobra.Command, args []string) { func nodeList(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ptitle, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
status, _ := cmd.Flags().GetInt32("status") status, _ := cmd.Flags().GetInt32("status")
params := pt.ReqParacrossNodeInfo{ params := pt.ReqParacrossNodeInfo{
Title: ptitle, Title: paraName,
Status: status, Status: status,
} }
var res pt.RespParacrossNodeAddrs var res pt.RespParacrossNodeAddrs
...@@ -528,18 +509,16 @@ func addNodeGroupApplyCmdFlags(cmd *cobra.Command) { ...@@ -528,18 +509,16 @@ func addNodeGroupApplyCmdFlags(cmd *cobra.Command) {
cmd.Flags().Float64P("coins", "c", 0, "coins amount to frozen, not less config") cmd.Flags().Float64P("coins", "c", 0, "coins amount to frozen, not less config")
cmd.MarkFlagRequired("coins") cmd.MarkFlagRequired("coins")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func nodeGroupApply(cmd *cobra.Command, args []string) { func nodeGroupApply(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
addrs, _ := cmd.Flags().GetString("addrs") addrs, _ := cmd.Flags().GetString("addrs")
coins, _ := cmd.Flags().GetFloat64("coins") coins, _ := cmd.Flags().GetFloat64("coins")
payload := &pt.ParaNodeGroupConfig{Title: title, Op: 1, Addrs: addrs, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4} payload := &pt.ParaNodeGroupConfig{Title: paraName, Op: 1, Addrs: addrs, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeGroupConfig", ActionName: "NodeGroupConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -566,18 +545,16 @@ func addNodeGroupApproveCmdFlags(cmd *cobra.Command) { ...@@ -566,18 +545,16 @@ func addNodeGroupApproveCmdFlags(cmd *cobra.Command) {
cmd.Flags().Float64P("coins", "c", 0, "coins amount to frozen, not less config") cmd.Flags().Float64P("coins", "c", 0, "coins amount to frozen, not less config")
cmd.MarkFlagRequired("coins") cmd.MarkFlagRequired("coins")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func nodeGroupApprove(cmd *cobra.Command, args []string) { func nodeGroupApprove(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
id, _ := cmd.Flags().GetString("id") id, _ := cmd.Flags().GetString("id")
coins, _ := cmd.Flags().GetFloat64("coins") coins, _ := cmd.Flags().GetFloat64("coins")
payload := &pt.ParaNodeGroupConfig{Title: title, Op: 2, Id: id, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4} payload := &pt.ParaNodeGroupConfig{Title: paraName, Op: 2, Id: id, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeGroupConfig", ActionName: "NodeGroupConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -601,17 +578,15 @@ func addNodeGroupQuitCmdFlags(cmd *cobra.Command) { ...@@ -601,17 +578,15 @@ func addNodeGroupQuitCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("id", "i", "", "apply quit id for nodegroup ") cmd.Flags().StringP("id", "i", "", "apply quit id for nodegroup ")
cmd.MarkFlagRequired("id") cmd.MarkFlagRequired("id")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func nodeGroupQuit(cmd *cobra.Command, args []string) { func nodeGroupQuit(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
id, _ := cmd.Flags().GetString("id") id, _ := cmd.Flags().GetString("id")
payload := &pt.ParaNodeGroupConfig{Title: title, Op: 3, Id: id} payload := &pt.ParaNodeGroupConfig{Title: paraName, Op: 3, Id: id}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeGroupConfig", ActionName: "NodeGroupConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -635,17 +610,15 @@ func addNodeGroupModifyCmdFlags(cmd *cobra.Command) { ...@@ -635,17 +610,15 @@ func addNodeGroupModifyCmdFlags(cmd *cobra.Command) {
cmd.Flags().Float64P("coins", "c", 0, "modify coins amount to frozen, not less config") cmd.Flags().Float64P("coins", "c", 0, "modify coins amount to frozen, not less config")
cmd.MarkFlagRequired("coins") cmd.MarkFlagRequired("coins")
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
} }
func nodeGroupModify(cmd *cobra.Command, args []string) { func nodeGroupModify(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
coins, _ := cmd.Flags().GetFloat64("coins") coins, _ := cmd.Flags().GetFloat64("coins")
payload := &pt.ParaNodeGroupConfig{Title: title, Op: 4, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4} payload := &pt.ParaNodeGroupConfig{Title: paraName, Op: 4, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: title + pt.ParaX, Execer: getRealExecName(paraName, pt.ParaX),
ActionName: "NodeGroupConfig", ActionName: "NodeGroupConfig",
Payload: types.MustPBToJSON(payload), Payload: types.MustPBToJSON(payload),
} }
...@@ -682,17 +655,12 @@ func isSync(cmd *cobra.Command, args []string) { ...@@ -682,17 +655,12 @@ func isSync(cmd *cobra.Command, args []string) {
ctx.Run() ctx.Run()
} }
func addTitleFlags(cmd *cobra.Command) {
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title, default null in para chain")
cmd.MarkFlagRequired("ptitle")
}
func consusHeight(cmd *cobra.Command, args []string) { func consusHeight(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ptitle, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
var res pt.ParacrossConsensusStatus var res pt.ParacrossConsensusStatus
ctx := jsonclient.NewRPCCtx(rpcLaddr, "paracross.GetHeight", &types.ReqString{Data: ptitle}, &res) ctx := jsonclient.NewRPCCtx(rpcLaddr, "paracross.GetHeight", &types.ReqString{Data: paraName}, &res)
ctx.Run() ctx.Run()
} }
...@@ -703,7 +671,6 @@ func GetHeightCmd() *cobra.Command { ...@@ -703,7 +671,6 @@ func GetHeightCmd() *cobra.Command {
Short: "query consensus height", Short: "query consensus height",
Run: consusHeight, Run: consusHeight,
} }
addTitleFlags(cmd)
return cmd return cmd
} }
...@@ -772,9 +739,6 @@ func GetLocalBlockInfoCmd() *cobra.Command { ...@@ -772,9 +739,6 @@ func GetLocalBlockInfoCmd() *cobra.Command {
} }
func addParaBodyCmdFlags(cmd *cobra.Command) { func addParaBodyCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
cmd.Flags().Int64P("height", "g", 0, "height to para chain") cmd.Flags().Int64P("height", "g", 0, "height to para chain")
cmd.MarkFlagRequired("height") cmd.MarkFlagRequired("height")
...@@ -782,11 +746,11 @@ func addParaBodyCmdFlags(cmd *cobra.Command) { ...@@ -782,11 +746,11 @@ func addParaBodyCmdFlags(cmd *cobra.Command) {
func paraInfo(cmd *cobra.Command, args []string) { func paraInfo(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ptitle, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
height, _ := cmd.Flags().GetInt64("height") height, _ := cmd.Flags().GetInt64("height")
params := pt.ReqParacrossTitleHeight{ params := pt.ReqParacrossTitleHeight{
Title: ptitle, Title: paraName,
Height: height, Height: height,
} }
var res pt.ParacrossHeightStatusRsp var res pt.ParacrossHeightStatusRsp
...@@ -831,21 +795,15 @@ func getNodeGroupAddrsCmd() *cobra.Command { ...@@ -831,21 +795,15 @@ func getNodeGroupAddrsCmd() *cobra.Command {
Short: "Query super node group's current addrs by title", Short: "Query super node group's current addrs by title",
Run: nodeGroup, Run: nodeGroup,
} }
addNodeGroupCmdFlags(cmd)
return cmd return cmd
} }
func addNodeGroupCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
}
func nodeGroup(cmd *cobra.Command, args []string) { func nodeGroup(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ptitle, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
var res types.ReplyConfig var res types.ReplyConfig
ctx := jsonclient.NewRPCCtx(rpcLaddr, "paracross.GetNodeGroupAddrs", pt.ReqParacrossNodeInfo{Title: ptitle}, &res) ctx := jsonclient.NewRPCCtx(rpcLaddr, "paracross.GetNodeGroupAddrs", pt.ReqParacrossNodeInfo{Title: paraName}, &res)
ctx.Run() ctx.Run()
} }
...@@ -856,22 +814,15 @@ func nodeGroupStatusCmd() *cobra.Command { ...@@ -856,22 +814,15 @@ func nodeGroupStatusCmd() *cobra.Command {
Short: "query super node group apply status by title", Short: "query super node group apply status by title",
Run: nodeGroupStatus, Run: nodeGroupStatus,
} }
getNodeGroupStatusCmdFlags(cmd)
return cmd return cmd
} }
func getNodeGroupStatusCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("ptitle", "t", "", "parallel chain's title")
cmd.MarkFlagRequired("ptitle")
}
func nodeGroupStatus(cmd *cobra.Command, args []string) { func nodeGroupStatus(cmd *cobra.Command, args []string) {
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ptitle, _ := cmd.Flags().GetString("ptitle") paraName, _ := cmd.Flags().GetString("paraName")
params := pt.ReqParacrossNodeInfo{ params := pt.ReqParacrossNodeInfo{
Title: ptitle, Title: paraName,
} }
var res pt.ParaNodeGroupStatus var res pt.ParaNodeGroupStatus
......
plugin/dapp/paracross/commands/utils.go 0 → 100644
View file @ a16842cb
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package commands
import (
"strings"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/types"
)
// GetExecAddr 获取执行器地址
func GetExecAddr(exec string) (string, error) {
if ok := types.IsAllowExecName([]byte(exec), []byte(exec)); !ok {
return "", types.ErrExecNameNotAllow
}
addrResult := address.ExecAddress(exec)
result := addrResult
return result, nil
}
func getRealExecName(paraName string, name string) string {
if strings.HasPrefix(name, "user.p.") {
return name
}
return paraName + name
}
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