diff --git a/Makefile b/Makefile index 219b32e5..a4140f56 100644 --- 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 index ef74c9d7..d9157232 100644 --- 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 index f673c8e4..4940eae0 100644 --- 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 index 9e0b4d45..89b80fca 100644 --- 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 \ No newline at end of file +EOF diff --git a/godwoken b/godwoken index dd589257..46d9c4c5 160000 --- a/godwoken +++ b/godwoken @@ -1 +1 @@ -Subproject commit dd58925749f459ef27a401aa38d16ed1796ca963 +Subproject commit 46d9c4c5b33fcfece3300b6ac9ed3263eb00e3af diff --git a/godwoken-examples b/godwoken-examples index 200a17ae..64feaff6 160000 --- a/godwoken-examples +++ b/godwoken-examples @@ -1 +1 @@ -Subproject commit 200a17aeffcb70f695985f87d8ed54e88e7d5789 +Subproject commit 64feaff6580c085b91b561d975f0b891b7383ae9 diff --git a/godwoken-polyjuice b/godwoken-polyjuice index 868f77ec..b4bd6de1 160000 --- a/godwoken-polyjuice +++ b/godwoken-polyjuice @@ -1 +1 @@ -Subproject commit 868f77ec917df209378f793c2ea9f5f0d0d83845 +Subproject commit b4bd6de146514b16076cea876d7c97fa80961991 diff --git a/godwoken-scripts b/godwoken-scripts index 83ae3736..c621d96e 160000 --- a/godwoken-scripts +++ b/godwoken-scripts @@ -1 +1 @@ -Subproject commit 83ae373670216313a1dbca3ab5efcab6d576e492 +Subproject commit c621d96ec123845a6c55eea4fdfdb7e8e00a5b0b diff --git a/godwoken-web3 b/godwoken-web3 index 03241669..818a30b8 160000 --- a/godwoken-web3 +++ b/godwoken-web3 @@ -1 +1 @@ -Subproject commit 03241669a38dcdffc466f9f33d90c827271fade6 +Subproject commit 818a30b81fc30fdeb83d9a3c141d048e6b5f3520 diff --git a/web3_entrypoint.sh b/web3_entrypoint.sh index 56332e71..ccfb61ab 100644 --- 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