From fd378fff3f9034043df02f51a29f606a85d46d32 Mon Sep 17 00:00:00 2001 From: Flouse Date: Thu, 3 Nov 2022 18:34:14 +0800 Subject: [PATCH 1/4] mainnet: bump godwoken-prebuilds to 1.7.0-poly.1.4.5 --- mainnet_v1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet_v1/docker-compose.yml b/mainnet_v1/docker-compose.yml index 373858e..38e739e 100644 --- a/mainnet_v1/docker-compose.yml +++ b/mainnet_v1/docker-compose.yml @@ -4,7 +4,7 @@ version: '3.9' services: gw-readonly: container_name: gw-mainnet_v1-readonly - image: ghcr.io/godwokenrises/godwoken-prebuilds:1.6.2-poly.1.4.5 + image: ghcr.io/godwokenrises/godwoken-prebuilds:1.7.0-poly.1.4.5 expose: [8119, 8219] healthcheck: test: /bin/gw-healthcheck.sh From 2be77d08d481bf3eeb099d783e940e0fb1a3785a Mon Sep 17 00:00:00 2001 From: Flouse Date: Thu, 3 Nov 2022 22:41:47 +0800 Subject: [PATCH 2/4] mainnet_v1: use default `SyscallCyclesConfig` --- mainnet_v1/gw-mainnet_v1-config-readonly.toml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/mainnet_v1/gw-mainnet_v1-config-readonly.toml b/mainnet_v1/gw-mainnet_v1-config-readonly.toml index 9c8f78d..2d52044 100644 --- a/mainnet_v1/gw-mainnet_v1-config-readonly.toml +++ b/mainnet_v1/gw-mainnet_v1-config-readonly.toml @@ -157,7 +157,7 @@ hash_type = 'data' args = '0x' [mem_pool] -execute_l2tx_max_cycles = 150000000 +execute_l2tx_max_cycles = 3000000000 restore_path = '/mnt/mem_block' [mem_pool.mem_block] @@ -167,16 +167,10 @@ max_txs = 1500 # Introduce max_cycles_limit of a Godwoken block # https://github.com/nervosnetwork/godwoken/pull/767 max_cycles_limit = '1950000000' -[mem_pool.mem_block.syscall_cycles] -sys_store_cycles = 50000 -sys_load_cycles = 5000 -sys_create_cycles = 50000 -sys_load_account_script_cycles = 5000 -sys_store_data_cycles = 50000 -sys_load_data_cycles = 5000 -sys_get_block_hash_cycles = 50000 -sys_recover_account_cycles = 50000 -sys_log_cycles = 50000 + +# [mem_pool.mem_block.syscall_cycles] +# Default SyscallCyclesConfig: +# https://github.com/godwokenrises/godwoken/blob/v1.7.0/crates/config/src/config.rs#L579-L599 [store] path = '/mnt/mainnet_v1-store.db' From 4a3e06e75cb56265e7defc734dfd2d83c7ecfe22 Mon Sep 17 00:00:00 2001 From: Flouse Date: Mon, 7 Nov 2022 15:33:55 +0800 Subject: [PATCH 3/4] fixup! mainnet: bump godwoken-prebuilds to 1.7.0-poly.1.4.5 --- mainnet_v1/gw-mainnet_v1-config-readonly.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mainnet_v1/gw-mainnet_v1-config-readonly.toml b/mainnet_v1/gw-mainnet_v1-config-readonly.toml index 2d52044..53039e5 100644 --- a/mainnet_v1/gw-mainnet_v1-config-readonly.toml +++ b/mainnet_v1/gw-mainnet_v1-config-readonly.toml @@ -161,9 +161,10 @@ execute_l2tx_max_cycles = 3000000000 restore_path = '/mnt/mem_block' [mem_pool.mem_block] -max_deposits = 100 -max_withdrawals = 100 -max_txs = 1500 +max_deposits = 50 +max_withdrawals = 50 +# MAX_TPS * block_time = 40 * 8 = 320, rounded up to 400 +max_txs = 400 # Introduce max_cycles_limit of a Godwoken block # https://github.com/nervosnetwork/godwoken/pull/767 max_cycles_limit = '1950000000' From 7acee91c25d5e126f6a3550ab98fde9bcd7869d3 Mon Sep 17 00:00:00 2001 From: Flouse Date: Mon, 7 Nov 2022 15:35:32 +0800 Subject: [PATCH 4/4] mainnet_v1: bump web3/indexer to 1.8.6 --- mainnet_v1/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mainnet_v1/docker-compose.yml b/mainnet_v1/docker-compose.yml index 38e739e..9ad1fa7 100644 --- a/mainnet_v1/docker-compose.yml +++ b/mainnet_v1/docker-compose.yml @@ -43,7 +43,7 @@ services: - ./chain-data/redis-data:/data web3: - image: ghcr.io/godwokenrises/godwoken-web3-prebuilds:v1.8.5 + image: ghcr.io/godwokenrises/godwoken-web3-prebuilds:v1.8.6 healthcheck: test: curl http://127.0.0.1:8024 || exit 1 volumes: @@ -60,7 +60,7 @@ services: condition: service_healthy web3-indexer: - image: ghcr.io/godwokenrises/godwoken-web3-indexer-prebuilds:v1.8.5 + image: ghcr.io/godwokenrises/godwoken-web3-indexer-prebuilds:v1.8.6 volumes: - ./web3-indexer-config.toml:/var/lib/web3-indexer/indexer-config.toml working_dir: /var/lib/web3-indexer