Merge branch 'develop'

godwokenrises · Sep 29, 2021 · 740d042 · 740d042
2 parents 5d82c82 + 98717c4
commit 740d042
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,21 @@ make init
 make start
 ```
 
+## Requirement
+
+if you are using quick-mode:
+
+- [curl](https://curl.se/) (this only [effects](https://github.com/RetricSu/godwoken-kicker/issues/115) showing progressbar correctly)
+- [docker-compose](https://docs.docker.com/compose/)
+
+if you are using custom-mode:
+
+- [curl](https://curl.se/) (this only [effects](https://github.com/RetricSu/godwoken-kicker/issues/115) showing progressbar correctly)
+- [docker-compose](https://docs.docker.com/compose/)
+- [moleculec](https://github.com/nervosnetwork/molecule) 0.7.2 (cargo install moleculec)
+- nodejs 14 && yarn ([how to install](https://yarnpkg.com/lang/en/docs/install/))
+- [capsule](https://github.com/nervosnetwork/capsule) 0.4.6 (cargo install capsule)
+
 ## How Kicker Works
 
 - `packages`: contains all componets repo used in custom-mode.

diff --git a/docker/.build.mode.env b/docker/.build.mode.env
@@ -12,13 +12,13 @@ DOCKER_PREBUILD_IMAGE_TAG=v0.6.5-rc3
 DOCKER_MANUAL_BUILD_IMAGE_NAME=retricsu/godwoken-manual-build
 DOCKER_MANUAL_BUILD_IMAGE_TAG=ckb2021
 DOCKER_JS_PREBUILD_IMAGE_NAME=nervos/godwoken-js-prebuilds
-DOCKER_JS_PREBUILD_IMAGE_TAG=v0.8.0-rc2
+DOCKER_JS_PREBUILD_IMAGE_TAG=v0.8.0-rc3
 
 ####[packages]
 GODWOKEN_GIT_URL=https://github.com/nervosnetwork/godwoken.git
 GODWOKEN_GIT_CHECKOUT=v0.6.5-rc3
 POLYMAN_GIT_URL=https://github.com/retricsu/godwoken-polyman.git
-POLYMAN_GIT_CHECKOUT=v0.7.0-rc2
+POLYMAN_GIT_CHECKOUT=v0.7.0-rc3
 WEB3_GIT_URL=https://github.com/nervosnetwork/godwoken-web3.git
 WEB3_GIT_CHECKOUT=v0.7.0-rc1
 SCRIPTS_GIT_URL=https://github.com/nervosnetwork/godwoken-scripts.git

diff --git a/docker/gen-godwoken-schema/entrypoint.sh b/docker/gen-godwoken-schema/entrypoint.sh
@@ -1,6 +1,8 @@
 PROJECT_DIR='/code';
 ENTRY_DIR=${PROJECT_DIR}/docker/gen-godwoken-schema
 
+# you need to install moleculec on your machine
+# cargo install moleculec
 moleculec -V
 
 mkdir -p ${ENTRY_DIR}/schemas
@@ -9,9 +11,11 @@ moleculec --language - --schema-file ${PROJECT_DIR}/packages/godwoken/crates/typ
 moleculec --language - --schema-file ${PROJECT_DIR}/packages/godwoken/crates/types/schemas/godwoken.mol --format json > ${ENTRY_DIR}/schemas/godwoken.json
 moleculec --language - --schema-file ${PROJECT_DIR}/packages/godwoken/crates/types/schemas/store.mol --format json > ${ENTRY_DIR}/schemas/store.json
 
-${ENTRY_DIR}/moleculec-es -generateTypeScriptDefinition -hasBigInt -inputFile ${ENTRY_DIR}/schemas/blockchain.json -outputFile ${ENTRY_DIR}/schemas/blockchain.esm.js
-${ENTRY_DIR}/moleculec-es -generateTypeScriptDefinition -hasBigInt -inputFile ${ENTRY_DIR}/schemas/godwoken.json -outputFile ${ENTRY_DIR}/schemas/godwoken.esm.js
-${ENTRY_DIR}/moleculec-es -generateTypeScriptDefinition -hasBigInt -inputFile ${ENTRY_DIR}/schemas/store.json -outputFile ${ENTRY_DIR}/schemas/store.esm.js
+# you need to install moleculec-es on your machine
+# https://github.com/nervosnetwork/moleculec-es/releases
+moleculec-es -generateTypeScriptDefinition -hasBigInt -inputFile ${ENTRY_DIR}/schemas/blockchain.json -outputFile ${ENTRY_DIR}/schemas/blockchain.esm.js
+moleculec-es -generateTypeScriptDefinition -hasBigInt -inputFile ${ENTRY_DIR}/schemas/godwoken.json -outputFile ${ENTRY_DIR}/schemas/godwoken.esm.js
+moleculec-es -generateTypeScriptDefinition -hasBigInt -inputFile ${ENTRY_DIR}/schemas/store.json -outputFile ${ENTRY_DIR}/schemas/store.esm.js
 
 # rollup to pack esm file
 npm install -g rollup

diff --git a/docker/gen-godwoken-schema/moleculec-es b/docker/gen-godwoken-schema/moleculec-es