From 25fc86dd3841144b9dedacaf70513ea2fb816b1e Mon Sep 17 00:00:00 2001 From: julien Date: Tue, 11 Jul 2023 09:34:55 +0200 Subject: [PATCH 1/2] Proto,SCORU: deactivate DAL page reveal --- .../lib_parameters/default_parameters.ml | 12 ++++++++++- src/proto_alpha/lib_protocol/raw_context.ml | 21 ++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 6bcadcc6fc35..c4a6977496cd 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -230,7 +230,17 @@ let constants_mainnet = { raw_data = {blake2B = Raw_level.root}; metadata = Raw_level.root; - dal_page = Raw_level.root; + dal_page = + (if default_dal.feature_enable then Raw_level.root + else + (* Deactivate the reveal if the dal is not enabled. *) + (* https://gitlab.com/tezos/tezos/-/issues/5968 + Encoding error with Raw_level + + We set the activation level to [pred max_int] to deactivate + the feature. The [pred] is needed to not trigger an encoding + exception with the value [Int32.int_min] (see tezt/tests/mockup.ml). *) + Raw_level.of_int32_exn Int32.(pred max_int)); }; }; zk_rollup = diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 0f24dac256a6..f3acf3ce588d 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -951,7 +951,26 @@ let prepare_first_block ~level ~timestamp ctxt = { raw_data = {blake2B = Raw_level_repr.root}; metadata = Raw_level_repr.root; - dal_page = Raw_level_repr.root; + dal_page = + (* For the protocol activating the DAL one should replace + the expression below by + [Raw_level_repr.of_int32_exn (Int32.succ level)]. + + For a protocol for which the DAL is already activated + the expression below should be changed to + [c.sc_rollup.reveal_activation_level.dal_page]. *) + (if dal.feature_enable then + (* First level of the protocol with dal activated. *) + Raw_level_repr.of_int32_exn (Int32.succ level) + else + (* Deactivate the reveal if the dal is not enabled. *) + (* https://gitlab.com/tezos/tezos/-/issues/5968 + Encoding error with Raw_level + + We set the activation level to [pred max_int] to deactivate + the feature. The [pred] is needed to not trigger an encoding + exception with the value [Int32.int_min] (see tezt/tests/mockup.ml). *) + Raw_level_repr.of_int32_exn Int32.(pred max_int)); } in let sc_rollup = -- GitLab From e6ae597d219e31206f9853237e1f6c47a7d14ae8 Mon Sep 17 00:00:00 2001 From: julien Date: Tue, 11 Jul 2023 13:16:34 +0200 Subject: [PATCH 2/2] Proto,tests: update regressions --- ...Alpha- (mode client) RPC regression tests- misc_protocol.out | 2 +- .../Alpha- (mode light) RPC regression tests- misc_protocol.out | 2 +- .../Alpha- (mode proxy) RPC regression tests- misc_protocol.out | 2 +- ...oxy_server_data_dir) RPC regression tests- misc_protocol.out | 2 +- ...de proxy_server_rpc) RPC regression tests- misc_protocol.out | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out index 417a3ecc4d55..4b1254b5464a 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out @@ -52,7 +52,7 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 0 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646 }, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, "zk_rollup_max_ticket_payload_size": 2048, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out index 23444bb0085a..da9fed28e830 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out @@ -52,7 +52,7 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 0 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646 }, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, "zk_rollup_max_ticket_payload_size": 2048, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out index 847a8dd3ce69..31e7c1c12b82 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out @@ -52,7 +52,7 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 0 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646 }, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, "zk_rollup_max_ticket_payload_size": 2048, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out index ba03367b297a..6e1185a7d09b 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out @@ -52,7 +52,7 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 0 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646 }, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, "zk_rollup_max_ticket_payload_size": 2048, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out index ba03367b297a..6e1185a7d09b 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out @@ -52,7 +52,7 @@ "smart_rollup_max_number_of_cemented_commitments": 5, "smart_rollup_max_number_of_parallel_games": 32, "smart_rollup_reveal_activation_level": - { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 0 }, + { "raw_data": { "Blake2B": 0 }, "metadata": 0, "dal_page": 2147483646 }, "zk_rollup_enable": false, "zk_rollup_origination_size": 4000, "zk_rollup_min_pending_to_process": 10, "zk_rollup_max_ticket_payload_size": 2048, -- GitLab