Merge pull request #42 from RetricSu/rename-deposition-to-deposit

Rename deposition to deposit
godwokenrises · May 31, 2021 · f652400 · f652400
2 parents 0af1958 + b9088b0
commit f652400
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -270,7 +270,7 @@ copy-gw-scripts-and-bin-from-docker:
 	cp quick-mode/godwoken/challenge-lock config/scripts/release/
 	cp quick-mode/godwoken/state-validator config/scripts/release/
 	cp quick-mode/godwoken/custodian-lock config/scripts/release/
-	cp quick-mode/godwoken/deposition-lock config/scripts/release/
+	cp quick-mode/godwoken/deposit-lock config/scripts/release/
 	cp quick-mode/godwoken/always-success config/scripts/release/
 
 copy-poa-scripts-from-docker:

diff --git a/README.md b/README.md
@@ -68,11 +68,9 @@ you will need to change your Metamask network setting like following:
 ```sh
     Network Name: Godwoken
     New RPC URL: http://localhost:8024
-    Chain ID: 0x3
+    Chain ID: 0x100000003
 ```
 
-![panel](docs/provider.png)
-
 ### 2. custom mode
 
 #### ***- build custom components on manual***

diff --git a/docker/.build.mode.env b/docker/.build.mode.env
@@ -7,6 +7,6 @@ MANUAL_BUILD_CLERKB=false
 
 ####[images]
 DOCKER_PREBUILD_IMAGE_NAME=nervos/godwoken-prebuilds
-DOCKER_PREBUILD_IMAGE_TAG=v0.2.4
+DOCKER_PREBUILD_IMAGE_TAG=v0.3.0
 DOCKER_MANUAL_BUILD_IMAGE_NAME=retricsu/godwoken-manual-build
 DOCKER_MANUAL_BUILD_IMAGE_TAG=latest
diff --git a/docker/layer2/init_config_json.sh b/docker/layer2/init_config_json.sh
@@ -5,11 +5,11 @@ cat << EOF > scripts-deploy.json
 {
   "programs": {
     "custodian_lock": "scripts/release/always-success",
-    "deposition_lock": "scripts/release/always-success",
+    "deposit_lock": "scripts/release/always-success",
     "withdrawal_lock": "scripts/release/always-success",
     "challenge_lock": "scripts/release/always-success",
     "stake_lock": "scripts/release/always-success",
-    "state_validator": "scripts/release/state-validator",
+    "state_validator": "scripts/release/always-success",
     "l2_sudt_validator": "scripts/release/always-success",
     "meta_contract_validator": "scripts/release/always-success",
     "eth_account_lock": "scripts/release/always-success",
@@ -51,6 +51,7 @@ cat << EOF > rollup-config.json
   "reward_burn_rate": 50,
   "allowed_eoa_type_hashes": [
     "0xf0e03a329803bd033eae42e80c8cd6c6dc81b48afe9f4a630f27e78be54db14c"
-  ]
+  ],
+  "compatible_chain_id": 1
 }
-EOF
+EOF
diff --git a/godwoken b/godwoken
diff --git a/godwoken-examples b/godwoken-examples
diff --git a/godwoken-polyjuice b/godwoken-polyjuice
diff --git a/godwoken-scripts b/godwoken-scripts
diff --git a/godwoken-web3 b/godwoken-web3
diff --git a/web3_entrypoint.sh b/web3_entrypoint.sh
@@ -52,6 +52,7 @@ GODWOKEN_JSON_RPC=http://godwoken:8119
 ETH_ACCOUNT_LOCK_HASH=$EthAccountLockCodeHash
 ROLLUP_TYPE_HASH=$RollupTypeHash
 PORT=8024
+CHAIN_ID=4294967299
 CREATOR_ACCOUNT_ID=3
 EOF
+1 −1		README.md
+1 −1		packages/client/src/config/constant.json
+3 −3		packages/godwoken/index.d.ts
+12 −12		packages/godwoken/normalizer.ts
+6 −0		packages/godwoken/schemas/blockchain.json
+11 −0		packages/godwoken/schemas/blockchian.d.ts
+45 −0		packages/godwoken/schemas/blockchian.esm.js
+39 −0		packages/godwoken/schemas/blockchian.js
+62 −21		packages/godwoken/schemas/godwoken.d.ts
+316 −90		packages/godwoken/schemas/godwoken.esm.js
+285 −84		packages/godwoken/schemas/godwoken.js
+104 −31		packages/godwoken/schemas/godwoken.json
+63 −24		packages/godwoken/schemas/store.d.ts
+348 −114		packages/godwoken/schemas/store.esm.js
+313 −108		packages/godwoken/schemas/store.js
+109 −37		packages/godwoken/schemas/store.json
+1 −1		packages/runner/configs/config.toml
+2 −2		packages/runner/configs/godwoken_config.json
+2 −2		packages/runner/configs/scripts-deploy-result.json
+3 −3		packages/runner/js/base/index.ts
+17 −17		packages/runner/js/transactions/deposit.ts
+4 −4		packages/runner/js/utils/deployment_config.ts
+14 −14		packages/runner/src/api.ts
+1 −1		packages/runner/src/common.ts
+1 −1		packages/runner/src/server.ts
+6 −6		packages/runner/src/util.ts
+7 −7		packages/runner/ui/asset-manifest.json
+1 −1		packages/runner/ui/index.html
+2 −2		packages/runner/ui/static/js/2.ee67f51d.chunk.js
+0 −0		packages/runner/ui/static/js/2.ee67f51d.chunk.js.LICENSE.txt
+1 −1		packages/runner/ui/static/js/2.ee67f51d.chunk.js.map
+2 −0		packages/runner/ui/static/js/main.8fe819f4.chunk.js
+1 −1		packages/runner/ui/static/js/main.8fe819f4.chunk.js.map
+0 −2		packages/runner/ui/static/js/main.c107c022.chunk.js