Merge remote-tracking branch 'upstream/master'

build/docker-compose.sh

@@ -78,6 +78,9 @@ function base_init() {
     sed -i $sedfix 's/^Title.*/Title="local"/g' chain33.toml
     sed -i $sedfix 's/^TestNet=.*/TestNet=true/g' chain33.toml
 
+    sed -i $sedfix 's/^powLimitBits=.*/powLimitBits="0x1f2fffff"/g' chain33.toml
+    sed -i $sedfix 's/^targetTimePerBlock=.*/targetTimePerBlock=1/g' chain33.toml
+
     # p2p
     sed -i $sedfix 's/^seeds=.*/seeds=["chain33:13802","chain32:13802","chain31:13802"]/g' chain33.toml
     #sed -i $sedfix 's/^enable=.*/enable=true/g' chain33.toml
@@ -366,7 +369,7 @@ function rpc_test() {
         dapp_test_rpc "http://${1}:8801"
     fi
     if [ "$DAPP" == "paracross" ]; then
-        #system_test_rpc "http://${1}:8901"
+        system_test_rpc "http://${1}:8901"
         dapp_test_address "${CLI}"
         dapp_test_rpc "http://${1}:8901"
     fi
@@ -396,7 +399,7 @@ function main() {
     dapp_run test "${ip}"
 
     ### rpc test  ###
-    rpc_test "${ip}"
+    #    rpc_test "${ip}"
 
     ### finish ###
     check_docker_container

chain33.toml

@@ -92,7 +92,7 @@ fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
-powLimitBits = "0x1f00ffff"
+powLimitBits="0x1f00ffff"
 retargetAdjustmentFactor = 4
 futureBlockTime = 16
 ticketFrozenTime = 5    #5s only for test
@@ -100,7 +100,7 @@ ticketWithdrawTime = 10 #10s only for test
 ticketMinerWaitTime = 2 #2s only for test
 maxTxNumber = 1600      #160
 targetTimespan = 2304
-targetTimePerBlock = 16
+targetTimePerBlock=16
 
 [mver.consensus.ForkChainParamV1]
 futureBlockTime = 15
@@ -136,12 +136,12 @@ returnAddr="1KcCVZLSQYRUwE5EXTsAoQs9LuJW6xwfQa"
 count=10000
 
 [store]
-name="mavl"
+name="kvmvccmavl"
 driver="leveldb"
 dbPath="datadir/mavltree"
 dbCache=128
 # store数据库版本
-storedbVersion="1.0.0"
+storedbVersion="2.0.0"
 
 [store.sub.mavl]
 enableMavlPrefix=false
@@ -154,6 +154,7 @@ enableMemTree=true
 enableMemVal=true
 
 [store.sub.kvmvccmavl]
+enableMVCCIter=true
 enableMavlPrefix=false
 enableMVCC=false
 enableMavlPrune=false

plugin/dapp/game/cmd/Makefile

+all:
+	chmod +x ./build.sh
+	./build.sh $(OUT) $(FLAG)
\ No newline at end of file

plugin/dapp/game/cmd/build.sh

+#!/usr/bin/env bash
+
+strpwd=$(pwd)
+strcmd=${strpwd##*dapp/}
+strapp=${strcmd%/cmd*}
+
+OUT_DIR="${1}/$strapp"
+OUT_TESTDIR="${1}/dapptest/$strapp"
+
+PARACLI="${OUT_DIR}/chain33-para-cli"
+PARANAME=para
+SRC_CLI=github.com/33cn/plugin/cli
+
+go build -v -o "${PARACLI}" -ldflags "-X ${SRC_CLI}/buildflags.ParaName=user.p.${PARANAME}. -X ${SRC_CLI}/buildflags.RPCAddr=http://localhost:8901" "${SRC_CLI}"
+# shellcheck disable=SC2086
+cp ./build/* "${OUT_DIR}"
+
+mkdir -p "${OUT_TESTDIR}"
+cp ./build/* "${OUT_TESTDIR}"

plugin/dapp/game/cmd/build/test-rpc.sh

+#!/usr/bin/env bash
+# shellcheck disable=SC2128
+set -e
+set -o pipefail
+
+MAIN_HTTP=""
+CASE_ERR=""
+GAME_ID=""
+PASSWD="ABCD"
+HASH_VALUE=$(echo -n "ABCD1" | sha256sum | awk '{print $1}')
+signedTx=""
+txHash=""
+ACCOUNT_A="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
+# PRIVA_A="cc38546e9e659d15e6b4893f0ab32a06d103931a8230b0bde71459d2b27d6944"
+ACCOUNT_B="19MJmA7GcE1NfMwdGqgLJioBjVbzQnVYvR"
+PRIVA_B="5072a3b6ed612845a7c00b88b38e4564093f57ce652212d6e26da9fded83e951"
+EXECTOR=""
+#color
+RED='\033[1;31m'
+GRE='\033[1;32m'
+NOC='\033[0m'
+
+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 chain33_GetExecAddr() {
+    #获取GAME合约地址
+    local exector=$1
+    local req='"method":"Chain33.ConvertExectoAddr","params":[{"execname":"'"${exector}"'"}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    echo "#response: $resp"
+    # GAME_ADDR=$(echo "${res}" | jq -r ".result")
+    echo_rst "$FUNCNAME" "$?"
+}
+
+function CreateGameTx() {
+    local amount=$1
+    local hash_value=$2
+    local addr=$3
+    local req='"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"createGame", "payload":{"amount": '"${amount}"',"hashType":"sha256","hashValue":"'"${hash_value}"'"}}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    echo "#response: $resp"
+    rawTx=$(echo "${resp}" | jq -r ".result")
+    if [ "$rawTx" == "null" ]; then
+        echo_rst "CreateGame createRawTx" 1
+    fi
+    signRawTx "${rawTx}" "${ACCOUNT_A}"
+    echo_rst "CreateGame signRawTx" "$?"
+    sendSignedTx
+    echo_rst "CreateGame sendSignedTx" "$?"
+    GAME_ID="${txHash}"
+    # create_txHash="${txHash}"
+    query_tx "${txHash}"
+    echo_rst "CreateGame query_tx" "$?"
+}
+
+function MatchGameTx() {
+    local gameId=$1
+    local req='"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"matchGame", "payload":{"gameId": "'"${gameId}"'","guess":2}}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    echo "#response: $resp"
+    rawTx=$(echo "${resp}" | jq -r ".result")
+    if [ "$rawTx" == "null" ]; then
+        echo_rst "MatchGame createRawTx" 1
+    fi
+    signRawTx "${rawTx}" "${ACCOUNT_B}"
+    echo_rst "MatchGame signRawTx" "$?"
+    sendSignedTx
+    echo_rst "MatchGame sendSignedTx" "$?"
+    # match_txHash="${txHash}"
+    query_tx "${txHash}"
+    echo_rst "MatchGame query_tx" "$?"
+}
+
+function CloseGameTx() {
+    local gameId=$1
+    local secret=$2
+    local req='"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"closeGame", "payload":{"gameId": "'"${gameId}"'","secret":"'"${secret}"'","result":1}}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    echo "#response: $resp"
+    rawTx=$(echo "${resp}" | jq -r ".result")
+    if [ "$rawTx" == "null" ]; then
+        echo_rst "CloseGame createRawTx" 1
+    fi
+    signRawTx "${rawTx}" "${ACCOUNT_A}"
+    echo_rst "CloseGame signRawTx" "$?"
+    sendSignedTx
+    echo_rst "CloseGame sendSignedTx" "$?"
+    query_tx "${txHash}"
+    echo_rst "CloseGame query_tx" "$?"
+}
+
+function CancleGameTx() {
+    local gameId=$1
+    local req='"method":"Chain33.CreateTransaction","params":[{"execer":"'"${EXECTOR}"'", "actionName":"cancelGame", "payload":{"gameId": "'"${gameId}"'"}}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    echo "#response: $resp"
+    rawTx=$(echo "${resp}" | jq -r ".result")
+    if [ "$rawTx" == "null" ]; then
+        echo_rst "CancleGame createRawTx" 1
+    fi
+    signRawTx "${rawTx}" "${ACCOUNT_A}"
+    echo_rst "CancleGame signRawTx" "$?"
+    sendSignedTx
+    echo_rst "CancleGame sendSignedTx" "$?"
+    # close_txHash="${txHash}"
+    query_tx "${txHash}"
+    echo_rst "CancleGame query_tx" "$?"
+}
+
+function QueryGameByStatus() {
+    local status=$1
+    local req='"method":"Chain33.Query","params":[{"execer":"'"${EXECTOR}"'","funcName":"QueryGameListByStatusAndAddr","payload":{"status":'"${status}"',"address":""}}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    echo "#response: $resp"
+    GAMES=$(echo "${resp}" | jq -r ".result.games")
+    echo "${GAMES}"
+    echo_rst "$FUNCNAME" "$?"
+}
+
+function QueryGameByGameId() {
+    local gameId=$1
+    local status=$2
+    local req='"method":"Chain33.Query","params":[{"execer":"'"${EXECTOR}"'","funcName":"QueryGameById","payload":{"gameId":"'"${gameId}"'"}}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    echo "#response: $resp"
+    STATUS=$(echo "${resp}" | jq -r ".result.game.status")
+    if [ "${STATUS}" -ne "${status}" ]; then
+        echo "status is not equal"
+        echo_rst "QueryGameByGameId" 1
+        return 0
+    fi
+    echo_rst "QueryGameByGameId" 0
+}
+
+function chain33_ImportPrivkey() {
+    local pri=$2
+    #local acc=$3
+    local req='"method":"Chain33.ImportPrivkey", "params":[{"privkey":"'"$pri"'", "label":"gameB"}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "$1")
+    echo "#response: $resp"
+    # ok=$(jq '(.error|not) and (.result.label=="gameB") and (.result.acc.addr == "'"$acc"'")' <<<"$resp")
+    # [ "$ok" == true ]
+    # echo_rst "$FUNCNAME" "$?"
+}
+
+function Chain33_SendToAddress() {
+    from=$1
+    to=$2
+    amount=$3
+    http=$4
+    note="test"
+    resp=$(curl -ksd '{"jsonrpc":"2.0","id":2,"method":"Chain33.SendToAddress","params":[{"from":"'"$from"'","to":"'"$to"'","amount":'"$amount"',"note":"'"$note"'"}]}' -H 'content-type:text/plain;' "${http}")
+    ok=$(jq '(.error|not)' <<<"$resp")
+    [ "$ok" == true ]
+    rst=$?
+    echo_rst "$FUNCNAME" "$rst"
+}
+
+function chain33_unlock() {
+    ok=$(curl -k -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result.isOK")
+    [ "$ok" == true ]
+    rst=$?
+    echo_rst "$FUNCNAME" "$rst"
+}
+
+function block_wait() {
+    local req='"method":"Chain33.GetLastHeader","params":[]'
+    cur_height=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq ".result.height")
+    expect=$((cur_height + ${1}))
+    local count=0
+    while true; do
+        new_height=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq ".result.height")
+        if [ "${new_height}" -ge "${expect}" ]; then
+            break
+        fi
+        count=$((count + 1))
+        sleep 1
+    done
+    echo "wait new block $count s, cur height=$expect,old=$cur_height"
+}
+
+function signRawTx() {
+    unsignedTx=$1
+    addr=$2
+    signedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.SignRawTx","params":[{"addr":"'"${addr}"'","txHex":"'"${unsignedTx}"'","expire":"120s","fee":1000000}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "$signedTx" == "null" ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+function sendSignedTx() {
+    txHash=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.SendTransaction","params":[{"token":"","data":"'"${signedTx}"'"}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "$txHash" == "null" ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+function query_tx() {
+    block_wait 1
+    txhash="$1"
+    # echo "req=$req"
+    local times=10
+    while true; do
+        req='{"method":"Chain33.QueryTransaction","params":[{"hash":"'"$txhash"'"}]}'
+        ret=$(curl -ksd "$req" ${MAIN_HTTP})
+        tx=$(jq -r ".result.tx.hash" <<<"$ret")
+        echo "====query tx= ${1}, return=$ret "
+        if [ "${tx}" != "${1}" ]; then
+            block_wait 1
+            times=$((times - 1))
+            if [ $times -le 0 ]; then
+                echo "====query tx=$1 failed"
+                echo "req=$req"
+                curl -ksd "$req" ${MAIN_HTTP}
+                exit 1
+            fi
+        else
+            exec_err=$(jq '(.result.receipt.logs[0].tyName == "LogErr")' <<<"$ret")
+            [ "$exec_err" != true ]
+            echo "====query tx=$1  success"
+            break
+        fi
+    done
+}
+
+function init() {
+    ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
+    echo "ipara=$ispara"
+    from="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
+
+    chain33_ImportPrivkey "${MAIN_HTTP}" "${PRIVA_B}" "${ACCOUNT_B}"
+
+    local game_addr=""
+    if [ "$ispara" == "true" ]; then
+        #主链中相应账户需要转帐
+        M_HTTP=${MAIN_HTTP//8901/8801}
+
+        Chain33_SendToAddress "${ACCOUNT_A}" "${ACCOUNT_B}" 20000000000 "${M_HTTP}"
+
+        block_wait 1
+
+        EXECTOR="user.p.para.game"
+        game_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.game"}]}' ${MAIN_HTTP} | jq -r ".result")
+    else
+        EXECTOR="game"
+        game_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"game"}]}' ${MAIN_HTTP} | jq -r ".result")
+    fi
+    echo "gameAddr=${game_addr}"
+
+    Chain33_SendToAddress "${ACCOUNT_B}" "$game_addr" 5000000000 "${MAIN_HTTP}"
+
+    Chain33_SendToAddress "${ACCOUNT_A}" "$game_addr" 5000000000 "${MAIN_HTTP}"
+
+    block_wait 1
+}
+
+function run_test() {
+    local ip=$1
+    CreateGameTx 1000000000 "${HASH_VALUE}"
+
+    QueryGameByGameId "${GAME_ID}" 1
+
+    QueryGameByStatus 1
+
+    MatchGameTx "${GAME_ID}"
+
+    QueryGameByGameId "${GAME_ID}" 2
+
+    QueryGameByStatus 2
+
+    CloseGameTx "${GAME_ID}" "${PASSWD}"
+
+    QueryGameByGameId "${GAME_ID}" 4
+
+    QueryGameByStatus 4
+
+    CreateGameTx 500000000 "${HASH_VALUE}"
+
+    QueryGameByGameId "${GAME_ID}" 1
+
+    CancleGameTx "${GAME_ID}"
+
+    QueryGameByGameId "${GAME_ID}" 3
+
+    QueryGameByStatus 3
+}
+
+function main() {
+    local ip=$1
+    MAIN_HTTP=$ip
+    echo "=========== # game rpc test ============="
+    echo "main_ip=$MAIN_HTTP"
+
+    Chain33_SendToAddress "${ACCOUNT_A}" "${ACCOUNT_B}" 20000000000 "${MAIN_HTTP}"
+
+    block_wait 1
+
+    init
+
+    run_test "$MAIN_HTTP"
+
+    if [ -n "$CASE_ERR" ]; then
+        echo -e "${RED}=============game Rpc Test Fail=============${NOC}"
+        exit 1
+    else
+        echo -e "${GRE}=============game Rpc Test Pass==============${NOC}"
+    fi
+}
+
+main "$1"

plugin/dapp/paracross/cmd/build/chain33.para.toml

@@ -108,6 +108,8 @@ searchHashMatchedBlockDepth=10000
 genesisAmount=100000000
 #主链支持平行链共识tx分叉高度，需要和主链保持严格一致
 MainForkParacrossCommitTx=-1
+#平行链自共识开启对应的主链高度，需要大于等于MainForkParacrossCommitTx
+MainParaSelfConsensusForkHeight=-1
 
 [store]
 name="mavl"
@@ -154,7 +156,7 @@ tokenApprs = [
 ]
 
 [exec.sub.paracross]
-#平行链自共识停止n个块后，超级账户可以直接参与投票
+#平行链自共识停止n个空块的对应主链高度后，超级账户可以直接参与投票
 paraConsensusStopBlocks=100
 
 [pprof]

plugin/dapp/paracross/cmd/build/testcase.sh

@@ -38,7 +38,7 @@ function para_set_toml() {
     sed -i $xsedfix 's/^emptyBlockInterval=.*/emptyBlockInterval=4/g' "${1}"
     sed -i $xsedfix '/^emptyBlockInterval=.*/a MainBlockHashForkHeight=1' "${1}"
 
-    sed -i $xsedfix '/^emptyBlockInterval=.*/a MainParaSelfConsensusForkHeight=50' "${1}"
+    sed -i $xsedfix 's/^MainParaSelfConsensusForkHeight=.*/MainParaSelfConsensusForkHeight=50/g' "${1}"
     sed -i $xsedfix 's/^MainForkParacrossCommitTx=.*/MainForkParacrossCommitTx=1/g' "${1}"
 
     # rpc
@@ -603,6 +603,7 @@ function para_nodegroup_behalf_quit_test() {
 
     ${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
     ${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
+    ${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588
     hash=$(${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
     echo "${hash}"
     query_tx "${PARA_CLI}" "${hash}"
@@ -669,6 +670,7 @@ function para_nodemanage_test() {
     echo "=========== # para chain node vote quit ============="
     ${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
     ${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
+    ${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588
     hash=$(${PARA_CLI} send para node -o vote -a 1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY -v yes -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
     echo "${hash}"
     query_tx "${PARA_CLI}" "${hash}"
@@ -724,6 +726,7 @@ function para_nodemanage_test() {
     echo "=========== # para chain node vote quit ============="
     ${PARA_CLI} send para node -o vote -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -v yes -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b
     ${PARA_CLI} send para node -o vote -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -v yes -k 0x19c069234f9d3e61135fefbeb7791b149cdf6af536f26bebb310d4cd22c3fee4
+    ${PARA_CLI} send para node -o vote -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -v yes -k 0x794443611e7369a57b078881445b93b754cbc9b9b8f526535ab9c6d21d29203d
     hash=$(${PARA_CLI} send para node -o vote -a 1NNaYHkscJaLJ2wUrFNeh6cQXBS4TrFYeB -v yes -k 0x7a80a1f75d7360c6123c32a78ecf978c1ac55636f87892df38d8b85a9aeff115)
     echo "${hash}"
     query_tx "${PARA_CLI}" "${hash}"

plugin/dapp/paracross/commands/paracross.go

@@ -332,7 +332,7 @@ func nodeGroupApply(cmd *cobra.Command, args []string) {
 	payload := &pt.ParaNodeGroupConfig{Op: op, Addrs: addrs, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4}
 	params := &rpctypes.CreateTxIn{
 		Execer:     types.ExecName(pt.ParaX),
-		ActionName: "NodeGroupApply",
+		ActionName: "NodeGroupConfig",
 		Payload:    types.MustPBToJSON(payload),
 	}
 

plugin/dapp/paracross/executor/action.go

@@ -225,13 +225,9 @@ func hasCommited(addrs []string, addr string) (bool, int) {
 }
 
 func getDappForkHeight(fork string) int64 {
-	paraConfigFork := ""
-	if fork == pt.ForkCommitTx {
-		paraConfigFork = "MainForkParacrossCommitTx"
-	}
 	var forkHeight int64
 	if types.IsPara() {
-		forkHeight = types.Conf("config.consensus.sub.para").GInt(paraConfigFork)
+		forkHeight = types.Conf("config.consensus.sub.para").GInt("MainForkParacrossCommitTx")
 		if forkHeight <= 0 {
 			forkHeight = types.MaxHeight
 		}

plugin/dapp/paracross/executor/superaccount.go

@@ -163,6 +163,18 @@ func (a *action) nodeJoin(config *pt.ParaNodeAddrConfig) (*types.Receipt, error)
 		return nil, errors.Wrapf(pt.ErrParaNodeAddrExisted, "nodeAddr existed:%s", config.Addr)
 	}
 
+	nodeGroupStatus, err := getNodeGroupStatus(a.db, config.Title)
+	if err != nil {
+		return nil, errors.Wrapf(pt.ErrParaNodeGroupNotSet, "nodegroup not exist:%s", config.Title)
+	}
+
+	if config.CoinsFrozen < nodeGroupStatus.CoinsFrozen {
+		clog.Error("nodeJoin coinfrozen not enough", "title", config.Title, "addr", config.Addr,
+			"config", config.CoinsFrozen, "nodegroupConfig", nodeGroupStatus.CoinsFrozen)
+		return nil, errors.Wrapf(pt.ErrParaNodeGroupFrozenCoinsNotEnough,
+			"coinFrozen not enough:%d,expected:%d", config.CoinsFrozen, nodeGroupStatus.CoinsFrozen)
+	}
+
 	receipt := &types.Receipt{Ty: types.ExecOk}
 	if !types.IsPara() {
 		r, err := a.nodeGroupCoinsFrozen(a.fromaddr, config.CoinsFrozen, 1)
@@ -223,9 +235,16 @@ func (a *action) nodeQuit(config *pt.ParaNodeAddrConfig) (*types.Receipt, error)
 		return nil, err
 	}
 
+	//代替别人退出或者自己退出都允许，但代替别人退出时候创建账户也必须匹配
+	if a.fromaddr != stat.FromAddr && a.fromaddr != config.Addr {
+		clog.Error("nodeaccount.nodeQuit wrong addr", "createAddr", stat.FromAddr, "confAddr", config.Addr, "fromAddr", a.fromaddr)
+		return nil, types.ErrNotAllow
+
+	}
+
 	if stat.Status == pt.ParacrossNodeQuiting || stat.Status == pt.ParacrossNodeQuited {
 		clog.Error("nodeaccount.nodeQuit wrong status", "status", stat)
-		return nil, errors.Wrapf(pt.ErrParaUnSupportNodeOper, "nodeAddr %s was quit status:%d", a.fromaddr, stat.Status)
+		return nil, errors.Wrapf(pt.ErrParaUnSupportNodeOper, "nodeAddr %s was quit status:%d", config.Addr, stat.Status)
 	}
 
 	if stat.Status == pt.ParacrossNodeAdded {
@@ -233,12 +252,12 @@ func (a *action) nodeQuit(config *pt.ParaNodeAddrConfig) (*types.Receipt, error)
 		if err != nil {
 			return nil, errors.Wrapf(err, "getNodes for title:%s", config.Title)
 		}
-		if !validNode(a.fromaddr, nodes) {
-			return nil, errors.Wrapf(pt.ErrParaNodeAddrNotExisted, "nodeAddr not existed:%s", a.fromaddr)
+		if !validNode(config.Addr, nodes) {
+			return nil, errors.Wrapf(pt.ErrParaNodeAddrNotExisted, "nodeAddr not existed:%s", config.Addr)
 		}
 		//不允许最后一个账户退出
 		if len(nodes) == 1 {
-			return nil, errors.Wrapf(pt.ErrParaNodeGroupLastAddr, "nodeAddr last one:%s", a.fromaddr)
+			return nil, errors.Wrapf(pt.ErrParaNodeGroupLastAddr, "nodeAddr last one:%s", config.Addr)
 		}
 	}
 
@@ -354,21 +373,6 @@ func (a *action) nodeVote(config *pt.ParaNodeAddrConfig) (*types.Receipt, error)
 		return nil, errors.Wrapf(pt.ErrNodeNotForTheTitle, "not validNode:%s", a.fromaddr)
 	}
 
-	if a.fromaddr == config.Addr {
-		return nil, errors.Wrapf(pt.ErrParaNodeVoteSelf, "not allow to vote self:%s", a.fromaddr)
-	}
-
-	// 如果投票账户是group账户，需计算此账户之外的投票
-	if validNode(config.Addr, nodes) {
-		temp := make(map[string]struct{})
-		for k := range nodes {
-			if k != config.Addr {
-				temp[k] = struct{}{}
-			}
-		}
-		nodes = temp
-	}
-
 	stat, err := getNodeAddr(a.db, config.Title, config.Addr)
 	if err != nil {
 		return nil, err
@@ -422,6 +426,14 @@ func (a *action) nodeVote(config *pt.ParaNodeAddrConfig) (*types.Receipt, error)
 				return nil, err
 			}
 			stat.Status = pt.ParacrossNodeQuited
+			if !types.IsPara() {
+				r, err := a.nodeGroupCoinsActive(stat.FromAddr, stat.CoinsFrozen, 1)
+				if err != nil {
+					return nil, err
+				}
+				receiptGroup.KV = append(receiptGroup.KV, r.KV...)
+				receiptGroup.Logs = append(receiptGroup.Logs, r.Logs...)
+			}
 		}
 	} else {
 		if stat.Status == pt.ParacrossNodeAdding {
@@ -512,6 +524,10 @@ func (a *action) checkConfig(title string) error {
 }
 
 func getAddrGroup(addr string) []string {
+	addr = strings.Trim(addr, " ")
+	if addr == "" {
+		return nil
+	}
 	if strings.Contains(addr, ",") {
 		repeats := make(map[string]bool)
 		var addrs []string
@@ -521,7 +537,7 @@ func getAddrGroup(addr string) []string {
 		ss := strings.Split(s, ",")
 		for _, v := range ss {
 			v = strings.Trim(v, " ")
-			if !repeats[v] {
+			if v != "" && !repeats[v] {
 				addrs = append(addrs, v)
 				repeats[v] = true
 			}
@@ -562,7 +578,7 @@ func (a *action) nodeGroupCoinsFrozen(createAddr string, configCoinsFrozen int64
 
 	r, err := a.coinsAccount.ExecFrozen(createAddr, realExecAddr, nodeCounts*configCoinsFrozen)
 	if err != nil {
-		clog.Error("node group apply", "addr", createAddr, "realExec", realExec, "realAddr", realExecAddr, "amount", configCoinsFrozen)
+		clog.Error("node group apply", "addr", createAddr, "realExec", realExec, "realAddr", realExecAddr, "amount", nodeCounts*configCoinsFrozen)
 		return nil, err
 	}
 
@@ -607,6 +623,11 @@ func (a *action) nodeGroupApply(config *pt.ParaNodeGroupConfig) (*types.Receipt,
 	}
 
 	addrs := getAddrGroup(config.Addrs)
+	if len(addrs) == 0 {
+		clog.Error("node group apply addrs null", "addrs", config.Addrs)
+		return nil, types.ErrInvalidParam
+	}
+
 	receipt := &types.Receipt{Ty: types.ExecOk}
 	//main chain
 	if !types.IsPara() {
@@ -639,7 +660,7 @@ func (a *action) nodeGroupQuit(config *pt.ParaNodeGroupConfig) (*types.Receipt,
 	if err != nil {
 		return nil, err
 	}
-	if status != nil && status.Status != pt.ParacrossNodeGroupApply {
+	if status.Status != pt.ParacrossNodeGroupApply {
 		clog.Error("node group apply exist", "status", status.Status)
 		return nil, pt.ErrParaNodeGroupStatusWrong
 	}
@@ -727,6 +748,10 @@ func (a *action) nodeGroupApprove(config *pt.ParaNodeGroupConfig) (*types.Receip
 		return nil, pt.ErrParaNodeGroupStatusWrong
 	}
 
+	if status.CoinsFrozen < config.CoinsFrozen {
+		clog.Error("node group approve not apply status", "status", status.Status)
+		return nil, pt.ErrParaNodeGroupFrozenCoinsNotEnough
+	}
 	applyAddrs, err := checkNodeGroupAddrsMatch(status.ApplyAddr, config.Addrs)
 	if err != nil {
 		return nil, err
@@ -796,7 +821,8 @@ func (a *action) NodeGroupConfig(config *pt.ParaNodeGroupConfig) (*types.Receipt
 		return nil, pt.ErrInvalidTitle
 	}
 
-	if len(config.Addrs) == 0 {
+	s := strings.Trim(config.Addrs, " ")
+	if len(s) == 0 {
 		return nil, types.ErrInvalidParam
 	}
 
@@ -832,9 +858,6 @@ func (a *action) NodeConfig(config *pt.ParaNodeAddrConfig) (*types.Receipt, erro
 		return a.nodeJoin(config)
 
 	} else if config.Op == pt.ParaNodeQuit {
-		if config.Addr != a.fromaddr {
-			return nil, types.ErrFromAddr
-		}
 		return a.nodeQuit(config)
 
 	} else if config.Op == pt.ParaNodeVote {

plugin/dapp/paracross/executor/superaccount_test.go

@@ -306,3 +306,27 @@ func TestNodeManageSuite(t *testing.T) {
 func (suite *NodeManageTestSuite) TearDownSuite() {
 
 }
+
+func TestGetAddrGroup(t *testing.T) {
+	addrs := " 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,    1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR, 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k, ,,,  1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs ,   "
+
+	retAddrs := getAddrGroup(addrs)
+	expectAddrs := []string{"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4", "1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR", "1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k", "1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs"}
+	assert.Equal(t, expectAddrs, retAddrs)
+
+	addrs = " 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 , ,   "
+	retAddrs = getAddrGroup(addrs)
+	expectAddrs = []string{"1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"}
+	assert.Equal(t, expectAddrs, retAddrs)
+
+	addrs = " , "
+	ret := getAddrGroup(addrs)
+	assert.Equal(t, []string(nil), ret)
+	assert.Equal(t, 0, len(ret))
+
+	addrs = " "
+	ret = getAddrGroup(addrs)
+	assert.Equal(t, []string(nil), ret)
+	assert.Equal(t, 0, len(ret))
+
+}

plugin/dapp/paracross/types/paracross.go

@@ -7,6 +7,7 @@ package types
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"github.com/33cn/chain33/common/address"
 	"github.com/33cn/chain33/common/log/log15"
@@ -177,6 +178,7 @@ func createRawCommitTx(status *ParacrossNodeStatus, name string, fee int64) (*ty
 // CreateRawNodeConfigTx create raw tx for node config
 func CreateRawNodeConfigTx(config *ParaNodeAddrConfig) (*types.Transaction, error) {
 	config.Title = types.GetTitle()
+	config.Addr = strings.Trim(config.Addr, " ")
 
 	action := &ParacrossAction{
 		Ty:    ParacrossActionNodeConfig,

plugin/dapp/paracross/types/type.go

@@ -64,9 +64,9 @@ func (p *ParacrossType) GetLogMap() map[int64]*types.LogInfo {
 		TyLogParaNodeConfig:        {Ty: reflect.TypeOf(ReceiptParaNodeConfig{}), Name: "LogParaNodeConfig"},
 		TyLogParaNodeGroupUpdate:   {Ty: reflect.TypeOf(types.ReceiptConfig{}), Name: "LogParaNodeGroupUpdate"},
 		TyLogParaNodeVoteDone:      {Ty: reflect.TypeOf(ReceiptParaNodeVoteDone{}), Name: "LogParaNodeVoteDone"},
-		TyLogParaNodeGroupApply:    {Ty: reflect.TypeOf(ReceiptParaNodeConfig{}), Name: "LogParaNodeGroupApply"},
-		TyLogParaNodeGroupApprove:  {Ty: reflect.TypeOf(ReceiptParaNodeConfig{}), Name: "LogParaNodeGroupApprove"},
-		TyLogParaNodeGroupQuit:     {Ty: reflect.TypeOf(ReceiptParaNodeConfig{}), Name: "LogParaNodeGroupQuit"},
+		TyLogParaNodeGroupApply:    {Ty: reflect.TypeOf(ReceiptParaNodeGroupConfig{}), Name: "LogParaNodeGroupApply"},
+		TyLogParaNodeGroupApprove:  {Ty: reflect.TypeOf(ReceiptParaNodeGroupConfig{}), Name: "LogParaNodeGroupApprove"},
+		TyLogParaNodeGroupQuit:     {Ty: reflect.TypeOf(ReceiptParaNodeGroupConfig{}), Name: "LogParaNodeGroupQuit"},
 	}
 }
 
@@ -126,7 +126,7 @@ func (p ParacrossType) CreateTx(action string, message json.RawMessage) (*types.
 			return nil, types.ErrInvalidParam
 		}
 		return CreateRawNodeConfigTx(&param)
-	} else if action == "NodeGroupApply" {
+	} else if action == "NodeGroupConfig" {
 		if !types.IsPara() {
 			return nil, types.ErrNotSupport
 		}

plugin/dapp/pokerbull/cmd/build/test-rpc.sh

@@ -73,7 +73,7 @@ pokerbull_PlayRawTx() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" "play"
+    signrawtx "$tx" "56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138" "play"
     echo "========== # pokerbull play tx end =========="
 
     block_wait 1
@@ -89,7 +89,7 @@ pokerbull_QuitRawTx() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" "quit"
+    signrawtx "$tx" "56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138" "quit"
     echo "========== # pokerbull quit tx end =========="
 
     block_wait 1
@@ -105,7 +105,7 @@ pokerbull_ContinueRawTx() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588" "continue"
+    signrawtx "$tx" "2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989" "continue"
     echo "========== # pokerbull continue tx end =========="
 
     block_wait 1
@@ -121,7 +121,7 @@ pokerbull_StartRawTx() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944" "start"
+    signrawtx "$tx" "56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138" "start"
     echo "========== # pokerbull start tx end =========="
 
     block_wait 1
@@ -135,7 +135,7 @@ pokerbull_QueryResult() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    data=$(curl -ksd '{"method":"Chain33.Query","params":[{"execer":"pokerbull","funcName":"QueryGameByAddr","payload":{"addr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}}]}' ${MAIN_HTTP} | jq -r ".result")
+    data=$(curl -ksd '{"method":"Chain33.Query","params":[{"execer":"pokerbull","funcName":"QueryGameByAddr","payload":{"addr":"1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"}}]}' ${MAIN_HTTP} | jq -r ".result")
     [ "$data" != null ]
     echo_rst "$FUNCNAME" "$?"
 
@@ -202,8 +202,8 @@ Chain33_SendToAddress() {
     ok=$(jq '(.error|not) and (.result.hash|length==66)' <<<"$resp")
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
-    hash=$(jq '(.result.hash)' <<<"$resp")
-    echo "hash=$hash"
+    hash=$(jq -r ".result.hash" <<<"$resp")
+    query_tx "$hash"
     echo "send '$3' from '$1' to '$2' end"
 }
 

plugin/dapp/retrieve/cmd/build/test-rpc.sh

@@ -65,7 +65,7 @@ function query_tx() {
 retrieve_Backup() {
     echo "========== # retrieve backup begin =========="
 
-    req='"method":"retrieve.CreateRawRetrieveBackupTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt","delayPeriod": 61}]'
+    req='"method":"retrieve.CreateRawRetrieveBackupTx","params":[{"backupAddr":"1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX","defaultAddr":"1PUiGcbsccfxW3zuvHXZBJfznziph5miAo","delayPeriod": 61}]'
     tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
 
     reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
@@ -75,7 +75,7 @@ retrieve_Backup() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
+    signrawtx "$tx" "56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138"
     echo "========== # retrieve backup end =========="
 
     block_wait 1
@@ -84,7 +84,7 @@ retrieve_Backup() {
 retrieve_Prepare() {
     echo "========== # retrieve prepare begin =========="
 
-    req='"method":"retrieve.CreateRawRetrievePrepareTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}]'
+    req='"method":"retrieve.CreateRawRetrievePrepareTx","params":[{"backupAddr":"1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX","defaultAddr":"1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"}]'
     tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
 
     reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
@@ -94,7 +94,7 @@ retrieve_Prepare() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588"
+    signrawtx "$tx" "2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989"
     echo "========== # retrieve prepare end =========="
 
     block_wait 1
@@ -103,7 +103,7 @@ retrieve_Prepare() {
 retrieve_Perform() {
     echo "========== # retrieve perform begin =========="
 
-    req='"method":"retrieve.CreateRawRetrievePerformTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}]'
+    req='"method":"retrieve.CreateRawRetrievePerformTx","params":[{"backupAddr":"1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX","defaultAddr":"1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"}]'
     tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
 
     reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
@@ -113,7 +113,7 @@ retrieve_Perform() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "0x9c451df9e5cb05b88b28729aeaaeb3169a2414097401fcb4c79c1971df734588"
+    signrawtx "$tx" "2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989"
     echo "========== # retrieve perform end =========="
 
     block_wait 1
@@ -122,7 +122,7 @@ retrieve_Perform() {
 retrieve_Cancel() {
     echo "========== # retrieve cancel begin =========="
 
-    req='"method":"retrieve.CreateRawRetrieveCancelTx","params":[{"backupAddr":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY","defaultAddr":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}]'
+    req='"method":"retrieve.CreateRawRetrieveCancelTx","params":[{"backupAddr":"1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX","defaultAddr":"1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"}]'
     tx=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
 
     reqDecode='"method":"Chain33.DecodeRawTransaction","params":[{"txHex":"'"$tx"'"}]'
@@ -132,7 +132,7 @@ retrieve_Cancel() {
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
 
-    signrawtx "$tx" "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
+    signrawtx "$tx" "56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138"
     echo "========== # retrieve cancel end =========="
 
     block_wait 1
@@ -143,7 +143,7 @@ retrieve_QueryResult() {
 
     local status=$1
 
-    req='"method":"Chain33.Query","params":[{"execer":"retrieve","funcName":"GetRetrieveInfo","payload":{"backupAddress":"1E5saiXVb9mW8wcWUUZjsHJPZs5GmdzuSY", "defaultAddress":"14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"}}]'
+    req='"method":"Chain33.Query","params":[{"execer":"retrieve","funcName":"GetRetrieveInfo","payload":{"backupAddress":"1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX", "defaultAddress":"1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"}}]'
     data=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq -r ".result")
     ok=$(jq '(.status == '"$status"')' <<<"$data")
 
@@ -207,8 +207,8 @@ Chain33_SendToAddress() {
     ok=$(jq '(.error|not) and (.result.hash|length==66)' <<<"$resp")
     [ "$ok" == true ]
     echo_rst "$FUNCNAME" "$?"
-    hash=$(jq '(.result.hash)' <<<"$resp")
-    echo "hash=$hash"
+    hash=$(jq -r ".result.hash" <<<"$resp")
+    query_tx "$hash"
 }
 
 init() {

plugin/dapp/testcase_compose_rule.md

@@ -15,15 +15,15 @@ cmd目录下有两个文件Makefile和build.sh 负责在make时候把build里面
 
 也可以通过dapp参数关键字all来run所有的dapp， all模式会自动删除pass的dapp的资源
 
- 1. make docker-compose [PROJ=xx] [DAPP=xx]
-    1. 如果PROJ 和DAPP都不设置如 make docker-compose, 只会run 系统的test case，不会run任何dapp
-    1. 如果PROJ不设置，系统会缺省采用build关键字作为docker-compose的service工程名，如果设置以设置为准，
-       不同PROJ可以实现docker compose 并行
-    1. 如果DAPP不设置，则不run任何dapp，如果设置，则只run 指定的dapp，run结束后需要手动 make docker-compose-down DAPP=xx释放
-    1. 如果DAPP=all 或者ALL， 则run 所有提供testcase的dapp
- 1. make docker-compose down [PROJ=xx] [DAPP=xx] 
-    负责clean make docker-compose 或make fork-test 创建了的docker资源， PROJ 和DAPP规则同上
- 1. make fork-test [PROJ=xx] [DAPP=xx]   分叉测试
+ 1. make docker-compose [proj=xx] [dapp=xx]
+    1. 如果proj 和dapp都不设置如 make docker-compose, 只会run 系统的test case，不会run任何dapp
+    1. 如果proj不设置，系统会缺省采用build关键字作为docker-compose的service工程名，如果设置以设置为准，
+       不同proj可以实现docker compose 并行
+    1. 如果dapp不设置，则不run任何dapp，如果设置，则只run 指定的dapp，run结束后需要手动 make docker-compose-down dapp=xx释放
+    1. 如果dapp=all 或者ALL， 则run 所有提供testcase的dapp
+ 1. make docker-compose down [proj=xx] [dapp=xx] 
+    负责clean make docker-compose 或make fork-test 创建了的docker资源， proj 和dapp规则同上
+ 1. make fork-test [proj=xx] [dapp=xx]   分叉测试
     1. 规则同make docker-compose     
 
 

plugin/dapp/token/cmd/Makefile

+all:
+	chmod +x ./build.sh
+	./build.sh $(OUT) $(FLAG)
\ No newline at end of file

plugin/dapp/token/cmd/build.sh

+#!/usr/bin/env bash
+
+strpwd=$(pwd)
+strcmd=${strpwd##*dapp/}
+strapp=${strcmd%/cmd*}
+OUT_DIR="${1}/$strapp"
+#FLAG=$2
+
+mkdir -p "${OUT_DIR}"
+cp ./build/* "${OUT_DIR}"
+
+OUT_TESTDIR="${1}/dapptest/$strapp"
+mkdir -p "${OUT_TESTDIR}"
+cp ./build/test-rpc.sh "${OUT_TESTDIR}"

plugin/dapp/token/cmd/build/test-rpc.sh

+#!/usr/bin/env bash
+# shellcheck disable=SC2128
+
+MAIN_HTTP=""
+CASE_ERR=""
+tokenAddr="1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
+recvAddr="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
+superManager="0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc"
+tokenSymbol="ABCDE"
+token_addr=""
+execName="token"
+
+#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 chain33_ImportPrivkey() {
+    local pri=$2
+    local acc=$3
+    local req='"method":"Chain33.ImportPrivkey", "params":[{"privkey":"'"$pri"'", "label":"tokenAddr"}]'
+    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "$1")
+    echo "#response: $resp"
+    ok=$(jq '(.error|not) and (.result.label=="tokenAddr") and (.result.acc.addr == "'"$acc"'")' <<<"$resp")
+    [ "$ok" == true ]
+    echo_rst "$FUNCNAME" "$?"
+}
+
+function Chain33_SendToAddress() {
+    local from="$1"
+    local to="$2"
+    local amount=$3
+    local req='"method":"Chain33.SendToAddress", "params":[{"from":"'"$from"'","to":"'"$to"'", "amount":'"$amount"', "note":"test\n"}]'
+    #    echo "#request: $req"
+    resp=$(curl -ksd "{$req}" "${MAIN_HTTP}")
+    #    echo "#response: $resp"
+    ok=$(jq '(.error|not) and (.result.hash|length==66)' <<<"$resp")
+    [ "$ok" == true ]
+    echo_rst "$FUNCNAME" "$?"
+    hash=$(jq '(.result.hash)' <<<"$resp")
+    echo "hash=$hash"
+    #    query_tx "$hash"
+}
+
+function chain33_unlock() {
+    ok=$(curl -k -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result.isOK")
+    [ "$ok" == true ]
+    rst=$?
+    echo_rst "$FUNCNAME" "$rst"
+}
+
+function block_wait() {
+    local req='"method":"Chain33.GetLastHeader","params":[]'
+    cur_height=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq ".result.height")
+    expect=$((cur_height + ${1}))
+    local count=0
+    while true; do
+        new_height=$(curl -ksd "{$req}" ${MAIN_HTTP} | jq ".result.height")
+        if [ "${new_height}" -ge "${expect}" ]; then
+            break
+        fi
+        count=$((count + 1))
+        sleep 1
+    done
+    echo "wait new block $count s, cur height=$expect,old=$cur_height"
+}
+
+function signRawTx() {
+    unsignedTx=$1
+    addr=$2
+    signedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.SignRawTx","params":[{"addr":"'"${addr}"'","txHex":"'"${unsignedTx}"'","expire":"120s"}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "$signedTx" == "null" ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+function sendSignedTx() {
+    txHash=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.SendTransaction","params":[{"token":"","data":"'"${signedTx}"'"}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "$txHash" == "null" ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+# 查询交易的执行结果
+# 根据传入的规则，校验查询的结果 （参数1: 校验规则 参数2: 预期匹配结果）
+function queryTransaction() {
+    validator=$1
+    expectRes=$2
+    echo "txhash=${txHash}"
+    res=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.QueryTransaction","params":[{"hash":"'"${txHash}"'"}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r "${validator}")
+    if [ "${res}" != "${expectRes}" ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+function init() {
+    ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
+    echo "ipara=$ispara"
+    chain33_ImportPrivkey "${MAIN_HTTP}" "${superManager}" "${tokenAddr}"
+
+    if [ "$ispara" == true ]; then
+        execName="user.p.para.token"
+        token_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"user.p.para.token"}]}' ${MAIN_HTTP} | jq -r ".result")
+        Chain33_SendToAddress "$recvAddr" "$tokenAddr" 100000000000
+        block_wait 1
+        Chain33_SendToAddress "$tokenAddr" "$token_addr" 1000000000
+        block_wait 1
+    else
+        token_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"token"}]}' ${MAIN_HTTP} | jq -r ".result")
+        from="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
+        Chain33_SendToAddress "$from" "$tokenAddr" 10000000000
+        block_wait 1
+        Chain33_SendToAddress "$tokenAddr" "$token_addr" 1000000000
+        block_wait 1
+    fi
+    echo "token=$token_addr"
+    updateConfig
+}
+
+function updateConfig() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.CreateTransaction","params":[{"execer": "manage","actionName":"Modify","payload":{ "key": "token-blacklist","value": "BTY","op": "add","addr": ""}}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "update config create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "update config signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "update config sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "update config queryExecRes" "$?"
+}
+function token_preCreate() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"token.CreateRawTokenPreCreateTx","params":[{"name": "yinhebib", "symbol": "'"${tokenSymbol}"'", "total": 100000000000, "price": 100, "category": 1,"owner":"'${tokenAddr}'"}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "token preCreate create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "token preCreate signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "token preCreate sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "token preCreate queryExecRes" "$?"
+}
+
+function token_getPreCreated() {
+    res=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.Query","params":[{"execer":"'"${execName}"'","funcName":"GetTokens","payload":{"queryAll":true,"status":0,"tokens":[],"symbolOnly":false}}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".error | not")
+    if [ "${res}" != "true" ]; then
+        echo_rst "token preCreate create tx" 1
+        return
+    fi
+}
+
+function token_finish() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"token.CreateRawTokenFinishTx","params":[{"symbol": "'"${tokenSymbol}"'", "owner":"'${tokenAddr}'"}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "token finish create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "token finish signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "token finish sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "token finish queryExecRes" "$?"
+}
+
+function token_getFinishCreated() {
+    res=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.Query","params":[{"execer":"'"${execName}"'","funcName":"GetTokens","payload":{"queryAll":true,"status":1,"tokens":[],"symbolOnly":false}}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result.tokens" | grep "symbol")
+
+    if [ "${res}" != "" ]; then
+        echo_rst "token get finishCreated create tx" 0
+    else
+        echo_rst "token get finishCreated create tx" 1
+    fi
+}
+
+function token_assets() {
+    res=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.Query","params":[{"execer": "'"${execName}"'","funcName":"GetAccountTokenAssets","payload": {"address":"'"${recvAddr}"'", "execer": "token"}}]}' -H 'content-type:text/plain;' ${MAIN_HTTP})
+
+    if [ "${res}" == "" ]; then
+        echo_rst "token get balance tx" 1
+        return
+    fi
+
+    tokenInfo=$(echo "${res}" | jq -r '.result.tokenAssets' | grep -A 6 -B 1 "${tokenSymbol}")
+    addr=$(echo "${tokenInfo}" | grep "addr" | awk -F '"' '{print $4}')
+    balance=$(echo "${tokenInfo}" | grep "balance" | awk -F '"' '{print $4}')
+
+    if [ "${addr}" == "${recvAddr}" ] && [ "${balance}" -eq 1000000000 ]; then
+        echo_rst "token get assets tx" 0
+    else
+        echo_rst "token get assets tx" 1
+    fi
+
+}
+function token_balance() {
+    res=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"token.GetTokenBalance","params":[{"addresses": ["'${tokenAddr}'"],"tokenSymbol":"'"${tokenSymbol}"'","execer": "'"${execName}"'"}]}' -H 'content-type:text/plain;' ${MAIN_HTTP})
+
+    if [ "${res}" == "" ]; then
+        echo_rst "token get balance tx" 1
+        return
+    fi
+
+    addr=$(echo "${res}" | jq -r ".result[0].addr")
+    balance=$(echo "${res}" | jq -r ".result[0].balance")
+
+    if [ "${addr}" == "${tokenAddr}" ] && [ "${balance}" -eq 100000000000 ]; then
+        echo_rst "token get balance tx" 0
+    else
+        echo_rst "token get balance tx" 1
+    fi
+}
+
+function token_burn() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"token.CreateRawTokenBurnTx","params":[{"symbol": "'"${tokenSymbol}"'","amount": 10000}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "token burn create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "token burn signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "token burn sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "token burn queryExecRes" "$?"
+}
+
+function token_mint() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"token.CreateRawTokenMintTx","params":[{"symbol": "'"${tokenSymbol}"'","amount": 10000}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "token mint create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "token mint signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "token mint sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "token mint queryExecRes" "$?"
+}
+function token_transfer() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.CreateTransaction","params":[{"execer": "'"${execName}"'","actionName":"Transfer","payload": {"cointoken":"'"${tokenSymbol}"'", "amount": "1000000000", "note": "", "to": "'"${recvAddr}"'"}}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "token transfer create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "token transfer signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "token transfer sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "token transfer queryExecRes" "$?"
+}
+
+function token_sendExec() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.CreateTransaction","params":[{"execer": "'"${execName}"'","actionName":"TransferToExec","payload": {"cointoken":"'"${tokenSymbol}"'", "amount": "10", "note": "", "to": "'"${token_addr}"'", "execName": "'"${execName}"'"}}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "token sendExec create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "token sendExec signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "token sendExec sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "token sendExec queryExecRes" "$?"
+}
+
+function token_withdraw() {
+    unsignedTx=$(curl -s --data-binary '{"jsonrpc":"2.0","id":2,"method":"Chain33.CreateTransaction","params":[{"execer": "'"${execName}"'","actionName":"Withdraw","payload": {"cointoken":"'"${tokenSymbol}"'", "amount": "10", "note": "", "to": "'"${token_addr}"'", "execName": "'"${execName}"'"}}]}' -H 'content-type:text/plain;' ${MAIN_HTTP} | jq -r ".result")
+    if [ "${unsignedTx}" == "" ]; then
+        echo_rst "token withdraw create tx" 1
+        return
+    fi
+
+    signRawTx "${unsignedTx}" "${tokenAddr}"
+    echo_rst "token withdraw signRawTx" "$?"
+
+    sendSignedTx
+    echo_rst "token withdraw sendSignedTx" "$?"
+
+    block_wait 1
+
+    queryTransaction ".error | not" "true"
+    echo_rst "token withdraw queryExecRes" "$?"
+}
+
+function run_test() {
+    local ip=$1
+    set -x
+    token_preCreate
+    token_getPreCreated
+
+    token_finish
+    token_getFinishCreated
+
+    token_balance
+    token_burn
+    token_mint
+    token_transfer
+    token_sendExec
+    token_assets
+    token_withdraw
+    set +x
+}
+
+function main() {
+    local ip=$1
+    MAIN_HTTP=$ip
+    echo "=========== # token rpc test ============="
+    echo "main_ip=$MAIN_HTTP"
+
+    init
+    run_test "$ip"
+
+    if [ -n "$CASE_ERR" ]; then
+        echo -e "${RED}=============Token Rpc Test Fail=============${NOC}"
+        exit 1
+    else
+        echo -e "${GRE}=============Token Rpc Test Pass==============${NOC}"
+    fi
+}
+
+main "$1"

plugin/store/kvmvccmavl/kvmvcc_mavl.go

@@ -61,7 +61,7 @@ func DisableLog() {
 
 func init() {
 	drivers.Reg("kvmvccmavl", New)
-	types.RegisterDappFork("store-kvmvccmavl", "ForkKvmvccmavl", 186*10000)
+	types.RegisterDappFork("store-kvmvccmavl", "ForkKvmvccmavl", 187*10000)
 }
 
 // KVmMavlStore provide kvmvcc and mavl store interface implementation