From bf92473def9bf71b6a7bf684eaef2cd1eef0c794 Mon Sep 17 00:00:00 2001 From: Flouse Date: Fri, 25 Nov 2022 12:34:36 +0800 Subject: [PATCH 1/5] testnet: bump web3/indexer to 1.9.0-rc2 --- .github/workflows/readonly-node-sync.yml | 2 +- testnet_v1_1/docker-compose.yml | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/readonly-node-sync.yml b/.github/workflows/readonly-node-sync.yml index 2cb0d66..868d46b 100644 --- a/.github/workflows/readonly-node-sync.yml +++ b/.github/workflows/readonly-node-sync.yml @@ -94,7 +94,7 @@ jobs: script: | const { getTipBlockNumber } = require("./godwoken-tests/scripts/helper"); const sleep = ms => new Promise(resolve => setTimeout(resolve, ms)); - const PUBLIC_WEB3_RPC='https://godwoken-testnet-v1.ckbapp.dev'; + const PUBLIC_WEB3_RPC='https://v1.testnet.godwoken.io/rpc'; let isSyncedToTip = false; while (!isSyncedToTip) { await sleep(6666); diff --git a/testnet_v1_1/docker-compose.yml b/testnet_v1_1/docker-compose.yml index 5f5497b..4589971 100644 --- a/testnet_v1_1/docker-compose.yml +++ b/testnet_v1_1/docker-compose.yml @@ -46,7 +46,7 @@ services: - ./chain-data/redis-data:/data web3: - image: ghcr.io/godwokenrises/godwoken-web3-prebuilds:v1.8.6 + image: ghcr.io/godwokenrises/godwoken-web3-prebuilds:v1.9.0-rc2 healthcheck: test: curl http://127.0.0.1:8024 || exit 1 volumes: @@ -63,9 +63,15 @@ services: condition: service_healthy web3-indexer: - image: ghcr.io/godwokenrises/godwoken-web3-indexer-prebuilds:v1.8.6 + image: ghcr.io/godwokenrises/godwoken-web3-indexer-prebuilds:v1.9.0-rc2 volumes: - ./web3-indexer-config.toml:/var/lib/web3-indexer/indexer-config.toml + - ./chain-data/logs:/var/lib/web3-indexer/logs + # How to re-sync web3-indexer at /var/lib/web3-indexer/ ? + # ➜ nohup gw-web3-indexer update > logs/web3-indexer-update.log 2>&1 & + # or + # ➜ nohup gw-web3-indexer update > logs/web3-indexer-update.log 2>&1 & + # refer to: https://github.com/godwokenrises/godwoken-web3/blob/main/README.md#update-blocks working_dir: /var/lib/web3-indexer command: [ "gw-web3-indexer" ] environment: From fe631a5e24f6f95c6c81994386aed80bd62a5e74 Mon Sep 17 00:00:00 2001 From: Flouse Date: Fri, 25 Nov 2022 14:16:18 +0800 Subject: [PATCH 2/5] docs: update pull-request template --- .github/pull_request_template.md | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a3edee1..f5c6647 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,13 +3,13 @@ ## Release notes - Godwoken Web3 - https://github.com/nervosnetwork/godwoken-web3/releases + https://github.com/godwokenrises/godwoken-web3/releases - Godwoken - https://github.com/nervosnetwork/godwoken/releases + https://github.com/godwokenrises/godwoken/releases - Scripts - https://github.com/nervosnetwork/godwoken-scripts/releases + https://github.com/godwokenrises/godwoken-scripts/releases - Polyjuice - https://github.com/nervosnetwork/godwoken-polyjuice/releases + https://github.com/godwokenrises/godwoken-polyjuice/releases ## Changed Configs @@ -18,16 +18,9 @@ From 15444f7dc11c49ae551a6fa07725eba209a953d4 Mon Sep 17 00:00:00 2001 From: Flouse Date: Fri, 25 Nov 2022 06:46:48 +0000 Subject: [PATCH 3/5] testnet: add restart_policy for web3-indexer service --- testnet_v1_1/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/testnet_v1_1/docker-compose.yml b/testnet_v1_1/docker-compose.yml index 4589971..8f46094 100644 --- a/testnet_v1_1/docker-compose.yml +++ b/testnet_v1_1/docker-compose.yml @@ -76,6 +76,7 @@ services: command: [ "gw-web3-indexer" ] environment: - RUST_LOG=info + restart: unless-stopped depends_on: web3: condition: service_healthy From 3247b031e95dd0ba0dc643ea08d60208e3c7397e Mon Sep 17 00:00:00 2001 From: Flouse Date: Fri, 25 Nov 2022 08:23:03 +0000 Subject: [PATCH 4/5] testnet: add volumes for pg and redis services --- testnet_v1_1/docker-compose.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testnet_v1_1/docker-compose.yml b/testnet_v1_1/docker-compose.yml index 8f46094..25085cd 100644 --- a/testnet_v1_1/docker-compose.yml +++ b/testnet_v1_1/docker-compose.yml @@ -1,6 +1,10 @@ # Requires docker-compose >= 1.29.0 version: '3.9' +volumes: + testnet_v1-web3-indexer-data: + testnet_v1-redis-data: + services: # Note: To achieve higher sync speed, please run your own ckb-testnet-node and ckb-testnet-indexer, # and update [rpc_client] in gw-testnet_v1-config-readonly.toml. @@ -37,13 +41,13 @@ services: POSTGRES_USER: your_db_user_name POSTGRES_PASSWORD: your_password volumes: - - ./chain-data/postgresql/data:/var/lib/postgresql/data + - testnet_v1-web3-indexer-data:/var/lib/postgresql/data redis: image: redis:bullseye user: redis:redis volumes: - - ./chain-data/redis-data:/data + - testnet_v1-redis-data:/data web3: image: ghcr.io/godwokenrises/godwoken-web3-prebuilds:v1.9.0-rc2 From bdc2d55b72be1a2afec8b92c2f3c236c478cc855 Mon Sep 17 00:00:00 2001 From: Flouse Date: Tue, 29 Nov 2022 09:09:36 +0000 Subject: [PATCH 5/5] Bump to godwoken-prebuilds 1.7.3 and web3/indexer 1.9.0 --- testnet_v1_1/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testnet_v1_1/docker-compose.yml b/testnet_v1_1/docker-compose.yml index 25085cd..4e2f277 100644 --- a/testnet_v1_1/docker-compose.yml +++ b/testnet_v1_1/docker-compose.yml @@ -11,7 +11,7 @@ services: # see: https://docs.nervos.org/docs/basics/guides/run-ckb-with-docker#run-a-ckb-testnet-node gw-readonly: container_name: gw-testnet_v1-readonly - image: ghcr.io/godwokenrises/godwoken-prebuilds:1.7.1-poly1.5.0 + image: ghcr.io/godwokenrises/godwoken-prebuilds:1.7.3 expose: [8119, 8219] healthcheck: test: /bin/gw-healthcheck.sh @@ -50,7 +50,7 @@ services: - testnet_v1-redis-data:/data web3: - image: ghcr.io/godwokenrises/godwoken-web3-prebuilds:v1.9.0-rc2 + image: ghcr.io/godwokenrises/godwoken-web3-prebuilds:v1.9.0 healthcheck: test: curl http://127.0.0.1:8024 || exit 1 volumes: @@ -67,7 +67,7 @@ services: condition: service_healthy web3-indexer: - image: ghcr.io/godwokenrises/godwoken-web3-indexer-prebuilds:v1.9.0-rc2 + image: ghcr.io/godwokenrises/godwoken-web3-indexer-prebuilds:v1.9.0 volumes: - ./web3-indexer-config.toml:/var/lib/web3-indexer/indexer-config.toml - ./chain-data/logs:/var/lib/web3-indexer/logs