部分函数名称修改,删除多余注释代码

91e8c14a · yingqiumin@126.com · 1448e30d · 91e8c14a · 91e8c14a · 91e8c14a
Commit 91e8c14a authored Dec 12, 2019 by yingqiumin@126.com
21 changed files
--- a/build/dapp-test-common.sh
+++ b/build/dapp-test-common.sh
@@ -35,11 +35,11 @@ chain33_Http() {
    echo_rst "$4" "$rst" "$body"
 }

-chain33_DecodeRawTransactionTx() {
+chain33_SignAndSendTxWait() {
    # txHex="$1" priKey="$2" MAIN_HTTP="$3" FUNCNAME="$4"
    req='{"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$1"'"}]}'
    chain33_Http "$req" "$3" '(.result.txs[0].execer != "") and (.result.txs[0].execer != null)' "$4"
-    chain33_SignRawTx "$1" "$2" "$3"
+    chain33_SignAndSendTx "$1" "$2" "$3"
    chain33_BlockWait 1 "$3"
 }

@@ -134,7 +134,7 @@ chain33_ImportPrivkey() {
    [ "$ok" == true ]
 }

-chain33_SignRawTx() {
+chain33_SignAndSendTx() {
    local txHex="$1"
    local priKey="$2"
    local MAIN_HTTP=$3

--- a/plugin/dapp/autonomy/cmd/test/test-rpc.sh
+++ b/plugin/dapp/autonomy/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
-#txhash=""

 function run_testcases() {
    echo "run_testcases"

--- a/plugin/dapp/blackwhite/cmd/test/test-rpc.sh
+++ b/plugin/dapp/blackwhite/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set +e
 set -o pipefail

 MAIN_HTTP=""
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 gID=""
@@ -111,14 +108,10 @@ blackwhite_GetBlackwhiteloopResult() {
 function run_testcases() {
    #密钥
    sect1="123"
-    #结果base64.StdEncoding.EncodeToString(common.Sha256([]byte("0"+secret+black)))
-    # black == "1" white := "0"
-    #black0="O3LD8NyaeeSCc8xDfvBoacTrQlrY91FHT9ceEOXgs18="
    black1="6vm6gJ2wvEIxC8Yc6r/N6lIU5OZk633YMnIfwcZBD0o="
    black2="6FXx5aeDSCaq1UrhLO8u0H31Hl8TpvzxuHrgGo9WeFk="
    white0="DrNPzA68XiGimZE/igx70kTPJxnIJnVf8NCGnb7XoYU="
    white1="SB5Pnf6Umf2Wba0dqyNOezq5FEqTd22WPVYAhSA6Lxs="
-    #white2="OiexKDzIlS1CKr3KBNWEY1k5uXzDI/ou6Dd+x0ByQCM="

    #先创建账户地址
    chain33_NewAccount "label188"

--- a/plugin/dapp/dposvote/cmd/test/test-rpc.sh
+++ b/plugin/dapp/dposvote/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

 MAIN_HTTP=""
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
-CASE_ERR=""
-
-#eventId=""
-#txhash=""

 init() {
    ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')

--- a/plugin/dapp/evm/cmd/test/test-rpc.sh
+++ b/plugin/dapp/evm/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
-CASE_ERR=""
 evm_createContract_unsignedTx="0a0365766d129407228405608060405234801561001057600080fd5b50610264806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063b8e010de1461003b578063cc80f6f314610045575b600080fd5b6100436100c2565b005b61004d610109565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561008757818101518382015260200161006f565b50505050905090810190601f1680156100b45780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051808201909152600d8082527f5468697320697320746573742e000000000000000000000000000000000000006020909201918252610106916000916101a0565b50565b60008054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156101955780601f1061016a57610100808354040283529160200191610195565b820191906000526020600020905b81548152906001019060200180831161017857829003601f168201915b505050505090505b90565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106101e157805160ff191683800117855561020e565b8280016001018555821561020e579182015b8281111561020e5782518255916020019190600101906101f3565b5061021a92915061021e565b5090565b61019d91905b8082111561021a576000815560010161022456fea165627a7a72305820fec5dd5ca2cb47523ba08c04749bc5c14c435afee039f3047c2b7ea2faca737800293a8a025b7b22636f6e7374616e74223a66616c73652c22696e70757473223a5b5d2c226e616d65223a22736574222c226f757470757473223a5b5d2c2270617961626c65223a66616c73652c2273746174654d75746162696c697479223a226e6f6e70617961626c65222c2274797065223a2266756e6374696f6e227d2c7b22636f6e7374616e74223a747275652c22696e70757473223a5b5d2c226e616d65223a2273686f77222c226f757470757473223a5b7b226e616d65223a22222c2274797065223a22737472696e67227d5d2c2270617961626c65223a66616c73652c2273746174654d75746162696c697479223a2276696577222c2274797065223a2266756e6374696f6e227d5d20c0c7ee04309aedc4bcfba5beca5f3a223139746a5335316b6a7772436f535153313355336f7765376759424c6653666f466d"
 evm_createContract_para_unsignedTx="0a0f757365722e702e706172612e65766d129407228405608060405234801561001057600080fd5b50610264806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063b8e010de1461003b578063cc80f6f314610045575b600080fd5b6100436100c2565b005b61004d610109565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561008757818101518382015260200161006f565b50505050905090810190601f1680156100b45780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051808201909152600d8082527f5468697320697320746573742e000000000000000000000000000000000000006020909201918252610106916000916101a0565b50565b60008054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156101955780601f1061016a57610100808354040283529160200191610195565b820191906000526020600020905b81548152906001019060200180831161017857829003601f168201915b505050505090505b90565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106101e157805160ff191683800117855561020e565b8280016001018555821561020e579182015b8281111561020e5782518255916020019190600101906101f3565b5061021a92915061021e565b5090565b61019d91905b8082111561021a576000815560010161022456fea165627a7a7230582080ff1004de2195e6c08d0d0a65484b3d393c99c280e305cb383dbc89343cdd6a00293a8a025b7b22636f6e7374616e74223a66616c73652c22696e70757473223a5b5d2c226e616d65223a22736574222c226f757470757473223a5b5d2c2270617961626c65223a66616c73652c2273746174654d75746162696c697479223a226e6f6e70617961626c65222c2274797065223a2266756e6374696f6e227d2c7b22636f6e7374616e74223a747275652c22696e70757473223a5b5d2c226e616d65223a2273686f77222c226f757470757473223a5b7b226e616d65223a22222c2274797065223a22737472696e67227d5d2c2270617961626c65223a66616c73652c2273746174654d75746162696c697479223a2276696577222c2274797065223a2266756e6374696f6e227d5d20c0c7ee0430e1c7facdc1f199956c3a2231483969326a67464a594e5167573350695468694337796b7a5663653570764b7478"
 evm_creatorAddr="1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt"
@@ -14,29 +10,15 @@ evm_contractAddr=""
 evm_addr=""
 txHash=""

-#color
-RED='\033[1;31m'
-GRE='\033[1;32m'
-NOC='\033[0m'
-
-# $2=0 means true, other false
-function echo_rst() {
-    if [ "$2" -eq 0 ]; then
-        echo -e "${GRE}$1 ok${NOC}"
-    else
-        echo -e "${RED}$1 fail${NOC}"
-        CASE_ERR="FAIL"
-    fi
-}

 function evm_createContract() {
    validator=$1
    expectRes=$2
    if [ "$ispara" == "true" ]; then
        paraName="user.p.para."
-        chain33_SignRawTx "${evm_createContract_para_unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
+        chain33_SignAndSendTx "${evm_createContract_para_unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
    else
-        chain33_SignRawTx "${evm_createContract_unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
+        chain33_SignAndSendTx "${evm_createContract_unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
    fi
    txHash=$RAW_TX_HASH
    queryTransaction "${validator}" "${expectRes}"
@@ -65,7 +47,7 @@ function evm_callContract() {
        return
    fi

-    chain33_SignRawTx "${unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
+    chain33_SignAndSendTx "${unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
    txHash=$RAW_TX_HASH
    queryTransaction "${validator}" "${expectRes}"
    echo "CallContract queryExecRes end"
@@ -88,7 +70,7 @@ function evm_transfer() {
        return
    fi

-    chain33_SignRawTx "${unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
+    chain33_SignAndSendTx "${unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
    txHash=$RAW_TX_HASH
    queryTransaction "${validator}" "${expectRes}"
    echo "evm transfer queryExecRes end"
@@ -113,7 +95,7 @@ function evm_withDraw() {
        return
    fi

-    chain33_SignRawTx "${unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
+    chain33_SignAndSendTx "${unsignedTx}" "${evm_creatorAddr_key}" "$MAIN_HTTP"
    txHash=$RAW_TX_HASH
    queryTransaction "${validator}" "${expectRes}"
    echo "evm withdraw queryExecRes end"
@@ -165,8 +147,6 @@ function init() {
    echo "ipara=$ispara"

    local main_ip=${MAIN_HTTP//8901/8801}
-    #main chain import pri key
-    #1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt
    chain33_ImportPrivkey "0x4947ce3c4b845cfed59be2edf47320546116a3ff3af5715a7df094d116039b89" "1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt" "evm" "${main_ip}"

    local from="1PTXh2EZ8aRUzpuoDRASV19K86Kx3qQiPt"

--- a/plugin/dapp/game/cmd/test/test-rpc.sh
+++ b/plugin/dapp/game/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-# set -e
 set -o pipefail

 MAIN_HTTP=""
@@ -12,8 +10,6 @@ PRIVA_A="0xfa21dc33a6144c546537580d28d894355d1e9af7292be175808b0f5737c30849"
 PRIVA_B="0x213286d352b01fd740b6eaeb78a4fd316d743dd51d2f12c6789977430a41e0c7"

 EXECTOR=""
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 function chain33_GetExecAddr() {
@@ -27,7 +23,7 @@ function CreateGameTx() {
    local hash_value=$2
    local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"createGame", "payload":{"amount": '"${amount}"',"hashType":"sha256","hashValue":"'"${hash_value}"'"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "${RETURN_RESP}" "${PRIVA_A}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${RETURN_RESP}" "${PRIVA_A}" "${MAIN_HTTP}"
    GAME_ID=$RAW_TX_HASH

    echo_rst "CreateGame query_tx" "$?"
@@ -37,7 +33,7 @@ function MatchGameTx() {
    local gameId=$1
    local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"matchGame", "payload":{"gameId": "'"${gameId}"'","guess":2}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "MatchGame createRawTx" ".result"
-    chain33_SignRawTx "${RETURN_RESP}" "${PRIVA_B}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${RETURN_RESP}" "${PRIVA_B}" "${MAIN_HTTP}"
    echo_rst "MatchGame query_tx" "$?"
 }

@@ -47,7 +43,7 @@ function CloseGameTx() {
    local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"closeGame", "payload":{"gameId": "'"${gameId}"'","secret":"'"${secret}"'","result":1}}]}'

    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "CloseGame createRawTx" ".result"
-    chain33_SignRawTx "${RETURN_RESP}" "${PRIVA_A}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${RETURN_RESP}" "${PRIVA_A}" "${MAIN_HTTP}"
    echo_rst "CloseGame query_tx" "$?"
 }

@@ -56,7 +52,7 @@ function CancleGameTx() {
    local req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"cancelGame", "payload":{"gameId": "'"${gameId}"'"}}]}'

    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "CancleGame createRawTx" ".result"
-    chain33_SignRawTx "${RETURN_RESP}" "${PRIVA_A}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${RETURN_RESP}" "${PRIVA_A}" "${MAIN_HTTP}"
    echo_rst "CancleGame query_tx" "$?"
 }


--- a/plugin/dapp/guess/cmd/test/test-rpc.sh
+++ b/plugin/dapp/guess/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

 MAIN_HTTP=""
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
-CASE_ERR=""
 guess_admin_addr=12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv
 guess_user1_addr=1NrfEBfdFJUUqgbw5ZbHXhdew6NNQumYhM
 guess_user2_addr=17tRkBrccmFiVcLPXgEceRxDzJ2WaDZumN
@@ -21,7 +17,7 @@ txhash=""

 guess_game_start() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"guess","actionName":"Start", "payload":{"topic":"WorldCup Final","options":"A:France;B:Claodia","category":"football","maxBetsOneTime":10000000000,"maxBetsNumber":100000000000,"devFeeFactor":5,"devFeeAddr":"1D6RFZNp2rh6QdbcZ1d7RWuBUz61We6SD7","platFeeFactor":5,"platFeeAddr":"1PHtChNt3UcfssR7v7trKSk3WJtAWjKjjX"}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
    eventId="${txhash}"
 }

@@ -29,22 +25,22 @@ guess_game_bet() {
    local priv=$1
    local opt=$2
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"guess","actionName":"Bet", "payload":{"gameID":"'"${eventId}"'","option":"'"${opt}"'", "betsNum":500000000}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "${priv}" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "${priv}" ${MAIN_HTTP} "$FUNCNAME"
 }

 guess_game_stop() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"guess","actionName":"StopBet", "payload":{"gameID":"'"${eventId}"'"}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
 }

 guess_game_publish() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"guess","actionName":"Publish", "payload":{"gameID":"'"${eventId}"'","result":"A"}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
 }

 guess_game_abort() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"guess","actionName":"Abort", "payload":{"gameID":"'"${eventId}"'"}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C721CED01" ${MAIN_HTTP} "$FUNCNAME"
 }

 guess_QueryGameByID() {
@@ -67,10 +63,7 @@ init() {
    echo "guess_addr=$guess_addr"

    local main_ip=${MAIN_HTTP//8901/8801}
-    #main chain import pri key
-    #1NrfEBfdFJUUqgbw5ZbHXhdew6NNQumYhM
    chain33_ImportPrivkey "0xc889d2958843fc96d4bd3f578173137d37230e580d65e9074545c61e7e9c1932" "1NrfEBfdFJUUqgbw5ZbHXhdew6NNQumYhM" "guess11" "${main_ip}"
-    #17tRkBrccmFiVcLPXgEceRxDzJ2WaDZumN
    chain33_ImportPrivkey "0xf10c79470dc74c229c4ee73b05d14c58322b771a6c749d27824f6a59bb6c2d73" "17tRkBrccmFiVcLPXgEceRxDzJ2WaDZumN" "guess22" "$main_ip"

    local guess1="1NrfEBfdFJUUqgbw5ZbHXhdew6NNQumYhM"
@@ -83,14 +76,12 @@ init() {
        chain33_applyCoins "$guess2" 12000000000 "${main_ip}"
        chain33_QueryBalance "${guess2}" "$main_ip"
    else
-        # tx fee
        chain33_applyCoins "$guess1" 1000000000 "${main_ip}"
        chain33_QueryBalance "${guess1}" "$main_ip"

        chain33_applyCoins "$guess2" 1000000000 "${main_ip}"
        chain33_QueryBalance "${guess2}" "$main_ip"
        local para_ip="${MAIN_HTTP}"
-        #para chain import pri key
        chain33_ImportPrivkey "0xc889d2958843fc96d4bd3f578173137d37230e580d65e9074545c61e7e9c1932" "1NrfEBfdFJUUqgbw5ZbHXhdew6NNQumYhM" "guess11" "$para_ip"
        chain33_ImportPrivkey "0xf10c79470dc74c229c4ee73b05d14c58322b771a6c749d27824f6a59bb6c2d73" "17tRkBrccmFiVcLPXgEceRxDzJ2WaDZumN" "guess22" "$para_ip"


--- a/plugin/dapp/hashlock/cmd/test/test-rpc.sh
+++ b/plugin/dapp/hashlock/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

@@ -7,26 +6,24 @@ MAIN_HTTP=""

 addr_A=19vpbRuz2XtKopQS2ruiVuVZeRdLd5n4t3
 addr_B=1FcofeCgU1KYbB8dSa7cV2wjAF2RpMuUQD
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 hashlock_lock() {
    local secret=$1
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"hashlock","actionName":"HashlockLock", "payload":{"secret":"'"${secret}"'","amount":1000000000, "time":75,"toAddr":"'"${addr_B}"'", "returnAddr":"'"${addr_A}"'","fee":100000000}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "0x1089b7f980fc467f029b7ae301249b36e3b582c911b1af1a24616c83b3563dcb" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "0x1089b7f980fc467f029b7ae301249b36e3b582c911b1af1a24616c83b3563dcb" ${MAIN_HTTP} "$FUNCNAME"
 }

 hashlock_send() {
    local secret=$1
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"hashlock","actionName":"HashlockSend", "payload":{"secret":"'"${secret}"'","fee":100000000}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "0xb76a398c3901dfe5c7335525da88fda4df24c11ad11af4332f00c0953cc2910f" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "0xb76a398c3901dfe5c7335525da88fda4df24c11ad11af4332f00c0953cc2910f" ${MAIN_HTTP} "$FUNCNAME"
 }

 hashlock_unlock() {
    local secret=$1
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"hashlock","actionName":"HashlockUnlock", "payload":{"secret":"'"${secret}"'","fee":100000000}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "0x1089b7f980fc467f029b7ae301249b36e3b582c911b1af1a24616c83b3563dcb" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "0x1089b7f980fc467f029b7ae301249b36e3b582c911b1af1a24616c83b3563dcb" ${MAIN_HTTP} "$FUNCNAME"
 }

 init() {
@@ -39,10 +36,7 @@ init() {
    fi

    local main_ip=${MAIN_HTTP//8901/8801}
-    #main chain import pri key
-    #19vpbRuz2XtKopQS2ruiVuVZeRdLd5n4t3
    chain33_ImportPrivkey "0x1089b7f980fc467f029b7ae301249b36e3b582c911b1af1a24616c83b3563dcb" "19vpbRuz2XtKopQS2ruiVuVZeRdLd5n4t3" "hashlock1" "${main_ip}"
-    #1FcofeCgU1KYbB8dSa7cV2wjAF2RpMuUQD
    chain33_ImportPrivkey "0xb76a398c3901dfe5c7335525da88fda4df24c11ad11af4332f00c0953cc2910f" "1FcofeCgU1KYbB8dSa7cV2wjAF2RpMuUQD" "hashlock2" "$main_ip"

    local hashlock1="19vpbRuz2XtKopQS2ruiVuVZeRdLd5n4t3"

--- a/plugin/dapp/js/cmd/test/test-rpc.sh
+++ b/plugin/dapp/js/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
@@ -12,11 +9,6 @@ function init() {
    beneficiary_key=0xf146df80206194c81e0b3171db6aa40c7ad6182a24560698d4871d4dc75223ce
    beneficiary=1DwHQp8S7RS9krQTyrqePxRyvaLcuoQGks
    chain33_applyCoins "${beneficiary}" 10000000000 "${MAIN_HTTP}"
-    #paracross_get_money 12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv
-    #//beneficiary=12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv
-    #beneficiary_key=0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01
-    #owner=14KEKbYtKKQm4wMthSK9J4La4nAiidGozt
-    #owner_key=CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944
    echo "ipara=$ispara"
    manager_name="manage"
    exec_name="jsvm"
@@ -42,19 +34,19 @@ function init() {
 function configJSCreator() {
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'${manager_name}'","actionName":"Modify","payload":{"key":"js-creator","op":"add","value":"'${beneficiary}'"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${super_manager}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${super_manager}" "${MAIN_HTTP}"
 }

 function createJSContract() {
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'${exec_name}'","actionName":"Create","payload":{"name":"'${game}'","code":"'${jsCode}'"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${beneficiary_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${beneficiary_key}" "${MAIN_HTTP}"
 }

 function callJS() {
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"'${user_game}'","actionName":"Call","payload":{"name":"'${game}'","funcname":"hello","args":"{}"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${beneficiary_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${beneficiary_key}" "${MAIN_HTTP}"
 }

 function queryJS() {

--- a/plugin/dapp/lottery/cmd/test/test-rpc.sh
+++ b/plugin/dapp/lottery/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

 MAIN_HTTP=""
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 lottery_addCreator_unsignedTx="0a066d616e616765123c0a3a0a0f6c6f74746572792d63726561746f721222313271796f6361794e46374c7636433971573461767873324537553431664b5366761a0361646420a08d0630c788b8f7ccbadbc0703a223151344e687572654a784b4e4266373164323642394a336642516f5163666d657a32"
@@ -29,18 +26,15 @@ init() {

    if [[ $ispara == true ]]; then
        lottExecAddr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.lottery"}]}' ${MAIN_HTTP} | jq -r ".result")
-        chain33_SignRawTx "${lottery_addCreator_unsignedTx_para}" "${lottery_creator_priv}" ${MAIN_HTTP}
+        chain33_SignAndSendTx "${lottery_addCreator_unsignedTx_para}" "${lottery_creator_priv}" ${MAIN_HTTP}
    else
        lottExecAddr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"lottery"}]}' ${MAIN_HTTP} | jq -r ".result")
-        chain33_SignRawTx "${lottery_addCreator_unsignedTx}" "${lottery_creator_priv}" ${MAIN_HTTP}
+        chain33_SignAndSendTx "${lottery_addCreator_unsignedTx}" "${lottery_creator_priv}" ${MAIN_HTTP}
    fi
    echo "lottExecAddr=$lottExecAddr"

    local main_ip=${MAIN_HTTP//8901/8801}
-    #main chain import pri key
-    #1FLh9wBS2rat1mUS4G95hRpJt6yHYy5nHF
    chain33_ImportPrivkey "0x8223b757a5d0f91b12e7af3b9666ca33be47fe63e1502987b0537089aaf90bc1" "1FLh9wBS2rat1mUS4G95hRpJt6yHYy5nHF" "lottery1" "${main_ip}"
-    #1UWE6NfXPR7eNAjYgT4HMERp7cMMi486E
    chain33_ImportPrivkey "0xbfccb96690e0a1f89748b321f85b03e14bda0cb3d5d19f255ff0b9b0ffb624b3" "1UWE6NfXPR7eNAjYgT4HMERp7cMMi486E" "lottery2" "$main_ip"

    local ACCOUNT_A="1FLh9wBS2rat1mUS4G95hRpJt6yHYy5nHF"
@@ -53,14 +47,12 @@ init() {
        chain33_applyCoins "$ACCOUNT_B" 12000000000 "${main_ip}"
        chain33_QueryBalance "${ACCOUNT_B}" "$main_ip"
    else
-        # tx fee
        chain33_applyCoins "$ACCOUNT_A" 1000000000 "${main_ip}"
        chain33_QueryBalance "${ACCOUNT_A}" "$main_ip"

        chain33_applyCoins "$ACCOUNT_B" 1000000000 "${main_ip}"
        chain33_QueryBalance "${ACCOUNT_B}" "$main_ip"
        local para_ip="${MAIN_HTTP}"
-        #para chain import pri key
        chain33_ImportPrivkey "0x8223b757a5d0f91b12e7af3b9666ca33be47fe63e1502987b0537089aaf90bc1" "1FLh9wBS2rat1mUS4G95hRpJt6yHYy5nHF" "lottery1" "$para_ip"
        chain33_ImportPrivkey "0xbfccb96690e0a1f89748b321f85b03e14bda0cb3d5d19f255ff0b9b0ffb624b3" "1UWE6NfXPR7eNAjYgT4HMERp7cMMi486E" "lottery2" "$para_ip"

@@ -78,7 +70,7 @@ lottery_LotteryCreate() {
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not)' "$FUNCNAME" ".result"

    #发送交易
-    chain33_SignRawTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}
+    chain33_SignAndSendTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}

    gID="${RAW_TX_HASH}"
    echo "gameID $gID"
@@ -94,7 +86,7 @@ lottery_LotteryBuy() {
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not)' "$FUNCNAME" ".result"

    #发送交易
-    chain33_SignRawTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}
+    chain33_SignAndSendTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}
 }

 lottery_LotteryDraw() {
@@ -103,7 +95,7 @@ lottery_LotteryDraw() {
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"lottery","actionName":"LotteryDraw","payload":{"lotteryId":"'"$gID"'","fee":1000000}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not)' "$FUNCNAME" ".result"
    #发送交易
-    chain33_SignRawTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}
+    chain33_SignAndSendTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}
 }

 lottery_LotteryClose() {
@@ -112,7 +104,7 @@ lottery_LotteryClose() {
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"lottery","actionName":"LotteryClose","payload":{"lotteryId":"'"$gID"'","fee":1000000}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not)' "$FUNCNAME" ".result"
    #发送交易
-    chain33_SignRawTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}
+    chain33_SignAndSendTx "${RETURN_RESP}" "${priv}" ${MAIN_HTTP}
 }

 lottery_GetLotteryNormalInfo() {

--- a/plugin/dapp/multisig/cmd/test/test-rpc.sh
+++ b/plugin/dapp/multisig/cmd/test/test-rpc.sh
@@ -10,18 +10,9 @@ source ../dapp-test-common.sh

 Symbol="BTY"
 Asset="coins"
-#PrivKeyA="0x06c0fa653c719275d1baa365c7bc0b9306447287499a715b541b930482eaa504"
-#PrivKeyB="0x4c8663cded61093af20339ae038b3c6bfa58a33e65874a655022f82eaf3f2fa0"
-#PrivKeyC="0x9abcf378b397682109c174b37a45bfc8a459c9514dd2ef719e22a9815373047d"
-#PrivKeyD="0xbf8f865a03fec64f30d2243847807e88d2dbc8104e77925e4fc11c4d4380f3da"
-#PrivKeyE="0x5b8ca316cf073aa94f1056a9e3f6e0b9a9ec11ae45862d58c7a09640b4d55302"
-#PrivKeyGen="CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
 AddrA="1C5xK2ytuoFqxmVGMcyz9XFKFWcDA8T3rK"
 AddrB="1LDGrokrZjo1HtSmSnw8ef3oy5Vm1nctbj"
-#AddrC="1DkrXbz2bK6XMpY4v9z2YUnhwWTXT6V5jd"
-#AddrD="166po3ghRbRu53hu8jBBQzddp7kUJ9Ynyf"
 AddrE="1KHwX7ZadNeQDjBGpnweb4k2dqj2CWtAYo"
-#GenAddr="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"

 GenAddr="15wcitPEu1X1TBfrGfwN8GTkNTJoCmGc75"
 PrivKeyGen="0x295710fa409bd0b0bf928efa0994645edfe80a247d89c1e1637f90dc5e303f5e"
@@ -29,8 +20,7 @@ PrivKeyGen="0x295710fa409bd0b0bf928efa0994645edfe80a247d89c1e1637f90dc5e303f5e"
 multisigExecAddr=""
 multisigAccAddr=""
 execName=""
-#execCoins=""
-#symbolCoins=""
+
 function init() {
    ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
    echo "ipara=$ispara"
@@ -70,7 +60,7 @@ function init() {
 function multisig_AccCreateTx() {
    echo "========== # multisig_AccCreateTx begin  =========="
    txHex=$(curl -ksd '{"method":"multisig.MultiSigAccCreateTx","params":[{"owners":[{"ownerAddr":"'$AddrA'","weight":20},{"ownerAddr":"'$AddrB'","weight":10},{"ownerAddr":"'$GenAddr'","weight":30}],"requiredWeight":15,"dailyLimit":{"symbol":"'$Symbol'","execer":"'$Asset'","dailyLimit":1000000000}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #查看创建的多重签名地址是否ok
    data=$(curl -ksd '{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccCount","payload":{}}]}' ${MAIN_HTTP} | jq -r ".result.data")
@@ -78,7 +68,6 @@ function multisig_AccCreateTx() {

    #获取创建的多重签名地址
    multisigAccAddr=$(curl -ksd '{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccounts","payload":{"start":"0","end":"0"}}]}' ${MAIN_HTTP} | jq -r ".result.address[0]")
-    #   echo "multisigAccAddr=$multisigAccAddr"

    #多重签名地址查询具体信息
    req='{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccountInfo","payload":{"multiSigAccAddr":"'"$multisigAccAddr"'"}}]}'
@@ -96,30 +85,24 @@ function multisig_TransferInTx() {
    echo "========== # multisig_TransferInTx begin =========="
    #首先转账到multisig合约中
    txHex=$(curl -ksd '{"method":"Chain33.CreateRawTransaction","params":[{"to":"'"$multisigExecAddr"'","amount":5000000000,"fee":1,"note":"12312","execName":"'"$execName"'"}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #转账到multisigAccAddr地址中
    txHex=$(curl -ksd '{"method":"multisig.MultiSigAccTransferInTx","params":[{"symbol":"'$Symbol'","amount":4000000000,"note":"test ","execname":"'$Asset'","to":"'"$multisigAccAddr"'"}]}' ${MAIN_HTTP} | jq -r ".result")
-
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #查询multisigAccAddr地址资产信息
    req='{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccAssets","payload":{"multiSigAddr":"'"$multisigAccAddr"'","assets":{"execer":"'$Asset'","symbol":"'$Symbol'"},"isAll":false}}]}'
    resok='(.result.accAssets[0].assets.execer == "'$Asset'") and (.result.accAssets[0].assets.symbol == "'$Symbol'") and (.result.accAssets[0].account.frozen == "4000000000")'
    chain33_Http "$req" ${MAIN_HTTP} "$resok" "$FUNCNAME"
    echo "========== # multisig_TransferInTx end =========="
-
 }

 function multisig_TransferOutTx() {
    echo "========== # multisig_TransferOutTx begin =========="
    #由GenAddr账户签名从multisigAccAddr账户转出2000000000到AddrB
-
    txHex=$(curl -ksd '{"method":"multisig.MultiSigAccTransferOutTx","params":[{"symbol":"'$Symbol'","amount":2000000000,"note":"test ","execname":"coins","to":"'$AddrB'","from":"'"$multisigAccAddr"'"}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #查询AddrB账户在multisig合约下有2000000000
    req='{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccAssets","payload":{"multiSigAddr":"1LDGrokrZjo1HtSmSnw8ef3oy5Vm1nctbj","assets":{"execer":"coins","symbol":"'$Symbol'"},"isAll":false}}]}'
@@ -136,11 +119,8 @@ function multisig_TransferOutTx() {
 function multisig_OwnerOperateTx() {
    echo "========== # multisig_OwnerOperateTx begin =========="
    #通过GenAddr账户添加AddrE到多重签名账户的owner
-
    txHex=$(curl -ksd '{"method":"multisig.MultiSigOwnerOperateTx","params":[{"multiSigAccAddr":"'"$multisigAccAddr"'","newOwner":"'$AddrE'","newWeight":8,"operateFlag":1}]}' ${MAIN_HTTP} | jq -r ".result")
-
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #查询多重签名账户的信息中有AddrEmultisig_TransferInTx
    req='{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccountInfo","payload":{"multiSigAccAddr":"'"$multisigAccAddr"'"}}]}'
@@ -148,48 +128,37 @@ function multisig_OwnerOperateTx() {
    chain33_Http "$req" ${MAIN_HTTP} "$resok" "$FUNCNAME"

    #删除多重签名账户的信息中owner AddrE
-
    txHex=$(curl -ksd '{"method":"multisig.MultiSigOwnerOperateTx","params":[{"multiSigAccAddr":"'"$multisigAccAddr"'","oldOwner":"'$AddrE'","operateFlag":2}]}' ${MAIN_HTTP} | jq -r ".result")
-
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #修改多重签名账户中owner AddrA的weight为30
    txHex=$(curl -ksd '{"method":"multisig.MultiSigOwnerOperateTx","params":[{"multiSigAccAddr":"'"$multisigAccAddr"'","oldOwner":"'$AddrA'","newWeight":30,"operateFlag":3}]}' ${MAIN_HTTP} | jq -r ".result")
-
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #将多重签名账户中owner AddrA的地址替换成AddrE
    txHex=$(curl -ksd '{"method":"multisig.MultiSigOwnerOperateTx","params":[{"multiSigAccAddr":"'"$multisigAccAddr"'","oldOwner":"'$AddrA'","newOwner":"'$AddrE'","operateFlag":4}]}' ${MAIN_HTTP} | jq -r ".result")
-
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #查询多重签名账户的信息中有AddrE并且weight为30
    req='{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccountInfo","payload":{"multiSigAccAddr":"'"$multisigAccAddr"'"}}]}'
    resok='(.result.owners[0].ownerAddr == "'$AddrE'") and (.result.owners[0].weight == "30")'
    chain33_Http "$req" ${MAIN_HTTP} "$resok" "$FUNCNAME"
+    echo "========== # multisig_OwnerOperateTx end =========="
 }

 function multisig_AccOperateTx() {
    echo "========== # multisig_AccOperateTx begin =========="
    #修改每日限额的值为 Symbol：Asset dailyLimit=1200000000
    txHex=$(curl -ksd '{"method":"multisig.MultiSigAccOperateTx","params":[{"multiSigAccAddr":"'"$multisigAccAddr"'","dailyLimit":{"symbol":"'$Symbol'","execer":"'$Asset'","dailyLimit":1200000000}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #增加资产的配置 HYB：token dailyLimit=1000000000
-
    txHex=$(curl -ksd '{"method":"multisig.MultiSigAccOperateTx","params":[{"multiSigAccAddr":"'"$multisigAccAddr"'","dailyLimit":{"symbol":"HYB","execer":"token","dailyLimit":1000000000}}]}' ${MAIN_HTTP} | jq -r ".result")
-
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #修改RequiredWeight=16
    txHex=$(curl -ksd '{"method":"multisig.MultiSigAccOperateTx","params":[{"multiSigAccAddr":"'"$multisigAccAddr"'","newRequiredWeight":16,"operateFlag":true}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_SignRawTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}
-    #chain33_BlockWait 1 ${MAIN_HTTP}
+    chain33_SignAndSendTx "$txHex" "$PrivKeyGen" ${MAIN_HTTP}

    #获取本多重签名账户上的交易数，已经对应的交易信息
    req='{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigAccTxCount","payload":{"multiSigAccAddr":"'"$multisigAccAddr"'"}}]}'
@@ -199,6 +168,7 @@ function multisig_AccOperateTx() {
    req='{"method":"Chain33.Query","params":[{"execer":"multisig","funcName":"MultiSigTxInfo","payload":{"multiSigAddr":"'"$multisigAccAddr"'","txId":"7"}}]}'
    resok='(.result.txid == "7") and (.result.executed == true) and (.result.multiSigAddr == "'"$multisigAccAddr"'")'
    chain33_Http "$req" ${MAIN_HTTP} "$resok" "$FUNCNAME"
+    echo "========== # multisig_AccOperateTx end =========="
 }

 function run_test() {

--- a/plugin/dapp/oracle/cmd/test/test-rpc.sh
+++ b/plugin/dapp/oracle/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128

 MAIN_HTTP=""
 oracle_addPublisher_unsignedTx="0a066d616e61676512410a3f0a146f7261636c652d7075626c6973682d6576656e741222313271796f6361794e46374c7636433971573461767873324537553431664b5366761a0361646420a08d0630e6b685d696ee9394163a223151344e687572654a784b4e4266373164323642394a336642516f5163666d657a32"
@@ -8,7 +7,6 @@ oracle_publisher_key="4257D8692EF7FE13C68B65D6A52F03933DB2FA5CE8FAF210B5B8B80C72
 eventId=""
 txhash=""

-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 oracle_AddPublisher() {
@@ -16,16 +14,16 @@ oracle_AddPublisher() {
    ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
    echo "ispara=$ispara"
    if [ "$ispara" == true ]; then
-        chain33_SignRawTx "${oracle_addPublisher_unsignedTx_para}" "${oracle_publisher_key}" "${MAIN_HTTP}"
+        chain33_SignAndSendTx "${oracle_addPublisher_unsignedTx_para}" "${oracle_publisher_key}" "${MAIN_HTTP}"
    else
-        chain33_SignRawTx "${oracle_addPublisher_unsignedTx}" "${oracle_publisher_key}" "${MAIN_HTTP}"
+        chain33_SignAndSendTx "${oracle_addPublisher_unsignedTx}" "${oracle_publisher_key}" "${MAIN_HTTP}"
    fi
 }

 oracle_publish_transaction() {
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"EventPublish","payload":{"type":"football", "subType":"Premier League","time":1747814996,"content":"test","introduction":"test"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
    eventId="${txhash}"
    echo "eventId $eventId"
 }
@@ -34,28 +32,28 @@ oracle_prePublishResult_transaction() {
    event_id=$1
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"ResultPrePublish","payload":{"eventID":"'"$event_id"'", "source":"sina sport","result":"0:1"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
 }

 oracle_eventAbort_transaction() {
    event_id=$1
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"EventAbort","payload":{"eventID":"'"$event_id"'"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
 }

 oracle_resultAbort_transaction() {
    event_id=$1
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"ResultAbort","payload":{"eventID":"'"$event_id"'"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
 }

 oracle_publishResult_transaction() {
    event_id=$1
    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"ResultPublish","payload":{"eventID":"'"$event_id"'", "source":"sina sport","result":"1:1"}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
 }

 oracle_QueryOraclesByID() {

--- a/plugin/dapp/paracross/cmd/test/test-rpc.sh
+++ b/plugin/dapp/paracross/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128

-CASE_ERR=""
 UNIT_HTTP=""
 IS_PARA=false

-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 paracross_GetBlock2MainInfo() {
@@ -64,8 +61,6 @@ function paracross_Transfer_Withdraw_Inner() {
    local amount_should=27000
    #withdraw_should 应取款金额
    local withdraw_should=13000
-    #fee 交易费
-    #local fee=1000000
    #平行链转移前余额
    local para_balance_before
    #平行链转移后余额
@@ -92,9 +87,7 @@ function paracross_Transfer_Withdraw_Inner() {

    #2  存钱到合约地址
    tx_hash=$(curl -ksd '{"method":"Chain33.CreateRawTransaction","params":[{"to":"'"$paracross_addr"'","amount":'$amount_save'}]}' ${UNIT_HTTP} | jq -r ".result")
-    ##echo "tx:$tx"
-    chain33_SignRawTx "$tx_hash" "$privkey" ${UNIT_HTTP}
-    #paracross_SignAndSend $fee "$privkey" "$tx_hash"
+    chain33_SignAndSendTx "$tx_hash" "$privkey" ${UNIT_HTTP}

    #1. 查询资产转移前余额状态
    para_balance_before=$(paracross_QueryParaBalance "$from_addr" "paracross")
@@ -104,9 +97,7 @@ function paracross_Transfer_Withdraw_Inner() {

    #3  资产从主链转移到平行链
    tx_hash=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"'"$execer_name"'","actionName":"ParacrossAssetTransfer","payload":{"execName":"'"$execer_name"'","to":"'"$from_addr"'","amount":'$amount_should'}}]}' ${UNIT_HTTP} | jq -r ".result")
-    #echo "rawTx:$rawTx"
-    chain33_SignRawTx "$tx_hash" "$privkey" ${UNIT_HTTP}
-    #paracross_SignAndSend $fee "$privkey" "$tx_hash"
+    chain33_SignAndSendTx "$tx_hash" "$privkey" ${UNIT_HTTP}

    #4 查询转移后余额状态
    local times=100
@@ -127,7 +118,6 @@ function paracross_Transfer_Withdraw_Inner() {
                exit 1
            fi
        else
-            #echo "para_cross_transfer_withdraw success"
            count=$((count + 1))
            break
        fi
@@ -135,9 +125,7 @@ function paracross_Transfer_Withdraw_Inner() {

    #5 取钱
    tx_hash=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"'"$execer_name"'","actionName":"ParacrossAssetWithdraw","payload":{"IsWithdraw":true,"execName":"'"$execer_name"'","to":"'"$from_addr"'","amount":'$withdraw_should'}}]}' ${UNIT_HTTP} | jq -r ".result")
-    #echo "rawTx:$rawTx"
-    chain33_SignRawTx "$tx_hash" "$privkey" ${UNIT_HTTP}
-    #paracross_SignAndSend $fee "$privkey" "$tx_hash"
+    chain33_SignAndSendTx "$tx_hash" "$privkey" ${UNIT_HTTP}

    #6 查询取钱后余额状态
    local times=100
@@ -149,7 +137,6 @@ function paracross_Transfer_Withdraw_Inner() {
        #实际取钱金额
        para_withdraw_real=$((para_balance_after - para_balance_withdraw_after))
        main_withdraw_real=$((main_balance_withdraw_after - main_balance_after))
-        #echo $withdraw_real
        if [ "$withdraw_should" != "$para_withdraw_real" ] || [ "$withdraw_should" != "$main_withdraw_real" ]; then
            chain33_BlockWait 2 ${UNIT_HTTP}
            times=$((times - 1))
@@ -158,7 +145,6 @@ function paracross_Transfer_Withdraw_Inner() {
                exit 1
            fi
        else
-            #echo "para_cross_transfer_withdraw success"
            count=$((count + 1))
            break
        fi
@@ -181,7 +167,6 @@ function paracross_Transfer_Withdraw() {
    local execer_name="user.p.para.paracross"

    paracross_Transfer_Withdraw_Inner "$from_addr" "$privkey" "$paracross_addr" "$execer_name"
-
 }

 function paracross_IsSync() {
@@ -220,7 +205,6 @@ function paracross_ListNodeStatus() {
    chain33_Http '{"method":"paracross.ListNodeStatus","params":[{"title":"user.p.para.","status":4}]}' ${UNIT_HTTP} '(.error|not) and (.result| [has("status"),true])' "$FUNCNAME"
 }

-#main chain import pri key
 para_test_addr="1MAuE8QSbbech3bVKK2JPJJxYxNtT95oSU"
 para_test_prikey="0x24d1fad138be98eebee31440f144aa38c404533f40862995282162bc538e91c8"

@@ -243,7 +227,6 @@ function paracross_txgroupex() {
        exit 1
    fi
    tx_hash_asset=$(jq -r ".result" <<<"$resp")
-    #    tx_hash_asset=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"'"${paracross_execer_name}"'","actionName":"ParacrossAssetTransfer","payload":{"execName":"'"${paracross_execer_name}"'","to":"'"$para_test_addr"'","amount":'${amount_transfer}'}}]}' "${para_ip}" | jq -r ".result")

    #  资产从平行链转移到平行链合约
    req='"method":"Chain33.CreateTransaction","params":[{"execer":"'"${paracross_execer_name}"'","actionName":"TransferToExec","payload":{"execName":"'"${paracross_execer_name}"'","to":"'"${trade_exec_addr}"'","amount":'${amount_trade}', "cointoken":"coins.bty"}}]'
@@ -274,7 +257,6 @@ function paracross_txgroupex() {

    #send
    chain33_SendTx "${tx_sign2}" "${para_ip}"
-
 }

 #测试平行链交易组跨链失败,主链自动恢复原值
@@ -290,7 +272,6 @@ function paracross_testTxGroupFail() {
    echo "paracross_addr=$paracross_addr"

    #execer
-
    local trade_exec_addr="12bihjzbaYWjcpDiiy9SuAWeqNksQdiN13"
    #测试跨链过去１个,交易组转账８个失败的场景,主链应该还保持原来的
    local amount_trade=800000000
@@ -402,7 +383,7 @@ paracross_testSelfConsensStages() {
    req='"method":"Chain33.CreateTransaction","params":[{"execer" : "user.p.para.paracross","actionName" : "selfConsStageConfig","payload" : {"title":"user.p.para.","op" : "1", "stage" : {"startHeight":'"$newHeight"',"enable":2} }}]'
    resp=$(curl -ksd "{$req}" "${para_ip}")
    rawtx=$(jq -r ".result" <<<"$resp")
-    chain33_SignRawTx "$rawtx" "$para_test_prikey" "${para_ip}"
+    chain33_SignAndSendTx "$rawtx" "$para_test_prikey" "${para_ip}"

    echo "get stage apply id"
    req='"method":"paracross.ListSelfStages","params":[{"status":1,"count":1}]'
@@ -423,11 +404,11 @@ paracross_testSelfConsensStages() {
    resp=$(curl -ksd "{$req}" "${para_ip}")
    rawtx=$(jq -r ".result" <<<"$resp")
    echo "send vote 1"
-    chain33_SignRawTx "$rawtx" "$KS_PRI" "${para_ip}"
+    chain33_SignAndSendTx "$rawtx" "$KS_PRI" "${para_ip}"
    echo "send vote 2"
-    chain33_SignRawTx "$rawtx" "$JR_PRI" "${para_ip}" "110s"
+    chain33_SignAndSendTx "$rawtx" "$JR_PRI" "${para_ip}" "110s"
    echo "send vote 3"
-    chain33_SignRawTx "$rawtx" "$NL_PRI" "${para_ip}" "111s"
+    chain33_SignAndSendTx "$rawtx" "$NL_PRI" "${para_ip}" "111s"

    echo "query status"
    req='"method":"paracross.ListSelfStages","params":[{"status":3,"count":1}]'

--- a/plugin/dapp/pokerbull/cmd/test/test-rpc.sh
+++ b/plugin/dapp/pokerbull/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

 MAIN_HTTP=""
 GAME_ID=""

-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 pokerbull_PlayRawTx() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"pokerbull","actionName":"Play","payload":{"gameId":"pokerbull-abc", "value":"1000000000", "round":1}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" ${MAIN_HTTP} "$FUNCNAME"
 }

 pokerbull_QuitRawTx() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"pokerbull","actionName":"Quit","payload":{"gameId":"'$GAME_ID'"}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" ${MAIN_HTTP} "$FUNCNAME"
 }

 pokerbull_ContinueRawTx() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"pokerbull","actionName":"Continue","payload":{"gameId":"'$GAME_ID'"}}]}' ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "0xa26038cbdd9e6fbfb85f2c3d032254755e75252b9edccbecc16d9ba117d96705" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "0xa26038cbdd9e6fbfb85f2c3d032254755e75252b9edccbecc16d9ba117d96705" ${MAIN_HTTP} "$FUNCNAME"
 }

 pokerbull_StartRawTx() {
    tx=$(curl -ksd '{"method":"Chain33.CreateTransaction","params":[{"execer":"pokerbull","actionName":"Start","payload":{"value":"1000000000", "playerNum":"2"}}]}' ${MAIN_HTTP} | jq -r ".result")
    req='{"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.result.txs[0].execer != null)' "$FUNCNAME"
-    chain33_SignRawTx "$tx" "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" ${MAIN_HTTP}
+    chain33_SignAndSendTx "$tx" "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" ${MAIN_HTTP}
    GAME_ID=$RAW_TX_HASH
    chain33_BlockWait 1 "${MAIN_HTTP}"
 }
@@ -55,10 +53,7 @@ init() {
    fi

    local main_ip=${MAIN_HTTP//8901/8801}
-    #main chain import pri key
-    #14VkqML8YTRK4o15Cf97CQhpbnRUa6sJY4
    chain33_ImportPrivkey "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" "14VkqML8YTRK4o15Cf97CQhpbnRUa6sJY4" "pokerbull1" "${main_ip}"
-    #1MuVM87DLigWhJxLJKvghTa1po4ZdWtDv1
    chain33_ImportPrivkey "0xa26038cbdd9e6fbfb85f2c3d032254755e75252b9edccbecc16d9ba117d96705" "1MuVM87DLigWhJxLJKvghTa1po4ZdWtDv1" "pokerbull2" "$main_ip"

    local pokerbull1="14VkqML8YTRK4o15Cf97CQhpbnRUa6sJY4"
@@ -71,14 +66,12 @@ init() {
        chain33_applyCoins "$pokerbull2" 12000000000 "${main_ip}"
        chain33_QueryBalance "${pokerbull2}" "$main_ip"
    else
-        # tx fee
        chain33_applyCoins "$pokerbull1" 1000000000 "${main_ip}"
        chain33_QueryBalance "${pokerbull1}" "$main_ip"

        chain33_applyCoins "$pokerbull2" 1000000000 "${main_ip}"
        chain33_QueryBalance "${pokerbull2}" "$main_ip"
        local para_ip="${MAIN_HTTP}"
-        #para chain import pri key
        chain33_ImportPrivkey "0x0316d5e33e7bce2455413156cb95209f8c641af352ee5d648c647f24383e4d94" "14VkqML8YTRK4o15Cf97CQhpbnRUa6sJY4" "pokerbull1" "$para_ip"
        chain33_ImportPrivkey "0xa26038cbdd9e6fbfb85f2c3d032254755e75252b9edccbecc16d9ba117d96705" "1MuVM87DLigWhJxLJKvghTa1po4ZdWtDv1" "pokerbull2" "$para_ip"


--- a/plugin/dapp/privacy/cmd/test/test-rpc.sh
+++ b/plugin/dapp/privacy/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""

--- a/plugin/dapp/relay/cmd/test/test-rpc.sh
+++ b/plugin/dapp/relay/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
@@ -9,19 +6,19 @@ MAIN_HTTP=""
 relay_CreateRawRelaySaveBTCHeadTx() {
    local req='{"method":"relay.CreateRawRelaySaveBTCHeadTx","params":[{"hash":"5e7d9c599cd040ec2ba53f4dee28028710be8c135e779f65c56feadaae34c3f2","height":10,"version":536870912,"merkleRoot":"ab91cd4160e1379c337eee6b7a4bdbb7399d70268d86045aba150743c00c90b6","time":1530862108,"nonce":0,"bits":545259519,"previousHash":"604efe53975ab06cad8748fd703ad5bc960e8b752b2aae98f0f871a4a05abfc7","isReset":true}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
 }

 relay_CreateRawRelaySaveBTCHeadTx_11() {
    local req='{"method":"relay.CreateRawRelaySaveBTCHeadTx","params":[{"hash":"7b7a4a9b49db5a1162be515d380cd186e98c2bf0bb90f1145485d7c43343fc7c","height":11,"version":536870912,"merkleRoot":"cfa9b66696aea63b7266ffaa1cb4b96c8dd6959eaabf2eb14173f4adaa551f6f","time":1530862108,"nonce":1,"bits":545259519,"previousHash":"5e7d9c599cd040ec2ba53f4dee28028710be8c135e779f65c56feadaae34c3f2","isReset":false}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
 }

 relay_CreateRawRelayOrderTx() {
    local req='{"method":"relay.CreateRawRelayOrderTx","params":[{"operation":0,"coin":"BTC","amount":299000000,"addr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT","btyAmount":1000000000,"coinWaits":6}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
 }

 relay_CreateRawRelayAcceptTx() {
@@ -36,7 +33,7 @@ relay_CreateRawRelayAcceptTx() {

    local req='{"method":"relay.CreateRawRelayAcceptTx","params":[{"orderId":"'"$id"'","coinAddr":"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT"}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "0xec9162ea5fc2f473ab8240619a0a0f495ba9e9e5d4d9c434b8794a68280236c4" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "0xec9162ea5fc2f473ab8240619a0a0f495ba9e9e5d4d9c434b8794a68280236c4" "${MAIN_HTTP}"
 }

 relay_CreateRawRelayRevokeTx() {
@@ -51,7 +48,7 @@ relay_CreateRawRelayRevokeTx() {

    local req='{"method":"relay.CreateRawRelayRevokeTx","params":[{"orderId":"'"$id"'","target":0,"action":1}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "0x22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "${MAIN_HTTP}"
 }

 relay_CreateRawRelayConfirmTx() {
@@ -66,7 +63,7 @@ relay_CreateRawRelayConfirmTx() {

    local req='{"method":"relay.CreateRawRelayConfirmTx","params":[{"orderId":"'"$id"'","rawTx":"6359f0868171b1d194cbee1af2f16ea598ae8fad666d9b012c8ed2b79a236ec4"}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "0xec9162ea5fc2f473ab8240619a0a0f495ba9e9e5d4d9c434b8794a68280236c4" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "0xec9162ea5fc2f473ab8240619a0a0f495ba9e9e5d4d9c434b8794a68280236c4" "${MAIN_HTTP}"
 }

 query_GetRelayOrderByStatus() {
@@ -109,10 +106,7 @@ init() {

    local main_ip=${MAIN_HTTP//8901/8801}

-    #main chain import pri key
-    #1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3
    chain33_ImportPrivkey "22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3" "relay_sell" "${main_ip}"
-    #1EZKahMRfoMiKp1BewjWrQWoaJ9kmC4hum
    chain33_ImportPrivkey "ec9162ea5fc2f473ab8240619a0a0f495ba9e9e5d4d9c434b8794a68280236c4" "1EZKahMRfoMiKp1BewjWrQWoaJ9kmC4hum" "relay_acc" "$main_ip"

    local sellAddr="1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3"
@@ -125,14 +119,12 @@ init() {
        chain33_applyCoins "$accepAddr" 12000000000 "${main_ip}"
        chain33_QueryBalance "${accepAddr}" "$main_ip"
    else
-        # tx fee
        chain33_applyCoins "$sellAddr" 1000000000 "${main_ip}"
        chain33_QueryBalance "${sellAddr}" "$main_ip"

        chain33_applyCoins "$accepAddr" 1000000000 "${main_ip}"
        chain33_QueryBalance "${accepAddr}" "$main_ip"
        local para_ip="${MAIN_HTTP}"
-        #para chain import pri key
        chain33_ImportPrivkey "22968d29c6de695381a8719ef7bf00e2edb6cce500bb59a4fc73c41887610962" "1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3" "relay_sell" "$para_ip"
        chain33_ImportPrivkey "ec9162ea5fc2f473ab8240619a0a0f495ba9e9e5d4d9c434b8794a68280236c4" "1EZKahMRfoMiKp1BewjWrQWoaJ9kmC4hum" "relay_acc" "$para_ip"


--- a/plugin/dapp/retrieve/cmd/test/test-rpc.sh
+++ b/plugin/dapp/retrieve/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

 MAIN_HTTP=""

-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 # TODO
@@ -19,7 +17,7 @@ function updateConfig() {
        return
    fi

-    chain33_SignRawTx "${unsignedTx}" "0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${unsignedTx}" "0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01" "${MAIN_HTTP}"
 }

 function token_preCreate() {
@@ -29,7 +27,7 @@ function token_preCreate() {
        return
    fi

-    chain33_SignRawTx "${unsignedTx}" "0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${unsignedTx}" "0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01" "${MAIN_HTTP}"
 }

 function token_finish() {
@@ -39,7 +37,7 @@ function token_finish() {
        return
    fi

-    chain33_SignRawTx "${unsignedTx}" "0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${unsignedTx}" "0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01" "${MAIN_HTTP}"
 }

 function token_sendExec() {
@@ -49,7 +47,7 @@ function token_sendExec() {
        return
    fi

-    chain33_SignRawTx "${unsignedTx}" "$3" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${unsignedTx}" "$3" "${MAIN_HTTP}"
 }

 function createToken() {
@@ -63,31 +61,31 @@ function createToken() {
 retrieve_Backup() {
    local req='{"method":"retrieve.CreateRawRetrieveBackupTx","params":[{"backupAddr":"'$retrieve1'","defaultAddr":"'$retrieve2'","delayPeriod": 61}]}'
    tx=$(curl -ksd "$req" ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "$retrieve2_key" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "$retrieve2_key" ${MAIN_HTTP} "$FUNCNAME"
 }

 retrieve_Prepare() {
    local req='{"method":"retrieve.CreateRawRetrievePrepareTx","params":[{"backupAddr":"'$retrieve1'","defaultAddr":"'$retrieve2'"}]}'
    tx=$(curl -ksd "$req" ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "$retrieve1_key" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "$retrieve1_key" ${MAIN_HTTP} "$FUNCNAME"
 }

 retrieve_Perform() {
    local req='{"method":"retrieve.CreateRawRetrievePerformTx","params":[{"backupAddr":"'$retrieve1'","defaultAddr":"'$retrieve2'"}]}'
    tx=$(curl -ksd "$req" ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "$retrieve1_key" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "$retrieve1_key" ${MAIN_HTTP} "$FUNCNAME"
 }

 retrieve_Perform_Token() {
    local req='{"method":"retrieve.CreateRawRetrievePerformTx","params":[{"backupAddr":"'$retrieve1'","defaultAddr":"'$retrieve2'","assets": [{"exec":"token","symbol":"'"$symbol"'"}] }]}'
    tx=$(curl -ksd "$req" ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "$retrieve1_key" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "$retrieve1_key" ${MAIN_HTTP} "$FUNCNAME"
 }

 retrieve_Cancel() {
    local req='{"method":"retrieve.CreateRawRetrieveCancelTx","params":[{"backupAddr":"'$retrieve1'","defaultAddr":"'$retrieve2'"}]}'
    tx=$(curl -ksd "$req" ${MAIN_HTTP} | jq -r ".result")
-    chain33_DecodeRawTransactionTx "$tx" "$retrieve2_key" ${MAIN_HTTP} "$FUNCNAME"
+    chain33_SignAndSendTxWait "$tx" "$retrieve2_key" ${MAIN_HTTP} "$FUNCNAME"
 }

 retrieve_QueryResult() {
@@ -126,7 +124,6 @@ init() {
    chain33_applyCoins "${retrieve2}" 10000000000 "${MAIN_HTTP}"

    if [ "$ispara" == true ]; then
-        # for fee
        local main_ip=${MAIN_HTTP//8901/8801}
        chain33_applyCoins "${retrieve1}" 1000000000 "${main_ip}"
        chain33_applyCoins "${retrieve2}" 1000000000 "${main_ip}"

--- a/plugin/dapp/ticket/cmd/test/test-rpc.sh
+++ b/plugin/dapp/ticket/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
 set -e
 set -o pipefail

 MAIN_HTTP=""

-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 ticketId=""
@@ -19,7 +17,7 @@ ticket_CreateBindMiner() {
    amount=$4
    req='{"method":"ticket.CreateBindMiner","params":[{"bindAddr":"'"$minerAddr"'", "originAddr":"'"$returnAddr"'", "amount":'"$amount"', "checkBalance":true}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not)' "$FUNCNAME" ".result.txHex"
-    chain33_SignRawTx "$RETURN_RESP" "${returnPriv}" ${MAIN_HTTP}
+    chain33_SignAndSendTx "$RETURN_RESP" "${returnPriv}" ${MAIN_HTTP}
 }

 ticket_SetAutoMining() {

--- a/plugin/dapp/token/cmd/test/test-rpc.sh
+++ b/plugin/dapp/token/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
-CASE_ERR=""
 tokenAddr="1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
 recvAddr="1CLrYLNhHfCfMUV7mtdqhbMSF6vGmtTvzq"
 superManager="0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc"
 tokenSymbol="ABCDE"
 token_addr=""
 execName="token"
-#txHash=""
-
-#color
-#RED='\033[1;31m'
-#GRE='\033[1;32m'
-#NOC='\033[0m'
-
-# $2=0 means true, other false
-#function echo_rst() {
-#    if [ "$2" -eq 0 ]; then
-#        echo -e "${GRE}$1 ok${NOC}"
-#    else
-#        echo -e "${RED}$1 fail${NOC}"
-#        CASE_ERR="FAIL"
-#    fi
-#}

 # 查询交易的执行结果
 # 根据传入的规则，校验查询的结果 （参数1: 校验规则 参数2: 预期匹配结果）
@@ -44,8 +24,7 @@ function queryTransaction() {
 }

 function signRawTxAndQuery() {
-    chain33_SignRawTx "${unsignedTx}" "${superManager}" "${MAIN_HTTP}"
-    #  txHash=$RAW_TX_HASH
+    chain33_SignAndSendTx "${unsignedTx}" "${superManager}" "${MAIN_HTTP}"
    queryTransaction ".error | not" "true"
    echo_rst "$1 queryExecRes" "$?"
 }
@@ -56,8 +35,6 @@ function init() {
    chain33_ImportPrivkey "${superManager}" "${tokenAddr}" "tokenAddr" "${MAIN_HTTP}"

    local main_ip=${MAIN_HTTP//8901/8801}
-    #main chain import pri key
-    #1CLrYLNhHfCfMUV7mtdqhbMSF6vGmtTvzq
    chain33_ImportPrivkey "0x882c963ce2afbedc2353cb417492aa9e889becd878a10f2529fc9e6c3b756128" "1CLrYLNhHfCfMUV7mtdqhbMSF6vGmtTvzq" "token1" "${main_ip}"

    local ACCOUNT_A="1CLrYLNhHfCfMUV7mtdqhbMSF6vGmtTvzq"
@@ -66,12 +43,10 @@ function init() {
        chain33_applyCoins "$ACCOUNT_A" 12000000000 "${main_ip}"
        chain33_QueryBalance "${ACCOUNT_A}" "$main_ip"
    else
-        # tx fee
        chain33_applyCoins "$ACCOUNT_A" 1000000000 "${main_ip}"
        chain33_QueryBalance "${ACCOUNT_A}" "$main_ip"

        local para_ip="${MAIN_HTTP}"
-        #para chain import pri key
        chain33_ImportPrivkey "0x882c963ce2afbedc2353cb417492aa9e889becd878a10f2529fc9e6c3b756128" "1CLrYLNhHfCfMUV7mtdqhbMSF6vGmtTvzq" "token1" "$para_ip"

        chain33_applyCoins "$ACCOUNT_A" 12000000000 "${para_ip}"
@@ -181,7 +156,6 @@ function token_burn() {
        echo_rst "token burn create tx" 1
        return
    fi
-
    signRawTxAndQuery "$FUNCNAME"
 }

@@ -191,7 +165,6 @@ function token_mint() {
        echo_rst "token mint create tx" 1
        return
    fi
-
    signRawTxAndQuery "$FUNCNAME"
 }
 function token_transfer() {
@@ -200,7 +173,6 @@ function token_transfer() {
        echo_rst "token transfer create tx" 1
        return
    fi
-
    signRawTxAndQuery "$FUNCNAME"
 }

@@ -210,7 +182,6 @@ function token_sendExec() {
        echo_rst "token sendExec create tx" 1
        return
    fi
-
    signRawTxAndQuery "$FUNCNAME"
 }

@@ -220,13 +191,11 @@ function token_withdraw() {
        echo_rst "token withdraw create tx" 1
        return
    fi
-
    signRawTxAndQuery "$FUNCNAME"
 }

 function run_test() {
    local ip=$1
-    #    set -x
    token_preCreate
    token_getPreCreated

@@ -240,7 +209,6 @@ function run_test() {
    token_sendExec
    token_assets
    token_withdraw
-    #   set +x
 }

 function main() {

--- a/plugin/dapp/trade/cmd/test/test-rpc.sh
+++ b/plugin/dapp/trade/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
-CASE_ERR=""
 trade_addr=""
 tradeAddr="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 tradeBuyerAddr="1CvLe1qNaC7tCf5xmfAqJ9UJkMhtmhUKNg"
@@ -169,7 +165,7 @@ function queryTransaction() {
 }

 function signRawTxAndQuery() {
-    chain33_SignRawTx "${unsignedTx}" "$2" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "${unsignedTx}" "$2" "${MAIN_HTTP}"
    queryTransaction ".error | not" "true"
    echo_rst "$1 queryExecRes" "$?"
 }
@@ -193,8 +189,6 @@ function init() {
    fi

    local main_ip=${MAIN_HTTP//8901/8801}
-    #main chain import pri key
-    #1CvLe1qNaC7tCf5xmfAqJ9UJkMhtmhUKNg
    chain33_ImportPrivkey "0xaeef1ad76d43a2056d0dcb57d5bf1ba96471550614ab9e7f611ef9c5ca403f42" "1CvLe1qNaC7tCf5xmfAqJ9UJkMhtmhUKNg" "trade1" "${main_ip}"

    local ACCOUNT_A="1CvLe1qNaC7tCf5xmfAqJ9UJkMhtmhUKNg"
@@ -203,12 +197,10 @@ function init() {
        chain33_applyCoins "$ACCOUNT_A" 12000000000 "${main_ip}"
        chain33_QueryBalance "${ACCOUNT_A}" "$main_ip"
    else
-        # tx fee
        chain33_applyCoins "$ACCOUNT_A" 1000000000 "${main_ip}"
        chain33_QueryBalance "${ACCOUNT_A}" "$main_ip"

        local para_ip="${MAIN_HTTP}"
-        #para chain import pri key
        chain33_ImportPrivkey "0xaeef1ad76d43a2056d0dcb57d5bf1ba96471550614ab9e7f611ef9c5ca403f42" "1CvLe1qNaC7tCf5xmfAqJ9UJkMhtmhUKNg" "trade1" "$para_ip"

        chain33_applyCoins "$ACCOUNT_A" 12000000000 "${para_ip}"

--- a/plugin/dapp/unfreeze/cmd/test/test-rpc.sh
+++ b/plugin/dapp/unfreeze/cmd/test/test-rpc.sh
 #!/usr/bin/env bash
-# shellcheck disable=SC2128
-
-# shellcheck source=/dev/null
 source ../dapp-test-common.sh

 MAIN_HTTP=""
@@ -27,7 +24,6 @@ function query_unfreezeID() {
            fi
        else
            unfreeze_id=$(jq '(.result.receipt.logs['"$uid_index"'].log.current.unfreezeID)' <<<"$ret")
-            #echo "${unfreeze_id}"
            unfreeze_id2=${unfreeze_id#\"mavl-unfreeze-}
            uid=${unfreeze_id2%\"}
            echo -e "${GRE}====query tx=$txhash  success${NOC}"
@@ -75,7 +71,7 @@ function init() {
 function CreateRawUnfreezeCreate() {
    req='{"jsonrpc": "2.0", "method" :  "unfreeze.CreateRawUnfreezeCreate" , "params":[{"startTime":10000,"assetExec":"coins","assetSymbol":"'$symbol'","totalCount":400000000,"beneficiary":"'$beneficiary'","means":"FixAmount","fixAmount": {"period":10,"amount":1000000}}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "$owner_key" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "$owner_key" "${MAIN_HTTP}"
    query_unfreezeID
 }

@@ -83,13 +79,13 @@ function CreateRawUnfreezeWithdraw() {
    sleep 10
    req='{"method":"unfreeze.CreateRawUnfreezeWithdraw","params":[{"unfreezeID":"'${uid}'"}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "${beneficiary_key}" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "${beneficiary_key}" "${MAIN_HTTP}"
 }

 function CreateRawUnfreezeTerminate() {
    req='{"method":"unfreeze.CreateRawUnfreezeTerminate","params":[{"unfreezeID":"'${uid}'"}]}'
    chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
-    chain33_SignRawTx "$RETURN_RESP" "$owner_key" "${MAIN_HTTP}"
+    chain33_SignAndSendTx "$RETURN_RESP" "$owner_key" "${MAIN_HTTP}"
    chain33_BlockWait 2 "${MAIN_HTTP}"
 }