From d864e2afa279efe02c62b22ed4c14818133bbd0b Mon Sep 17 00:00:00 2001 From: Flouse Date: Wed, 9 Nov 2022 15:35:05 +0800 Subject: [PATCH 1/3] config(mainnet): rm useless backend poly1.4.4 --- mainnet_v1/docker-compose.yml | 2 +- mainnet_v1/gw-mainnet_v1-config-readonly.toml | 25 ++++++------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/mainnet_v1/docker-compose.yml b/mainnet_v1/docker-compose.yml index 9ad1fa7..c7cabcc 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.7.0-poly.1.4.5 + image: ghcr.io/godwokenrises/godwoken-prebuilds:dev-poly1.4.6 expose: [8119, 8219] healthcheck: test: /bin/gw-healthcheck.sh diff --git a/mainnet_v1/gw-mainnet_v1-config-readonly.toml b/mainnet_v1/gw-mainnet_v1-config-readonly.toml index 53039e5..aba8729 100644 --- a/mainnet_v1/gw-mainnet_v1-config-readonly.toml +++ b/mainnet_v1/gw-mainnet_v1-config-readonly.toml @@ -37,35 +37,24 @@ generator_path = '/scripts/godwoken-polyjuice-v1.4.1/generator' validator_script_type_hash = '0x83d5d8841518e8db686909d27c821398491f475ed5f1cd392c36e83f4252c4ac' backend_type = 'Polyjuice' -# TODO: remove the useless backend version -# [[backend_switches]] -# switch_height = 186750 -# [[backend_switches.backends]] -# # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.4.2 -# validator_path = '/scripts/godwoken-polyjuice-v1.4.2/validator' -# generator_path = '/scripts/godwoken-polyjuice-v1.4.2/generator' -# validator_script_type_hash = '0x83d5d8841518e8db686909d27c821398491f475ed5f1cd392c36e83f4252c4ac' -# backend_type = 'Polyjuice' - [[backend_switches]] switch_height = 186758 [[backend_switches.backends]] -# https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.4.4 -validator_path = '/scripts/godwoken-polyjuice-v1.4.4/validator' -generator_path = '/scripts/godwoken-polyjuice-v1.4.4/generator' +# https://github.com/godwokenrises/godwoken-polyjuice/releases/tag/1.4.5 +validator_path = '/scripts/godwoken-polyjuice-v1.4.5/validator' +generator_path = '/scripts/godwoken-polyjuice-v1.4.5/generator' validator_script_type_hash = '0x83d5d8841518e8db686909d27c821398491f475ed5f1cd392c36e83f4252c4ac' backend_type = 'Polyjuice' [[backend_switches]] -switch_height = 204000 +switch_height = 217000 [[backend_switches.backends]] -# https://github.com/godwokenrises/godwoken-polyjuice/releases/tag/1.4.5 -validator_path = '/scripts/godwoken-polyjuice-v1.4.5/validator' -generator_path = '/scripts/godwoken-polyjuice-v1.4.5/generator' +# https://github.com/godwokenrises/godwoken-polyjuice/releases/tag/1.4.6 +validator_path = '/scripts/godwoken-polyjuice/validator' +generator_path = '/scripts/godwoken-polyjuice/generator' validator_script_type_hash = '0x83d5d8841518e8db686909d27c821398491f475ed5f1cd392c36e83f4252c4ac' backend_type = 'Polyjuice' - [genesis] timestamp = 1655830128000 rollup_type_hash = '0x1ca35cb5fda4bd542e71d94a6d5f4c0d255d6d6fba73c41cf45d2693e59b3072' From a85d12730a2539091a3a06adf89c040b8525a070 Mon Sep 17 00:00:00 2001 From: Flouse Date: Mon, 14 Nov 2022 20:42:04 +0800 Subject: [PATCH 2/3] mainnet_v1: bump godwoken-prebuilds to 1.7.1-poly1.5.0 --- mainnet_v1/docker-compose.yml | 2 +- mainnet_v1/gw-mainnet_v1-config-readonly.toml | 37 +++++++++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/mainnet_v1/docker-compose.yml b/mainnet_v1/docker-compose.yml index c7cabcc..5d42204 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:dev-poly1.4.6 + image: ghcr.io/godwokenrises/godwoken-prebuilds:1.7.1-poly1.5.0 expose: [8119, 8219] healthcheck: test: /bin/gw-healthcheck.sh diff --git a/mainnet_v1/gw-mainnet_v1-config-readonly.toml b/mainnet_v1/gw-mainnet_v1-config-readonly.toml index aba8729..c3201d3 100644 --- a/mainnet_v1/gw-mainnet_v1-config-readonly.toml +++ b/mainnet_v1/gw-mainnet_v1-config-readonly.toml @@ -13,48 +13,53 @@ enable_methods = [] # [p2p_network_config] # dial = ["/dns4/godwoken/tcp/9999"] -[[backend_switches]] -switch_height = 0 -[[backend_switches.backends]] + +[fork] +increase_max_l2_tx_cycles_to_500m = 233000 + +[[fork.backend_forks]] +fork_height = 0 +[[fork.backend_forks.backends]] validator_path = '/scripts/godwoken-scripts/meta-contract-validator' generator_path = '/scripts/godwoken-scripts/meta-contract-generator' validator_script_type_hash = '0x2c0b586137cb942f92cc3f84f62d77924b560e4088667f6f47012ecfa828e184' backend_type = 'Meta' -[[backend_switches.backends]] +[[fork.backend_forks.backends]] validator_path = '/scripts/godwoken-scripts/sudt-validator' generator_path = '/scripts/godwoken-scripts/sudt-generator' validator_script_type_hash = '0x990027acd7058ec1b45df9d7448c0c5407fc17dde4b9b769f594d613c8053084' backend_type = 'Sudt' -[[backend_switches.backends]] +[[fork.backend_forks.backends]] validator_path = '/scripts/godwoken-scripts/eth-addr-reg-validator' generator_path = '/scripts/godwoken-scripts/eth-addr-reg-generator' validator_script_type_hash = '0xc55c5ede907d13ac1e744cff8ce4386b9dc5aad905d8f3badfd9419efe49eeb2' backend_type = 'EthAddrReg' -[[backend_switches.backends]] +[[fork.backend_forks.backends]] # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.4.1 validator_path = '/scripts/godwoken-polyjuice-v1.4.1/validator' generator_path = '/scripts/godwoken-polyjuice-v1.4.1/generator' validator_script_type_hash = '0x83d5d8841518e8db686909d27c821398491f475ed5f1cd392c36e83f4252c4ac' backend_type = 'Polyjuice' -[[backend_switches]] -switch_height = 186758 -[[backend_switches.backends]] +[[fork.backend_forks]] +fork_height = 186758 +[[fork.backend_forks.backends]] # https://github.com/godwokenrises/godwoken-polyjuice/releases/tag/1.4.5 validator_path = '/scripts/godwoken-polyjuice-v1.4.5/validator' generator_path = '/scripts/godwoken-polyjuice-v1.4.5/generator' validator_script_type_hash = '0x83d5d8841518e8db686909d27c821398491f475ed5f1cd392c36e83f4252c4ac' backend_type = 'Polyjuice' -[[backend_switches]] -switch_height = 217000 -[[backend_switches.backends]] -# https://github.com/godwokenrises/godwoken-polyjuice/releases/tag/1.4.6 -validator_path = '/scripts/godwoken-polyjuice/validator' -generator_path = '/scripts/godwoken-polyjuice/generator' +[[fork.backend_forks]] +fork_height = 233000 +[[fork.backend_forks.backends]] +# https://github.com/godwokenrises/godwoken-polyjuice/releases/tag/1.5.0 +validator_path = '/scripts/godwoken-polyjuice-v1.5.0/validator' +generator_path = '/scripts/godwoken-polyjuice-v1.5.0/generator' validator_script_type_hash = '0x83d5d8841518e8db686909d27c821398491f475ed5f1cd392c36e83f4252c4ac' backend_type = 'Polyjuice' + [genesis] timestamp = 1655830128000 rollup_type_hash = '0x1ca35cb5fda4bd542e71d94a6d5f4c0d255d6d6fba73c41cf45d2693e59b3072' @@ -146,7 +151,7 @@ hash_type = 'data' args = '0x' [mem_pool] -execute_l2tx_max_cycles = 3000000000 +execute_l2tx_max_cycles = 500000000 restore_path = '/mnt/mem_block' [mem_pool.mem_block] From e53318cc98bc8767bde52bf8cfc8c147ca1e7a53 Mon Sep 17 00:00:00 2001 From: jjy Date: Tue, 15 Nov 2022 14:20:51 +0800 Subject: [PATCH 3/3] Update gw-mainnet_v1-config-readonly.toml --- mainnet_v1/gw-mainnet_v1-config-readonly.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet_v1/gw-mainnet_v1-config-readonly.toml b/mainnet_v1/gw-mainnet_v1-config-readonly.toml index c3201d3..5184fe8 100644 --- a/mainnet_v1/gw-mainnet_v1-config-readonly.toml +++ b/mainnet_v1/gw-mainnet_v1-config-readonly.toml @@ -151,7 +151,7 @@ hash_type = 'data' args = '0x' [mem_pool] -execute_l2tx_max_cycles = 500000000 +execute_l2tx_max_cycles = 3000000000 restore_path = '/mnt/mem_block' [mem_pool.mem_block]