Skip to content

Commit

Permalink
Add COMPATIBLE_CHAIN_ID into web3.env (#179)
Browse files Browse the repository at this point in the history
* Add `COMPATIBLE_CHAIN_ID` into web3.env

* Update Web3 to MANUAL_BUILD mode

* Remove useless code

* config(web3): chain_id can be removed from env

see: https://github.com/nervosnetwork/godwoken-web3/tree/compatibility-breaking-changes#config-database

* chore: MANUAL_BUILD mode takes more time

* Update Polyjuice

- godwokenrises/godwoken-polyjuice#128

* Update reusable-integration-test-v1 to develop branch
  • Loading branch information
Flouse authored Mar 10, 2022
1 parent 27bc0d6 commit e1d06ab
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/start-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
run: make version

- name: start kicker
timeout-minutes: 15
run: |
make init && make start
docker-compose --file docker/docker-compose.yml logs --tail 6
Expand All @@ -34,7 +33,7 @@ jobs:
run: make down

integration-test:
uses: nervosnetwork/godwoken-tests/.github/workflows/reusable-integration-test-v1.yml@v1
uses: nervosnetwork/godwoken-tests/.github/workflows/reusable-integration-test-v1.yml@develop
with:
# github.head_ref: The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target.
# github.ref: The branch or tag ref that triggered the workflow run. For branches this is the format refs/heads/<branch_name>, and for tags it is refs/tags/<tag_name>.
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ start: workspace/bin/godwoken
fi
source ./gw_util.sh && start
make show_wait_tips
# TODO: only deposit for dev accounts one time
source ./gw_util.sh && deposit_for_two_dev_accounts

start-f:
cd docker && FORCE_GODWOKEN_REDEPLOY=true docker-compose --env-file .build.mode.env up -d --build > /dev/null
Expand Down
8 changes: 4 additions & 4 deletions docker/.build.mode.env
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
####[mode]
MANUAL_BUILD_GODWOKEN=false
MANUAL_BUILD_WEB3=false
MANUAL_BUILD_WEB3_INDEXER=false
MANUAL_BUILD_WEB3=true
MANUAL_BUILD_WEB3_INDEXER=true
MANUAL_BUILD_SCRIPTS=false
MANUAL_BUILD_POLYJUICE=false
MANUAL_BUILD_POLYMAN=false
MANUAL_BUILD_OMNI_LOCK=false

####[images]
DOCKER_PREBUILD_IMAGE_NAME=ghcr.io/flouse/godwoken-prebuilds
DOCKER_PREBUILD_IMAGE_TAG=v1.0.x-202203071046
DOCKER_PREBUILD_IMAGE_TAG=v1.0.x-202203101259
DOCKER_MANUAL_BUILD_IMAGE_NAME=retricsu/godwoken-manual-build
DOCKER_MANUAL_BUILD_IMAGE_TAG=ckb2021
DOCKER_WEB3_PREBUILD_IMAGE_NAME=ghcr.io/retricsu/godwoken-web3-prebuilds
Expand Down Expand Up @@ -62,4 +62,4 @@ ENABLE_GW_READONLY_NODE=false
#
# - WATCH_CKB_REORG [boolean]
# if set to true, will start watch ckb network for reorgs
# and output the logs in chain-reorg.log
# and output the logs in chain-reorg.log
2 changes: 1 addition & 1 deletion docker/web3/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ GODWOKEN_READONLY_JSON_RPC=${GODWOKEN_READONLY_JSON_RPC}
ETH_ACCOUNT_LOCK_HASH=$EthAccountLockCodeHash
ROLLUP_TYPE_HASH=$RollupTypeHash
PORT=8024
CHAIN_ID=8521215115268
COMPATIBLE_CHAIN_ID=1984
CREATOR_ACCOUNT_ID=$CreatorId
DEFAULT_FROM_ADDRESS=0x6daf63d8411d6e23552658e3cfb48416a6a2ca78
DEFAULT_FROM_ID=2
Expand Down

0 comments on commit e1d06ab

Please sign in to comment.