Merge remote-tracking branch 'upstream/master'

build/dapp-test-rpc.sh

@@ -10,7 +10,7 @@ function dapp_test_rpc() {
     if [ -d dapptest ]; then
         cp $DAPP_TEST_COMMON dapptest/
         cd dapptest || return
-        dir=$(find . -maxdepth 1 -type d ! -name dapptest ! -name multisig ! -name paracross ! -name js ! -name unfreeze ! -name . | sed 's/^\.\///' | sort)
+        dir=$(find . -maxdepth 1 -type d ! -name dapptest ! -name multisig ! -name paracross ! -name . | sed 's/^\.\///' | sort)
         echo "dapps list: $dir"
         for app in $dir; do
             echo "=========== # $app rpc test ============="

chain33.para.toml

@@ -301,6 +301,9 @@ ForkUnfreezeIDX= 0
 [fork.sub.autonomy]
 Enable=0
 
+[fork.sub.jsvm]
+Enable=0
+
 #对已有的平行链如果不是从0开始同步数据，需要设置这个kvmvccmavl的对应平行链高度的fork，如果从0开始同步，statehash会跟以前mavl的不同
 [fork.sub.store-kvmvccmavl]
 ForkKvmvccmavl=0

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

@@ -9,8 +9,12 @@ MAIN_HTTP=""
 function init() {
     ispara=$(echo '"'"${MAIN_HTTP}"'"' | jq '.|contains("8901")')
 
-    beneficiary=12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv
-    beneficiary_key=0x4257d8692ef7fe13c68b65d6a52f03933db2fa5ce8faf210b5b8b80c721ced01
+    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"
@@ -24,6 +28,9 @@ function init() {
         manager_name="user.p.para."${manager_name}
         user_game="user.p.para."${user_game}
         super_manager=0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc
+        ## fee
+        local main_ip=${MAIN_HTTP//8901/8801}
+        chain33_applyCoins "${beneficiary}" 10000000000 "${main_ip}"
     fi
     exec_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"'${exec_name}'"}]}' ${MAIN_HTTP} | jq -r ".result")
     echo "exec_addr=${exec_addr}"

plugin/dapp/js/types/js.go

@@ -57,6 +57,7 @@ var (
 func init() {
 	types.AllowUserExec = append(types.AllowUserExec, []byte(JsX))
 	types.RegistorExecutor(JsX, NewType())
+	types.RegisterDappFork(JsX, "Enable", 0)
 }
 
 //JsType 类型

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

@@ -42,25 +42,39 @@ function init() {
     echo "ipara=$ispara"
     exec_name="unfreeze"
     uid_index=2
+    symbol="bty"
+
+    beneficiary_key=0xa2ec1c6274723c021daa8792f4d0d52ffa0eff0fd47c9c6c1d1dd618762dc178
+    beneficiary=1qpAv7H4C5JBgVQffDRbQKti7ibdM2TfU
+
+    owner=1CK51xZ1wNkrzAhGyDuFayxeQXHg3gqcVS
+    owner_key=0x3b0d7f65b35da1c394891ba7a8ce0f070ccef6818e3f7ca9c203776013b3a4b0
+
+    chain33_ImportPrivkey "${beneficiary_key}" "${beneficiary}" "unfreeze_beneficiary" "${MAIN_HTTP}"
+    chain33_ImportPrivkey "${owner_key}" "${owner}" "unfreeze_owner" "${MAIN_HTTP}"
+
+    chain33_applyCoins "${beneficiary}" 10000000000 "${MAIN_HTTP}"
+    chain33_applyCoins "${owner}" 10000000000 "${MAIN_HTTP}"
+
     if [ "$ispara" == true ]; then
         exec_name="user.p.para."${exec_name}
         uid_index=1
+        symbol="para"
+
+        local main_ip=${MAIN_HTTP//8901/8801}
+        chain33_applyCoins "${beneficiary}" 10000000000 "${main_ip}"
+        chain33_applyCoins "${owner}" 10000000000 "${main_ip}"
     fi
+
     exec_addr=$(curl -ksd '{"method":"Chain33.ConvertExectoAddr","params":[{"execname":"'${exec_name}'"}]}' ${MAIN_HTTP} | jq -r ".result")
     echo "exec_addr=${exec_addr}"
-
-    beneficiary=1PUiGcbsccfxW3zuvHXZBJfznziph5miAo
-    beneficiary_key=0x56942AD84CCF4788ED6DACBC005A1D0C4F91B63BCF0C99A02BE03C8DEAE71138
-    owner=1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX
-    owner_key=0x2116459C0EC8ED01AA0EEAE35CAC5C96F94473F7816F114873291217303F6989
-
-    chain33_SendToAddress "$owner" "$exec_addr" 500000000 "${MAIN_HTTP}"
-    chain33_SendToAddress "$beneficiary" "$exec_addr" 500000000 "${MAIN_HTTP}"
+    chain33_SendToAddress "$owner" "$exec_addr" 5000000000 "${MAIN_HTTP}"
+    chain33_SendToAddress "$beneficiary" "$exec_addr" 5000000000 "${MAIN_HTTP}"
     chain33_BlockWait 1 "${MAIN_HTTP}"
 }
 
 function CreateRawUnfreezeCreate() {
-    req='{"jsonrpc": "2.0", "method" :  "unfreeze.CreateRawUnfreezeCreate" , "params":[{"startTime":10000,"assetExec":"coins","assetSymbol":"bty","totalCount":400000000,"beneficiary":"'$beneficiary'","means":"FixAmount","fixAmount": {"period":10,"amount":1000000}}]}'
+    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}}]}'
     # echo "#request: $req"
     resp=$(curl -ksd "$req" "${MAIN_HTTP}")
     # echo "#resp: $resp"