From 9c975e02a189aee47bd6b9bd090e10438ca3d7f6 Mon Sep 17 00:00:00 2001 From: Flouse Date: Thu, 10 Nov 2022 11:11:48 +0800 Subject: [PATCH 1/2] testnet_v1: bump godwoken-prebuilds to 1.7.1-poly1.5.0 --- testnet_v1_1/docker-compose.yml | 2 +- .../gw-testnet_v1-config-readonly.toml | 55 +++++++++++-------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/testnet_v1_1/docker-compose.yml b/testnet_v1_1/docker-compose.yml index d7a6e3f..5f5497b 100644 --- a/testnet_v1_1/docker-compose.yml +++ b/testnet_v1_1/docker-compose.yml @@ -7,7 +7,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.0-poly.1.4.5 + image: ghcr.io/godwokenrises/godwoken-prebuilds:1.7.1-poly1.5.0 expose: [8119, 8219] healthcheck: test: /bin/gw-healthcheck.sh diff --git a/testnet_v1_1/gw-testnet_v1-config-readonly.toml b/testnet_v1_1/gw-testnet_v1-config-readonly.toml index 795c428..9f3461c 100644 --- a/testnet_v1_1/gw-testnet_v1-config-readonly.toml +++ b/testnet_v1_1/gw-testnet_v1-config-readonly.toml @@ -10,67 +10,79 @@ indexer_url = 'https://testnet.ckbapp.dev/indexer' [rpc_server] listen = '0.0.0.0:8119' enable_methods = [] -err_receipt_ws_listen = '0.0.0.0:8219' -[[backend_switches]] -switch_height = 0 -[[backend_switches.backends]] +[fork] +increase_max_l2_tx_cycles_to_500m = 825000 + +[[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 = '0x37b25df86ca495856af98dff506e49f2380d673b0874e13d29f7197712d735e8' 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 = '0xb6176a6170ea33f8468d61f934c45c57d29cdc775bcd3ecaaec183f04b9f33d9' 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 = '0xa30dcbb83ebe571f49122d8d1ce4537679ebf511261c8ffaaa6679bf9fdea3a4' backend_type = 'EthAddrReg' -[[backend_switches.backends]] +[[fork.backend_forks.backends]] validator_path = '/scripts/godwoken-polyjuice-v1.1.5-beta/validator' generator_path = '/scripts/godwoken-polyjuice-v1.1.5-beta/generator' validator_script_type_hash = '0x1629b04b49ded9e5747481f985b11cba6cdd4ffc167971a585e96729455ca736' backend_type = 'Polyjuice' -[[backend_switches]] -switch_height = 110000 -[[backend_switches.backends]] +[[fork.backend_forks]] +fork_height = 110000 +[[fork.backend_forks.backends]] validator_path = '/scripts/godwoken-polyjuice-v1.2.0/validator' generator_path = '/scripts/godwoken-polyjuice-v1.2.0/generator' validator_script_type_hash = '0x1629b04b49ded9e5747481f985b11cba6cdd4ffc167971a585e96729455ca736' backend_type = 'Polyjuice' -[[backend_switches]] -switch_height = 180000 +[[fork.backend_forks]] +fork_height = 180000 # Polyjuice v1.4.0 is backward compatible with Polyjuice v1.3 # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.4.0 -[[backend_switches.backends]] +[[fork.backend_forks.backends]] validator_path = '/scripts/godwoken-polyjuice-v1.4.0/validator' generator_path = '/scripts/godwoken-polyjuice-v1.4.0/generator' validator_script_type_hash = '0x1629b04b49ded9e5747481f985b11cba6cdd4ffc167971a585e96729455ca736' backend_type = 'Polyjuice' -[[backend_switches]] -switch_height = 380000 +[[fork.backend_forks]] +fork_height = 380000 # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.4.1 -[[backend_switches.backends]] +[[fork.backend_forks.backends]] validator_path = '/scripts/godwoken-polyjuice-v1.4.1/validator' generator_path = '/scripts/godwoken-polyjuice-v1.4.1/generator_log' validator_script_type_hash = '0x1629b04b49ded9e5747481f985b11cba6cdd4ffc167971a585e96729455ca736' backend_type = 'Polyjuice' -[[backend_switches]] -switch_height = 630000 +[[fork.backend_forks]] +fork_height = 630000 # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.4.5 -[[backend_switches.backends]] -validator_path = '/scripts/godwoken-polyjuice/validator' -generator_path = '/scripts/godwoken-polyjuice/generator' +[[fork.backend_forks.backends]] +validator_path = '/scripts/godwoken-polyjuice-v1.4.5/validator' +generator_path = '/scripts/godwoken-polyjuice-v1.4.5/generator' +validator_script_type_hash = '0x1629b04b49ded9e5747481f985b11cba6cdd4ffc167971a585e96729455ca736' +backend_type = 'Polyjuice' + +[[fork.backend_forks]] +fork_height = 825000 +# https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/1.5.0 +[[fork.backend_forks.backends]] +validator_path = '/scripts/godwoken-polyjuice-v1.5.0/validator' +generator_path = '/scripts/godwoken-polyjuice-v1.5.0/generator' validator_script_type_hash = '0x1629b04b49ded9e5747481f985b11cba6cdd4ffc167971a585e96729455ca736' backend_type = 'Polyjuice' + [genesis] timestamp = 1651979802446 rollup_type_hash = '0x702359ea7f073558921eb50d8c1c77e92f760c8f8656bde4995f26b8963e2dd8' @@ -164,7 +176,6 @@ args = '0x' [mem_pool] execute_l2tx_max_cycles = 100000000 restore_path = '/mnt/mem-pool/mem-block' - [mem_pool.mem_block] max_deposits = 50 max_withdrawals = 50 From 7871f9272871c56abcb5334cf41af8bc6029c7de Mon Sep 17 00:00:00 2001 From: Flouse Date: Mon, 14 Nov 2022 10:37:53 +0800 Subject: [PATCH 2/2] confg(testnet_v1): execute_l2tx_max_cycles = 500000000 Co-authored-by: jjy --- testnet_v1_1/gw-testnet_v1-config-readonly.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testnet_v1_1/gw-testnet_v1-config-readonly.toml b/testnet_v1_1/gw-testnet_v1-config-readonly.toml index 9f3461c..eb75ac8 100644 --- a/testnet_v1_1/gw-testnet_v1-config-readonly.toml +++ b/testnet_v1_1/gw-testnet_v1-config-readonly.toml @@ -174,7 +174,7 @@ hash_type = 'data' args = '0x' [mem_pool] -execute_l2tx_max_cycles = 100000000 +execute_l2tx_max_cycles = 500000000 restore_path = '/mnt/mem-pool/mem-block' [mem_pool.mem_block] max_deposits = 50