Merge pull request #106 from RetricSu/develop

release v0.7.1-rc2

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.vscode/
 config/deployment-results.json
 config/runner_config.json
 node_modules/

docker/.build.mode.env

@@ -12,15 +12,15 @@ DOCKER_PREBUILD_IMAGE_TAG=v0.6.2-rc6
 DOCKER_MANUAL_BUILD_IMAGE_NAME=retricsu/godwoken-manual-build
 DOCKER_MANUAL_BUILD_IMAGE_TAG=add-jq
 DOCKER_JS_PREBUILD_IMAGE_NAME=nervos/godwoken-js-prebuilds
-DOCKER_JS_PREBUILD_IMAGE_TAG=v0.7.3-rc1
+DOCKER_JS_PREBUILD_IMAGE_TAG=v0.7.3-rc3
 
 ####[packages]
 GODWOKEN_GIT_URL=https://github.com/nervosnetwork/godwoken.git
 GODWOKEN_GIT_CHECKOUT=v0.6.2-rc5
 POLYMAN_GIT_URL=https://github.com/RetricSu/godwoken-polyman.git
 POLYMAN_GIT_CHECKOUT=v0.6.1-rc1
 WEB3_GIT_URL=https://github.com/nervosnetwork/godwoken-web3.git
-WEB3_GIT_CHECKOUT=v0.6.0-rc5
+WEB3_GIT_CHECKOUT=v0.6.0-rc7
 SCRIPTS_GIT_URL=https://github.com/nervosnetwork/godwoken-scripts.git
 SCRIPTS_GIT_CHECKOUT=v0.8.0-rc2
 POLYJUICE_GIT_URL=https://github.com/nervosnetwork/godwoken-polyjuice.git

docker/docker-compose.yml

@@ -25,7 +25,7 @@ services:
     - 8114:8114
     - 8115:8115   # 8115 is not using for now, but we may need it when extend kicker in the future
     volumes:
-    - ../ckb:/ckb 
+    - ../:/code       
     - ../cache/activity/ckb-chain-data:/usr/local/ckb-chain-data
     environment:
       # env of layer 1:

docker/layer1/entrypoint.sh

@@ -1,9 +1,24 @@
-#!/bin/sh
-cd /ckb
+#!/bin/bash
+
+# import some helper function
+source /code/gw_util.sh
+
+cd /code/ckb
 if ! [ -f ckb.toml ]; then
   /bin/ckb init --chain "$CKB_CHAIN" --ba-arg "$BA_ARG" --ba-code-hash "$BA_CODE_HASH" --ba-hash-type "$BA_HASH_TYPE" --ba-message "$BA_MESSAGE"
 fi
 
 exec /bin/ckb run &
-sleep 3 
-exec /bin/ckb miner 
+
+# wait for ckb rpc setup
+while true; do
+    sleep 1;
+    if isCkbRpcRunning;
+    then
+      echo "start ckb-miner now.."
+      break;
+    else echo "keep waitting for ckb rpc .."
+    fi
+done
+
+exec /bin/ckb miner 

docker/layer2/entrypoint.sh

@@ -16,7 +16,7 @@ export GODWOKEN_BIN=${PROJECT_DIR}/workspace/bin/godwoken
 export GW_TOOLS_BIN=${PROJECT_DIR}/workspace/bin/gw-tools
 
 function runGodwoken(){
-  GODWOKEN_DEBUG=true RUST_LOG=gw_block_producer=info,gw_generator=debug,gw_web3_indexer=debug $GODWOKEN_BIN
+  RUST_LOG=info,gw_block_producer=info,gw_generator=debug,gw_web3_indexer=debug $GODWOKEN_BIN
 }
 
 # import some helper function

docs/get-started.md

@@ -35,7 +35,7 @@ make sg # sg means show godwoken logs
 
 after everything started, check `http://localhost:6100/` to deploy contract.
 
-![panel](docs/main.png)
+![panel](main.png)
 
 ### How to deploy contract
 
@@ -54,7 +54,7 @@ after deployment successfully get done, you will find the contract address listi
 
 you can use the kicker's built-in `Contract Debugger` right on the page to give your dapp a first simple manual test.
 
-![panel](docs/contract-debugger.png)
+![panel](contract-debugger.png)
 
 ## 2. Custom mode
 

gw_util.sh

@@ -379,6 +379,36 @@ isRollupCellExits(){
     fi
 }
 
+isCkbRpcRunning(){
+    if [[ -n $1 ]]; 
+    then
+        local rpc_url="$1"
+    else
+        local rpc_url="http://localhost:8114"
+    fi
+
+    result=$( echo '{
+    "id": 2,
+    "jsonrpc": "2.0",
+    "method": "ping",
+    "params": []
+    }' \
+    | tr -d '\n' \
+    | curl -s --ipv4 \
+    -H 'content-type: application/json' -d @- \
+    $rpc_url)
+
+    if [[ $result =~ "pong" ]]; then
+        echo "ckb rpc server is up and running!"
+        # 0 equals true
+        return 0
+    else
+        echo "ckb rpc server is down."
+        # 1 equals false
+        return 1
+    fi
+}
+
 isGodwokenRpcRunning(){
     if [[ -n $1 ]]; 
     then